From ec9a000871b2cf0180fcca90d02548ed3d2ac68d Mon Sep 17 00:00:00 2001 From: Mark Kattenbelt Date: Mon, 30 Oct 2006 12:17:28 +0000 Subject: [PATCH] Changed the dialog boxes such that the "Okay" button is default when you press enter. git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@87 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/src/userinterface/GUIConstantsPicker.java | 1 + prism/src/userinterface/GUIOptionsDialog.java | 5 +++-- prism/src/userinterface/GUISimulationPicker.java | 2 ++ prism/src/userinterface/model/GUITransientTime.java | 4 +++- prism/src/userinterface/properties/GUIExperimentPicker.java | 4 +++- prism/src/userinterface/properties/GUIGraphPicker.java | 1 + prism/src/userinterface/properties/GUIPropertyEditor.java | 3 ++- .../userinterface/properties/GUIPropertyResultDialog.java | 4 ++-- prism/src/userinterface/properties/GUIResultsTable.java | 1 + prism/src/userinterface/simulator/GUIInitialStatePicker.java | 3 ++- 10 files changed, 20 insertions(+), 8 deletions(-) diff --git a/prism/src/userinterface/GUIConstantsPicker.java b/prism/src/userinterface/GUIConstantsPicker.java index 7b143dd1..59dad9c6 100644 --- a/prism/src/userinterface/GUIConstantsPicker.java +++ b/prism/src/userinterface/GUIConstantsPicker.java @@ -82,6 +82,7 @@ public class GUIConstantsPicker extends javax.swing.JDialog //initialise initComponents(); + this.getRootPane().setDefaultButton(okayButton); initTables(areModel, areProp); initValues(undef, modelDefaults, propDefaults); diff --git a/prism/src/userinterface/GUIOptionsDialog.java b/prism/src/userinterface/GUIOptionsDialog.java index 1cad9d1b..81a2b6ce 100644 --- a/prism/src/userinterface/GUIOptionsDialog.java +++ b/prism/src/userinterface/GUIOptionsDialog.java @@ -42,6 +42,7 @@ public class GUIOptionsDialog extends javax.swing.JDialog settings = parent.getPrism().getSettings(); panels = new ArrayList(); initComponents(); + this.getRootPane().setDefaultButton(cancelButton); setLocationRelativeTo(getParent()); // centre //setResizable(false); @@ -136,7 +137,7 @@ public class GUIOptionsDialog extends javax.swing.JDialog jPanel4.setLayout(new java.awt.FlowLayout(java.awt.FlowLayout.RIGHT)); - cancelButton.setText("OK"); + cancelButton.setText("Okay"); cancelButton.setMaximumSize(new java.awt.Dimension(200, 50)); cancelButton.setMinimumSize(new java.awt.Dimension(80, 25)); cancelButton.setPreferredSize(new java.awt.Dimension(80, 25)); @@ -153,7 +154,7 @@ public class GUIOptionsDialog extends javax.swing.JDialog jPanel2.add(jPanel4, java.awt.BorderLayout.EAST); getContentPane().add(jPanel2, java.awt.BorderLayout.SOUTH); - + pack(); }//GEN-END:initComponents diff --git a/prism/src/userinterface/GUISimulationPicker.java b/prism/src/userinterface/GUISimulationPicker.java index 3c08a132..82e560ee 100644 --- a/prism/src/userinterface/GUISimulationPicker.java +++ b/prism/src/userinterface/GUISimulationPicker.java @@ -133,6 +133,8 @@ public class GUISimulationPicker extends javax.swing.JDialog implements KeyListe // initialise initComponents(); + this.getRootPane().setDefaultButton(okayButton); + initTable(); initValues(); approximationField.addKeyListener(this); diff --git a/prism/src/userinterface/model/GUITransientTime.java b/prism/src/userinterface/model/GUITransientTime.java index 75d6e518..36932ff6 100644 --- a/prism/src/userinterface/model/GUITransientTime.java +++ b/prism/src/userinterface/model/GUITransientTime.java @@ -60,6 +60,7 @@ public class GUITransientTime extends javax.swing.JDialog public GUITransientTime(java.awt.Frame parent) { super(parent, "Define time", true); initComponents(); + this.getRootPane().setDefaultButton(okayButton); setLocationRelativeTo(getParent()); // centre if (!first) timeField.setText(""+time); } @@ -142,7 +143,8 @@ public class GUITransientTime extends javax.swing.JDialog jPanel6.add(cancelButton); getContentPane().add(jPanel6, java.awt.BorderLayout.SOUTH); - + + pack(); }//GEN-END:initComponents diff --git a/prism/src/userinterface/properties/GUIExperimentPicker.java b/prism/src/userinterface/properties/GUIExperimentPicker.java index 41f74319..f40a6de7 100644 --- a/prism/src/userinterface/properties/GUIExperimentPicker.java +++ b/prism/src/userinterface/properties/GUIExperimentPicker.java @@ -88,6 +88,7 @@ public class GUIExperimentPicker extends javax.swing.JDialog //initialise initComponents(); + this.getRootPane().setDefaultButton(okayButton); if (offerGraph) { createGraphCheck.setEnabled(true); @@ -213,7 +214,8 @@ public class GUIExperimentPicker extends javax.swing.JDialog jPanel1.add(useSimulationCheck, gridBagConstraints); getContentPane().add(jPanel1, java.awt.BorderLayout.CENTER); - + + jPanel6.setLayout(new java.awt.FlowLayout(java.awt.FlowLayout.RIGHT)); okayButton.setText("Okay"); diff --git a/prism/src/userinterface/properties/GUIGraphPicker.java b/prism/src/userinterface/properties/GUIGraphPicker.java index 8762f68d..00565063 100644 --- a/prism/src/userinterface/properties/GUIGraphPicker.java +++ b/prism/src/userinterface/properties/GUIGraphPicker.java @@ -63,6 +63,7 @@ public class GUIGraphPicker extends javax.swing.JDialog this.gh = gh; multiSeries = new ArrayList(); initComponents(); + getRootPane().setDefaultButton(lineOkayButton); setResizable(false); init(); setLocationRelativeTo(getParent()); // centre diff --git a/prism/src/userinterface/properties/GUIPropertyEditor.java b/prism/src/userinterface/properties/GUIPropertyEditor.java index ac234af0..c7f5ba1f 100644 --- a/prism/src/userinterface/properties/GUIPropertyEditor.java +++ b/prism/src/userinterface/properties/GUIPropertyEditor.java @@ -84,6 +84,7 @@ public class GUIPropertyEditor extends javax.swing.JDialog implements ActionList this.parsedModel = parsedModel; this.propertyInvalidStrategy = strategy; initComponents(); + this.getRootPane().setDefaultButton(okayButton); setLocationRelativeTo(getParent()); // centre //propertyList.setListData(props); if(prop == null) @@ -781,7 +782,7 @@ public class GUIPropertyEditor extends javax.swing.JDialog implements ActionList jPanel2.add(cancelButton); getContentPane().add(jPanel2, java.awt.BorderLayout.SOUTH); - + pack(); }//GEN-END:initComponents diff --git a/prism/src/userinterface/properties/GUIPropertyResultDialog.java b/prism/src/userinterface/properties/GUIPropertyResultDialog.java index 6adf59ba..cc23aa6d 100644 --- a/prism/src/userinterface/properties/GUIPropertyResultDialog.java +++ b/prism/src/userinterface/properties/GUIPropertyResultDialog.java @@ -39,7 +39,7 @@ public class GUIPropertyResultDialog extends javax.swing.JDialog super(parent, false); initComponents(); - + getRootPane().setDefaultButton(jButton1); setTitle("Property Details"); propertyLabel.setText(gp.getPropString()); @@ -109,7 +109,7 @@ public class GUIPropertyResultDialog extends javax.swing.JDialog jPanel2.add(jButton1); getContentPane().add(jPanel2, java.awt.BorderLayout.SOUTH); - + jPanel10.setLayout(new java.awt.GridBagLayout()); jPanel1.setLayout(new java.awt.GridBagLayout()); diff --git a/prism/src/userinterface/properties/GUIResultsTable.java b/prism/src/userinterface/properties/GUIResultsTable.java index 4f4bb85a..e8aef4cd 100644 --- a/prism/src/userinterface/properties/GUIResultsTable.java +++ b/prism/src/userinterface/properties/GUIResultsTable.java @@ -57,6 +57,7 @@ public class GUIResultsTable extends javax.swing.JDialog //initialise initComponents(); + getRootPane().setDefaultButton(closeButton); setResizable(true); pack(); setLocationRelativeTo(getParent()); // centre diff --git a/prism/src/userinterface/simulator/GUIInitialStatePicker.java b/prism/src/userinterface/simulator/GUIInitialStatePicker.java index 420a57a8..98bad523 100644 --- a/prism/src/userinterface/simulator/GUIInitialStatePicker.java +++ b/prism/src/userinterface/simulator/GUIInitialStatePicker.java @@ -98,6 +98,7 @@ public class GUIInitialStatePicker extends javax.swing.JDialog implements KeyLis //initialise initComponents(); + this.getRootPane().setDefaultButton(okayButton); initTable(); initValues(); @@ -198,7 +199,7 @@ public class GUIInitialStatePicker extends javax.swing.JDialog implements KeyLis jPanel7.add(jPanel1, java.awt.BorderLayout.CENTER); getContentPane().add(jPanel7, java.awt.BorderLayout.CENTER); - + pack(); }//GEN-END:initComponents