tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed spelling and grammar, also fixed the size of the pop up dialog boxes and the placement of the Arch list check boxes in EventsDlg.java 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1106 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
lhauch 2006-07-26 19:20:43 +00:00
parent 0a75428c1b
commit f51ee52bce
15 changed files with 38 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -150,7 +150,7 @@ public class MsaHeader extends IInternalFrame {
jTextFieldBaseName.setBounds(new java.awt.Rectangle(160, 10, 320, 20)); jTextFieldBaseName.setBounds(new java.awt.Rectangle(160, 10, 320, 20));
jTextFieldBaseName.setPreferredSize(new java.awt.Dimension(320, 20)); jTextFieldBaseName.setPreferredSize(new java.awt.Dimension(320, 20));
jTextFieldBaseName.addFocusListener(this); 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; return jTextFieldBaseName;
} }
@ -168,7 +168,7 @@ public class MsaHeader extends IInternalFrame {
jTextFieldGuid.setLocation(new java.awt.Point(160, 60)); jTextFieldGuid.setLocation(new java.awt.Point(160, 60));
jTextFieldGuid.setSize(new java.awt.Dimension(250, 20)); jTextFieldGuid.setSize(new java.awt.Dimension(250, 20));
jTextFieldGuid.addFocusListener(this); 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; return jTextFieldGuid;
} }
@ -186,7 +186,7 @@ public class MsaHeader extends IInternalFrame {
jTextFieldVersion.setLocation(new java.awt.Point(160, 85)); jTextFieldVersion.setLocation(new java.awt.Point(160, 85));
jTextFieldVersion.setSize(new java.awt.Dimension(320, 20)); jTextFieldVersion.setSize(new java.awt.Dimension(320, 20));
jTextFieldVersion.addFocusListener(this); 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; return jTextFieldVersion;
} }
@ -224,7 +224,7 @@ public class MsaHeader extends IInternalFrame {
jTextAreaLicense.setWrapStyleWord(true); jTextAreaLicense.setWrapStyleWord(true);
jTextAreaLicense.setSelectionStart(0); jTextAreaLicense.setSelectionStart(0);
jTextAreaLicense.setSelectionEnd(0); jTextAreaLicense.setSelectionEnd(0);
jTextAreaLicense.setToolTipText("The License for this file"); jTextAreaLicense.setToolTipText("The License for this Module.");
} }
return jTextAreaLicense; return jTextAreaLicense;
} }

2
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/BootModesDlg.java
View File

@ -204,7 +204,7 @@ public class BootModesDlg extends IDialog {
**/ **/
private void init() { private void init() {
this.setSize(500, 200); this.setSize(508, 220);
this.setContentPane(getJScrollPane()); this.setContentPane(getJScrollPane());
this.setTitle("Boot Modes"); this.setTitle("Boot Modes");
initFrame(); initFrame();

2
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/DataHubsDlg.java
View File

@ -206,7 +206,7 @@ public class DataHubsDlg extends IDialog {
**/ **/
private void init() { private void init() {
this.setSize(500, 200); this.setSize(508, 220);
this.setContentPane(getJScrollPane()); this.setContentPane(getJScrollPane());
this.setTitle("Data Hubs"); this.setTitle("Data Hubs");
initFrame(); initFrame();

13
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/EventsDlg.java
View File

@ -15,6 +15,8 @@
package org.tianocore.frameworkwizard.module.ui.dialog; package org.tianocore.frameworkwizard.module.ui.dialog;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.util.Vector; import java.util.Vector;
import javax.swing.JButton; import javax.swing.JButton;
@ -147,7 +149,7 @@ public class EventsDlg extends IDialog {
jComboBoxEventsType.setBounds(new java.awt.Rectangle(160, 10, 320, 20)); jComboBoxEventsType.setBounds(new java.awt.Rectangle(160, 10, 320, 20));
jComboBoxEventsType.setPreferredSize(new java.awt.Dimension(320, 20)); jComboBoxEventsType.setPreferredSize(new java.awt.Dimension(320, 20));
jComboBoxEventsType jComboBoxEventsType
.setToolTipText("<html>Select Create event if the Module has an event that<br> 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.</html>"); .setToolTipText("<html>Select CreateEvents if the Module has an event that is waiting to be signaled.<br>Select SignalEvents if the Module will signal all events in an event group.<br>NOTE: Signal events are named by GUID.</html>");
} }
return jComboBoxEventsType; return jComboBoxEventsType;
} }
@ -162,6 +164,7 @@ public class EventsDlg extends IDialog {
jComboBoxEventGroup = new JComboBox(); jComboBoxEventGroup = new JComboBox();
jComboBoxEventGroup.setBounds(new java.awt.Rectangle(160, 60, 320, 20)); jComboBoxEventGroup.setBounds(new java.awt.Rectangle(160, 60, 320, 20));
jComboBoxEventGroup.setPreferredSize(new java.awt.Dimension(320, 20)); jComboBoxEventGroup.setPreferredSize(new java.awt.Dimension(320, 20));
jComboBoxEventGroup.setToolTipText("Select Type of Event, Guid or Timer.");
} }
return jComboBoxEventGroup; return jComboBoxEventGroup;
@ -250,7 +253,7 @@ public class EventsDlg extends IDialog {
**/ **/
private void init() { private void init() {
this.setSize(500, 255); this.setSize(508, 265);
this.setContentPane(getJScrollPane()); this.setContentPane(getJScrollPane());
this.setTitle("Events"); this.setTitle("Events");
initFrame(); initFrame();
@ -315,7 +318,7 @@ public class EventsDlg extends IDialog {
private JPanel getJContentPane() { private JPanel getJContentPane() {
if (jContentPane == null) { if (jContentPane == null) {
jArchCheckBox = new ArchCheckBox(); 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)); jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20));
jLabelFeatureFlag = new JLabel(); jLabelFeatureFlag = new JLabel();
jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 135, 140, 20)); jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 135, 140, 20));
@ -327,10 +330,10 @@ public class EventsDlg extends IDialog {
jLabelUsage.setText("Usage"); jLabelUsage.setText("Usage");
jLabelUsage.setBounds(new java.awt.Rectangle(15, 85, 140, 20)); jLabelUsage.setBounds(new java.awt.Rectangle(15, 85, 140, 20));
jLabelC_Name = new JLabel(); 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)); jLabelC_Name.setBounds(new java.awt.Rectangle(15, 35, 140, 20));
jLabelGroup = new JLabel(); jLabelGroup = new JLabel();
jLabelGroup.setText("Even Type"); jLabelGroup.setText("Event Type");
jLabelGroup.setBounds(new java.awt.Rectangle(15, 60, 140, 20)); jLabelGroup.setBounds(new java.awt.Rectangle(15, 60, 140, 20));
jLabelEventType = new JLabel(); jLabelEventType = new JLabel();
jLabelEventType.setText("Type"); jLabelEventType.setText("Type");

4
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ExternsDlg.java
View File

@ -202,7 +202,7 @@ public class ExternsDlg extends IDialog implements ItemListener {
**/ **/
private void init() { private void init() {
this.setSize(500, 180); this.setSize(508, 200);
this.setContentPane(getJScrollPane()); this.setContentPane(getJScrollPane());
this.setTitle("Externs"); this.setTitle("Externs");
initFrame(); initFrame();
@ -350,7 +350,7 @@ public class ExternsDlg extends IDialog implements ItemListener {
} }
} else { } else {
if (!DataValidation.isC_NameType(this.jTextFieldC_Name.getText())) { 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; return false;
} }
} }

2
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/GuidsDlg.java
View File

@ -208,7 +208,7 @@ public class GuidsDlg extends IDialog {
**/ **/
private void init() { private void init() {
this.setSize(500, 200); this.setSize(508, 220);
this.setContentPane(getJScrollPane()); this.setContentPane(getJScrollPane());
this.setTitle("Guids"); this.setTitle("Guids");
initFrame(); initFrame();

2
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HiiPackagesDlg.java
View File

@ -205,7 +205,7 @@ public class HiiPackagesDlg extends IDialog {
**/ **/
private void init() { private void init() {
this.setSize(500, 200); this.setSize(508, 220);
this.setContentPane(getJScrollPane()); this.setContentPane(getJScrollPane());
this.setTitle("Hii Packages"); this.setTitle("Hii Packages");
initFrame(); initFrame();

4
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HobsDlg.java
View File

@ -223,7 +223,7 @@ public class HobsDlg extends IDialog {
**/ **/
private void init() { private void init() {
this.setSize(500, 225); this.setSize(510, 240);
this.setContentPane(getJScrollPane()); this.setContentPane(getJScrollPane());
this.setTitle("Hobs"); this.setTitle("Hobs");
initFrame(); initFrame();
@ -302,7 +302,7 @@ public class HobsDlg extends IDialog {
jLabelUsage.setText("Usage"); jLabelUsage.setText("Usage");
jLabelUsage.setBounds(new java.awt.Rectangle(15, 60, 140, 20)); jLabelUsage.setBounds(new java.awt.Rectangle(15, 60, 140, 20));
jLabel = new JLabel(); jLabel = new JLabel();
jLabel.setText("Guid C_Name"); jLabel.setText("Guid C Name");
jLabel.setBounds(new java.awt.Rectangle(15, 10, 140, 20)); jLabel.setBounds(new java.awt.Rectangle(15, 10, 140, 20));
jLabelHelpText = new JLabel(); jLabelHelpText = new JLabel();
jLabelHelpText.setBounds(new java.awt.Rectangle(14, 85, 140, 20)); jLabelHelpText.setBounds(new java.awt.Rectangle(14, 85, 140, 20));

8
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PCDsDlg.java
View File

@ -248,7 +248,7 @@ public class PCDsDlg extends IDialog implements ItemListener {
**/ **/
private void init() { private void init() {
this.setSize(500, 225); this.setSize(508, 240);
this.setContentPane(getJScrollPane()); this.setContentPane(getJScrollPane());
this.setTitle("Pcd Coded"); this.setTitle("Pcd Coded");
initFrame(); initFrame();
@ -322,13 +322,13 @@ public class PCDsDlg extends IDialog implements ItemListener {
jLabelFeatureFlag.setText("Feature Flag"); jLabelFeatureFlag.setText("Feature Flag");
jLabelTokenSpaceGuid = new JLabel(); jLabelTokenSpaceGuid = new JLabel();
jLabelTokenSpaceGuid.setBounds(new java.awt.Rectangle(15, 60, 140, 20)); 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); jLabelTokenSpaceGuid.setVisible(false);
jLabelHelpText = new JLabel(); jLabelHelpText = new JLabel();
jLabelHelpText.setBounds(new java.awt.Rectangle(15, 85, 140, 20)); jLabelHelpText.setBounds(new java.awt.Rectangle(15, 85, 140, 20));
jLabelHelpText.setText("Help Text"); jLabelHelpText.setText("Help Text");
jLabelC_Name = new JLabel(); 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)); jLabelC_Name.setBounds(new java.awt.Rectangle(15, 10, 140, 20));
jLabelDefaultValue = new JLabel(); jLabelDefaultValue = new JLabel();
jLabelDefaultValue.setText("Default Value"); jLabelDefaultValue.setText("Default Value");
@ -421,7 +421,7 @@ public class PCDsDlg extends IDialog implements ItemListener {
// //
if (!isEmpty(this.jComboBoxCName.getSelectedItem().toString())) { if (!isEmpty(this.jComboBoxCName.getSelectedItem().toString())) {
if (!DataValidation.isC_NameType(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; return false;
} }
} }

2
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PackageDepDlg.java
View File

@ -228,7 +228,7 @@ public class PackageDepDlg extends IDialog implements ItemListener {
**/ **/
private void init() { private void init() {
this.setSize(500, 175); this.setSize(508, 188);
this.setContentPane(getJScrollPane()); this.setContentPane(getJScrollPane());
this.setTitle("Package Dependencies"); this.setTitle("Package Dependencies");
initFrame(); initFrame();

4
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PpisDlg.java
View File

@ -227,7 +227,7 @@ public class PpisDlg extends IDialog implements ItemListener {
**/ **/
private void init() { private void init() {
this.setSize(500, 225); this.setSize(510, 240);
this.setContentPane(getJScrollPane()); this.setContentPane(getJScrollPane());
this.setTitle("Ppis"); this.setTitle("Ppis");
initFrame(); initFrame();
@ -291,7 +291,7 @@ public class PpisDlg extends IDialog implements ItemListener {
jLabelFeatureFlag.setText("Feature Flag"); jLabelFeatureFlag.setText("Feature Flag");
jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 110, 140, 20)); jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 110, 140, 20));
jLabelC_Name = new JLabel(); 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)); jLabelC_Name.setBounds(new java.awt.Rectangle(15, 35, 140, 20));
jLabelHelpText = new JLabel(); jLabelHelpText = new JLabel();
jLabelHelpText.setBounds(new java.awt.Rectangle(14, 85, 140, 20)); jLabelHelpText.setBounds(new java.awt.Rectangle(14, 85, 140, 20));

4
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ProtocolsDlg.java
View File

@ -231,7 +231,7 @@ public class ProtocolsDlg extends IDialog implements ItemListener {
**/ **/
private void init() { private void init() {
this.setSize(500, 225); this.setSize(510, 240);
this.setContentPane(getJScrollPane()); this.setContentPane(getJScrollPane());
this.setTitle("Protocols"); this.setTitle("Protocols");
initFrame(); initFrame();
@ -313,7 +313,7 @@ public class ProtocolsDlg extends IDialog implements ItemListener {
jLabelFeatureFlag.setText("Feature Flag"); jLabelFeatureFlag.setText("Feature Flag");
jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 110, 140, 20)); jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 110, 140, 20));
jLabelC_Name = new JLabel(); 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)); jLabelC_Name.setBounds(new java.awt.Rectangle(15, 35, 140, 20));
jContentPane = new JPanel(); jContentPane = new JPanel();

2
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SourceFilesDlg.java
View File

@ -251,7 +251,7 @@ public class SourceFilesDlg extends IDialog {
**/ **/
private void init() { private void init() {
this.setSize(500, 235); this.setSize(510, 240);
this.setContentPane(getJScrollPane()); this.setContentPane(getJScrollPane());
this.setTitle("Source Files"); this.setTitle("Source Files");
this.setViewMode(false); this.setViewMode(false);

4
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SystemTablesDlg.java
View File

@ -208,7 +208,7 @@ public class SystemTablesDlg extends IDialog {
**/ **/
private void init() { private void init() {
this.setSize(500, 200); this.setSize(508, 215);
this.setContentPane(getJScrollPane()); this.setContentPane(getJScrollPane());
this.setTitle("System Tables"); this.setTitle("System Tables");
initFrame(); initFrame();
@ -281,7 +281,7 @@ public class SystemTablesDlg extends IDialog {
jLabelUsage.setText("Usage"); jLabelUsage.setText("Usage");
jLabelUsage.setBounds(new java.awt.Rectangle(15, 35, 140, 20)); jLabelUsage.setBounds(new java.awt.Rectangle(15, 35, 140, 20));
jLabelEntry = new JLabel(); jLabelEntry = new JLabel();
jLabelEntry.setText("Guid C_Name"); jLabelEntry.setText("Guid C Name");
jLabelEntry.setBounds(new java.awt.Rectangle(15, 10, 140, 20)); jLabelEntry.setBounds(new java.awt.Rectangle(15, 10, 140, 20));
jLabelHelpText = new JLabel(); jLabelHelpText = new JLabel();
jLabelHelpText.setBounds(new java.awt.Rectangle(14, 60, 140, 20)); jLabelHelpText.setBounds(new java.awt.Rectangle(14, 60, 140, 20));

11
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/VariablesDlg.java
View File

@ -110,7 +110,7 @@ public class VariablesDlg extends IDialog {
jTextFieldVariableName.setPreferredSize(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(160, 10));
jTextFieldVariableName 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; return jTextFieldVariableName;
} }
@ -169,6 +169,7 @@ public class VariablesDlg extends IDialog {
jTextFieldHelpText = new JTextField(); jTextFieldHelpText = new JTextField();
jTextFieldHelpText.setBounds(new java.awt.Rectangle(160, 85, 320, 20)); jTextFieldHelpText.setBounds(new java.awt.Rectangle(160, 85, 320, 20));
jTextFieldHelpText.setPreferredSize(new java.awt.Dimension(320, 20)); jTextFieldHelpText.setPreferredSize(new java.awt.Dimension(320, 20));
jTextFieldHelpText.setToolTipText("Enter information on how to use this Variable.");
} }
return jTextFieldHelpText; return jTextFieldHelpText;
} }
@ -184,7 +185,7 @@ public class VariablesDlg extends IDialog {
jComboBoxGuidC_Name = new JComboBox(); jComboBoxGuidC_Name = new JComboBox();
jComboBoxGuidC_Name.setBounds(new java.awt.Rectangle(160, 35, 320, 20)); jComboBoxGuidC_Name.setBounds(new java.awt.Rectangle(160, 35, 320, 20));
jComboBoxGuidC_Name.setPreferredSize(new java.awt.Dimension(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; return jComboBoxGuidC_Name;
} }
@ -230,7 +231,7 @@ public class VariablesDlg extends IDialog {
**/ **/
private void init() { private void init() {
this.setSize(500, 225); this.setSize(510, 240);
this.setContentPane(getJScrollPane()); this.setContentPane(getJScrollPane());
this.setTitle("Variables"); this.setTitle("Variables");
initFrame(); initFrame();
@ -262,7 +263,7 @@ public class VariablesDlg extends IDialog {
/** /**
This is the override edit constructor This is the override edit constructor
@param inHobsIdentification @param inVariablesIdentification
@param iFrame @param iFrame
**/ **/
@ -297,7 +298,7 @@ public class VariablesDlg extends IDialog {
jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20)); jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20));
jLabelGuidCName = new JLabel(); jLabelGuidCName = new JLabel();
jLabelGuidCName.setBounds(new java.awt.Rectangle(15, 35, 140, 20)); jLabelGuidCName.setBounds(new java.awt.Rectangle(15, 35, 140, 20));
jLabelGuidCName.setText("Guid C_Name"); jLabelGuidCName.setText("Guid C Name");
jLabelUsage = new JLabel(); jLabelUsage = new JLabel();
jLabelUsage.setText("Usage"); jLabelUsage.setText("Usage");
jLabelUsage.setBounds(new java.awt.Rectangle(15, 60, 140, 20)); jLabelUsage.setBounds(new java.awt.Rectangle(15, 60, 140, 20));