Set start points and widths for the label and value fields so that they display corre...
authorlhauch <lhauch@6f19259b-4bc3-4df7-8a09-765794883524>
Fri, 22 Sep 2006 16:07:23 +0000 (16:07 +0000)
committerlhauch <lhauch@6f19259b-4bc3-4df7-8a09-765794883524>
Fri, 22 Sep 2006 16:07:23 +0000 (16:07 +0000)
Hid the PCD type selection, since the tool should be able to determine whether the module is a DXE_DRIVER or PEIM and set the value accordingly.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1601 6f19259b-4bc3-4df7-8a09-765794883524

Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/MsaHeader.java

index fddf763..18757ae 100644 (file)
@@ -63,6 +63,13 @@ public class MsaHeader extends IInternalFrame {
 \r
     private int dialogHeight = 630;\r
 \r
+    private final int labelWidth = 155;\r
+    \r
+    private int valueWidth = 320;\r
+    \r
+    private final int labelCol = 12;\r
+    \r
+    private final int valueCol = 168;\r
     //\r
     //Define class members\r
     //\r
@@ -195,7 +202,7 @@ public class MsaHeader extends IInternalFrame {
     private JCheckBox getJCheckBoxIa32() {\r
         if (jCheckBoxIa32 == null) {\r
             jCheckBoxIa32 = new JCheckBox();\r
-            jCheckBoxIa32.setBounds(new java.awt.Rectangle(160, 505, 55, 20));\r
+            jCheckBoxIa32.setBounds(new java.awt.Rectangle(valueCol, 505, 55, 20));\r
             jCheckBoxIa32.setText("IA32");\r
             jCheckBoxIa32.setToolTipText(DataType.SUP_ARCH_LIST_HELP_TEXT);\r
             jCheckBoxIa32.addFocusListener(this);\r
@@ -211,7 +218,7 @@ public class MsaHeader extends IInternalFrame {
     private JCheckBox getJCheckBoxX64() {\r
         if (jCheckBoxX64 == null) {\r
             jCheckBoxX64 = new JCheckBox();\r
-            jCheckBoxX64.setBounds(new java.awt.Rectangle(215, 505, 53, 20));\r
+            jCheckBoxX64.setBounds(new java.awt.Rectangle(valueCol + 55, 505, 53, 20));\r
             jCheckBoxX64.setText("X64");\r
             jCheckBoxX64.setToolTipText(DataType.SUP_ARCH_LIST_HELP_TEXT);\r
             jCheckBoxX64.addFocusListener(this);\r
@@ -227,7 +234,7 @@ public class MsaHeader extends IInternalFrame {
     private JCheckBox getJCheckBoxIpf() {\r
         if (jCheckBoxIpf == null) {\r
             jCheckBoxIpf = new JCheckBox();\r
-            jCheckBoxIpf.setBounds(new java.awt.Rectangle(270, 505, 52, 20));\r
+            jCheckBoxIpf.setBounds(new java.awt.Rectangle(valueCol + 110, 505, 52, 20));\r
             jCheckBoxIpf.setText("IPF");\r
             jCheckBoxIpf.setToolTipText(DataType.SUP_ARCH_LIST_HELP_TEXT);\r
             jCheckBoxIpf.addFocusListener(this);\r
@@ -243,7 +250,7 @@ public class MsaHeader extends IInternalFrame {
     private JCheckBox getJCheckBoxEbc() {\r
         if (jCheckBoxEbc == null) {\r
             jCheckBoxEbc = new JCheckBox();\r
-            jCheckBoxEbc.setBounds(new java.awt.Rectangle(325, 505, 53, 20));\r
+            jCheckBoxEbc.setBounds(new java.awt.Rectangle(valueCol + 165, 505, 53, 20));\r
             jCheckBoxEbc.setText("EBC");\r
             jCheckBoxEbc.setToolTipText(DataType.SUP_ARCH_LIST_HELP_TEXT);\r
             jCheckBoxEbc.addFocusListener(this);\r
@@ -259,7 +266,7 @@ public class MsaHeader extends IInternalFrame {
     private JCheckBox getJCheckBoxArm() {\r
         if (jCheckBoxArm == null) {\r
             jCheckBoxArm = new JCheckBox();\r
-            jCheckBoxArm.setBounds(new java.awt.Rectangle(380, 505, 54, 20));\r
+            jCheckBoxArm.setBounds(new java.awt.Rectangle(valueCol + 220, 505, 54, 20));\r
             jCheckBoxArm.setText("ARM");\r
             jCheckBoxArm.setToolTipText(DataType.SUP_ARCH_LIST_HELP_TEXT);\r
             jCheckBoxArm.addFocusListener(this);\r
@@ -275,7 +282,7 @@ public class MsaHeader extends IInternalFrame {
     private JCheckBox getJCheckBoxPpc() {\r
         if (jCheckBoxPpc == null) {\r
             jCheckBoxPpc = new JCheckBox();\r
-            jCheckBoxPpc.setBounds(new java.awt.Rectangle(435, 505, 53, 20));\r
+            jCheckBoxPpc.setBounds(new java.awt.Rectangle(valueCol + 285, 505, 53, 20));\r
             jCheckBoxPpc.setText("PPC");\r
             jCheckBoxPpc.setToolTipText(DataType.SUP_ARCH_LIST_HELP_TEXT);\r
             jCheckBoxPpc.addFocusListener(this);\r
@@ -292,7 +299,7 @@ public class MsaHeader extends IInternalFrame {
     private JTextField getJTextFieldBaseName() {\r
         if (jTextFieldBaseName == null) {\r
             jTextFieldBaseName = new JTextField();\r
-            jTextFieldBaseName.setBounds(new java.awt.Rectangle(160, 10, 320, 20));\r
+            jTextFieldBaseName.setBounds(new java.awt.Rectangle(valueCol, 10, valueWidth, 20));\r
             jTextFieldBaseName.setPreferredSize(new java.awt.Dimension(320, 20));\r
             jTextFieldBaseName.addFocusListener(this);\r
             jTextFieldBaseName.setToolTipText("A brief Identifier, such as USB I/O Library, of the module");\r
@@ -310,7 +317,7 @@ public class MsaHeader extends IInternalFrame {
         if (jTextFieldGuid == null) {\r
             jTextFieldGuid = new JTextField();\r
             jTextFieldGuid.setPreferredSize(new java.awt.Dimension(250, 20));\r
-            jTextFieldGuid.setLocation(new java.awt.Point(160, 60));\r
+            jTextFieldGuid.setLocation(new java.awt.Point(valueCol, 60));\r
             jTextFieldGuid.setSize(new java.awt.Dimension(250, 20));\r
             jTextFieldGuid.addFocusListener(this);\r
             jTextFieldGuid.setToolTipText("Guaranteed Unique Identification Number, Registry Format (8-4-4-4-12)");\r
@@ -327,9 +334,9 @@ public class MsaHeader extends IInternalFrame {
     private JTextField getJTextFieldVersion() {\r
         if (jTextFieldVersion == null) {\r
             jTextFieldVersion = new JTextField();\r
-            jTextFieldVersion.setPreferredSize(new java.awt.Dimension(320, 20));\r
-            jTextFieldVersion.setLocation(new java.awt.Point(160, 85));\r
-            jTextFieldVersion.setSize(new java.awt.Dimension(320, 20));\r
+            jTextFieldVersion.setPreferredSize(new java.awt.Dimension(valueWidth, 20));\r
+            jTextFieldVersion.setLocation(new java.awt.Point(valueCol, 85));\r
+            jTextFieldVersion.setSize(new java.awt.Dimension(valueWidth, 20));\r
             jTextFieldVersion.addFocusListener(this);\r
             jTextFieldVersion.setToolTipText("A Version Number, 1.0, 1, 1.01, 1.0.1");\r
         }\r
@@ -344,10 +351,11 @@ public class MsaHeader extends IInternalFrame {
      **/\r
     private JButton getJButtonGenerateGuid() {\r
         if (jButtonGenerateGuid == null) {\r
+            int genGuidCol = valueCol + 285;\r
             jButtonGenerateGuid = new JButton();\r
             jButtonGenerateGuid.setPreferredSize(new java.awt.Dimension(65, 20));\r
             jButtonGenerateGuid.setSize(new java.awt.Dimension(65, 20));\r
-            jButtonGenerateGuid.setLocation(new java.awt.Point(415, 60));\r
+            jButtonGenerateGuid.setLocation(new java.awt.Point(genGuidCol, 60));\r
             jButtonGenerateGuid.setText("GEN");\r
             jButtonGenerateGuid.addActionListener(this);\r
         }\r
@@ -401,14 +409,15 @@ public class MsaHeader extends IInternalFrame {
      **/\r
     private JTextField getJTextFieldSpecification() {\r
         if (jTextFieldSpecification == null) {\r
+            int specWidth = valueWidth + 50;\r
             jTextFieldSpecification = new JTextField();\r
 \r
-            jTextFieldSpecification.setPreferredSize(new java.awt.Dimension(320, 20));\r
+            jTextFieldSpecification.setPreferredSize(new java.awt.Dimension(specWidth, 20));\r
             jTextFieldSpecification.setText("FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052");\r
             jTextFieldSpecification.setBorder(null);\r
 \r
-            jTextFieldSpecification.setSize(new java.awt.Dimension(320, 20));\r
-            jTextFieldSpecification.setLocation(new java.awt.Point(2, dialogHeight - 30));\r
+            jTextFieldSpecification.setSize(new java.awt.Dimension(specWidth, 20));\r
+            jTextFieldSpecification.setLocation(new java.awt.Point(labelCol, dialogHeight - 30));\r
             jTextFieldSpecification.setEditable(false);\r
             jTextFieldSpecification.addFocusListener(this);\r
         }\r
@@ -461,10 +470,10 @@ public class MsaHeader extends IInternalFrame {
         if (jScrollPaneLicense == null) {\r
             jScrollPaneLicense = new JScrollPane();\r
             jScrollPaneLicense.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);\r
-            jScrollPaneLicense.setSize(new java.awt.Dimension(320, 120));\r
-            jScrollPaneLicense.setLocation(new java.awt.Point(160, 305));\r
+            jScrollPaneLicense.setSize(new java.awt.Dimension(valueWidth, 120));\r
+            jScrollPaneLicense.setLocation(new java.awt.Point(valueCol, 305));\r
             jScrollPaneLicense.setViewportView(getJTextAreaLicense());\r
-            jScrollPaneLicense.setPreferredSize(new java.awt.Dimension(320, 120));\r
+            jScrollPaneLicense.setPreferredSize(new java.awt.Dimension(valueWidth, 120));\r
         }\r
         return jScrollPaneLicense;\r
     }\r
@@ -479,10 +488,10 @@ public class MsaHeader extends IInternalFrame {
         if (jScrollPaneDescription == null) {\r
             jScrollPaneDescription = new JScrollPane();\r
             jScrollPaneDescription.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);\r
-            jScrollPaneDescription.setSize(new java.awt.Dimension(320, 120));\r
-            jScrollPaneDescription.setLocation(new java.awt.Point(160, 135));\r
+            jScrollPaneDescription.setSize(new java.awt.Dimension(valueWidth, 120));\r
+            jScrollPaneDescription.setLocation(new java.awt.Point(valueCol, 135));\r
             jScrollPaneDescription.setViewportView(getJTextAreaDescription());\r
-            jScrollPaneDescription.setPreferredSize(new java.awt.Dimension(320, 120));\r
+            jScrollPaneDescription.setPreferredSize(new java.awt.Dimension(valueWidth, 120));\r
         }\r
         return jScrollPaneDescription;\r
     }\r
@@ -496,9 +505,9 @@ public class MsaHeader extends IInternalFrame {
     private JTextField getJTextFieldAbstract() {\r
         if (jTextFieldAbstract == null) {\r
             jTextFieldAbstract = new JTextField();\r
-            jTextFieldAbstract.setPreferredSize(new java.awt.Dimension(320, 20));\r
-            jTextFieldAbstract.setLocation(new java.awt.Point(160, 110));\r
-            jTextFieldAbstract.setSize(new java.awt.Dimension(320, 20));\r
+            jTextFieldAbstract.setPreferredSize(new java.awt.Dimension(valueWidth, 20));\r
+            jTextFieldAbstract.setLocation(new java.awt.Point(valueCol, 110));\r
+            jTextFieldAbstract.setSize(new java.awt.Dimension(valueWidth, 20));\r
             jTextFieldAbstract.addFocusListener(this);\r
             jTextFieldAbstract.setToolTipText("A one sentence description of this module.");\r
         }\r
@@ -514,8 +523,8 @@ public class MsaHeader extends IInternalFrame {
     private JComboBox getJComboBoxModuleType() {\r
         if (jComboBoxModuleType == null) {\r
             jComboBoxModuleType = new JComboBox();\r
-            jComboBoxModuleType.setBounds(new java.awt.Rectangle(160, 35, 320, 20));\r
-            jComboBoxModuleType.setPreferredSize(new java.awt.Dimension(320, 20));\r
+            jComboBoxModuleType.setBounds(new java.awt.Rectangle(valueCol, 35, valueWidth, 20));\r
+            jComboBoxModuleType.setPreferredSize(new java.awt.Dimension(valueWidth, 20));\r
             jComboBoxModuleType.addFocusListener(this);\r
         }\r
         return jComboBoxModuleType;\r
@@ -530,9 +539,9 @@ public class MsaHeader extends IInternalFrame {
     private JTextField getJTextFieldURL() {\r
         if (jTextFieldURL == null) {\r
             jTextFieldURL = new JTextField();\r
-            jTextFieldURL.setPreferredSize(new java.awt.Dimension(320, 20));\r
-            jTextFieldURL.setLocation(new java.awt.Point(160, 430));\r
-            jTextFieldURL.setSize(new java.awt.Dimension(320, 20));\r
+            jTextFieldURL.setPreferredSize(new java.awt.Dimension(valueWidth, 20));\r
+            jTextFieldURL.setLocation(new java.awt.Point(valueCol, 430));\r
+            jTextFieldURL.setSize(new java.awt.Dimension(valueWidth, 20));\r
             jTextFieldURL.addFocusListener(this);\r
             jTextFieldURL.setToolTipText("A URL for the latest version of the license.");\r
         }\r
@@ -562,10 +571,10 @@ public class MsaHeader extends IInternalFrame {
     private JScrollPane getJScrollPaneCopyright() {\r
         if (jScrollPaneCopyright == null) {\r
             jScrollPaneCopyright = new JScrollPane();\r
-            jScrollPaneCopyright.setBounds(new java.awt.Rectangle(160, 260, 320, 40));\r
-            jScrollPaneCopyright.setPreferredSize(new java.awt.Dimension(320, 40));\r
+            jScrollPaneCopyright.setBounds(new java.awt.Rectangle(valueCol, 260, valueWidth, 40));\r
+            jScrollPaneCopyright.setPreferredSize(new java.awt.Dimension(valueWidth, 40));\r
             jScrollPaneCopyright.setViewportView(getJTextAreaCopyright());\r
-            jScrollPaneCopyright.setSize(new java.awt.Dimension(320, 40));\r
+            jScrollPaneCopyright.setSize(new java.awt.Dimension(valueWidth, 40));\r
         }\r
         return jScrollPaneCopyright;\r
     }\r
@@ -584,7 +593,7 @@ public class MsaHeader extends IInternalFrame {
             jTextAreaCopyright.setWrapStyleWord(true);\r
             jTextAreaCopyright.setSelectionStart(0);\r
             jTextAreaCopyright.setSelectionEnd(0);\r
-            jTextAreaCopyright.setBounds(new java.awt.Rectangle(0, 0, 320, 40));\r
+            jTextAreaCopyright.setBounds(new java.awt.Rectangle(0, 0, valueWidth, 40));\r
             jTextAreaCopyright.setToolTipText("One or more copyright lines.");\r
         }\r
         return jTextAreaCopyright;\r
@@ -598,8 +607,8 @@ public class MsaHeader extends IInternalFrame {
     private JComboBox getJComboBoxBinaryModule() {\r
         if (jComboBoxBinaryModule == null) {\r
             jComboBoxBinaryModule = new JComboBox();\r
-            jComboBoxBinaryModule.setBounds(new java.awt.Rectangle(160, 480, 320, 20));\r
-            jComboBoxBinaryModule.setPreferredSize(new java.awt.Dimension(320, 20));\r
+            jComboBoxBinaryModule.setBounds(new java.awt.Rectangle(valueCol, 480, valueWidth, 20));\r
+            jComboBoxBinaryModule.setPreferredSize(new java.awt.Dimension(valueWidth, 20));\r
             jComboBoxBinaryModule.addFocusListener(this);\r
             jComboBoxBinaryModule.setToolTipText("<html>Modules are either source modules <br>"\r
                                                  + "which can be compiled or binary <br>"\r
@@ -621,8 +630,8 @@ public class MsaHeader extends IInternalFrame {
     private JTextField getJTextFieldOutputFileBasename() {\r
         if (jTextFieldOutputFileBasename == null) {\r
             jTextFieldOutputFileBasename = new JTextField();\r
-            jTextFieldOutputFileBasename.setBounds(new java.awt.Rectangle(160, 455, 320, 20));\r
-            jTextFieldOutputFileBasename.setPreferredSize(new java.awt.Dimension(320, 20));\r
+            jTextFieldOutputFileBasename.setBounds(new java.awt.Rectangle(valueCol, 455, valueWidth, 20));\r
+            jTextFieldOutputFileBasename.setPreferredSize(new java.awt.Dimension(valueWidth, 20));\r
             jTextFieldOutputFileBasename.addFocusListener(this);\r
             jTextFieldOutputFileBasename.setToolTipText("Enter a single word for generated output file names.");\r
         }\r
@@ -637,12 +646,13 @@ public class MsaHeader extends IInternalFrame {
     private JComboBox getJComboBoxPcdIsDriver() {\r
         if (jComboBoxPcdIsDriver == null) {\r
             jComboBoxPcdIsDriver = new JComboBox();\r
-            jComboBoxPcdIsDriver.setPreferredSize(new java.awt.Dimension(320, 20));\r
-            jComboBoxPcdIsDriver.setBounds(new java.awt.Rectangle(160, 530, 320, 20));\r
+            jComboBoxPcdIsDriver.setPreferredSize(new java.awt.Dimension(valueWidth, 20));\r
+            jComboBoxPcdIsDriver.setBounds(new java.awt.Rectangle(valueCol, 530, valueWidth, 20));\r
             jComboBoxPcdIsDriver.addItemListener(this);\r
             jComboBoxPcdIsDriver.addFocusListener(this);\r
             jComboBoxPcdIsDriver.setEnabled(false);\r
             Tools.generateComboBoxByVector(jComboBoxPcdIsDriver, ed.getVPcdDriverTypes());\r
+            jComboBoxPcdIsDriver.setVisible(false);\r
         }\r
         return jComboBoxPcdIsDriver;\r
     }\r
@@ -812,6 +822,9 @@ public class MsaHeader extends IInternalFrame {
                 this.jCheckBoxPcd.setSelected(true);\r
                 this.jComboBoxPcdIsDriver.setEnabled(true);\r
                 this.jComboBoxPcdIsDriver.setSelectedItem(ex.getPcdIsDriver());\r
+                // TODO:  If the module type is DXE_DRIVER, set PCD_DXE_DRIVER\r
+                //        If the module type is PEIM, set PCD_PEI_DRIVER\r
+                //        If the module type is anything else, unset this!\r
             }\r
             this.jCheckBoxFlashMap.setSelected(ex.getTianoR8FlashMapH());\r
         }\r
@@ -828,51 +841,51 @@ public class MsaHeader extends IInternalFrame {
 \r
             jLabelURL = new JLabel();\r
             jLabelURL.setText("License URL");\r
-            jLabelURL.setLocation(new java.awt.Point(15, 430));\r
-            jLabelURL.setSize(new java.awt.Dimension(140, 20));\r
+            jLabelURL.setLocation(new java.awt.Point(labelCol, 430));\r
+            jLabelURL.setSize(new java.awt.Dimension(labelWidth, 20));\r
             jLabelBaseName = new JLabel();\r
             jLabelBaseName.setText("Module Name");\r
-            jLabelBaseName.setBounds(new java.awt.Rectangle(15, 10, 140, 20));\r
+            jLabelBaseName.setBounds(new java.awt.Rectangle(labelCol, 10, labelWidth, 20));\r
             jLabelModuleType = new JLabel();\r
-            jLabelModuleType.setBounds(new java.awt.Rectangle(15, 35, 140, 20));\r
+            jLabelModuleType.setBounds(new java.awt.Rectangle(labelCol, 35, labelWidth, 20));\r
             jLabelModuleType.setText("Module Type");\r
             jLabelGuid = new JLabel();\r
             jLabelGuid.setText("Guid Value");\r
-            jLabelGuid.setLocation(new java.awt.Point(15, 60));\r
-            jLabelGuid.setSize(new java.awt.Dimension(140, 20));\r
+            jLabelGuid.setLocation(new java.awt.Point(labelCol, 60));\r
+            jLabelGuid.setSize(new java.awt.Dimension(labelWidth, 20));\r
             jLabelVersion = new JLabel();\r
             jLabelVersion.setText("Version");\r
-            jLabelVersion.setLocation(new java.awt.Point(15, 85));\r
-            jLabelVersion.setSize(new java.awt.Dimension(140, 20));\r
+            jLabelVersion.setLocation(new java.awt.Point(labelCol, 85));\r
+            jLabelVersion.setSize(new java.awt.Dimension(labelWidth, 20));\r
             jLabelAbstract = new JLabel();\r
             jLabelAbstract.setText("Abstract");\r
-            jLabelAbstract.setLocation(new java.awt.Point(15, 110));\r
-            jLabelAbstract.setSize(new java.awt.Dimension(140, 20));\r
+            jLabelAbstract.setLocation(new java.awt.Point(labelCol, 110));\r
+            jLabelAbstract.setSize(new java.awt.Dimension(labelWidth, 20));\r
             jLabelDescription = new JLabel();\r
             jLabelDescription.setText("Description");\r
-            jLabelDescription.setLocation(new java.awt.Point(15, 135));\r
-            jLabelDescription.setSize(new java.awt.Dimension(140, 20));\r
+            jLabelDescription.setLocation(new java.awt.Point(labelCol, 135));\r
+            jLabelDescription.setSize(new java.awt.Dimension(labelWidth, 20));\r
             jLabelCopyright = new JLabel();\r
             jLabelCopyright.setText("Copyright");\r
-            jLabelCopyright.setLocation(new java.awt.Point(15, 260));\r
-            jLabelCopyright.setSize(new java.awt.Dimension(140, 20));\r
+            jLabelCopyright.setLocation(new java.awt.Point(labelCol, 260));\r
+            jLabelCopyright.setSize(new java.awt.Dimension(labelWidth, 20));\r
             jLabelLicense = new JLabel();\r
             jLabelLicense.setText("License");\r
-            jLabelLicense.setLocation(new java.awt.Point(15, 305));\r
-            jLabelLicense.setSize(new java.awt.Dimension(140, 20));\r
+            jLabelLicense.setLocation(new java.awt.Point(labelCol, 305));\r
+            jLabelLicense.setSize(new java.awt.Dimension(labelWidth, 20));\r
             jLabelOutputFileBasename = new JLabel();\r
-            jLabelOutputFileBasename.setBounds(new java.awt.Rectangle(15, 455, 140, 20));\r
+            jLabelOutputFileBasename.setBounds(new java.awt.Rectangle(labelCol, 455, labelWidth, 20));\r
             jLabelOutputFileBasename.setText("Output File Basename");\r
             jLabelBinaryModule = new JLabel();\r
-            jLabelBinaryModule.setBounds(new java.awt.Rectangle(15, 480, 140, 20));\r
+            jLabelBinaryModule.setBounds(new java.awt.Rectangle(labelCol, 480, labelWidth, 20));\r
             jLabelBinaryModule.setText("Binary Module");\r
             jLabelArch = new JLabel();\r
-            jLabelArch.setBounds(new java.awt.Rectangle(15, 505, 140, 20));\r
+            jLabelArch.setBounds(new java.awt.Rectangle(labelCol, 505, labelWidth, 20));\r
             jLabelArch.setText("Supported Architectures");\r
             jLabelSpecification = new JLabel();\r
             jLabelSpecification.setText("Specification");\r
-            jLabelSpecification.setLocation(new java.awt.Point(14, 530));\r
-            jLabelSpecification.setSize(new java.awt.Dimension(140, 20));\r
+            jLabelSpecification.setLocation(new java.awt.Point(labelCol, 530));\r
+            jLabelSpecification.setSize(new java.awt.Dimension(labelWidth, 20));\r
 \r
             jContentPane = new JPanel();\r
             jContentPane.setLayout(null);\r
@@ -950,8 +963,10 @@ public class MsaHeader extends IInternalFrame {
             jContentPane.add(getJCheckBoxArm(), null);\r
             jContentPane.add(getJCheckBoxPpc(), null);\r
 \r
+            \r
             jContentPane.add(getJCheckBoxPcd(), null);\r
             jContentPane.add(getJComboBoxPcdIsDriver(), null);\r
+            \r
             jContentPane.add(getJCheckBoxFlashMap(), null);\r
         }\r
         return jContentPane;\r
@@ -1171,15 +1186,15 @@ public class MsaHeader extends IInternalFrame {
         Tools.resizeComponentWidth(this.jTextFieldURL, intCurrentWidth, intPreferredWidth);\r
         Tools.resizeComponentWidth(this.jScrollPaneCopyright, intCurrentWidth, intPreferredWidth);\r
         Tools.resizeComponentWidth(this.jScrollPaneDescription, intCurrentWidth, intPreferredWidth);\r
-        Tools.resizeComponentWidth(this.jTextFieldSpecification, intCurrentWidth, intPreferredWidth);\r
+        // Tools.resizeComponentWidth(this.jTextFieldSpecification, intCurrentWidth, intPreferredWidth);\r
         Tools.resizeComponentWidth(this.jTextFieldAbstract, intCurrentWidth, intPreferredWidth);\r
-        Tools.resizeComponentWidth(this.jComboBoxModuleType, intCurrentWidth, intPreferredWidth);\r
-        Tools.resizeComponentWidth(this.jComboBoxBinaryModule, intCurrentWidth, intPreferredWidth);\r
+        // Tools.resizeComponentWidth(this.jComboBoxModuleType, intCurrentWidth, intPreferredWidth);\r
+        // Tools.resizeComponentWidth(this.jComboBoxBinaryModule, intCurrentWidth, intPreferredWidth);\r
         Tools.resizeComponentWidth(this.jTextFieldOutputFileBasename, intCurrentWidth, intPreferredWidth);\r
-        Tools.resizeComponentWidth(this.jComboBoxPcdIsDriver, intCurrentWidth, intPreferredWidth);\r
+        // Tools.resizeComponentWidth(this.jComboBoxPcdIsDriver, intCurrentWidth, intPreferredWidth);\r
 \r
         Tools.relocateComponentX(this.jButtonGenerateGuid, intCurrentWidth, intPreferredWidth,\r
-                                 DataType.SPACE_TO_RIGHT_FOR_GENERATE_BUTTON);\r
+                                 DataType.SPACE_TO_RIGHT_FOR_GENERATE_BUTTON - 5);\r
     }\r
 \r
     public void focusLost(FocusEvent arg0) {\r
@@ -1581,7 +1596,7 @@ public class MsaHeader extends IInternalFrame {
     private JCheckBox getJCheckBoxPcd() {\r
         if (jCheckBoxPcd == null) {\r
             jCheckBoxPcd = new JCheckBox();\r
-            jCheckBoxPcd.setBounds(new java.awt.Rectangle(0, 530, 140, 20));\r
+            jCheckBoxPcd.setBounds(new java.awt.Rectangle(labelCol, 530, labelWidth, 20));\r
             jCheckBoxPcd.setText("Is this a PCD Driver?");\r
             jCheckBoxPcd.addFocusListener(this);\r
             jCheckBoxPcd.addActionListener(this);\r
@@ -1597,10 +1612,11 @@ public class MsaHeader extends IInternalFrame {
     private JCheckBox getJCheckBoxFlashMap() {\r
         if (jCheckBoxFlashMap == null) {\r
             jCheckBoxFlashMap = new JCheckBox();\r
-            jCheckBoxFlashMap.setBounds(new java.awt.Rectangle(0, 555, 480, 20));\r
+            jCheckBoxFlashMap.setBounds(new java.awt.Rectangle(labelCol, 555, 480, 20));\r
             jCheckBoxFlashMap.setText("Are you using a legacy FlashMap header file?");\r
             jCheckBoxFlashMap.addFocusListener(this);\r
         }\r
         return jCheckBoxFlashMap;\r
     }\r
+    \r
 }\r