From e177915ca57e919f2f0e7e35efa3d731f141142a Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Tue, 25 Jul 2006 13:13:18 +0000 Subject: [PATCH] Fixed various dialogs so that they centre on their window parent. git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@60 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/src/chart/GraphListEditor.java | 2 ++ prism/src/chart/MultiGraphOptions.java | 1 + prism/src/settings/FontChooser.java | 1 + prism/src/userinterface/GUIConstantsPicker.java | 1 + prism/src/userinterface/GUIOptionsDialog.java | 1 + prism/src/userinterface/GUISimulationPicker.java | 1 + prism/src/userinterface/model/GUIMultiModel.java | 1 + prism/src/userinterface/model/GUITransientTime.java | 2 +- prism/src/userinterface/properties/GUIExperimentPicker.java | 1 + prism/src/userinterface/properties/GUIGraphPicker.java | 1 + prism/src/userinterface/properties/GUIPropertyEditor.java | 1 + prism/src/userinterface/properties/GUIResultsTable.java | 1 + prism/src/userinterface/simulator/GUIInitialStatePicker.java | 3 ++- .../userinterface/simulator/networking/GUINetworkEditor.java | 1 + .../simulator/networking/GUISimulatorDistributionDialog.java | 1 + prism/src/userinterface/util/FontChooser.java | 1 + 16 files changed, 18 insertions(+), 2 deletions(-) diff --git a/prism/src/chart/GraphListEditor.java b/prism/src/chart/GraphListEditor.java index e30a63b0..264c7cf7 100644 --- a/prism/src/chart/GraphListEditor.java +++ b/prism/src/chart/GraphListEditor.java @@ -476,6 +476,7 @@ public class GraphListEditor extends JPanel d.getContentPane().add(closePanel, BorderLayout.SOUTH); d.pack(); + d.setLocationRelativeTo(parent); // centre d.show(); } @@ -543,6 +544,7 @@ public class GraphListEditor extends JPanel sd.pack(); + sd.setLocationRelativeTo(parent); // centre sd.show(); } diff --git a/prism/src/chart/MultiGraphOptions.java b/prism/src/chart/MultiGraphOptions.java index d6a71561..0e646722 100644 --- a/prism/src/chart/MultiGraphOptions.java +++ b/prism/src/chart/MultiGraphOptions.java @@ -81,6 +81,7 @@ public class MultiGraphOptions extends JDialog pack(); + setLocationRelativeTo(getParent()); // centre //show(); setDefaultCloseOperation(javax.swing.JFrame.EXIT_ON_CLOSE); } diff --git a/prism/src/settings/FontChooser.java b/prism/src/settings/FontChooser.java index 87268ac3..145381aa 100644 --- a/prism/src/settings/FontChooser.java +++ b/prism/src/settings/FontChooser.java @@ -54,6 +54,7 @@ public class FontChooser extends javax.swing.JDialog implements ListSelectionLis doListModels(); doListeners(); shouldReturn = true; + setLocationRelativeTo(getParent()); // centre } public FontChooser(Dialog parent) diff --git a/prism/src/userinterface/GUIConstantsPicker.java b/prism/src/userinterface/GUIConstantsPicker.java index bbc9e0c0..7b143dd1 100644 --- a/prism/src/userinterface/GUIConstantsPicker.java +++ b/prism/src/userinterface/GUIConstantsPicker.java @@ -88,6 +88,7 @@ public class GUIConstantsPicker extends javax.swing.JDialog setResizable(false); pack(); + setLocationRelativeTo(getParent()); // centre } /** This method is called from within the constructor to diff --git a/prism/src/userinterface/GUIOptionsDialog.java b/prism/src/userinterface/GUIOptionsDialog.java index cf3055c6..2f37592d 100644 --- a/prism/src/userinterface/GUIOptionsDialog.java +++ b/prism/src/userinterface/GUIOptionsDialog.java @@ -54,6 +54,7 @@ public class GUIOptionsDialog extends javax.swing.JDialog implements EntityResol settings = parent.getPrism().getSettings(); panels = new ArrayList(); initComponents(); + setLocationRelativeTo(getParent()); // centre //setResizable(false); diff --git a/prism/src/userinterface/GUISimulationPicker.java b/prism/src/userinterface/GUISimulationPicker.java index a9cddc8c..3c08a132 100644 --- a/prism/src/userinterface/GUISimulationPicker.java +++ b/prism/src/userinterface/GUISimulationPicker.java @@ -142,6 +142,7 @@ public class GUISimulationPicker extends javax.swing.JDialog implements KeyListe setResizable(false); pack(); + setLocationRelativeTo(getParent()); // centre } /** This method is called from within the constructor to diff --git a/prism/src/userinterface/model/GUIMultiModel.java b/prism/src/userinterface/model/GUIMultiModel.java index 07c2efe6..df5f04b3 100644 --- a/prism/src/userinterface/model/GUIMultiModel.java +++ b/prism/src/userinterface/model/GUIMultiModel.java @@ -206,6 +206,7 @@ public class GUIMultiModel extends GUIPlugin implements PrismSettingsListener diag.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); diag.pack(); + diag.setLocationRelativeTo(getGUI()); // centre diag.show(); } diff --git a/prism/src/userinterface/model/GUITransientTime.java b/prism/src/userinterface/model/GUITransientTime.java index 980d81c4..75d6e518 100644 --- a/prism/src/userinterface/model/GUITransientTime.java +++ b/prism/src/userinterface/model/GUITransientTime.java @@ -60,7 +60,7 @@ public class GUITransientTime extends javax.swing.JDialog public GUITransientTime(java.awt.Frame parent) { super(parent, "Define time", true); initComponents(); - setLocation(parent.getLocation().x+(parent.getWidth()-getWidth())/2, parent.getLocation().y+(parent.getHeight()-getHeight())/2); + setLocationRelativeTo(getParent()); // centre if (!first) timeField.setText(""+time); } diff --git a/prism/src/userinterface/properties/GUIExperimentPicker.java b/prism/src/userinterface/properties/GUIExperimentPicker.java index de6a7f81..41f74319 100644 --- a/prism/src/userinterface/properties/GUIExperimentPicker.java +++ b/prism/src/userinterface/properties/GUIExperimentPicker.java @@ -117,6 +117,7 @@ public class GUIExperimentPicker extends javax.swing.JDialog setResizable(false); pack(); + setLocationRelativeTo(getParent()); // centre } /** This method is called from within the constructor to diff --git a/prism/src/userinterface/properties/GUIGraphPicker.java b/prism/src/userinterface/properties/GUIGraphPicker.java index 9691975c..8762f68d 100644 --- a/prism/src/userinterface/properties/GUIGraphPicker.java +++ b/prism/src/userinterface/properties/GUIGraphPicker.java @@ -65,6 +65,7 @@ public class GUIGraphPicker extends javax.swing.JDialog initComponents(); setResizable(false); init(); + setLocationRelativeTo(getParent()); // centre } public void startGraphExperiment(GUIExperimentTable et, int experimentIndex) diff --git a/prism/src/userinterface/properties/GUIPropertyEditor.java b/prism/src/userinterface/properties/GUIPropertyEditor.java index ef818d73..ac234af0 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(); + setLocationRelativeTo(getParent()); // centre //propertyList.setListData(props); if(prop == null) { diff --git a/prism/src/userinterface/properties/GUIResultsTable.java b/prism/src/userinterface/properties/GUIResultsTable.java index 33b19d3b..4f4bb85a 100644 --- a/prism/src/userinterface/properties/GUIResultsTable.java +++ b/prism/src/userinterface/properties/GUIResultsTable.java @@ -59,6 +59,7 @@ public class GUIResultsTable extends javax.swing.JDialog initComponents(); setResizable(true); pack(); + setLocationRelativeTo(getParent()); // centre } /** This method is called from within the constructor to initialize the form. */ diff --git a/prism/src/userinterface/simulator/GUIInitialStatePicker.java b/prism/src/userinterface/simulator/GUIInitialStatePicker.java index 9419f779..420a57a8 100644 --- a/prism/src/userinterface/simulator/GUIInitialStatePicker.java +++ b/prism/src/userinterface/simulator/GUIInitialStatePicker.java @@ -76,7 +76,7 @@ public class GUIInitialStatePicker extends javax.swing.JDialog implements KeyLis /** Creates new form GUIConstantsPicker */ public GUIInitialStatePicker(GUIPrism parent, Values defaultInitial, ModulesFile mf) { - super(parent, "Simulation Parameters", true); + super(parent, "Initial State for Simulation", true); this.gui = parent; this.mf = mf; @@ -105,6 +105,7 @@ public class GUIInitialStatePicker extends javax.swing.JDialog implements KeyLis setResizable(false); pack(); + setLocationRelativeTo(getParent()); // centre } /** This method is called from within the constructor to diff --git a/prism/src/userinterface/simulator/networking/GUINetworkEditor.java b/prism/src/userinterface/simulator/networking/GUINetworkEditor.java index 1c008b65..1363a61f 100644 --- a/prism/src/userinterface/simulator/networking/GUINetworkEditor.java +++ b/prism/src/userinterface/simulator/networking/GUINetworkEditor.java @@ -72,6 +72,7 @@ public class GUINetworkEditor extends JDialog implements TreeSelectionListener, setActiveFile(null); initComponents(); + setLocationRelativeTo(getParent()); // centre initPopups(); theMenu.add(fileMenu); theMenu.add(editMenu); diff --git a/prism/src/userinterface/simulator/networking/GUISimulatorDistributionDialog.java b/prism/src/userinterface/simulator/networking/GUISimulatorDistributionDialog.java index 79539277..62ae9b2c 100644 --- a/prism/src/userinterface/simulator/networking/GUISimulatorDistributionDialog.java +++ b/prism/src/userinterface/simulator/networking/GUISimulatorDistributionDialog.java @@ -81,6 +81,7 @@ public class GUISimulatorDistributionDialog extends javax.swing.JDialog implemen this.simulator = simulator; initComponents(); + setLocationRelativeTo(getParent()); // centre SummaryEditorKit kit = new SummaryEditorKit(); diff --git a/prism/src/userinterface/util/FontChooser.java b/prism/src/userinterface/util/FontChooser.java index 67171763..3a1f96af 100644 --- a/prism/src/userinterface/util/FontChooser.java +++ b/prism/src/userinterface/util/FontChooser.java @@ -64,6 +64,7 @@ public class FontChooser extends javax.swing.JDialog implements ListSelectionLis doListModels(); doListeners(); shouldReturn = true; + setLocationRelativeTo(getParent()); // centre } public static FontColorPair getFont(Dialog parent, Font startFont, Color startColor, Font defaultFont, Color defaultColor)