diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/MsaHeader.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/MsaHeader.java index 826a7cbf1f..c161b5de4c 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/MsaHeader.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/MsaHeader.java @@ -150,7 +150,7 @@ public class MsaHeader extends IInternalFrame { jTextFieldBaseName.setBounds(new java.awt.Rectangle(160, 10, 320, 20)); jTextFieldBaseName.setPreferredSize(new java.awt.Dimension(320, 20)); jTextFieldBaseName.addFocusListener(this); - jTextFieldBaseName.setToolTipText("An brief Identifier, such as USB I/O Library, of the module"); + jTextFieldBaseName.setToolTipText("A brief Identifier, such as USB I/O Library, of the module"); } return jTextFieldBaseName; } @@ -168,7 +168,7 @@ public class MsaHeader extends IInternalFrame { jTextFieldGuid.setLocation(new java.awt.Point(160, 60)); jTextFieldGuid.setSize(new java.awt.Dimension(250, 20)); jTextFieldGuid.addFocusListener(this); - jTextFieldGuid.setToolTipText("Guaranteed Unique Identification Number (8-4-4-4-12)"); + jTextFieldGuid.setToolTipText("Guaranteed Unique Identification Number, Registry Format (8-4-4-4-12)"); } return jTextFieldGuid; } @@ -186,7 +186,7 @@ public class MsaHeader extends IInternalFrame { jTextFieldVersion.setLocation(new java.awt.Point(160, 85)); jTextFieldVersion.setSize(new java.awt.Dimension(320, 20)); jTextFieldVersion.addFocusListener(this); - jTextFieldVersion.setToolTipText("A Version Number, 1.0, 1, 1.01"); + jTextFieldVersion.setToolTipText("A Version Number, 1.0, 1, 1.01, 1.0.1"); } return jTextFieldVersion; } @@ -224,7 +224,7 @@ public class MsaHeader extends IInternalFrame { jTextAreaLicense.setWrapStyleWord(true); jTextAreaLicense.setSelectionStart(0); jTextAreaLicense.setSelectionEnd(0); - jTextAreaLicense.setToolTipText("The License for this file"); + jTextAreaLicense.setToolTipText("The License for this Module."); } return jTextAreaLicense; } 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 95441eda39..a94c2b7171 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 @@ -204,7 +204,7 @@ public class BootModesDlg extends IDialog { **/ private void init() { - this.setSize(500, 200); + this.setSize(508, 220); this.setContentPane(getJScrollPane()); this.setTitle("Boot Modes"); initFrame(); 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 98c3703534..ba71a20f67 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 @@ -206,7 +206,7 @@ public class DataHubsDlg extends IDialog { **/ private void init() { - this.setSize(500, 200); + this.setSize(508, 220); this.setContentPane(getJScrollPane()); this.setTitle("Data Hubs"); initFrame(); 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 3bb8b3b717..fc77c6bcb7 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 @@ -15,6 +15,8 @@ package org.tianocore.frameworkwizard.module.ui.dialog; import java.awt.event.ActionEvent; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; import java.util.Vector; import javax.swing.JButton; @@ -147,7 +149,7 @@ public class EventsDlg extends IDialog { jComboBoxEventsType.setBounds(new java.awt.Rectangle(160, 10, 320, 20)); jComboBoxEventsType.setPreferredSize(new java.awt.Dimension(320, 20)); jComboBoxEventsType - .setToolTipText("Select Create event if the Module has an event that
is waiting to be signaled. Select Signal if the Module will signal all events in an event group. Signal Event The 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; } @@ -162,6 +164,7 @@ public class EventsDlg extends IDialog { jComboBoxEventGroup = new JComboBox(); jComboBoxEventGroup.setBounds(new java.awt.Rectangle(160, 60, 320, 20)); jComboBoxEventGroup.setPreferredSize(new java.awt.Dimension(320, 20)); + jComboBoxEventGroup.setToolTipText("Select Type of Event, Guid or Timer."); } return jComboBoxEventGroup; @@ -250,7 +253,7 @@ public class EventsDlg extends IDialog { **/ private void init() { - this.setSize(500, 255); + this.setSize(508, 265); this.setContentPane(getJScrollPane()); this.setTitle("Events"); initFrame(); @@ -315,7 +318,7 @@ public class EventsDlg extends IDialog { private JPanel getJContentPane() { if (jContentPane == null) { jArchCheckBox = new ArchCheckBox(); - jArchCheckBox.setBounds(new java.awt.Rectangle(160, 135, 320, 20)); + jArchCheckBox.setBounds(new java.awt.Rectangle(160, 160, 320, 20)); jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20)); jLabelFeatureFlag = new JLabel(); jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 135, 140, 20)); @@ -327,10 +330,10 @@ public class EventsDlg extends IDialog { jLabelUsage.setText("Usage"); jLabelUsage.setBounds(new java.awt.Rectangle(15, 85, 140, 20)); jLabelC_Name = new JLabel(); - jLabelC_Name.setText("Guid C_Name"); + jLabelC_Name.setText("Guid C Name"); jLabelC_Name.setBounds(new java.awt.Rectangle(15, 35, 140, 20)); jLabelGroup = new JLabel(); - jLabelGroup.setText("Even Type"); + jLabelGroup.setText("Event Type"); jLabelGroup.setBounds(new java.awt.Rectangle(15, 60, 140, 20)); jLabelEventType = new JLabel(); jLabelEventType.setText("Type"); diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ExternsDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ExternsDlg.java index a67e60fb8a..b53058952a 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ExternsDlg.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ExternsDlg.java @@ -202,7 +202,7 @@ public class ExternsDlg extends IDialog implements ItemListener { **/ private void init() { - this.setSize(500, 180); + this.setSize(508, 200); this.setContentPane(getJScrollPane()); this.setTitle("Externs"); initFrame(); @@ -350,7 +350,7 @@ public class ExternsDlg extends IDialog implements ItemListener { } } else { if (!DataValidation.isC_NameType(this.jTextFieldC_Name.getText())) { - Log.wrn("Update Externs", "Incorrect data type for C_Name"); + Log.wrn("Update Externs", "Incorrect data type for C Name"); return false; } } 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 24d8f942d3..f9eaa3a0a7 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 @@ -208,7 +208,7 @@ public class GuidsDlg extends IDialog { **/ private void init() { - this.setSize(500, 200); + this.setSize(508, 220); this.setContentPane(getJScrollPane()); this.setTitle("Guids"); initFrame(); 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 1a02487501..216d2e04fd 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 @@ -205,7 +205,7 @@ public class HiiPackagesDlg extends IDialog { **/ private void init() { - this.setSize(500, 200); + this.setSize(508, 220); this.setContentPane(getJScrollPane()); this.setTitle("Hii Packages"); initFrame(); 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 a9621a601b..fb9381c138 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 @@ -223,7 +223,7 @@ public class HobsDlg extends IDialog { **/ private void init() { - this.setSize(500, 225); + this.setSize(510, 240); this.setContentPane(getJScrollPane()); this.setTitle("Hobs"); initFrame(); @@ -302,7 +302,7 @@ public class HobsDlg extends IDialog { jLabelUsage.setText("Usage"); jLabelUsage.setBounds(new java.awt.Rectangle(15, 60, 140, 20)); jLabel = new JLabel(); - jLabel.setText("Guid C_Name"); + jLabel.setText("Guid C Name"); jLabel.setBounds(new java.awt.Rectangle(15, 10, 140, 20)); jLabelHelpText = new JLabel(); jLabelHelpText.setBounds(new java.awt.Rectangle(14, 85, 140, 20)); 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 dcb4946e90..5cb598d9da 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 @@ -248,7 +248,7 @@ public class PCDsDlg extends IDialog implements ItemListener { **/ private void init() { - this.setSize(500, 225); + this.setSize(508, 240); this.setContentPane(getJScrollPane()); this.setTitle("Pcd Coded"); initFrame(); @@ -322,13 +322,13 @@ public class PCDsDlg extends IDialog implements ItemListener { jLabelFeatureFlag.setText("Feature Flag"); jLabelTokenSpaceGuid = new JLabel(); jLabelTokenSpaceGuid.setBounds(new java.awt.Rectangle(15, 60, 140, 20)); - jLabelTokenSpaceGuid.setText("Token Space C_Name"); + jLabelTokenSpaceGuid.setText("Token Space C Name"); jLabelTokenSpaceGuid.setVisible(false); jLabelHelpText = new JLabel(); jLabelHelpText.setBounds(new java.awt.Rectangle(15, 85, 140, 20)); jLabelHelpText.setText("Help Text"); jLabelC_Name = new JLabel(); - jLabelC_Name.setText("C_Name"); + jLabelC_Name.setText("C Name"); jLabelC_Name.setBounds(new java.awt.Rectangle(15, 10, 140, 20)); jLabelDefaultValue = new JLabel(); jLabelDefaultValue.setText("Default Value"); @@ -421,7 +421,7 @@ public class PCDsDlg extends IDialog implements ItemListener { // if (!isEmpty(this.jComboBoxCName.getSelectedItem().toString())) { if (!DataValidation.isC_NameType(this.jComboBoxCName.getSelectedItem().toString())) { - Log.wrn("Update PcdCoded", "Incorrect data type for C_Name"); + Log.wrn("Update PcdCoded", "Incorrect data type for C Name"); return false; } } diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PackageDepDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PackageDepDlg.java index d8f6cb5b23..922560247d 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PackageDepDlg.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PackageDepDlg.java @@ -228,7 +228,7 @@ public class PackageDepDlg extends IDialog implements ItemListener { **/ private void init() { - this.setSize(500, 175); + this.setSize(508, 188); this.setContentPane(getJScrollPane()); this.setTitle("Package Dependencies"); initFrame(); 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 de182cd4ea..4ad12ee76e 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 @@ -227,7 +227,7 @@ public class PpisDlg extends IDialog implements ItemListener { **/ private void init() { - this.setSize(500, 225); + this.setSize(510, 240); this.setContentPane(getJScrollPane()); this.setTitle("Ppis"); initFrame(); @@ -291,7 +291,7 @@ public class PpisDlg extends IDialog implements ItemListener { jLabelFeatureFlag.setText("Feature Flag"); jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 110, 140, 20)); jLabelC_Name = new JLabel(); - jLabelC_Name.setText("C_Name Type"); + jLabelC_Name.setText("C Name Type"); jLabelC_Name.setBounds(new java.awt.Rectangle(15, 35, 140, 20)); jLabelHelpText = new JLabel(); jLabelHelpText.setBounds(new java.awt.Rectangle(14, 85, 140, 20)); 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 c77585a3af..5ca71a0ac5 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 @@ -231,7 +231,7 @@ public class ProtocolsDlg extends IDialog implements ItemListener { **/ private void init() { - this.setSize(500, 225); + this.setSize(510, 240); this.setContentPane(getJScrollPane()); this.setTitle("Protocols"); initFrame(); @@ -313,7 +313,7 @@ public class ProtocolsDlg extends IDialog implements ItemListener { jLabelFeatureFlag.setText("Feature Flag"); jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 110, 140, 20)); jLabelC_Name = new JLabel(); - jLabelC_Name.setText("C_Name Type"); + jLabelC_Name.setText("C Name Type"); jLabelC_Name.setBounds(new java.awt.Rectangle(15, 35, 140, 20)); jContentPane = new JPanel(); diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SourceFilesDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SourceFilesDlg.java index d45bd21897..0be868f54e 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SourceFilesDlg.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SourceFilesDlg.java @@ -251,7 +251,7 @@ public class SourceFilesDlg extends IDialog { **/ private void init() { - this.setSize(500, 235); + this.setSize(510, 240); this.setContentPane(getJScrollPane()); this.setTitle("Source Files"); this.setViewMode(false); 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 c285626537..741ee3da77 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 @@ -208,7 +208,7 @@ public class SystemTablesDlg extends IDialog { **/ private void init() { - this.setSize(500, 200); + this.setSize(508, 215); this.setContentPane(getJScrollPane()); this.setTitle("System Tables"); initFrame(); @@ -281,7 +281,7 @@ public class SystemTablesDlg extends IDialog { jLabelUsage.setText("Usage"); jLabelUsage.setBounds(new java.awt.Rectangle(15, 35, 140, 20)); jLabelEntry = new JLabel(); - jLabelEntry.setText("Guid C_Name"); + jLabelEntry.setText("Guid C Name"); jLabelEntry.setBounds(new java.awt.Rectangle(15, 10, 140, 20)); jLabelHelpText = new JLabel(); jLabelHelpText.setBounds(new java.awt.Rectangle(14, 60, 140, 20)); 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 7ff3f99536..4394112bbe 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 @@ -110,7 +110,7 @@ public class VariablesDlg extends IDialog { jTextFieldVariableName.setPreferredSize(new java.awt.Dimension(320, 20)); jTextFieldVariableName.setLocation(new java.awt.Point(160, 10)); jTextFieldVariableName - .setToolTipText("Enter a Hex Word Array, you must provide leading Zeros. 0x000a, 0x0010, бн"); + .setToolTipText("Enter a Hex Word Array, you must provide leading Zeros. 0x000a, 0x0010, 0x00FF"); } return jTextFieldVariableName; } @@ -169,6 +169,7 @@ public class VariablesDlg extends IDialog { jTextFieldHelpText = new JTextField(); jTextFieldHelpText.setBounds(new java.awt.Rectangle(160, 85, 320, 20)); jTextFieldHelpText.setPreferredSize(new java.awt.Dimension(320, 20)); + jTextFieldHelpText.setToolTipText("Enter information on how to use this Variable."); } return jTextFieldHelpText; } @@ -184,7 +185,7 @@ public class VariablesDlg extends IDialog { jComboBoxGuidC_Name = new JComboBox(); jComboBoxGuidC_Name.setBounds(new java.awt.Rectangle(160, 35, 320, 20)); jComboBoxGuidC_Name.setPreferredSize(new java.awt.Dimension(320, 20)); - jComboBoxGuidC_Name.setToolTipText("Select the GUID C Name of the Hob"); + jComboBoxGuidC_Name.setToolTipText("Select the GUID C Name of the Variable."); } return jComboBoxGuidC_Name; } @@ -230,7 +231,7 @@ public class VariablesDlg extends IDialog { **/ private void init() { - this.setSize(500, 225); + this.setSize(510, 240); this.setContentPane(getJScrollPane()); this.setTitle("Variables"); initFrame(); @@ -262,7 +263,7 @@ public class VariablesDlg extends IDialog { /** This is the override edit constructor - @param inHobsIdentification + @param inVariablesIdentification @param iFrame **/ @@ -297,7 +298,7 @@ public class VariablesDlg extends IDialog { jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20)); jLabelGuidCName = new JLabel(); jLabelGuidCName.setBounds(new java.awt.Rectangle(15, 35, 140, 20)); - jLabelGuidCName.setText("Guid C_Name"); + jLabelGuidCName.setText("Guid C Name"); jLabelUsage = new JLabel(); jLabelUsage.setText("Usage"); jLabelUsage.setBounds(new java.awt.Rectangle(15, 60, 140, 20));