fletchPanel -> woodcuttingPanel

This commit is contained in:
RedSparr0w
2019-10-12 14:50:03 +13:00
parent 20525c7f21
commit 32508f4d65
2 changed files with 18 additions and 21 deletions
+1 -4
View File
@@ -2,10 +2,7 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="3ab8e8a0-ccfd-4b0b-9547-98173085dc38" name="Default Changelist" comment=""> <list default="true" id="3ab8e8a0-ccfd-4b0b-9547-98173085dc38" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ParaScript/data/Variables.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ParaScript/data/Variables.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ParaScript/strategies/MakeArrowShafts.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ParaScript/strategies/MakeArrowShafts.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ParaScript/ui/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ParaScript/ui/UI.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/ParaScript/ui/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ParaScript/ui/UI.java" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -33,7 +30,7 @@
<property name="GenerateAntBuildDialog.forceTargetJdk" value="true" /> <property name="GenerateAntBuildDialog.forceTargetJdk" value="true" />
<property name="GenerateAntBuildDialog.generateSingleFile" value="true" /> <property name="GenerateAntBuildDialog.generateSingleFile" value="true" />
<property name="GenerateAntBuildDialog.outputFileNameProperty" value="parascript" /> <property name="GenerateAntBuildDialog.outputFileNameProperty" value="parascript" />
<property name="last_opened_file_path" value="$USER_HOME$/OneDrive/Documents/GitHub/2006rebotted" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/../Script-Factory" />
<property name="project.structure.last.edited" value="Modules" /> <property name="project.structure.last.edited" value="Modules" />
<property name="project.structure.proportion" value="0.15" /> <property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2" /> <property name="project.structure.side.proportion" value="0.2" />
+17 -17
View File
@@ -33,66 +33,66 @@ public class UI extends JFrame {
tabbedPane.setBounds(0, 0, 395, 220); tabbedPane.setBounds(0, 0, 395, 220);
contentPane.add(tabbedPane); contentPane.add(tabbedPane);
JPanel fletchPanel = new JPanel(); JPanel woodcuttingPanel = new JPanel();
tabbedPane.addTab("Woodcutting", null, fletchPanel, null); tabbedPane.addTab("Woodcutting", null, woodcuttingPanel, null);
fletchPanel.setLayout(null); woodcuttingPanel.setLayout(null);
JLabel lblUsername = new JLabel("Username:"); JLabel lblUsername = new JLabel("Username:");
lblUsername.setBounds(20, 20, 73, 20); lblUsername.setBounds(20, 20, 73, 20);
fletchPanel.add(lblUsername); woodcuttingPanel.add(lblUsername);
username.setBounds(20, 40, 150, 20); username.setBounds(20, 40, 150, 20);
fletchPanel.add(username); woodcuttingPanel.add(username);
JLabel lblPassword = new JLabel("Password:"); JLabel lblPassword = new JLabel("Password:");
lblPassword.setBounds(20, 60, 73, 20); lblPassword.setBounds(20, 60, 73, 20);
fletchPanel.add(lblPassword); woodcuttingPanel.add(lblPassword);
password.setBounds(20, 80, 150, 20); password.setBounds(20, 80, 150, 20);
fletchPanel.add(password); woodcuttingPanel.add(password);
JLabel lblLocation = new JLabel("Location"); JLabel lblLocation = new JLabel("Location");
lblLocation.setBounds(200, 20, 73, 20); lblLocation.setBounds(200, 20, 73, 20);
fletchPanel.add(lblLocation); woodcuttingPanel.add(lblLocation);
/* /*
location.setModel( location.setModel(
new DefaultComboBoxModel(Methods.locationToStringArray())); new DefaultComboBoxModel(Methods.locationToStringArray()));
location.setBounds(200, 40, 150, 20); location.setBounds(200, 40, 150, 20);
fletchPanel.add(location); woodcuttingPanel.add(location);
*/ */
JLabel lblTree = new JLabel("Tree"); JLabel lblTree = new JLabel("Tree");
lblTree.setBounds(200, 60, 73, 20); lblTree.setBounds(200, 60, 73, 20);
fletchPanel.add(lblTree); woodcuttingPanel.add(lblTree);
treeSelect.setModel(new DefaultComboBoxModel(Trees.toStringArray())); treeSelect.setModel(new DefaultComboBoxModel(Trees.toStringArray()));
treeSelect.setBounds(200, 80, 150, 20); treeSelect.setBounds(200, 80, 150, 20);
fletchPanel.add(treeSelect); woodcuttingPanel.add(treeSelect);
JLabel lblMethod = new JLabel("Method"); JLabel lblMethod = new JLabel("Method");
lblMethod.setBounds(20, 120, 73, 20); lblMethod.setBounds(20, 120, 73, 20);
fletchPanel.add(lblMethod); woodcuttingPanel.add(lblMethod);
/* /*
woodcutOptionButtonGroup.add(bank); woodcutOptionButtonGroup.add(bank);
bank.setSelected(true); bank.setSelected(true);
bank.setBounds(20, 140, 80, 20); bank.setBounds(20, 140, 80, 20);
fletchPanel.add(bank); woodcuttingPanel.add(bank);
woodcutOptionButtonGroup.add(drop); woodcutOptionButtonGroup.add(drop);
drop.setBounds(20, 160, 80, 20); drop.setBounds(20, 160, 80, 20);
fletchPanel.add(drop); woodcuttingPanel.add(drop);
JLabel lblBirdsNest = new JLabel("Bird nests"); JLabel lblBirdsNest = new JLabel("Bird nests");
lblBirdsNest.setBounds(200, 120, 150, 20); lblBirdsNest.setBounds(200, 120, 150, 20);
fletchPanel.add(lblBirdsNest); woodcuttingPanel.add(lblBirdsNest);
birdsNest.setBounds(195, 140, 20, 20); birdsNest.setBounds(195, 140, 20, 20);
birdsNest.setSelected(true); birdsNest.setSelected(true);
fletchPanel.add(birdsNest); woodcuttingPanel.add(birdsNest);
JLabel lblBirdsNestCheckBox = new JLabel("Pickup"); JLabel lblBirdsNestCheckBox = new JLabel("Pickup");
lblBirdsNestCheckBox.setBounds(215, 140, 150, 20); lblBirdsNestCheckBox.setBounds(215, 140, 150, 20);
fletchPanel.add(lblBirdsNestCheckBox); woodcuttingPanel.add(lblBirdsNestCheckBox);
location.addActionListener (new ActionListener () { location.addActionListener (new ActionListener () {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {