Commit b90d17f2 authored by Eric Seigne's avatar Eric Seigne
Browse files

fix #3: elegant solution to font size computed from screen size

parent 3c032804
<?xml version="1.1" encoding="UTF-8" ?>
<?xml version="1.0" encoding="UTF-8" ?>
<Form version="1.2" maxVersion="1.2" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
<NonVisualComponents>
......@@ -12,7 +12,6 @@
<Property name="title" type="java.lang.String" value="About"/>
<Property name="modal" type="boolean" value="true"/>
<Property name="name" type="java.lang.String" value="About" noResource="true"/>
<Property name="resizable" type="boolean" value="false"/>
</Properties>
<SyntheticProperties>
<SyntheticProperty name="formSizePolicy" type="int" value="2"/>
......@@ -26,7 +25,7 @@
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
<AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,46,0,0,1,98"/>
<AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,2,23,0,0,3,110"/>
</AuxValues>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
......@@ -117,9 +116,6 @@
</Component>
<Component class="javax.swing.JLabel" name="updateLabel1">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Tahoma" size="12" style="0"/>
</Property>
<Property name="text" type="java.lang.String" value="&lt;every&gt;"/>
</Properties>
</Component>
......
......@@ -53,11 +53,11 @@ public class AboutDialog extends JDialog {
setResources();
oldCursor=getCursor();
infoTextLabel.setText(info);
java.awt.Font infoFont = new java.awt.Font("Tahoma", 0, 14);
infoTextLabel.setFont(infoFont);
updateLabel1.setFont(infoFont);
updateLabel2.setFont(infoFont);
updateCheckBox.setFont(infoFont);
// java.awt.Font infoFont = new java.awt.Font("Tahoma", 0, 14);
// infoTextLabel.setFont(infoFont);
// updateLabel1.setFont(infoFont);
// updateLabel2.setFont(infoFont);
// updateCheckBox.setFont(infoFont);
// Set initial state
......@@ -107,7 +107,7 @@ public class AboutDialog extends JDialog {
* WARNING: Do NOT modify this code. The content of this method is
* always regenerated by the Form Editor.
*/
// <editor-fold defaultstate="collapsed" desc=" Generated Code ">//GEN-BEGIN:initComponents
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
private void initComponents() {
java.awt.GridBagConstraints gridBagConstraints;
......@@ -124,13 +124,12 @@ public class AboutDialog extends JDialog {
updateLabel2 = new javax.swing.JLabel();
infoTextLabel = new javax.swing.JLabel();
getContentPane().setLayout(new java.awt.GridBagLayout());
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
setTitle("About");
setModal(true);
setName("About");
setResizable(false);
setName("About"); // NOI18N
getContentPane().setLayout(new java.awt.GridBagLayout());
okButton.setText("<OK>");
okButton.setActionCommand("ok");
okButton.addActionListener(new java.awt.event.ActionListener() {
......@@ -138,7 +137,6 @@ public class AboutDialog extends JDialog {
okButtonActionPerformed(evt);
}
});
buttonPanel.add(okButton);
gridBagConstraints = new java.awt.GridBagConstraints();
......@@ -147,9 +145,8 @@ public class AboutDialog extends JDialog {
gridBagConstraints.gridwidth = 2;
getContentPane().add(buttonPanel, gridBagConstraints);
infoPanel.setLayout(new java.awt.BorderLayout());
infoPanel.setMinimumSize(new java.awt.Dimension(150, 150));
infoPanel.setLayout(new java.awt.BorderLayout());
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
gridBagConstraints.gridy = 0;
......@@ -159,7 +156,7 @@ public class AboutDialog extends JDialog {
logoPanel.setLayout(new java.awt.GridBagLayout());
logoLabel.setIcon(new javax.swing.ImageIcon(getClass().getResource("/mvplan/resources/mvplan64.gif")));
logoLabel.setIcon(new javax.swing.ImageIcon(getClass().getResource("/mvplan/resources/mvplan64.gif"))); // NOI18N
logoLabel.setVerticalAlignment(javax.swing.SwingConstants.TOP);
logoLabel.setVerticalTextPosition(javax.swing.SwingConstants.TOP);
logoLabel.addMouseListener(new java.awt.event.MouseAdapter() {
......@@ -173,7 +170,6 @@ public class AboutDialog extends JDialog {
logoLabelMouseExited(evt);
}
});
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 0;
......@@ -185,7 +181,7 @@ public class AboutDialog extends JDialog {
gridBagConstraints.gridy = 0;
getContentPane().add(logoPanel, gridBagConstraints);
updatePanel.setLayout(new java.awt.FlowLayout(java.awt.FlowLayout.LEFT));
updatePanel.setLayout(new java.awt.FlowLayout(0));
updateCheckBox.setText("<Check>");
updateCheckBox.setHorizontalTextPosition(javax.swing.SwingConstants.LEFT);
......@@ -194,10 +190,8 @@ public class AboutDialog extends JDialog {
updateCheckBoxActionPerformed(evt);
}
});
updatePanel.add(updateCheckBox);
updateLabel1.setFont(new java.awt.Font("Tahoma", 0, 12));
updateLabel1.setText("<every>");
updatePanel.add(updateLabel1);
......@@ -218,7 +212,6 @@ public class AboutDialog extends JDialog {
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.insets = new java.awt.Insets(10, 10, 10, 10);
getContentPane().add(infoTextLabel, gridBagConstraints);
}// </editor-fold>//GEN-END:initComponents
private void logoLabelMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_logoLabelMouseClicked
......
<?xml version="1.1" encoding="UTF-8" ?>
<?xml version="1.0" encoding="UTF-8" ?>
<Form version="1.2" maxVersion="1.2" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
<Properties>
......@@ -7,6 +7,7 @@
</Properties>
<SyntheticProperties>
<SyntheticProperty name="formSizePolicy" type="int" value="1"/>
<SyntheticProperty name="generateCenter" type="boolean" value="false"/>
</SyntheticProperties>
<AuxValues>
<AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
......
......@@ -52,7 +52,7 @@ public class ConditionsAcceptance extends javax.swing.JDialog {
agreeButton.setToolTipText( MvplanInstance.getMvplan().getResource("mvplan.gui.TermsAcceptance.agreeButton.tip") );
exitButton.setToolTipText( MvplanInstance.getMvplan().getResource("mvplan.gui.TermsAcceptance.exitButton.tip") );
// Display T&Cs
termsTextArea.setFont(new Font("MONOSPACED",Font.PLAIN,16));
//termsTextArea.setFont(new Font("MONOSPACED",Font.PLAIN,18));
new ConditionsDisplay(termsTextArea);
// Position at start
......@@ -80,7 +80,7 @@ public class ConditionsAcceptance extends javax.swing.JDialog {
* WARNING: Do NOT modify this code. The content of this method is
* always regenerated by the Form Editor.
*/
// <editor-fold defaultstate="collapsed" desc=" Generated Code ">//GEN-BEGIN:initComponents
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
private void initComponents() {
java.awt.GridBagConstraints gridBagConstraints;
......@@ -94,15 +94,15 @@ public class ConditionsAcceptance extends javax.swing.JDialog {
exitButton = new javax.swing.JButton();
agreeButton = new javax.swing.JButton();
getContentPane().setLayout(new java.awt.GridBagLayout());
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
setResizable(false);
infoPanel.setLayout(new java.awt.BorderLayout());
getContentPane().setLayout(new java.awt.GridBagLayout());
infoPanel.setMaximumSize(new java.awt.Dimension(1000, 14));
infoPanel.setMinimumSize(new java.awt.Dimension(400, 14));
infoPanel.setPreferredSize(new java.awt.Dimension(500, 14));
infoPanel.setLayout(new java.awt.BorderLayout());
infoLabel.setText("jLabel1");
infoPanel.add(infoLabel, java.awt.BorderLayout.CENTER);
......@@ -115,11 +115,11 @@ public class ConditionsAcceptance extends javax.swing.JDialog {
gridBagConstraints.insets = new java.awt.Insets(10, 10, 10, 10);
getContentPane().add(infoPanel, gridBagConstraints);
displayPanel.setLayout(new java.awt.BorderLayout());
displayPanel.setMaximumSize(new java.awt.Dimension(1000, 1000));
displayPanel.setMinimumSize(new java.awt.Dimension(400, 200));
displayPanel.setPreferredSize(new java.awt.Dimension(500, 350));
displayPanel.setLayout(new java.awt.BorderLayout());
termsTextArea.setColumns(40);
termsTextArea.setEditable(false);
termsTextArea.setRows(20);
......@@ -139,6 +139,7 @@ public class ConditionsAcceptance extends javax.swing.JDialog {
buttonPanel.setMaximumSize(new java.awt.Dimension(1000, 43));
buttonPanel.setMinimumSize(new java.awt.Dimension(400, 43));
buttonPanel.setPreferredSize(new java.awt.Dimension(500, 43));
instructionsLabel.setText("jLabel1");
instructionsLabel.setMaximumSize(new java.awt.Dimension(300, 16));
instructionsLabel.setPreferredSize(new java.awt.Dimension(250, 13));
......@@ -153,7 +154,6 @@ public class ConditionsAcceptance extends javax.swing.JDialog {
exitButtonActionPerformed(evt);
}
});
buttonPanel.add(exitButton);
agreeButton.setText("I Agree");
......@@ -166,7 +166,6 @@ public class ConditionsAcceptance extends javax.swing.JDialog {
agreeButtonActionPerformed(evt);
}
});
buttonPanel.add(agreeButton);
gridBagConstraints = new java.awt.GridBagConstraints();
......
<?xml version="1.0" encoding="UTF-8" ?>
<Form version="1.0" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
<Form version="1.2" maxVersion="1.2" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
<Properties>
<Property name="defaultCloseOperation" type="int" value="2"/>
<Property name="modal" type="boolean" value="true"/>
......@@ -10,7 +10,11 @@
<SyntheticProperty name="formSizePolicy" type="int" value="2"/>
</SyntheticProperties>
<AuxValues>
<AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
<AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
......
......@@ -73,7 +73,7 @@ public class InfoURLDialog extends javax.swing.JDialog {
* WARNING: Do NOT modify this code. The content of this method is
* always regenerated by the Form Editor.
*/
// <editor-fold defaultstate="collapsed" desc=" Generated Code ">//GEN-BEGIN:initComponents
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
private void initComponents() {
java.awt.GridBagConstraints gridBagConstraints;
......@@ -87,12 +87,12 @@ public class InfoURLDialog extends javax.swing.JDialog {
infoLabel2 = new javax.swing.JLabel();
infoLabel3 = new javax.swing.JLabel();
getContentPane().setLayout(new java.awt.GridBagLayout());
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
setModal(true);
setResizable(false);
jLabel1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/mvplan/resources/metal-Inform.gif")));
getContentPane().setLayout(new java.awt.GridBagLayout());
jLabel1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/mvplan/resources/metal-Inform.gif"))); // NOI18N
iconPanel.add(jLabel1);
gridBagConstraints = new java.awt.GridBagConstraints();
......@@ -121,7 +121,6 @@ public class InfoURLDialog extends javax.swing.JDialog {
okButtonActionPerformed(evt);
}
});
buttonPanel.add(okButton);
gridBagConstraints = new java.awt.GridBagConstraints();
......@@ -147,7 +146,6 @@ public class InfoURLDialog extends javax.swing.JDialog {
infoLabel3MousePressed(evt);
}
});
infoPanel2.add(infoLabel3);
gridBagConstraints = new java.awt.GridBagConstraints();
......@@ -156,7 +154,6 @@ public class InfoURLDialog extends javax.swing.JDialog {
gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
gridBagConstraints.insets = new java.awt.Insets(0, 10, 10, 10);
getContentPane().add(infoPanel2, gridBagConstraints);
}// </editor-fold>//GEN-END:initComponents
private void infoLabel3MousePressed(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_infoLabel3MousePressed
......
<?xml version="1.0" encoding="UTF-8" ?>
<Form version="1.0" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
<Form version="1.2" maxVersion="1.2" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
<Properties>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
<Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
......@@ -15,7 +15,11 @@
</Property>
</Properties>
<AuxValues>
<AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
<AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
......
......@@ -37,16 +37,18 @@ public class ModelSaveAccessory extends javax.swing.JPanel {
* WARNING: Do NOT modify this code. The content of this method is
* always regenerated by the Form Editor.
*/
private void initComponents() {//GEN-BEGIN:initComponents
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
private void initComponents() {
modelMetaDataLabel = new javax.swing.JLabel();
jScrollPane1 = new javax.swing.JScrollPane();
modelMetaDataText = new javax.swing.JTextArea();
setLayout(new java.awt.BorderLayout());
setBorder(new javax.swing.border.EmptyBorder(new java.awt.Insets(1, 10, 1, 10)));
setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 10, 1, 10));
setMinimumSize(new java.awt.Dimension(200, 100));
setPreferredSize(new java.awt.Dimension(200, 100));
setLayout(new java.awt.BorderLayout());
modelMetaDataLabel.setText("MetaData");
modelMetaDataLabel.setVerticalAlignment(javax.swing.SwingConstants.TOP);
modelMetaDataLabel.setMaximumSize(new java.awt.Dimension(80, 30));
......@@ -57,6 +59,7 @@ public class ModelSaveAccessory extends javax.swing.JPanel {
jScrollPane1.setVerticalScrollBarPolicy(javax.swing.ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS);
jScrollPane1.setMinimumSize(new java.awt.Dimension(150, 100));
jScrollPane1.setPreferredSize(new java.awt.Dimension(180, 100));
modelMetaDataText.setLineWrap(true);
modelMetaDataText.setRows(3);
modelMetaDataText.setWrapStyleWord(true);
......@@ -65,8 +68,7 @@ public class ModelSaveAccessory extends javax.swing.JPanel {
jScrollPane1.setViewportView(modelMetaDataText);
add(jScrollPane1, java.awt.BorderLayout.SOUTH);
}//GEN-END:initComponents
}// </editor-fold>//GEN-END:initComponents
// Sets the MetaData text field
/**
* Sets MetaData field text
......
......@@ -110,7 +110,7 @@ public class ProfileDisplayComponent extends AbstractDisplayComponent
printColour = Mvplan.prefs.isPrintColour();
g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING,RenderingHints.VALUE_ANTIALIAS_ON);
g2.setFont(bodyFont);
//g2.setFont(bodyFont);
FontRenderContext frc=g2.getFontRenderContext();
bodyTextMetrics=bodyFont.getLineMetrics(heading,frc);
......@@ -215,7 +215,7 @@ public class ProfileDisplayComponent extends AbstractDisplayComponent
drawLine(g2,c6,PADY,c6,PADY+tableHeight);
// Add headings
g2.setFont(headFont);
//g2.setFont(headFont);
textOffsetY = CELLPADY+headTextMetrics.getDescent();
startY=PADY-textOffsetY+lineHeight*2;
......
<?xml version="1.1" encoding="UTF-8" ?>
<?xml version="1.0" encoding="UTF-8" ?>
<Form version="1.2" maxVersion="1.2" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
<Properties>
<Property name="name" type="java.lang.String" value="" noResource="true"/>
<Property name="resizable" type="boolean" value="false"/>
</Properties>
<SyntheticProperties>
<SyntheticProperty name="formSizePolicy" type="int" value="1"/>
<SyntheticProperty name="formSizePolicy" type="int" value="2"/>
</SyntheticProperties>
<AuxValues>
<AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
......@@ -17,7 +16,7 @@
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
<AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,0,-73,0,0,1,-126"/>
<AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,-117,0,0,3,10"/>
</AuxValues>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
......@@ -31,7 +30,7 @@
<EtchetBorder/>
</Border>
<Connection PropertyName="titleX" code="MvplanInstance.getMvplan().getResource(&quot;mvplan.gui.TableGeneratorDialog.segmentLabel.text&quot;)" type="code"/>
<Font PropertyName="font" name="Tahoma" size="10" style="0"/>
<Property name="font" value="java.awt.Font[family=Tahoma,name=Tahoma,style=plain,size=10]"/>
</TitledBorder>
</Border>
</Property>
......@@ -47,7 +46,7 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
<GridBagConstraints gridX="0" gridY="0" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="10" insetsLeft="10" insetsBottom="0" insetsRight="10" anchor="10" weightX="0.0" weightY="0.0"/>
<GridBagConstraints gridX="0" gridY="0" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="10" insetsLeft="2" insetsBottom="10" insetsRight="2" anchor="10" weightX="1.0" weightY="1.0"/>
</Constraint>
</Constraints>
......@@ -55,9 +54,6 @@
<SubComponents>
<Component class="javax.swing.JSpinner" name="segmentSpinner">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Tahoma" size="12" style="0"/>
</Property>
<Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
<Connection code="MvplanInstance.getMvplan().getResource(&quot;mvplan.gui.TableGeneratorDialog.segmentTip.text&quot;)" type="code"/>
</Property>
......@@ -85,7 +81,7 @@
<EtchetBorder/>
</Border>
<Connection PropertyName="titleX" code="MvplanInstance.getMvplan().getResource(&quot;mvplan.gui.TableGeneratorDialog.modifierLabel.text&quot;)" type="code"/>
<Font PropertyName="font" name="Tahoma" size="10" style="0"/>
<Property name="font" value="java.awt.Font[family=Tahoma,name=Tahoma,style=plain,size=10]"/>
</TitledBorder>
</Border>
</Property>
......@@ -98,7 +94,7 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
<GridBagConstraints gridX="0" gridY="1" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="10" insetsLeft="10" insetsBottom="10" insetsRight="10" anchor="10" weightX="1.0" weightY="1.0"/>
<GridBagConstraints gridX="0" gridY="2" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="10" insetsLeft="6" insetsBottom="10" insetsRight="6" anchor="10" weightX="1.0" weightY="1.0"/>
</Constraint>
</Constraints>
......@@ -185,7 +181,7 @@
<Container class="javax.swing.JPanel" name="buttonPanel">
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
<GridBagConstraints gridX="0" gridY="2" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
<GridBagConstraints gridX="0" gridY="3" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
......
......@@ -98,6 +98,7 @@ public class TableGeneratorDialog extends JDialog implements FocusListener {
modifierField2.setText(String.valueOf(modifiers[2]));
modifierField3.setText(String.valueOf(modifiers[3]));
modifierField4.setText(String.valueOf(modifiers[4]));
pack();
setVisible(true);
return returnResult;
}
......@@ -130,16 +131,14 @@ public class TableGeneratorDialog extends JDialog implements FocusListener {
cancelButton = new javax.swing.JButton();
setName(""); // NOI18N
setResizable(false);
getContentPane().setLayout(new java.awt.GridBagLayout());
infoPanel.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createEtchedBorder(), MvplanInstance.getMvplan().getResource("mvplan.gui.TableGeneratorDialog.segmentLabel.text"), javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Tahoma", 0, 16))); // NOI18N
infoPanel.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createEtchedBorder(), MvplanInstance.getMvplan().getResource("mvplan.gui.TableGeneratorDialog.segmentLabel.text"), 0, 0, null));
infoPanel.setToolTipText(MvplanInstance.getMvplan().getResource("mvplan.gui.TableGeneratorDialog.segmentTip.text"));
infoPanel.setMinimumSize(new java.awt.Dimension(320, 30));
infoPanel.setPreferredSize(new java.awt.Dimension(480, 80));
infoPanel.setMinimumSize(new java.awt.Dimension(230, 45));
infoPanel.setPreferredSize(new java.awt.Dimension(320, 70));
infoPanel.setLayout(new java.awt.GridBagLayout());
segmentSpinner.setFont(new java.awt.Font("Tahoma", 0, 16)); // NOI18N
segmentSpinner.setToolTipText(MvplanInstance.getMvplan().getResource("mvplan.gui.TableGeneratorDialog.segmentTip.text"));
segmentSpinner.setMinimumSize(new java.awt.Dimension(300, 18));
segmentSpinner.setPreferredSize(new java.awt.Dimension(210, 25));
......@@ -154,16 +153,18 @@ public class TableGeneratorDialog extends JDialog implements FocusListener {
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 0;
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
gridBagConstraints.insets = new java.awt.Insets(10, 10, 0, 10);
gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
gridBagConstraints.weightx = 1.0;
gridBagConstraints.weighty = 1.0;
gridBagConstraints.insets = new java.awt.Insets(10, 2, 10, 2);
getContentPane().add(infoPanel, gridBagConstraints);
inputPanel.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createEtchedBorder(), MvplanInstance.getMvplan().getResource("mvplan.gui.TableGeneratorDialog.modifierLabel.text"), javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Tahoma", 0, 16))); // NOI18N
inputPanel.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createEtchedBorder(), MvplanInstance.getMvplan().getResource("mvplan.gui.TableGeneratorDialog.modifierLabel.text"), 0, 0, null));
inputPanel.setToolTipText(MvplanInstance.getMvplan().getResource("mvplan.gui.TableGeneratorDialog.modifierTip.text"));
inputPanel.setPreferredSize(new java.awt.Dimension(270, 80));
inputPanel.setPreferredSize(new java.awt.Dimension(270, 70));
inputPanel.setLayout(new java.awt.GridBagLayout());
jPanel1.setPreferredSize(new java.awt.Dimension(250, 40));
jPanel1.setPreferredSize(new java.awt.Dimension(250, 29));
modifierField0.setColumns(3);
modifierField0.setEditable(false);
......@@ -202,11 +203,11 @@ public class TableGeneratorDialog extends JDialog implements FocusListener {
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 1;
gridBagConstraints.gridy = 2;
gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
gridBagConstraints.weightx = 1.0;
gridBagConstraints.weighty = 1.0;
gridBagConstraints.insets = new java.awt.Insets(10, 10, 10, 10);
gridBagConstraints.insets = new java.awt.Insets(10, 6, 10, 6);
getContentPane().add(inputPanel, gridBagConstraints);
okButton.setText(MvplanInstance.getMvplan().getResource("mvplan.gui.TableGeneratorDialog.okButton.text"));
......@@ -227,10 +228,8 @@ public class TableGeneratorDialog extends JDialog implements FocusListener {
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 2;
gridBagConstraints.gridy = 3;
getContentPane().add(buttonPanel, gridBagConstraints);
pack();
}// </editor-fold>//GEN-END:initComponents
/**
......
<?xml version="1.0" encoding="UTF-8" ?>
<Form version="1.0" type="org.netbeans.modules.form.forminfo.JFrameFormInfo">
<Form version="1.2" maxVersion="1.2" type="org.netbeans.modules.form.forminfo.JFrameFormInfo">
<Properties>
<Property name="defaultCloseOperation" type="int" value="3"/>
<Property name="title" type="java.lang.String" value="Error"/>
<Property name="resizable" type="boolean" value="false"/>
</Properties>
<SyntheticProperties>
<SyntheticProperty name="formSizePolicy" type="int" value="2"/>
</SyntheticProperties>
<AuxValues>
<AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
<AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
<AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,46,0,0,1,-112"/>
<AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,86,0,0,2,-8"/>
</AuxValues>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
......
......@@ -54,8 +54,9 @@ public class VersionFrame extends javax.swing.JFrame {
* WARNING: Do NOT modify this code. The content of this method is
* always regenerated by the Form Editor.
*/
// <editor-fold defaultstate="collapsed" desc=" Generated Code ">//GEN-BEGIN:initComponents
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
private void initComponents() {
jPanel2 = new javax.swing.JPanel();
versionLabel = new javax.swing.JLabel();
versionL1 = new javax.swing.JLabel();
......@@ -65,14 +66,13 @@ public class VersionFrame extends javax.swing.JFrame {
buttonPanel = new javax.swing.JPanel();
exitButton = new javax.swing.JButton();
getContentPane().setLayout(new java.awt.FlowLayout());
setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
setTitle("Error");
setResizable(false);
jPanel2.setLayout(new java.awt.GridLayout(4, 1));
getContentPane().setLayout(new java.awt.FlowLayout());
jPanel2.setBorder(javax.swing.BorderFactory.createEmptyBorder(10, 10, 10, 10));
jPanel2.setLayout(new java.awt.GridLayout(4, 1));
versionLabel.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);