Browse Source

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
master
Mark Kattenbelt 19 years ago
parent
commit
ec9a000871
  1. 1
      prism/src/userinterface/GUIConstantsPicker.java
  2. 3
      prism/src/userinterface/GUIOptionsDialog.java
  3. 2
      prism/src/userinterface/GUISimulationPicker.java
  4. 2
      prism/src/userinterface/model/GUITransientTime.java
  5. 2
      prism/src/userinterface/properties/GUIExperimentPicker.java
  6. 1
      prism/src/userinterface/properties/GUIGraphPicker.java
  7. 1
      prism/src/userinterface/properties/GUIPropertyEditor.java
  8. 2
      prism/src/userinterface/properties/GUIPropertyResultDialog.java
  9. 1
      prism/src/userinterface/properties/GUIResultsTable.java
  10. 1
      prism/src/userinterface/simulator/GUIInitialStatePicker.java

1
prism/src/userinterface/GUIConstantsPicker.java

@ -82,6 +82,7 @@ public class GUIConstantsPicker extends javax.swing.JDialog
//initialise //initialise
initComponents(); initComponents();
this.getRootPane().setDefaultButton(okayButton);
initTables(areModel, areProp); initTables(areModel, areProp);
initValues(undef, modelDefaults, propDefaults); initValues(undef, modelDefaults, propDefaults);

3
prism/src/userinterface/GUIOptionsDialog.java

@ -42,6 +42,7 @@ public class GUIOptionsDialog extends javax.swing.JDialog
settings = parent.getPrism().getSettings(); settings = parent.getPrism().getSettings();
panels = new ArrayList(); panels = new ArrayList();
initComponents(); initComponents();
this.getRootPane().setDefaultButton(cancelButton);
setLocationRelativeTo(getParent()); // centre setLocationRelativeTo(getParent()); // centre
//setResizable(false); //setResizable(false);
@ -136,7 +137,7 @@ public class GUIOptionsDialog extends javax.swing.JDialog
jPanel4.setLayout(new java.awt.FlowLayout(java.awt.FlowLayout.RIGHT)); 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.setMaximumSize(new java.awt.Dimension(200, 50));
cancelButton.setMinimumSize(new java.awt.Dimension(80, 25)); cancelButton.setMinimumSize(new java.awt.Dimension(80, 25));
cancelButton.setPreferredSize(new java.awt.Dimension(80, 25)); cancelButton.setPreferredSize(new java.awt.Dimension(80, 25));

2
prism/src/userinterface/GUISimulationPicker.java

@ -133,6 +133,8 @@ public class GUISimulationPicker extends javax.swing.JDialog implements KeyListe
// initialise // initialise
initComponents(); initComponents();
this.getRootPane().setDefaultButton(okayButton);
initTable(); initTable();
initValues(); initValues();
approximationField.addKeyListener(this); approximationField.addKeyListener(this);

2
prism/src/userinterface/model/GUITransientTime.java

@ -60,6 +60,7 @@ public class GUITransientTime extends javax.swing.JDialog
public GUITransientTime(java.awt.Frame parent) { public GUITransientTime(java.awt.Frame parent) {
super(parent, "Define time", true); super(parent, "Define time", true);
initComponents(); initComponents();
this.getRootPane().setDefaultButton(okayButton);
setLocationRelativeTo(getParent()); // centre setLocationRelativeTo(getParent()); // centre
if (!first) timeField.setText(""+time); if (!first) timeField.setText(""+time);
} }
@ -143,6 +144,7 @@ public class GUITransientTime extends javax.swing.JDialog
getContentPane().add(jPanel6, java.awt.BorderLayout.SOUTH); getContentPane().add(jPanel6, java.awt.BorderLayout.SOUTH);
pack(); pack();
}//GEN-END:initComponents }//GEN-END:initComponents

2
prism/src/userinterface/properties/GUIExperimentPicker.java

@ -88,6 +88,7 @@ public class GUIExperimentPicker extends javax.swing.JDialog
//initialise //initialise
initComponents(); initComponents();
this.getRootPane().setDefaultButton(okayButton);
if (offerGraph) if (offerGraph)
{ {
createGraphCheck.setEnabled(true); createGraphCheck.setEnabled(true);
@ -214,6 +215,7 @@ public class GUIExperimentPicker extends javax.swing.JDialog
getContentPane().add(jPanel1, java.awt.BorderLayout.CENTER); getContentPane().add(jPanel1, java.awt.BorderLayout.CENTER);
jPanel6.setLayout(new java.awt.FlowLayout(java.awt.FlowLayout.RIGHT)); jPanel6.setLayout(new java.awt.FlowLayout(java.awt.FlowLayout.RIGHT));
okayButton.setText("Okay"); okayButton.setText("Okay");

1
prism/src/userinterface/properties/GUIGraphPicker.java

@ -63,6 +63,7 @@ public class GUIGraphPicker extends javax.swing.JDialog
this.gh = gh; this.gh = gh;
multiSeries = new ArrayList(); multiSeries = new ArrayList();
initComponents(); initComponents();
getRootPane().setDefaultButton(lineOkayButton);
setResizable(false); setResizable(false);
init(); init();
setLocationRelativeTo(getParent()); // centre setLocationRelativeTo(getParent()); // centre

1
prism/src/userinterface/properties/GUIPropertyEditor.java

@ -84,6 +84,7 @@ public class GUIPropertyEditor extends javax.swing.JDialog implements ActionList
this.parsedModel = parsedModel; this.parsedModel = parsedModel;
this.propertyInvalidStrategy = strategy; this.propertyInvalidStrategy = strategy;
initComponents(); initComponents();
this.getRootPane().setDefaultButton(okayButton);
setLocationRelativeTo(getParent()); // centre setLocationRelativeTo(getParent()); // centre
//propertyList.setListData(props); //propertyList.setListData(props);
if(prop == null) if(prop == null)

2
prism/src/userinterface/properties/GUIPropertyResultDialog.java

@ -39,7 +39,7 @@ public class GUIPropertyResultDialog extends javax.swing.JDialog
super(parent, false); super(parent, false);
initComponents(); initComponents();
getRootPane().setDefaultButton(jButton1);
setTitle("Property Details"); setTitle("Property Details");
propertyLabel.setText(gp.getPropString()); propertyLabel.setText(gp.getPropString());

1
prism/src/userinterface/properties/GUIResultsTable.java

@ -57,6 +57,7 @@ public class GUIResultsTable extends javax.swing.JDialog
//initialise //initialise
initComponents(); initComponents();
getRootPane().setDefaultButton(closeButton);
setResizable(true); setResizable(true);
pack(); pack();
setLocationRelativeTo(getParent()); // centre setLocationRelativeTo(getParent()); // centre

1
prism/src/userinterface/simulator/GUIInitialStatePicker.java

@ -98,6 +98,7 @@ public class GUIInitialStatePicker extends javax.swing.JDialog implements KeyLis
//initialise //initialise
initComponents(); initComponents();
this.getRootPane().setDefaultButton(okayButton);
initTable(); initTable();
initValues(); initValues();

Loading…
Cancel
Save