Fixed display sizes for X-Windows

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

2 files changed, 10 insertions, 8 deletions

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdBuildOptions.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdBuildOptions.java
index c79d7727a7..12058aa7cc 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdBuildOptions.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdBuildOptions.java
@@ -364,7 +364,7 @@ public class FpdBuildOptions extends IInternalFrame {
         if (jTabbedPane == null) {

             jTabbedPane = new JTabbedPane();

             jTabbedPane.addTab("Flash Filesystem Options", null, getJPanelFfsTab(), null);

-            jTabbedPane.addTab("Tool Arguments", null, getJPanelOptionsTab(), null);

+            jTabbedPane.addTab("Customize Tool Chain Configurations", null, getJPanelOptionsTab(), null);

             jTabbedPane.addTab("User Defined ANT Tasks", null, getJPanelUserDef(), null);

         }

         return jTabbedPane;

@@ -407,7 +407,7 @@ public class FpdBuildOptions extends IInternalFrame {
     private JPanel getJPanelTableOptionsContainer() {

         if (jPanelTableOptionsContainer == null) {

             jLabelTableOptionsTitle = new JLabel();

-            jLabelTableOptionsTitle.setText("  Current Option Configuration Lines");

+            jLabelTableOptionsTitle.setText("  Current Argument Lines");

             jPanelTableOptionsContainer = new JPanel();

             jPanelTableOptionsContainer.setLayout(new BorderLayout());

             jPanelTableOptionsContainer.add(jLabelTableOptionsTitle, java.awt.BorderLayout.NORTH);

@@ -1426,7 +1426,7 @@ public class FpdBuildOptions extends IInternalFrame {
             jLabelOptionContents = new JLabel();

             jLabelOptionContents.setBounds(new java.awt.Rectangle(labelColumn, rowSix, labelWidth, oneRowHeight));

             jLabelOptionContents.setLocation(new java.awt.Point(labelColumn, rowSix));

-            jLabelOptionContents.setText("Option Contents");

+            jLabelOptionContents.setText("Argument Strings");

 

             jPanelOptionsContainer = new JPanel();

 

@@ -1758,7 +1758,7 @@ public class FpdBuildOptions extends IInternalFrame {
             optionsTableModel.addColumn("Supported Architectures");

             optionsTableModel.addColumn("Tool Command Code");

             optionsTableModel.addColumn("TagName");

-            optionsTableModel.addColumn("Contents");

+            optionsTableModel.addColumn("Arguments");

 

             javax.swing.table.TableColumn toolFamilyCol = jTableOptions.getColumnModel().getColumn(1);

             JComboBox cb = new JComboBox();

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdPlatformDefs.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdPlatformDefs.java
index 64201b5aa5..454df225e1 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdPlatformDefs.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdPlatformDefs.java
@@ -61,6 +61,8 @@ public class FpdPlatformDefs extends IInternalFrame {
 

     //    private final int sepWidth = 10;

 

+    private final int offsetWidth = 70;

+

     private final int buttonWidth = 90;

 

     private final int rowOne = 12;

@@ -963,8 +965,8 @@ public class FpdPlatformDefs extends IInternalFrame {
         if (jComboBoxInterDir == null) {

             jComboBoxInterDir = new JComboBox();

             jComboBoxInterDir.setPreferredSize(new Dimension(75, oneRowHeight));

-            jComboBoxInterDir.setBounds(new java.awt.Rectangle(valueColumn + 30, rowEleven, 75, oneRowHeight));

-            jComboBoxInterDir.setLocation(new java.awt.Point(valueColumn + 30, rowEleven));

+            jComboBoxInterDir.setBounds(new java.awt.Rectangle(valueColumn + offsetWidth, rowEleven, 95, oneRowHeight));

+            jComboBoxInterDir.setLocation(new java.awt.Point(valueColumn + offsetWidth, rowEleven));

             jComboBoxInterDir.addItem("UNIFIED");

             jComboBoxInterDir.addItem("MODULE");

             jComboBoxInterDir.setSelectedIndex(0);

@@ -993,9 +995,9 @@ public class FpdPlatformDefs extends IInternalFrame {
         if (jTextFieldOutputDir == null) {

             jTextFieldOutputDir = new JTextField();

             jTextFieldOutputDir.setPreferredSize(new java.awt.Dimension(290, 20));

-            jTextFieldOutputDir.setBounds(new java.awt.Rectangle(valueColumn + 30, rowTwelve, valueWidth - 30,

+            jTextFieldOutputDir.setBounds(new java.awt.Rectangle(valueColumn + offsetWidth, rowTwelve, valueWidth - 30,

                                                                  oneRowHeight));

-            jTextFieldOutputDir.setLocation(new java.awt.Point(valueColumn + 30, rowTwelve));

+            jTextFieldOutputDir.setLocation(new java.awt.Point(valueColumn + offsetWidth, rowTwelve));

             jTextFieldOutputDir.setToolTipText("Select the name or URL for the output directory tree.");

             jTextFieldOutputDir.addFocusListener(new java.awt.event.FocusAdapter() {

                 public void focusLost(java.awt.event.FocusEvent e) {