Skip to content

Commit

Permalink
0.7.2.2
Browse files Browse the repository at this point in the history
- WIP
  • Loading branch information
GottFaust committed Jun 15, 2015
1 parent 8acf25b commit 942b614
Show file tree
Hide file tree
Showing 3 changed files with 284 additions and 253 deletions.
2 changes: 1 addition & 1 deletion src/etc/Constants.java
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public class Constants {

/** Frame Title **/
public static final String APP_TITLE = "Warframe Weapon DPS Calculator";
public static final String APP_VERSION = "v0.7.2";
public static final String APP_VERSION = "v0.7.3";

/** ToolTips **/
public static final String NAME_TOOL_TIP = "The weapon's name.";
Expand Down
16 changes: 10 additions & 6 deletions src/main/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,9 @@ public class Main {
protected static Boolean targetManagerInit = false;
protected static Boolean colorOptionsInit = false;
protected static JCheckBox advancedTTKBox = new JCheckBox("Run TTK");
protected static JLabel targetGroupLabel = new JLabel("Target Group:");
protected static JLabel targetGroupLabel = new JLabel("Group:");
protected static JComboBox targetGroupBox = new JComboBox();
protected static JLabel corrosiveProjectionLabel = new JLabel("Corrosive Projection Count:");
protected static JLabel corrosiveProjectionLabel = new JLabel("CP Count:");
protected static JComboBox corrosiveProjectionBox = new JComboBox();

/** Data **/
Expand Down Expand Up @@ -307,15 +307,19 @@ public static void buildUI(){
JPanel buttonPanel = new JPanel();
UIBuilder.panelInit(buttonPanel);
buttonPanel.setLayout(new FlowLayout(FlowLayout.CENTER));
buttonPanel.add(calculateButton);
buttonPanel.add(clearButton);
buttonPanel.add(clearOutputButton);
buttonPanel.add(advancedTTKBox);
buttonPanel.add(corrosiveProjectionLabel);
buttonPanel.add(corrosiveProjectionBox);
buttonPanel.add(targetGroupLabel);
buttonPanel.add(targetGroupBox);
buttonPanel.add(advancedTTKBox);
buttonPanel.add(calculateButton);
buttonPanel.add(clearButton);
buttonPanel.add(clearOutputButton);

corrosiveProjectionLabel.setToolTipText("Number of Corrosive Projection auras active.");
corrosiveProjectionBox.setToolTipText("Number of Corrosive Projection auras active.");
targetGroupLabel.setToolTipText("Target group to run calculations against.");
targetGroupBox.setToolTipText("Target group to run calculations against.");
advancedTTKBox.setToolTipText("Warning: This will cause a significantly performance hit compared to not running TTK.");
advancedTTKBox.setSelected(useComplexTTK);

Expand Down
Loading

0 comments on commit 942b614

Please sign in to comment.