From 3f62225f1e49da815a9cc4c6ed6f56d3753ca37b Mon Sep 17 00:00:00 2001 From: lhauch Date: Fri, 28 Jul 2006 23:09:53 +0000 Subject: [PATCH] Adjusted sizes to accommodate Windows, iMac and Linux GUI git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1143 6f19259b-4bc3-4df7-8a09-765794883524 --- .../module/ui/dialog/BootModesDlg.java | 34 ++++----- .../module/ui/dialog/DataHubsDlg.java | 32 ++++---- .../module/ui/dialog/EventsDlg.java | 74 +++++++++---------- .../module/ui/dialog/GuidsDlg.java | 32 ++++---- .../module/ui/dialog/HiiPackagesDlg.java | 34 ++++----- .../module/ui/dialog/HobsDlg.java | 38 +++++----- .../module/ui/dialog/PCDsDlg.java | 44 +++++------ .../module/ui/dialog/PpisDlg.java | 40 +++++----- .../module/ui/dialog/ProtocolsDlg.java | 42 ++++++----- .../module/ui/dialog/SystemTablesDlg.java | 36 ++++----- .../module/ui/dialog/VariablesDlg.java | 56 +++++++------- 11 files changed, 232 insertions(+), 230 deletions(-) diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/BootModesDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/BootModesDlg.java index f7cc1a9a45..937b8b6361 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/BootModesDlg.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/BootModesDlg.java @@ -59,7 +59,7 @@ public class BootModesDlg extends IDialog { // Define class members // private JPanel jContentPane = null; - +private JLabel jLabelTest = null; private JLabel jLabelBootModeName = null; private JComboBox jComboBoxBootModeName = null; @@ -108,7 +108,7 @@ public class BootModesDlg extends IDialog { private JComboBox getJComboBoxBootModeName() { if (jComboBoxBootModeName == null) { jComboBoxBootModeName = new JComboBox(); - jComboBoxBootModeName.setBounds(new java.awt.Rectangle(160, 10, 320, 20)); + jComboBoxBootModeName.setBounds(new java.awt.Rectangle(168, 12, 320, 20)); jComboBoxBootModeName.setPreferredSize(new java.awt.Dimension(320, 20)); jComboBoxBootModeName .setToolTipText("" @@ -134,7 +134,7 @@ public class BootModesDlg extends IDialog { private JComboBox getJComboBoxUsage() { if (jComboBoxUsage == null) { jComboBoxUsage = new JComboBox(); - jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 35, 320, 20)); + jComboBoxUsage.setBounds(new java.awt.Rectangle(168, 37, 320, 20)); jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20)); jComboBoxUsage .setToolTipText("
" @@ -155,7 +155,7 @@ public class BootModesDlg extends IDialog { private JTextField getJTextFieldFeatureFlag() { if (jTextFieldFeatureFlag == null) { jTextFieldFeatureFlag = new JTextField(); - jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(160, 105, 320, 20)); + jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 107, 320, 20)); jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20)); jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE"); } @@ -202,7 +202,7 @@ public class BootModesDlg extends IDialog { jScrollPaneHelpText.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); jScrollPaneHelpText.setSize(new java.awt.Dimension(320, 40)); jScrollPaneHelpText.setPreferredSize(new java.awt.Dimension(320, 40)); - jScrollPaneHelpText.setLocation(new java.awt.Point(160, 60)); + jScrollPaneHelpText.setLocation(new java.awt.Point(168, 62)); jScrollPaneHelpText.setViewportView(getJTextAreaHelpText()); } return jScrollPaneHelpText; @@ -217,7 +217,7 @@ public class BootModesDlg extends IDialog { private JButton getJButtonOk() { if (jButtonOk == null) { jButtonOk = new JButton(); - jButtonOk.setBounds(new java.awt.Rectangle(290, 157, 90, 20)); + jButtonOk.setBounds(new java.awt.Rectangle(290, 162, 90, 20)); jButtonOk.setText("Ok"); jButtonOk.addActionListener(this); } @@ -233,7 +233,7 @@ public class BootModesDlg extends IDialog { private JButton getJButtonCancel() { if (jButtonCancel == null) { jButtonCancel = new JButton(); - jButtonCancel.setBounds(new java.awt.Rectangle(390, 157, 90, 20)); + jButtonCancel.setBounds(new java.awt.Rectangle(390, 162, 90, 20)); jButtonCancel.setText("Cancel"); jButtonCancel.addActionListener(this); } @@ -248,7 +248,7 @@ public class BootModesDlg extends IDialog { * */ private void init() { - this.setSize(500, 230); + this.setSize(505, 235); this.setContentPane(getJScrollPane()); this.setTitle("Boot Modes"); initFrame(); @@ -311,31 +311,31 @@ public class BootModesDlg extends IDialog { private JPanel getJContentPane() { if (jContentPane == null) { jStarLabel1 = new StarLabel(); - jStarLabel1.setLocation(new java.awt.Point(2, 10)); + jStarLabel1.setLocation(new java.awt.Point(2, 12)); jLabelBootModeName = new JLabel(); jLabelBootModeName.setText("Boot Mode Name"); - jLabelBootModeName.setBounds(new java.awt.Rectangle(15, 10, 145, 20)); + jLabelBootModeName.setBounds(new java.awt.Rectangle(12, 12, 155, 20)); jStarLabel2 = new StarLabel(); - jStarLabel2.setLocation(new java.awt.Point(2, 35)); + jStarLabel2.setLocation(new java.awt.Point(2, 37)); jLabelUsage = new JLabel(); jLabelUsage.setText("Usage"); - jLabelUsage.setBounds(new java.awt.Rectangle(15, 35, 145, 20)); + jLabelUsage.setBounds(new java.awt.Rectangle(12, 37, 155, 20)); jLabelHelpText = new JLabel(); - jLabelHelpText.setBounds(new java.awt.Rectangle(15, 60, 145, 20)); + jLabelHelpText.setBounds(new java.awt.Rectangle(12, 62, 155, 20)); jLabelHelpText.setText("Help Text"); jLabelFeatureFlag = new JLabel(); - jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 105, 145, 20)); + jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 107, 155, 20)); jLabelFeatureFlag.setText("Feature Flag Expression"); jLabelArch = new JLabel(); - jLabelArch.setBounds(new java.awt.Rectangle(15, 130, 145, 20)); + jLabelArch.setBounds(new java.awt.Rectangle(12, 132, 155, 20)); jLabelArch.setText("Supported Archectures"); jArchCheckBox = new ArchCheckBox(); - jArchCheckBox.setBounds(new java.awt.Rectangle(160, 130, 320, 20)); + jArchCheckBox.setBounds(new java.awt.Rectangle(168, 132, 320, 20)); jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20)); jContentPane = new JPanel(); jContentPane.setLayout(null); - jContentPane.setPreferredSize(new java.awt.Dimension(485, 185)); + jContentPane.setPreferredSize(new java.awt.Dimension(480, 180)); jContentPane.add(jLabelBootModeName, null); jContentPane.add(getJComboBoxBootModeName(), null); diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/DataHubsDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/DataHubsDlg.java index 05bd139257..b5238d9707 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/DataHubsDlg.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/DataHubsDlg.java @@ -108,7 +108,7 @@ public class DataHubsDlg extends IDialog { private JTextField getJTextFieldDataHubRecord() { if (jTextFieldDataHubRecord == null) { jTextFieldDataHubRecord = new JTextField(); - jTextFieldDataHubRecord.setBounds(new java.awt.Rectangle(160, 10, 320, 20)); + jTextFieldDataHubRecord.setBounds(new java.awt.Rectangle(168, 12, 320, 20)); jTextFieldDataHubRecord.setPreferredSize(new java.awt.Dimension(320, 20)); jTextFieldDataHubRecord.setToolTipText("Enter the C Name of the Data Hub Record"); } @@ -124,7 +124,7 @@ public class DataHubsDlg extends IDialog { private JComboBox getJComboBoxUsage() { if (jComboBoxUsage == null) { jComboBoxUsage = new JComboBox(); - jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 35, 320, 20)); + jComboBoxUsage.setBounds(new java.awt.Rectangle(168, 37, 320, 20)); jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20)); jComboBoxUsage .setToolTipText("
" @@ -145,7 +145,7 @@ public class DataHubsDlg extends IDialog { private JTextField getJTextFieldFeatureFlag() { if (jTextFieldFeatureFlag == null) { jTextFieldFeatureFlag = new JTextField(); - jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(160, 105, 320, 20)); + jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 107, 320, 20)); jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20)); jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE"); } @@ -192,7 +192,7 @@ public class DataHubsDlg extends IDialog { jScrollPaneHelpText.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); jScrollPaneHelpText.setSize(new java.awt.Dimension(320, 40)); jScrollPaneHelpText.setPreferredSize(new java.awt.Dimension(320, 40)); - jScrollPaneHelpText.setLocation(new java.awt.Point(160, 60)); + jScrollPaneHelpText.setLocation(new java.awt.Point(168, 62)); jScrollPaneHelpText.setViewportView(getJTextAreaHelpText()); } return jScrollPaneHelpText; @@ -207,7 +207,7 @@ public class DataHubsDlg extends IDialog { private JButton getJButtonOk() { if (jButtonOk == null) { jButtonOk = new JButton(); - jButtonOk.setBounds(new java.awt.Rectangle(290, 157, 90, 20)); + jButtonOk.setBounds(new java.awt.Rectangle(290, 162, 90, 20)); jButtonOk.setText("Ok"); jButtonOk.addActionListener(this); } @@ -223,7 +223,7 @@ public class DataHubsDlg extends IDialog { private JButton getJButtonCancel() { if (jButtonCancel == null) { jButtonCancel = new JButton(); - jButtonCancel.setBounds(new java.awt.Rectangle(390, 157, 90, 20)); + jButtonCancel.setBounds(new java.awt.Rectangle(390, 162, 90, 20)); jButtonCancel.setText("Cancel"); jButtonCancel.addActionListener(this); } @@ -239,7 +239,7 @@ public class DataHubsDlg extends IDialog { * */ private void init() { - this.setSize(500, 230); + this.setSize(505, 235); this.setContentPane(getJScrollPane()); this.setTitle("Data Hubs"); initFrame(); @@ -302,31 +302,31 @@ public class DataHubsDlg extends IDialog { private JPanel getJContentPane() { if (jContentPane == null) { jStarLabel1 = new StarLabel(); - jStarLabel1.setLocation(new java.awt.Point(2, 10)); + jStarLabel1.setLocation(new java.awt.Point(2, 12)); jLabelDataHubRecord = new JLabel(); - jLabelDataHubRecord.setBounds(new java.awt.Rectangle(15, 10, 145, 20)); + jLabelDataHubRecord.setBounds(new java.awt.Rectangle(12, 12, 155, 20)); jLabelDataHubRecord.setText("Data Hub Record"); jStarLabel2 = new StarLabel(); - jStarLabel2.setLocation(new java.awt.Point(2, 35)); + jStarLabel2.setLocation(new java.awt.Point(2, 37)); jLabelUsage = new JLabel(); jLabelUsage.setText("Usage"); - jLabelUsage.setBounds(new java.awt.Rectangle(15, 35, 145, 20)); + jLabelUsage.setBounds(new java.awt.Rectangle(12, 37, 155, 20)); jLabelHelpText = new JLabel(); - jLabelHelpText.setBounds(new java.awt.Rectangle(14, 60, 145, 20)); + jLabelHelpText.setBounds(new java.awt.Rectangle(12, 62, 155, 20)); jLabelHelpText.setText("Help Text"); jLabelFeatureFlag = new JLabel(); - jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 105, 145, 20)); + jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 107, 155, 20)); jLabelFeatureFlag.setText("Feature Flag Expression"); jLabelArch = new JLabel(); - jLabelArch.setBounds(new java.awt.Rectangle(15, 130, 145, 20)); + jLabelArch.setBounds(new java.awt.Rectangle(12, 132, 155, 20)); jLabelArch.setText("Supported Architectures"); jArchCheckBox = new ArchCheckBox(); - jArchCheckBox.setBounds(new java.awt.Rectangle(160, 130, 320, 20)); + jArchCheckBox.setBounds(new java.awt.Rectangle(168, 132, 320, 20)); jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20)); jContentPane = new JPanel(); jContentPane.setLayout(null); - jContentPane.setPreferredSize(new java.awt.Dimension(485, 185)); + jContentPane.setPreferredSize(new java.awt.Dimension(480, 180)); jContentPane.add(jLabelDataHubRecord, null); jContentPane.add(jLabelUsage, null); diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/EventsDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/EventsDlg.java index 00938840a8..624fae71df 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/EventsDlg.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/EventsDlg.java @@ -1,6 +1,6 @@ /** @file - The file is used to create, update Event of MSA/MBD file + The file is used to create, update Events section of the MSA file Copyright (c) 2006, Intel Corporation All rights reserved. This program and the accompanying materials @@ -38,8 +38,8 @@ import org.tianocore.frameworkwizard.module.Identifications.Events.EventsIdentif import org.tianocore.frameworkwizard.workspace.WorkspaceTools; /** - * The class is used to create, update Event of MSA/MBD file It extends - * IInternalFrame + * The class is used to create, update Events section of the MSA file + * It extends IDialog * * @since ModuleEditor 1.0 * @@ -118,12 +118,12 @@ public class EventsDlg extends IDialog { private JComboBox getJComboBoxEventsType() { if (jComboBoxEventsType == null) { jComboBoxEventsType = new JComboBox(); - jComboBoxEventsType.setBounds(new java.awt.Rectangle(160, 10, 320, 20)); + jComboBoxEventsType.setBounds(new java.awt.Rectangle(168, 12, 320, 20)); jComboBoxEventsType.setPreferredSize(new java.awt.Dimension(320, 20)); jComboBoxEventsType - .setToolTipText("Select CreateEvents if the Module has an event that is waiting to be signaled.
" - + "Select SignalEvents if the Module will signal all events in an event group.
" - + "NOTE: Signal events are named by GUID."); + .setToolTipText("Select CreateEvents if the Module has an event that is waiting to be signaled.
" + + "Select SignalEvents if the Module will signal all events in an event group.
" + + "NOTE: Signal events are named by GUID."); } return jComboBoxEventsType; } @@ -137,7 +137,7 @@ public class EventsDlg extends IDialog { private JComboBox getJComboBoxGuidC_Name() { if (jComboBoxGuidC_Name == null) { jComboBoxGuidC_Name = new JComboBox(); - jComboBoxGuidC_Name.setBounds(new java.awt.Rectangle(160, 35, 320, 20)); + jComboBoxGuidC_Name.setBounds(new java.awt.Rectangle(168, 37, 320, 20)); jComboBoxGuidC_Name.setPreferredSize(new java.awt.Dimension(320, 20)); jComboBoxGuidC_Name.setToolTipText("Select the GUID C Name of the Event"); } @@ -152,7 +152,7 @@ public class EventsDlg extends IDialog { private JComboBox getJComboBoxEventGroup() { if (jComboBoxEventGroup == null) { jComboBoxEventGroup = new JComboBox(); - jComboBoxEventGroup.setBounds(new java.awt.Rectangle(160, 60, 320, 20)); + jComboBoxEventGroup.setBounds(new java.awt.Rectangle(168, 62, 320, 20)); jComboBoxEventGroup.setPreferredSize(new java.awt.Dimension(320, 20)); jComboBoxEventGroup.setToolTipText("Select Type of Event: Guid or Timer."); @@ -169,18 +169,18 @@ public class EventsDlg extends IDialog { private JComboBox getJComboBoxUsage() { if (jComboBoxUsage == null) { jComboBoxUsage = new JComboBox(); - jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 85, 320, 20)); + jComboBoxUsage.setBounds(new java.awt.Rectangle(168, 87, 320, 20)); jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20)); jComboBoxUsage - .setToolTipText("
" - + "" - + "" - + "" - + "" - + "" - + "
Create Events
ALWAYS_CONSUMEDModule registers a notification function and REQUIRES that it be
" - + "executed for the module to fully function.
SOMETIMES_CONSUMEDModule registers a notification function and calls the function
" - + "when it is signaled
Signal Events
ALWAYS_PRODUCEDModule will Always signal the event
SOMETIMES_PRODUCEDModule will sometimes signal the event
"); + .setToolTipText("" + + "" + + "" + + "" + + "" + + "" + + "
Create Events
ALWAYS_CONSUMEDModule registers a notification function and REQUIRES that it be
" + + "executed for the module to fully function.
SOMETIMES_CONSUMEDModule registers a notification function and calls the function
" + + "when it is signaled
Signal Events
ALWAYS_PRODUCEDModule will Always signal the event
SOMETIMES_PRODUCEDModule will sometimes signal the event
"); } return jComboBoxUsage; } @@ -206,7 +206,7 @@ public class EventsDlg extends IDialog { private JTextField getJTextFieldFeatureFlag() { if (jTextFieldFeatureFlag == null) { jTextFieldFeatureFlag = new JTextField(); - jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(160, 155, 320, 20)); + jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 157, 320, 20)); jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20)); jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE"); } @@ -240,7 +240,7 @@ public class EventsDlg extends IDialog { jScrollPaneHelpText.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); jScrollPaneHelpText.setSize(new java.awt.Dimension(320, 40)); jScrollPaneHelpText.setPreferredSize(new java.awt.Dimension(320, 40)); - jScrollPaneHelpText.setLocation(new java.awt.Point(160, 110)); + jScrollPaneHelpText.setLocation(new java.awt.Point(168, 112)); jScrollPaneHelpText.setViewportView(getJTextAreaHelpText()); } return jScrollPaneHelpText; @@ -255,7 +255,7 @@ public class EventsDlg extends IDialog { private JButton getJButtonOk() { if (jButtonOk == null) { jButtonOk = new JButton(); - jButtonOk.setBounds(new java.awt.Rectangle(290, 202, 90, 20)); + jButtonOk.setBounds(new java.awt.Rectangle(290, 212, 90, 20)); jButtonOk.setText("Ok"); jButtonOk.addActionListener(this); } @@ -271,7 +271,7 @@ public class EventsDlg extends IDialog { private JButton getJButtonCancel() { if (jButtonCancel == null) { jButtonCancel = new JButton(); - jButtonCancel.setBounds(new java.awt.Rectangle(390, 202, 90, 20)); + jButtonCancel.setBounds(new java.awt.Rectangle(390, 212, 90, 20)); jButtonCancel.setText("Cancel"); jButtonCancel.addActionListener(this); } @@ -287,7 +287,7 @@ public class EventsDlg extends IDialog { * */ private void init() { - this.setSize(500, 275); + this.setSize(505, 280); this.setContentPane(getJScrollPane()); this.setTitle("Events"); initFrame(); @@ -353,47 +353,47 @@ public class EventsDlg extends IDialog { private JPanel getJContentPane() { if (jContentPane == null) { jStarLabel1 = new StarLabel(); - jStarLabel1.setLocation(new java.awt.Point(2, 10)); + jStarLabel1.setLocation(new java.awt.Point(2, 12)); jLabelEventType = new JLabel(); jLabelEventType.setText("Select Event Type"); - jLabelEventType.setBounds(new java.awt.Rectangle(15, 10, 145, 20)); + jLabelEventType.setBounds(new java.awt.Rectangle(12, 12, 168, 20)); jStarLabel2 = new StarLabel(); - jStarLabel2.setLocation(new java.awt.Point(2, 35)); + jStarLabel2.setLocation(new java.awt.Point(2, 37)); jLabelC_Name = new JLabel(); jLabelC_Name.setText("Guid C Name"); - jLabelC_Name.setBounds(new java.awt.Rectangle(15, 35, 145, 20)); + jLabelC_Name.setBounds(new java.awt.Rectangle(12, 37, 168, 20)); jStarLabel3 = new StarLabel(); - jStarLabel3.setLocation(new java.awt.Point(2, 60)); + jStarLabel3.setLocation(new java.awt.Point(2, 62)); jLabelGroup = new JLabel(); jLabelGroup.setText("Event Group Type"); - jLabelGroup.setBounds(new java.awt.Rectangle(15, 60, 145, 20)); + jLabelGroup.setBounds(new java.awt.Rectangle(12, 62, 168, 20)); jStarLabel4 = new StarLabel(); - jStarLabel4.setLocation(new java.awt.Point(2, 85)); + jStarLabel4.setLocation(new java.awt.Point(2, 87)); jLabelUsage = new JLabel(); jLabelUsage.setText("Usage"); - jLabelUsage.setBounds(new java.awt.Rectangle(15, 85, 140, 20)); + jLabelUsage.setBounds(new java.awt.Rectangle(12, 87, 168, 20)); jLabelHelpText = new JLabel(); - jLabelHelpText.setBounds(new java.awt.Rectangle(15, 110, 145, 20)); + jLabelHelpText.setBounds(new java.awt.Rectangle(12, 112, 168, 20)); jLabelHelpText.setText("Help Text"); jLabelFeatureFlag = new JLabel(); - jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 155, 145, 20)); + jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 157, 168, 20)); jLabelFeatureFlag.setText("Feature Flag Expression"); jLabelArch = new JLabel(); - jLabelArch.setBounds(new java.awt.Rectangle(15, 180, 145, 20)); + jLabelArch.setBounds(new java.awt.Rectangle(12, 182, 168, 20)); jLabelArch.setText("Supported Architectures"); jArchCheckBox = new ArchCheckBox(); - jArchCheckBox.setBounds(new java.awt.Rectangle(160, 180, 320, 20)); + jArchCheckBox.setBounds(new java.awt.Rectangle(168, 182, 320, 20)); jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20)); jContentPane = new JPanel(); jContentPane.setLayout(null); - jContentPane.setPreferredSize(new java.awt.Dimension(485, 230)); + jContentPane.setPreferredSize(new java.awt.Dimension(485, 235)); jContentPane.add(jStarLabel1, null); jContentPane.add(jLabelEventType, null); diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/GuidsDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/GuidsDlg.java index 7b42c44ad5..3c1e37037f 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/GuidsDlg.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/GuidsDlg.java @@ -104,7 +104,7 @@ public class GuidsDlg extends IDialog { private JComboBox getJComboBoxCName() { if (jComboBoxCName == null) { jComboBoxCName = new JComboBox(); - jComboBoxCName.setBounds(new java.awt.Rectangle(160, 10, 320, 20)); + jComboBoxCName.setBounds(new java.awt.Rectangle(168, 12, 320, 20)); jComboBoxCName.setPreferredSize(new java.awt.Dimension(320, 20)); jComboBoxCName.setToolTipText("Select the C Name of the GUID"); } @@ -120,7 +120,7 @@ public class GuidsDlg extends IDialog { private JComboBox getJComboBoxUsage() { if (jComboBoxUsage == null) { jComboBoxUsage = new JComboBox(); - jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 35, 320, 20)); + jComboBoxUsage.setBounds(new java.awt.Rectangle(168, 37, 320, 20)); jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20)); jComboBoxUsage .setToolTipText("" @@ -143,7 +143,7 @@ public class GuidsDlg extends IDialog { private JTextField getJTextFieldFeatureFlag() { if (jTextFieldFeatureFlag == null) { jTextFieldFeatureFlag = new JTextField(); - jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(160, 105, 320, 20)); + jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 107, 320, 20)); jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20)); jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE"); } @@ -190,7 +190,7 @@ public class GuidsDlg extends IDialog { jScrollPaneHelpText = new JScrollPane(); jScrollPaneHelpText.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); jScrollPaneHelpText.setSize(new java.awt.Dimension(320, 40)); - jScrollPaneHelpText.setLocation(new java.awt.Point(160, 60)); + jScrollPaneHelpText.setLocation(new java.awt.Point(168, 62)); jScrollPaneHelpText.setViewportView(getJTextAreaHelpText()); } return jScrollPaneHelpText; @@ -205,7 +205,7 @@ public class GuidsDlg extends IDialog { private JButton getJButtonOk() { if (jButtonOk == null) { jButtonOk = new JButton(); - jButtonOk.setBounds(new java.awt.Rectangle(290, 157, 90, 20)); + jButtonOk.setBounds(new java.awt.Rectangle(290, 162, 90, 20)); jButtonOk.setText("Ok"); jButtonOk.addActionListener(this); } @@ -221,7 +221,7 @@ public class GuidsDlg extends IDialog { private JButton getJButtonCancel() { if (jButtonCancel == null) { jButtonCancel = new JButton(); - jButtonCancel.setBounds(new java.awt.Rectangle(390, 157, 90, 20)); + jButtonCancel.setBounds(new java.awt.Rectangle(390, 162, 90, 20)); jButtonCancel.setText("Cancel"); jButtonCancel.addActionListener(this); } @@ -238,7 +238,7 @@ public class GuidsDlg extends IDialog { * */ private void init() { - this.setSize(500, 230); + this.setSize(505, 235); this.setContentPane(getJScrollPane()); this.setTitle("Guids"); initFrame(); @@ -301,35 +301,35 @@ public class GuidsDlg extends IDialog { private JPanel getJContentPane() { if (jContentPane == null) { jStarLabel1 = new StarLabel(); - jStarLabel1.setLocation(new java.awt.Point(2, 10)); + jStarLabel1.setLocation(new java.awt.Point(2, 12)); jLabelC_Name = new JLabel(); jLabelC_Name.setText("Select GUID's C Name"); - jLabelC_Name.setBounds(new java.awt.Rectangle(15, 10, 145, 20)); + jLabelC_Name.setBounds(new java.awt.Rectangle(12, 12, 155, 20)); jStarLabel2 = new StarLabel(); - jStarLabel2.setLocation(new java.awt.Point(2, 35)); + jStarLabel2.setLocation(new java.awt.Point(2, 37)); jLabelUsage = new JLabel(); jLabelUsage.setText("Usage"); - jLabelUsage.setBounds(new java.awt.Rectangle(15, 35, 145, 20)); + jLabelUsage.setBounds(new java.awt.Rectangle(12, 37, 155, 20)); jLabelHelpText = new JLabel(); - jLabelHelpText.setBounds(new java.awt.Rectangle(14, 60, 145, 20)); + jLabelHelpText.setBounds(new java.awt.Rectangle(12, 62, 155, 20)); jLabelHelpText.setText("Help Text"); jLabelFeatureFlag = new JLabel(); - jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 105, 145, 20)); + jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 107, 155, 20)); jLabelFeatureFlag.setText("Feature Flag Expression"); jLabelArch = new JLabel(); - jLabelArch.setBounds(new java.awt.Rectangle(15, 130, 145, 20)); + jLabelArch.setBounds(new java.awt.Rectangle(12, 132, 155, 20)); jLabelArch.setText("Supported Architectures"); jArchCheckBox = new ArchCheckBox(); - jArchCheckBox.setBounds(new java.awt.Rectangle(160, 130, 320, 20)); + jArchCheckBox.setBounds(new java.awt.Rectangle(168, 132, 320, 20)); jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20)); jContentPane = new JPanel(); jContentPane.setLayout(null); - jContentPane.setPreferredSize(new java.awt.Dimension(490, 165)); + jContentPane.setPreferredSize(new java.awt.Dimension(480, 180)); jContentPane.add(jStarLabel1, null); jContentPane.add(jLabelC_Name, null); diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HiiPackagesDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HiiPackagesDlg.java index 1997ab4c8a..a3c4b96fdc 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HiiPackagesDlg.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HiiPackagesDlg.java @@ -1,6 +1,6 @@ /** @file - The file is used to create, update Formset of MSA/MBD file + The file is used to create, update Hii Packages section of the MSA file Copyright (c) 2006, Intel Corporation All rights reserved. This program and the accompanying materials @@ -103,7 +103,7 @@ public class HiiPackagesDlg extends IDialog { private JTextField getJTextFieldName() { if (jTextFieldName == null) { jTextFieldName = new JTextField(); - jTextFieldName.setBounds(new java.awt.Rectangle(160, 10, 320, 20)); + jTextFieldName.setBounds(new java.awt.Rectangle(168, 12, 320, 20)); jTextFieldName.setPreferredSize(new java.awt.Dimension(320, 20)); jTextFieldName.setToolTipText("Enter the C Name of the HII Package"); } @@ -120,7 +120,7 @@ public class HiiPackagesDlg extends IDialog { private JComboBox getJComboBoxUsage() { if (jComboBoxUsage == null) { jComboBoxUsage = new JComboBox(); - jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 35, 320, 20)); + jComboBoxUsage.setBounds(new java.awt.Rectangle(168, 37, 320, 20)); jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20)); jComboBoxUsage .setToolTipText("
" @@ -140,7 +140,7 @@ public class HiiPackagesDlg extends IDialog { private JTextField getJTextFieldFeatureFlag() { if (jTextFieldFeatureFlag == null) { jTextFieldFeatureFlag = new JTextField(); - jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(160, 105, 320, 20)); + jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 107, 320, 20)); jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20)); jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE"); } @@ -191,7 +191,7 @@ public class HiiPackagesDlg extends IDialog { jScrollPaneHelpText.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); jScrollPaneHelpText.setSize(new java.awt.Dimension(320, 40)); jScrollPaneHelpText.setPreferredSize(new java.awt.Dimension(320, 40)); - jScrollPaneHelpText.setLocation(new java.awt.Point(160, 60)); + jScrollPaneHelpText.setLocation(new java.awt.Point(168, 62)); jScrollPaneHelpText.setViewportView(getJTextAreaHelpText()); } return jScrollPaneHelpText; @@ -207,7 +207,7 @@ public class HiiPackagesDlg extends IDialog { private JButton getJButtonOk() { if (jButtonOk == null) { jButtonOk = new JButton(); - jButtonOk.setBounds(new java.awt.Rectangle(290, 157, 90, 20)); + jButtonOk.setBounds(new java.awt.Rectangle(290, 162, 90, 20)); jButtonOk.setText("Ok"); jButtonOk.addActionListener(this); } @@ -224,7 +224,7 @@ public class HiiPackagesDlg extends IDialog { private JButton getJButtonCancel() { if (jButtonCancel == null) { jButtonCancel = new JButton(); - jButtonCancel.setBounds(new java.awt.Rectangle(390, 157, 90, 20)); + jButtonCancel.setBounds(new java.awt.Rectangle(390, 162, 90, 20)); jButtonCancel.setText("Cancel"); jButtonCancel.addActionListener(this); } @@ -241,7 +241,7 @@ public class HiiPackagesDlg extends IDialog { * **/ private void init() { - this.setSize(500, 230); + this.setSize(505, 235); this.setContentPane(getJScrollPane()); this.setTitle("Hii Packages"); initFrame(); @@ -306,31 +306,31 @@ public class HiiPackagesDlg extends IDialog { private JPanel getJContentPane() { if (jContentPane == null) { jStarLabel1 = new StarLabel(); - jStarLabel1.setLocation(new java.awt.Point(2, 10)); + jStarLabel1.setLocation(new java.awt.Point(2, 12)); jLabelName = new JLabel(); jLabelName.setText("Hii Package C Name"); - jLabelName.setBounds(new java.awt.Rectangle(15, 10, 145, 20)); + jLabelName.setBounds(new java.awt.Rectangle(12, 12, 155, 20)); jStarLabel2 = new StarLabel(); - jStarLabel2.setLocation(new java.awt.Point(2, 35)); + jStarLabel2.setLocation(new java.awt.Point(2, 37)); jLabelUsage = new JLabel(); jLabelUsage.setText("Usage"); - jLabelUsage.setBounds(new java.awt.Rectangle(15, 35, 145, 20)); + jLabelUsage.setBounds(new java.awt.Rectangle(12, 37, 155, 20)); jLabelHelpText = new JLabel(); - jLabelHelpText.setBounds(new java.awt.Rectangle(14, 60, 145, 20)); + jLabelHelpText.setBounds(new java.awt.Rectangle(12, 62, 155, 20)); jLabelHelpText.setText("Help Text"); jLabelFeatureFlag = new JLabel(); - jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 105, 145, 20)); + jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 107, 155, 20)); jLabelFeatureFlag.setText("Feature Flag Expression"); jLabelArch = new JLabel(); - jLabelArch.setBounds(new java.awt.Rectangle(15, 130, 145, 20)); + jLabelArch.setBounds(new java.awt.Rectangle(12, 132, 155, 20)); jLabelArch.setText("Supported Architectures"); jArchCheckBox = new ArchCheckBox(); - jArchCheckBox.setBounds(new java.awt.Rectangle(160, 130, 320, 20)); + jArchCheckBox.setBounds(new java.awt.Rectangle(168, 132, 320, 20)); jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20)); jContentPane = new JPanel(); jContentPane.setLayout(null); - jContentPane.setPreferredSize(new java.awt.Dimension(485, 185)); + jContentPane.setPreferredSize(new java.awt.Dimension(480, 180)); jContentPane.add(jStarLabel1, null); jContentPane.add(jLabelName, null); diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HobsDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HobsDlg.java index a320969292..d46958be1b 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HobsDlg.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HobsDlg.java @@ -109,7 +109,7 @@ public class HobsDlg extends IDialog { private JComboBox getJComboBoxGuidC_Name() { if (jComboBoxGuidC_Name == null) { jComboBoxGuidC_Name = new JComboBox(); - jComboBoxGuidC_Name.setBounds(new java.awt.Rectangle(160, 10, 320, 20)); + jComboBoxGuidC_Name.setBounds(new java.awt.Rectangle(168, 12, 320, 20)); jComboBoxGuidC_Name.setPreferredSize(new java.awt.Dimension(320, 20)); jComboBoxGuidC_Name.setToolTipText("Select the GUID C Name of the Hob"); } @@ -125,7 +125,7 @@ public class HobsDlg extends IDialog { private JComboBox getJComboBoxHobType() { if (jComboBoxHobType == null) { jComboBoxHobType = new JComboBox(); - jComboBoxHobType.setBounds(new java.awt.Rectangle(160, 35, 320, 20)); + jComboBoxHobType.setBounds(new java.awt.Rectangle(168, 37, 320, 20)); jComboBoxHobType.setPreferredSize(new java.awt.Dimension(320, 20)); jComboBoxHobType .setToolTipText("
" @@ -151,7 +151,7 @@ public class HobsDlg extends IDialog { private JComboBox getJComboBoxUsage() { if (jComboBoxUsage == null) { jComboBoxUsage = new JComboBox(); - jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 60, 320, 20)); + jComboBoxUsage.setBounds(new java.awt.Rectangle(168, 62, 320, 20)); jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20)); jComboBoxUsage .setToolTipText("
" @@ -185,7 +185,7 @@ public class HobsDlg extends IDialog { private JTextField getJTextFieldFeatureFlag() { if (jTextFieldFeatureFlag == null) { jTextFieldFeatureFlag = new JTextField(); - jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(160, 130, 320, 20)); + jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 132, 320, 20)); jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20)); jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE"); } @@ -218,7 +218,7 @@ public class HobsDlg extends IDialog { jScrollPaneHelpText.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); jScrollPaneHelpText.setSize(new java.awt.Dimension(320, 40)); jScrollPaneHelpText.setPreferredSize(new java.awt.Dimension(320, 40)); - jScrollPaneHelpText.setLocation(new java.awt.Point(160, 85)); + jScrollPaneHelpText.setLocation(new java.awt.Point(168, 87)); jScrollPaneHelpText.setViewportView(getJTextAreaHelpText()); } return jScrollPaneHelpText; @@ -233,7 +233,7 @@ public class HobsDlg extends IDialog { private JButton getJButtonOk() { if (jButtonOk == null) { jButtonOk = new JButton(); - jButtonOk.setBounds(new java.awt.Rectangle(290, 182, 90, 20)); + jButtonOk.setBounds(new java.awt.Rectangle(290, 187, 90, 20)); jButtonOk.setText("Ok"); jButtonOk.addActionListener(this); } @@ -249,7 +249,7 @@ public class HobsDlg extends IDialog { private JButton getJButtonCancel() { if (jButtonCancel == null) { jButtonCancel = new JButton(); - jButtonCancel.setBounds(new java.awt.Rectangle(390, 182, 90, 20)); + jButtonCancel.setBounds(new java.awt.Rectangle(390, 187, 90, 20)); jButtonCancel.setText("Cancel"); jButtonCancel.addActionListener(this); } @@ -265,7 +265,7 @@ public class HobsDlg extends IDialog { * */ private void init() { - this.setSize(500, 255); + this.setSize(505, 260); this.setContentPane(getJScrollPane()); this.setTitle("Hobs"); initFrame(); @@ -330,41 +330,41 @@ public class HobsDlg extends IDialog { public JPanel getJContentPane() { if (jContentPane == null) { jStarLabel1 = new StarLabel(); - jStarLabel1.setLocation(new java.awt.Point(2, 10)); + jStarLabel1.setLocation(new java.awt.Point(2, 12)); jLabelC_Name = new JLabel(); jLabelC_Name.setText("Hob's Guid C Name"); - jLabelC_Name.setBounds(new java.awt.Rectangle(15, 10, 145, 20)); + jLabelC_Name.setBounds(new java.awt.Rectangle(12, 12, 155, 20)); jStarLabel2 = new StarLabel(); - jStarLabel2.setLocation(new java.awt.Point(2, 35)); + jStarLabel2.setLocation(new java.awt.Point(2, 37)); jLabelHobType = new JLabel(); jLabelHobType.setText("Hob Type"); - jLabelHobType.setBounds(new java.awt.Rectangle(15, 35, 145, 20)); + jLabelHobType.setBounds(new java.awt.Rectangle(12, 37, 155, 20)); jStarLabel3 = new StarLabel(); - jStarLabel3.setLocation(new java.awt.Point(2, 60)); + jStarLabel3.setLocation(new java.awt.Point(2, 62)); jLabelUsage = new JLabel(); jLabelUsage.setText("Usage"); - jLabelUsage.setBounds(new java.awt.Rectangle(15, 60, 145, 20)); + jLabelUsage.setBounds(new java.awt.Rectangle(12, 62, 155, 20)); jLabelHelpText = new JLabel(); - jLabelHelpText.setBounds(new java.awt.Rectangle(15, 85, 145, 20)); + jLabelHelpText.setBounds(new java.awt.Rectangle(12, 87, 155, 20)); jLabelHelpText.setText("Help Text"); jLabelFeatureFlag = new JLabel(); - jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 130, 145, 20)); + jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 132, 155, 20)); jLabelFeatureFlag.setText("Feature Flag Expression"); jLabelArch = new JLabel(); - jLabelArch.setBounds(new java.awt.Rectangle(15, 155, 145, 20)); + jLabelArch.setBounds(new java.awt.Rectangle(12, 157, 155, 20)); jLabelArch.setText("Supported Architectures"); jArchCheckBox = new ArchCheckBox(); - jArchCheckBox.setBounds(new java.awt.Rectangle(160, 155, 320, 20)); + jArchCheckBox.setBounds(new java.awt.Rectangle(168, 157, 320, 20)); jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20)); jContentPane = new JPanel(); jContentPane.setLayout(null); - jContentPane.setPreferredSize(new java.awt.Dimension(485, 210)); + jContentPane.setPreferredSize(new java.awt.Dimension(485, 215)); jContentPane.add(jStarLabel1, null); jContentPane.add(jLabelC_Name, null); diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PCDsDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PCDsDlg.java index b2a2f6dc6d..9e0f120a19 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PCDsDlg.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PCDsDlg.java @@ -123,7 +123,7 @@ public class PCDsDlg extends IDialog implements ItemListener { private JComboBox getJComboBoxItemType() { if (jComboBoxItemType == null) { jComboBoxItemType = new JComboBox(); - jComboBoxItemType.setBounds(new java.awt.Rectangle(160, 35, 320, 20)); + jComboBoxItemType.setBounds(new java.awt.Rectangle(168, 37, 320, 20)); jComboBoxItemType.setPreferredSize(new java.awt.Dimension(320, 20)); } return jComboBoxItemType; @@ -138,7 +138,7 @@ public class PCDsDlg extends IDialog implements ItemListener { private JComboBox getJComboBoxCName() { if (jComboBoxCName == null) { jComboBoxCName = new JComboBox(); - jComboBoxCName.setBounds(new java.awt.Rectangle(160, 10, 320, 20)); + jComboBoxCName.setBounds(new java.awt.Rectangle(168, 12, 320, 20)); jComboBoxCName.setPreferredSize(new java.awt.Dimension(320, 20)); jComboBoxCName.addItemListener(this); } @@ -154,7 +154,7 @@ public class PCDsDlg extends IDialog implements ItemListener { private JTextField getJTextFieldDefaultValue() { if (jTextFieldDefaultValue == null) { jTextFieldDefaultValue = new JTextField(); - jTextFieldDefaultValue.setBounds(new java.awt.Rectangle(160, 60, 320, 20)); + jTextFieldDefaultValue.setBounds(new java.awt.Rectangle(168, 62, 320, 20)); jTextFieldDefaultValue.setPreferredSize(new java.awt.Dimension(320, 20)); } return jTextFieldDefaultValue; @@ -186,7 +186,7 @@ public class PCDsDlg extends IDialog implements ItemListener { jScrollPaneHelpText.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); jScrollPaneHelpText.setSize(new java.awt.Dimension(320, 40)); jScrollPaneHelpText.setPreferredSize(new java.awt.Dimension(320, 40)); - jScrollPaneHelpText.setLocation(new java.awt.Point(160, 110)); + jScrollPaneHelpText.setLocation(new java.awt.Point(168, 112)); jScrollPaneHelpText.setViewportView(getJTextAreaHelpText()); } return jScrollPaneHelpText; @@ -213,7 +213,7 @@ public class PCDsDlg extends IDialog implements ItemListener { private JTextField getJTextFieldTokenSpaceGuid() { if (jTextFieldTokenSpaceGuid == null) { jTextFieldTokenSpaceGuid = new JTextField(); - jTextFieldTokenSpaceGuid.setBounds(new java.awt.Rectangle(160, 60, 320, 20)); + jTextFieldTokenSpaceGuid.setBounds(new java.awt.Rectangle(168, 62, 320, 20)); jTextFieldTokenSpaceGuid.setPreferredSize(new java.awt.Dimension(320, 20)); jTextFieldTokenSpaceGuid.setVisible(false); } @@ -228,7 +228,7 @@ public class PCDsDlg extends IDialog implements ItemListener { private JTextField getJTextFieldFeatureFlag() { if (jTextFieldFeatureFlag == null) { jTextFieldFeatureFlag = new JTextField(); - jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(160, 155, 320, 20)); + jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 157, 320, 20)); jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20)); jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE"); } @@ -244,7 +244,7 @@ public class PCDsDlg extends IDialog implements ItemListener { private JButton getJButtonOk() { if (jButtonOk == null) { jButtonOk = new JButton(); - jButtonOk.setBounds(new java.awt.Rectangle(290, 205, 90, 20)); + jButtonOk.setBounds(new java.awt.Rectangle(290, 212, 90, 20)); jButtonOk.setText("Ok"); jButtonOk.addActionListener(this); } @@ -260,7 +260,7 @@ public class PCDsDlg extends IDialog implements ItemListener { private JButton getJButtonCancel() { if (jButtonCancel == null) { jButtonCancel = new JButton(); - jButtonCancel.setBounds(new java.awt.Rectangle(390, 205, 90, 20)); + jButtonCancel.setBounds(new java.awt.Rectangle(390, 212, 90, 20)); jButtonCancel.setText("Cancel"); jButtonCancel.addActionListener(this); } @@ -275,7 +275,7 @@ public class PCDsDlg extends IDialog implements ItemListener { private JComboBox getJComboBoxUsage() { if (jComboBoxUsage == null) { jComboBoxUsage = new JComboBox(); - jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 85, 320, 20)); + jComboBoxUsage.setBounds(new java.awt.Rectangle(168, 87, 320, 20)); jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20)); } return jComboBoxUsage; @@ -290,7 +290,7 @@ public class PCDsDlg extends IDialog implements ItemListener { * */ private void init() { - this.setSize(500, 270); + this.setSize(505, 280); this.setContentPane(getJScrollPane()); this.setTitle("Pcd Coded"); initFrame(); @@ -356,33 +356,33 @@ public class PCDsDlg extends IDialog implements ItemListener { private JPanel getJContentPane() { if (jContentPane == null) { jLabelUsage = new JLabel(); - jLabelUsage.setBounds(new java.awt.Rectangle(15, 85, 140, 20)); + jLabelUsage.setBounds(new java.awt.Rectangle(12, 87, 168, 20)); jLabelUsage.setText("Usge"); jStarLabel1 = new StarLabel(); - jStarLabel1.setLocation(new java.awt.Point(2, 10)); + jStarLabel1.setLocation(new java.awt.Point(2, 12)); jLabelC_Name = new JLabel(); jLabelC_Name.setText("PCD C Name"); - jLabelC_Name.setBounds(new java.awt.Rectangle(15, 10, 145, 20)); + jLabelC_Name.setBounds(new java.awt.Rectangle(12, 12, 168, 20)); jStarLabel2 = new StarLabel(); - jStarLabel2.setLocation(new java.awt.Point(2, 35)); + jStarLabel2.setLocation(new java.awt.Point(2, 37)); jLabelItemType = new JLabel(); jLabelItemType.setText("PCD Item Type"); - jLabelItemType.setBounds(new java.awt.Rectangle(15, 35, 145, 20)); + jLabelItemType.setBounds(new java.awt.Rectangle(12, 37, 168, 20)); jLabelDefaultValue = new JLabel(); jLabelDefaultValue.setText("Default Value"); - jLabelDefaultValue.setBounds(new java.awt.Rectangle(15, 60, 145, 20)); + jLabelDefaultValue.setBounds(new java.awt.Rectangle(12, 62, 168, 20)); jStarLabel3 = new StarLabel(); - jStarLabel3.setLocation(new java.awt.Point(2, 110)); + jStarLabel3.setLocation(new java.awt.Point(2, 112)); jLabelHelpText = new JLabel(); jLabelHelpText.setText("Help Text"); - jLabelHelpText.setBounds(new java.awt.Rectangle(15, 110, 145, 20)); + jLabelHelpText.setBounds(new java.awt.Rectangle(12, 112, 168, 20)); jLabelFeatureFlag = new JLabel(); jLabelFeatureFlag.setText("Feature Flag Expression"); - jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 155, 140, 20)); + jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 157, 168, 20)); jLabelTokenSpaceGuid = new JLabel(); jLabelTokenSpaceGuid.setText("Token Space C Name"); @@ -390,13 +390,13 @@ public class PCDsDlg extends IDialog implements ItemListener { jLabelArch = new JLabel(); jLabelArch.setText("Supported Architectures"); - jLabelArch.setBounds(new java.awt.Rectangle(15, 180, 145, 20)); + jLabelArch.setBounds(new java.awt.Rectangle(12, 182, 168, 20)); jArchCheckBox = new ArchCheckBox(); jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20)); - jArchCheckBox.setBounds(new java.awt.Rectangle(160, 180, 320, 20)); + jArchCheckBox.setBounds(new java.awt.Rectangle(168, 182, 320, 20)); // Hidden field - jLabelTokenSpaceGuid.setBounds(new java.awt.Rectangle(15, 60, 140, 20)); + jLabelTokenSpaceGuid.setBounds(new java.awt.Rectangle(12, 62, 140, 20)); jContentPane = new JPanel(); jContentPane.setLayout(null); diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PpisDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PpisDlg.java index 1e937e0b3c..2a2d2d399f 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PpisDlg.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PpisDlg.java @@ -1,6 +1,6 @@ /** @file - The file is used to create, update Ppi of MSA/MBD file + The file is used to create, update Ppi section of the MSA file Copyright (c) 2006, Intel Corporation All rights reserved. This program and the accompanying materials @@ -111,7 +111,7 @@ public class PpisDlg extends IDialog implements ItemListener { private JComboBox getJComboBoxPpiType() { if (jComboBoxPpiType == null) { jComboBoxPpiType = new JComboBox(); - jComboBoxPpiType.setBounds(new java.awt.Rectangle(160, 10, 320, 20)); + jComboBoxPpiType.setBounds(new java.awt.Rectangle(168, 12, 320, 20)); jComboBoxPpiType.setPreferredSize(new java.awt.Dimension(320, 20)); jComboBoxPpiType.addItemListener(this); jComboBoxPpiType @@ -129,7 +129,7 @@ public class PpisDlg extends IDialog implements ItemListener { private JComboBox getJComboBoxCName() { if (jComboBoxCName == null) { jComboBoxCName = new JComboBox(); - jComboBoxCName.setBounds(new java.awt.Rectangle(160, 35, 320, 20)); + jComboBoxCName.setBounds(new java.awt.Rectangle(168, 37, 320, 20)); jComboBoxCName.setPreferredSize(new java.awt.Dimension(320, 20)); jComboBoxCName.setToolTipText("Select Guid C Name of PPI"); } @@ -145,7 +145,7 @@ public class PpisDlg extends IDialog implements ItemListener { private JComboBox getJComboBoxUsage() { if (jComboBoxUsage == null) { jComboBoxUsage = new JComboBox(); - jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 60, 320, 20)); + jComboBoxUsage.setBounds(new java.awt.Rectangle(168, 62, 320, 20)); jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20)); jComboBoxUsage .setToolTipText("
PPI
ALWAYS_CONSUMEDModule always consumes the PPI
SOMETIMES_CONSUMEDModule sometimes consumes the PPI
ALWAYS_PRODUCEDModule always produces the PPI
SOMETIMES_PRODUCEDModule sometimes produces the PPI
PPI Notify
SOMETIMES_CONSUMEDModule will consume the PPI if it is produced. Consumption
is defined by executing the PPI notify function
"); @@ -162,7 +162,7 @@ public class PpisDlg extends IDialog implements ItemListener { private JTextField getJTextFieldFeatureFlag() { if (jTextFieldFeatureFlag == null) { jTextFieldFeatureFlag = new JTextField(); - jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(160, 130, 320, 20)); + jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 132, 320, 20)); jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20)); jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE"); } @@ -209,7 +209,7 @@ public class PpisDlg extends IDialog implements ItemListener { jScrollPaneHelpText.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); jScrollPaneHelpText.setSize(new java.awt.Dimension(320, 40)); jScrollPaneHelpText.setPreferredSize(new java.awt.Dimension(320, 40)); - jScrollPaneHelpText.setLocation(new java.awt.Point(160, 85)); + jScrollPaneHelpText.setLocation(new java.awt.Point(168, 87)); jScrollPaneHelpText.setViewportView(getJTextAreaHelpText()); } return jScrollPaneHelpText; @@ -224,7 +224,7 @@ public class PpisDlg extends IDialog implements ItemListener { private JButton getJButtonOk() { if (jButtonOk == null) { jButtonOk = new JButton(); - jButtonOk.setBounds(new java.awt.Rectangle(290, 182, 90, 20)); + jButtonOk.setBounds(new java.awt.Rectangle(290, 187, 90, 20)); jButtonOk.setText("Ok"); jButtonOk.addActionListener(this); } @@ -240,7 +240,7 @@ public class PpisDlg extends IDialog implements ItemListener { private JButton getJButtonCancel() { if (jButtonCancel == null) { jButtonCancel = new JButton(); - jButtonCancel.setBounds(new java.awt.Rectangle(390, 182, 90, 20)); + jButtonCancel.setBounds(new java.awt.Rectangle(390, 187, 90, 20)); jButtonCancel.setText("Cancel"); jButtonCancel.addActionListener(this); } @@ -256,7 +256,7 @@ public class PpisDlg extends IDialog implements ItemListener { * */ private void init() { - this.setSize(500, 255); + this.setSize(505, 260); this.setContentPane(getJScrollPane()); this.setTitle("PPI Definitions"); initFrame(); @@ -305,41 +305,41 @@ public class PpisDlg extends IDialog implements ItemListener { private JPanel getJContentPane() { if (jContentPane == null) { jStarLabel1 = new StarLabel(); - jStarLabel1.setLocation(new java.awt.Point(2, 10)); + jStarLabel1.setLocation(new java.awt.Point(2, 12)); jLabelPpiType = new JLabel(); - jLabelPpiType.setBounds(new java.awt.Rectangle(15, 10, 145, 20)); + jLabelPpiType.setBounds(new java.awt.Rectangle(12, 12, 168, 20)); jLabelPpiType.setText("Select Ppi Type"); jStarLabel2 = new StarLabel(); - jStarLabel2.setLocation(new java.awt.Point(2, 35)); + jStarLabel2.setLocation(new java.awt.Point(2, 37)); jLabelC_Name = new JLabel(); jLabelC_Name.setText("PPI GUID C Name"); - jLabelC_Name.setBounds(new java.awt.Rectangle(15, 35, 145, 20)); + jLabelC_Name.setBounds(new java.awt.Rectangle(12, 37, 168, 20)); jStarLabel3 = new StarLabel(); - jStarLabel3.setLocation(new java.awt.Point(2, 60)); + jStarLabel3.setLocation(new java.awt.Point(2, 62)); jLabelUsage = new JLabel(); jLabelUsage.setText("Usage"); - jLabelUsage.setBounds(new java.awt.Rectangle(15, 60, 145, 20)); + jLabelUsage.setBounds(new java.awt.Rectangle(12, 62, 168, 20)); jLabelHelpText = new JLabel(); - jLabelHelpText.setBounds(new java.awt.Rectangle(14, 85, 145, 20)); + jLabelHelpText.setBounds(new java.awt.Rectangle(14, 87, 168, 20)); jLabelHelpText.setText("Help Text"); jLabelFeatureFlag = new JLabel(); jLabelFeatureFlag.setText("Feature Flag Expression"); - jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 130, 145, 20)); + jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 132, 168, 20)); jLabelArch = new JLabel(); - jLabelArch.setBounds(new java.awt.Rectangle(15, 155, 145, 20)); + jLabelArch.setBounds(new java.awt.Rectangle(12, 157, 168, 20)); jLabelArch.setText("Supported Architectures"); jArchCheckBox = new ArchCheckBox(); - jArchCheckBox.setBounds(new java.awt.Rectangle(160, 155, 320, 20)); + jArchCheckBox.setBounds(new java.awt.Rectangle(168, 157, 320, 20)); jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20)); jContentPane = new JPanel(); jContentPane.setLayout(null); - jContentPane.setPreferredSize(new java.awt.Dimension(485, 210)); + jContentPane.setPreferredSize(new java.awt.Dimension(485, 215)); jContentPane.add(jStarLabel1, null); jContentPane.add(jLabelPpiType, null); diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ProtocolsDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ProtocolsDlg.java index 894955188c..0bd5b5fcd1 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ProtocolsDlg.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ProtocolsDlg.java @@ -1,6 +1,6 @@ /** @file - The file is used to create, update Protocol of MSA/MBD file + The file is used to create, update Protocol of section of the MSA file Copyright (c) 2006, Intel Corporation All rights reserved. This program and the accompanying materials @@ -114,7 +114,7 @@ public class ProtocolsDlg extends IDialog implements ItemListener { private JTextField getJTextFieldFeatureFlag() { if (jTextFieldFeatureFlag == null) { jTextFieldFeatureFlag = new JTextField(); - jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(160, 130, 320, 20)); + jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 132, 320, 20)); jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20)); jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE"); } @@ -130,7 +130,7 @@ public class ProtocolsDlg extends IDialog implements ItemListener { private JComboBox getJComboBoxProtocolUsage() { if (jComboBoxUsage == null) { jComboBoxUsage = new JComboBox(); - jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 60, 320, 20)); + jComboBoxUsage.setBounds(new java.awt.Rectangle(168, 62, 320, 20)); jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20)); jComboBoxUsage .setToolTipText("" @@ -167,7 +167,7 @@ public class ProtocolsDlg extends IDialog implements ItemListener { private JComboBox getJComboBoxProtocolType() { if (jComboBoxProtocolType == null) { jComboBoxProtocolType = new JComboBox(); - jComboBoxProtocolType.setBounds(new java.awt.Rectangle(160, 10, 320, 20)); + jComboBoxProtocolType.setBounds(new java.awt.Rectangle(168, 12, 320, 20)); jComboBoxProtocolType.setPreferredSize(new java.awt.Dimension(320, 20)); jComboBoxProtocolType.addItemListener(this); jComboBoxProtocolType @@ -184,7 +184,7 @@ public class ProtocolsDlg extends IDialog implements ItemListener { private JComboBox getJComboBoxCName() { if (jComboBoxCName == null) { jComboBoxCName = new JComboBox(); - jComboBoxCName.setBounds(new java.awt.Rectangle(160, 35, 320, 20)); + jComboBoxCName.setBounds(new java.awt.Rectangle(168, 37, 320, 20)); jComboBoxCName.setPreferredSize(new java.awt.Dimension(320, 20)); jComboBoxCName.setToolTipText("Select Guid C Name of the Protocol"); @@ -219,7 +219,7 @@ public class ProtocolsDlg extends IDialog implements ItemListener { jScrollPaneHelpText.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); jScrollPaneHelpText.setSize(new java.awt.Dimension(320, 40)); jScrollPaneHelpText.setPreferredSize(new java.awt.Dimension(320, 40)); - jScrollPaneHelpText.setLocation(new java.awt.Point(160, 85)); + jScrollPaneHelpText.setLocation(new java.awt.Point(168, 87)); jScrollPaneHelpText.setViewportView(getJTextAreaHelpText()); } return jScrollPaneHelpText; @@ -234,7 +234,7 @@ public class ProtocolsDlg extends IDialog implements ItemListener { private JButton getJButtonOk() { if (jButtonOk == null) { jButtonOk = new JButton(); - jButtonOk.setBounds(new java.awt.Rectangle(290, 182, 90, 20)); + jButtonOk.setBounds(new java.awt.Rectangle(290, 187, 90, 20)); jButtonOk.setText("Ok"); jButtonOk.addActionListener(this); } @@ -250,7 +250,7 @@ public class ProtocolsDlg extends IDialog implements ItemListener { private JButton getJButtonCancel() { if (jButtonCancel == null) { jButtonCancel = new JButton(); - jButtonCancel.setBounds(new java.awt.Rectangle(390, 182, 90, 20)); + jButtonCancel.setBounds(new java.awt.Rectangle(390, 187, 90, 20)); jButtonCancel.setText("Cancel"); jButtonCancel.addActionListener(this); } @@ -266,7 +266,9 @@ public class ProtocolsDlg extends IDialog implements ItemListener { * */ private void init() { - this.setSize(500, 255); + // Width must be 20 larger than Content Pane PreferredSize width for MSFT + // Height must be 45 larger than ContentPane PreferredSize height for MSFT + this.setSize(505, 260); this.setContentPane(getJScrollPane()); this.setTitle("Protocols"); initFrame(); @@ -330,41 +332,41 @@ public class ProtocolsDlg extends IDialog implements ItemListener { private JPanel getJContentPane() { if (jContentPane == null) { jStarLabel1 = new StarLabel(); - jStarLabel1.setLocation(new java.awt.Point(2, 10)); + jStarLabel1.setLocation(new java.awt.Point(2, 12)); jLabelProtocolType = new JLabel(); - jLabelProtocolType.setBounds(new java.awt.Rectangle(15, 10, 145, 20)); + jLabelProtocolType.setBounds(new java.awt.Rectangle(12, 12, 155, 20)); jLabelProtocolType.setText("Select Protocol Type"); jStarLabel2 = new StarLabel(); - jStarLabel2.setLocation(new java.awt.Point(2, 35)); + jStarLabel2.setLocation(new java.awt.Point(2, 37)); jLabelC_Name = new JLabel(); jLabelC_Name.setText("Protocol Guid C Name"); - jLabelC_Name.setBounds(new java.awt.Rectangle(15, 35, 145, 20)); + jLabelC_Name.setBounds(new java.awt.Rectangle(12, 37, 155, 20)); jStarLabel3 = new StarLabel(); - jStarLabel3.setLocation(new java.awt.Point(2, 60)); + jStarLabel3.setLocation(new java.awt.Point(2, 62)); jLabelUsage = new JLabel(); jLabelUsage.setText("Usage"); - jLabelUsage.setBounds(new java.awt.Rectangle(15, 60, 145, 20)); + jLabelUsage.setBounds(new java.awt.Rectangle(12, 62, 155, 20)); jLabelHelpText = new JLabel(); - jLabelHelpText.setBounds(new java.awt.Rectangle(15, 85, 145, 20)); + jLabelHelpText.setBounds(new java.awt.Rectangle(12, 87, 155, 20)); jLabelHelpText.setText("Help Text"); jLabelFeatureFlag = new JLabel(); jLabelFeatureFlag.setText("Feature Flag Expression"); - jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 130, 145, 20)); + jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 132, 155, 20)); jLabelArch = new JLabel(); - jLabelArch.setBounds(new java.awt.Rectangle(15, 155, 145, 20)); + jLabelArch.setBounds(new java.awt.Rectangle(12, 157, 155, 20)); jLabelArch.setText("Supported Architectures"); jArchCheckBox = new ArchCheckBox(); - jArchCheckBox.setBounds(new java.awt.Rectangle(160, 155, 320, 20)); + jArchCheckBox.setBounds(new java.awt.Rectangle(168, 157, 320, 20)); jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20)); jContentPane = new JPanel(); jContentPane.setLayout(null); - jContentPane.setPreferredSize(new java.awt.Dimension(485, 210)); + jContentPane.setPreferredSize(new java.awt.Dimension(485, 215)); jContentPane.add(jStarLabel1, null); jContentPane.add(jLabelProtocolType, null); diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SystemTablesDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SystemTablesDlg.java index f2b92ba7ef..8919552e7f 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SystemTablesDlg.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SystemTablesDlg.java @@ -39,8 +39,8 @@ import org.tianocore.frameworkwizard.module.Identifications.SystemTables.SystemT import org.tianocore.frameworkwizard.workspace.WorkspaceTools; /** - * The class is used to create, update SystemTable of MSA/MBD file It extends - * IInternalFrame + * The class is used to create, update SystemTable of MSA/MBD file + * It extends IDialog * * * @@ -107,7 +107,7 @@ public class SystemTablesDlg extends IDialog { private JComboBox getJComboBoxGuidC_Name() { if (jComboBoxGuidC_Name == null) { jComboBoxGuidC_Name = new JComboBox(); - jComboBoxGuidC_Name.setBounds(new java.awt.Rectangle(160, 10, 320, 20)); + jComboBoxGuidC_Name.setBounds(new java.awt.Rectangle(168, 12, 320, 20)); jComboBoxGuidC_Name.setPreferredSize(new java.awt.Dimension(320, 20)); jComboBoxGuidC_Name.setToolTipText("Select the GUID C Name of the System Table"); } @@ -123,7 +123,7 @@ public class SystemTablesDlg extends IDialog { private JComboBox getJComboBoxUsage() { if (jComboBoxUsage == null) { jComboBoxUsage = new JComboBox(); - jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 35, 320, 20)); + jComboBoxUsage.setBounds(new java.awt.Rectangle(168, 37, 320, 20)); jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20)); jComboBoxUsage .setToolTipText("
Protocol
" @@ -144,7 +144,7 @@ public class SystemTablesDlg extends IDialog { private JTextField getJTextFieldFeatureFlag() { if (jTextFieldFeatureFlag == null) { jTextFieldFeatureFlag = new JTextField(); - jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(160, 105, 320, 20)); + jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 107, 320, 20)); jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20)); jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE"); } @@ -190,7 +190,7 @@ public class SystemTablesDlg extends IDialog { jScrollPaneHelpText.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); jScrollPaneHelpText.setSize(new java.awt.Dimension(320, 40)); jScrollPaneHelpText.setPreferredSize(new java.awt.Dimension(320, 40)); - jScrollPaneHelpText.setLocation(new java.awt.Point(160, 60)); + jScrollPaneHelpText.setLocation(new java.awt.Point(168, 62)); jScrollPaneHelpText.setViewportView(getJTextAreaHelpText()); } return jScrollPaneHelpText; @@ -205,7 +205,7 @@ public class SystemTablesDlg extends IDialog { private JButton getJButtonOk() { if (jButtonOk == null) { jButtonOk = new JButton(); - jButtonOk.setBounds(new java.awt.Rectangle(290, 157, 90, 20)); + jButtonOk.setBounds(new java.awt.Rectangle(290, 162, 90, 20)); jButtonOk.setText("Ok"); jButtonOk.addActionListener(this); } @@ -221,7 +221,7 @@ public class SystemTablesDlg extends IDialog { private JButton getJButtonCancel() { if (jButtonCancel == null) { jButtonCancel = new JButton(); - jButtonCancel.setBounds(new java.awt.Rectangle(390, 157, 90, 20)); + jButtonCancel.setBounds(new java.awt.Rectangle(390, 162, 90, 20)); jButtonCancel.setText("Cancel"); jButtonCancel.addActionListener(this); } @@ -237,7 +237,7 @@ public class SystemTablesDlg extends IDialog { * */ private void init() { - this.setSize(500, 230); + this.setSize(505, 235); this.setContentPane(getJScrollPane()); this.setTitle("System Tables"); initFrame(); @@ -299,31 +299,31 @@ public class SystemTablesDlg extends IDialog { private JPanel getJContentPane() { if (jContentPane == null) { jStarLabel1 = new StarLabel(); - jStarLabel1.setLocation(new java.awt.Point(2, 10)); + jStarLabel1.setLocation(new java.awt.Point(2, 12)); jLabelEntry = new JLabel(); jLabelEntry.setText("Table's GUID C Name"); - jLabelEntry.setBounds(new java.awt.Rectangle(15, 10, 145, 20)); + jLabelEntry.setBounds(new java.awt.Rectangle(12, 12, 155, 20)); jStarLabel2 = new StarLabel(); - jStarLabel2.setLocation(new java.awt.Point(2, 35)); + jStarLabel2.setLocation(new java.awt.Point(2, 37)); jLabelUsage = new JLabel(); jLabelUsage.setText("Usage"); - jLabelUsage.setBounds(new java.awt.Rectangle(15, 35, 145, 20)); + jLabelUsage.setBounds(new java.awt.Rectangle(12, 37, 155, 20)); jLabelHelpText = new JLabel(); - jLabelHelpText.setBounds(new java.awt.Rectangle(14, 60, 145, 20)); + jLabelHelpText.setBounds(new java.awt.Rectangle(12, 62, 155, 20)); jLabelHelpText.setText("Help Text"); jLabelFeatureFlag = new JLabel(); - jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 105, 140, 20)); + jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 107, 155, 20)); jLabelFeatureFlag.setText("Feature Flag Expression"); jLabelArch = new JLabel(); - jLabelArch.setBounds(new java.awt.Rectangle(15, 130, 145, 20)); + jLabelArch.setBounds(new java.awt.Rectangle(12, 130, 155, 20)); jLabelArch.setText("Supported Architectures"); jArchCheckBox = new ArchCheckBox(); - jArchCheckBox.setBounds(new java.awt.Rectangle(160, 130, 320, 20)); + jArchCheckBox.setBounds(new java.awt.Rectangle(168, 130, 320, 20)); jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20)); jContentPane = new JPanel(); jContentPane.setLayout(null); - jContentPane.setPreferredSize(new java.awt.Dimension(485, 185)); + jContentPane.setPreferredSize(new java.awt.Dimension(480, 180)); jContentPane.add(jLabelEntry, null); jContentPane.add(jLabelFeatureFlag, null); diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/VariablesDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/VariablesDlg.java index 0761d30693..ca8a5839fe 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/VariablesDlg.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/VariablesDlg.java @@ -1,6 +1,6 @@ /** @file - The file is used to create, update Variable of MSA/MBD file + The file is used to create, update Variables section of the MSA file Copyright (c) 2006, Intel Corporation All rights reserved. This program and the accompanying materials @@ -39,8 +39,8 @@ import org.tianocore.frameworkwizard.module.Identifications.Variables.VariablesI import org.tianocore.frameworkwizard.workspace.WorkspaceTools; /** - * The class is used to create, update Variable of MSA/MBD file It extends - * IDialog + * The class is used to create, update Variables section of the MSA file + * It extends IDialog * */ public class VariablesDlg extends IDialog { @@ -113,7 +113,7 @@ public class VariablesDlg extends IDialog { jTextFieldVariableName = new JTextField(); jTextFieldVariableName.setSize(new java.awt.Dimension(320, 20)); jTextFieldVariableName.setPreferredSize(new java.awt.Dimension(320, 20)); - jTextFieldVariableName.setLocation(new java.awt.Point(160, 10)); + jTextFieldVariableName.setLocation(new java.awt.Point(168, 12)); jTextFieldVariableName .setToolTipText("Enter a Hex Word Array, you must provide leading Zeros. 0x000a, 0x0010, 0x00FF"); } @@ -129,15 +129,15 @@ public class VariablesDlg extends IDialog { private JComboBox getJComboBoxUsage() { if (jComboBoxUsage == null) { jComboBoxUsage = new JComboBox(); - jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 60, 320, 20)); + jComboBoxUsage.setBounds(new java.awt.Rectangle(168, 62, 320, 20)); jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20)); jComboBoxUsage - .setToolTipText("
" - + "" - + "" - + "" - + "" - + "
ALWAYS_CONSUMEDThe module requires the variable entry to be set
SOMETIMES_CONSUMEDThe module will use the variable entry if it is set.
ALWAYS_PRODUCEDThe module will always write the variable.
SOMETIMES_PRODUCEDThe module will sometimes write the variable.
"); + .setToolTipText("" + + "" + + "" + + "" + + "" + + "
ALWAYS_CONSUMEDThe module requires the variable entry to be set
SOMETIMES_CONSUMEDThe module will use the variable entry if it is set.
ALWAYS_PRODUCEDThe module will always write the variable.
SOMETIMES_PRODUCEDThe module will sometimes write the variable.
"); } return jComboBoxUsage; } @@ -164,7 +164,7 @@ public class VariablesDlg extends IDialog { private JTextField getJTextFieldFeatureFlag() { if (jTextFieldFeatureFlag == null) { jTextFieldFeatureFlag = new JTextField(); - jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(160, 130, 320, 20)); + jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 132, 320, 20)); jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20)); jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE"); } @@ -193,7 +193,7 @@ public class VariablesDlg extends IDialog { jScrollPaneHelpText.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); jScrollPaneHelpText.setSize(new java.awt.Dimension(320, 40)); jScrollPaneHelpText.setPreferredSize(new java.awt.Dimension(320, 40)); - jScrollPaneHelpText.setLocation(new java.awt.Point(160, 85)); + jScrollPaneHelpText.setLocation(new java.awt.Point(168, 87)); jScrollPaneHelpText.setViewportView(getJTextAreaHelpText()); } return jScrollPaneHelpText; @@ -208,7 +208,7 @@ public class VariablesDlg extends IDialog { private JComboBox getJComboBoxGuidC_Name() { if (jComboBoxGuidC_Name == null) { jComboBoxGuidC_Name = new JComboBox(); - jComboBoxGuidC_Name.setBounds(new java.awt.Rectangle(160, 35, 320, 20)); + jComboBoxGuidC_Name.setBounds(new java.awt.Rectangle(168, 37, 320, 20)); jComboBoxGuidC_Name.setPreferredSize(new java.awt.Dimension(320, 20)); jComboBoxGuidC_Name.setToolTipText("Select the GUID C Name of the Variable."); } @@ -224,7 +224,7 @@ public class VariablesDlg extends IDialog { private JButton getJButtonOk() { if (jButtonOk == null) { jButtonOk = new JButton(); - jButtonOk.setBounds(new java.awt.Rectangle(290, 182, 90, 20)); + jButtonOk.setBounds(new java.awt.Rectangle(290, 187, 90, 20)); jButtonOk.setText("Ok"); jButtonOk.addActionListener(this); } @@ -240,7 +240,7 @@ public class VariablesDlg extends IDialog { private JButton getJButtonCancel() { if (jButtonCancel == null) { jButtonCancel = new JButton(); - jButtonCancel.setBounds(new java.awt.Rectangle(390, 182, 90, 20)); + jButtonCancel.setBounds(new java.awt.Rectangle(390, 187, 90, 20)); jButtonCancel.setText("Cancel"); jButtonCancel.addActionListener(this); } @@ -256,7 +256,7 @@ public class VariablesDlg extends IDialog { * */ private void init() { - this.setSize(500, 255); + this.setSize(505, 260); this.setContentPane(getJScrollPane()); this.setTitle("Variables"); initFrame(); @@ -320,41 +320,41 @@ public class VariablesDlg extends IDialog { private JPanel getJContentPane() { if (jContentPane == null) { jStarLabel1 = new StarLabel(); - jStarLabel1.setLocation(new java.awt.Point(2, 10)); + jStarLabel1.setLocation(new java.awt.Point(2, 12)); jLabelVariableName = new JLabel(); jLabelVariableName.setText("Variable Name"); - jLabelVariableName.setBounds(new java.awt.Rectangle(15, 10, 145, 20)); + jLabelVariableName.setBounds(new java.awt.Rectangle(12, 12, 168, 20)); jStarLabel2 = new StarLabel(); - jStarLabel2.setLocation(new java.awt.Point(2, 35)); + jStarLabel2.setLocation(new java.awt.Point(2, 37)); jLabelGuidCName = new JLabel(); - jLabelGuidCName.setBounds(new java.awt.Rectangle(15, 35, 145, 20)); + jLabelGuidCName.setBounds(new java.awt.Rectangle(12, 37, 168, 20)); jLabelGuidCName.setText("Variable Guid C Name"); jStarLabel3 = new StarLabel(); - jStarLabel3.setLocation(new java.awt.Point(2, 60)); + jStarLabel3.setLocation(new java.awt.Point(2, 62)); jLabelUsage = new JLabel(); jLabelUsage.setText("Usage"); - jLabelUsage.setBounds(new java.awt.Rectangle(15, 60, 145, 20)); + jLabelUsage.setBounds(new java.awt.Rectangle(12, 62, 168, 20)); jLabelHelpText = new JLabel(); - jLabelHelpText.setBounds(new java.awt.Rectangle(14, 85, 145, 20)); + jLabelHelpText.setBounds(new java.awt.Rectangle(12, 87, 168, 20)); jLabelHelpText.setText("Help Text"); jLabelFeatureFlag = new JLabel(); jLabelFeatureFlag.setText("Feature Flag Expression"); - jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 130, 145, 20)); + jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 132, 168, 20)); jLabelArch = new JLabel(); - jLabelArch.setBounds(new java.awt.Rectangle(15, 155, 145, 20)); + jLabelArch.setBounds(new java.awt.Rectangle(12, 157, 168, 20)); jLabelArch.setText("Supported Architectures"); jArchCheckBox = new ArchCheckBox(); - jArchCheckBox.setBounds(new java.awt.Rectangle(160, 155, 320, 20)); + jArchCheckBox.setBounds(new java.awt.Rectangle(168, 157, 320, 20)); jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20)); jContentPane = new JPanel(); jContentPane.setLayout(null); - jContentPane.setPreferredSize(new java.awt.Dimension(485, 210)); + jContentPane.setPreferredSize(new java.awt.Dimension(485, 215)); jContentPane.add(jStarLabel1, null); jContentPane.add(jLabelVariableName, null); -- 2.39.2