Releasing v0.7-beta

karakasis · Mar 8, 2019 · 27ad262 · 27ad262
1 parent f0f5c04
commit 27ad262
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 17 deletions.
diff --git a/src/poe/level/fx/GemsPanel.fxml b/src/poe/level/fx/GemsPanel.fxml
@@ -55,7 +55,7 @@
          <graphic>
             <ImageView fitHeight="26.0" fitWidth="48.0" pickOnBounds="true" preserveRatio="true" smooth="false">
                <image>
-                  <Image url="@../../../icons/icons8-plus-math-50.png" />
+                  <Image url="@../../../icons/icons8-plus-math-50%20(3).png" />
                </image>
             </ImageView>
          </graphic>
@@ -70,7 +70,7 @@
          <graphic>
             <ImageView fitHeight="26.0" fitWidth="48.0" pickOnBounds="true" preserveRatio="true" smooth="false">
                <image>
-                  <Image url="@../../../icons/icons8-subtract-50.png" />
+                  <Image url="@../../../icons/icons8-subtract-50%20(1).png" />
                </image>
             </ImageView>
          </graphic>

diff --git a/src/poe/level/fx/MainApp.fxml b/src/poe/level/fx/MainApp.fxml
@@ -60,13 +60,13 @@
               </Menu>
                   <Menu mnemonicParsing="false" text="Run">
                     <items>
-                      <MenuItem fx:id="validateBuildMenuItem" mnemonicParsing="false" onAction="#validateBuild" text="Validate and view leveling progress" disable="true"/>
+                      <MenuItem fx:id="validateBuildMenuItem" disable="true" mnemonicParsing="false" onAction="#validateBuild" text="Validate and view leveling progress" />
                         <MenuItem mnemonicParsing="false" onAction="#validateToLauncher" text="Validate All and return to Launcher" />
                     </items>
                   </Menu>
               <Menu mnemonicParsing="false" text="View">
                 <items>
-                        <Menu mnemonicParsing="false" text="Skin">
+                        <Menu disable="true" mnemonicParsing="false" text="Skin">
                           <items>
                             <MenuItem disable="true" mnemonicParsing="false" text="Night Mode - Soon" />
                           </items>

diff --git a/src/poe/level/fx/POELevelFx.java b/src/poe/level/fx/POELevelFx.java
@@ -57,11 +57,11 @@ public class POELevelFx extends Application {
     /***************************************************************************
      * Change to true if a build is being pushed to the master branch for public release.
      ***************************************************************************/
-    public static final boolean MASTER_RELEASE = false;
+    public static final boolean MASTER_RELEASE = true;
     /*************************************************************************************/
     /* Update this when you are pushing a new release version, must match the GitHub release name!
     **************************************************************************************/
-    public static final String version = "v0.7-alpha";
+    public static final String version = "v0.7-beta";
 
 
     public static boolean DEBUG = false;
@@ -198,8 +198,8 @@ public void init() throws Exception {
             hotkeyDefaults.put("level-hotkey-remind","F5");
             hotkeyDefaults.put("recipe-hotkey-mark","F6");
             hotkeyDefaults.put("recipe-hotkey-preview","F7");
-            hotkeyDefaults.put("level-hotkey-beta-next","F8");
-            hotkeyDefaults.put("level-hotkey-beta-previous","F9");
+            hotkeyDefaults.put("level-hotkey-beta-next","Left");
+            hotkeyDefaults.put("level-hotkey-beta-previous","Right");
             hotkeyDefaults.put("lock-keybinds","F12");
 
             if (!new File(POELevelFx.directory + "\\Path of Leveling\\config.properties").isFile()) {

diff --git a/src/poe/level/fx/Preferences_Controller.java b/src/poe/level/fx/Preferences_Controller.java
@@ -382,8 +382,8 @@ public void initialize(URL url, ResourceBundle rb) {
     hotkeyDefaults.put("level-hotkey-remind","F5");
     hotkeyDefaults.put("recipe-hotkey-mark","F6");
     hotkeyDefaults.put("recipe-hotkey-preview","F7");
-    hotkeyDefaults.put("level-hotkey-beta-next","F8");
-    hotkeyDefaults.put("level-hotkey-beta-previous","F9");
+    hotkeyDefaults.put("level-hotkey-beta-next","Right");
+    hotkeyDefaults.put("level-hotkey-beta-previous","Left");
     hotkeyDefaults.put("lock-keybinds","F12");
 
         // TODO
@@ -1047,8 +1047,11 @@ private void save(){
                     prop.setProperty("zones-slider", String.valueOf(zones_slider));
                     prop.setProperty("level-slider", String.valueOf(level_slider));
 
-                    poe_log_dir = directory + "\\logs\\Client.txt";
-                    prop.setProperty("poe-dir",directory);
+                    if(!(directory == null || directory.isEmpty())){
+                        poe_log_dir = directory + "\\logs\\Client.txt";
+                        prop.setProperty("poe-dir",directory);
+                    }
+
 
                     //API
                     poe_account_name = txtAccountName.getText();
@@ -1101,6 +1104,20 @@ private void cancel(){
         }
     }
 
+    @FXML
+    private void toggleZonesImages(){
+        if(!images_toggle.isSelected() && !text_toggle.isSelected()){
+            text_toggle.setSelected(true);
+        }
+    }
+
+    @FXML
+    private void toggleZonesText(){
+        if(!images_toggle.isSelected() && !text_toggle.isSelected()){
+            images_toggle.setSelected(true);
+        }
+    }
+
     @FXML
     private void onToggle(){
         if(toggle.isSelected()){

diff --git a/src/poe/level/fx/gemEntry.fxml b/src/poe/level/fx/gemEntry.fxml
@@ -23,7 +23,7 @@
                <graphic>
                   <ImageView fitHeight="29.0" fitWidth="35.0" pickOnBounds="true" preserveRatio="true">
                      <image>
-                        <Image url="@../../../icons/icons8-plus-math-50.png" />
+                        <Image url="@../../../icons/icons8-plus-math-50%20(3).png" />
                      </image>
                   </ImageView>
                </graphic>

diff --git a/src/poe/level/fx/preferences.fxml b/src/poe/level/fx/preferences.fxml
@@ -85,11 +85,11 @@
             <Font name="System Italic" size="9.0" />
          </font>
       </Label>
-      <JFXToggleButton fx:id="images_toggle" alignment="CENTER_LEFT" layoutX="7.0" layoutY="228.0" prefHeight="47.0" prefWidth="167.0" selected="true" size="6.0" text="Show images " AnchorPane.leftAnchor="20.0">
+      <JFXToggleButton fx:id="images_toggle" alignment="CENTER_LEFT" layoutX="7.0" layoutY="228.0" onAction="#toggleZonesImages" prefHeight="47.0" prefWidth="167.0" selected="true" size="6.0" text="Show images " AnchorPane.leftAnchor="20.0">
          <font>
             <Font name="Trebuchet MS" size="13.0" />
          </font></JFXToggleButton>
-      <JFXToggleButton fx:id="text_toggle" alignment="CENTER_LEFT" layoutX="143.0" layoutY="228.0" prefHeight="47.0" prefWidth="150.0" selected="true" size="6.0" text="Show text" AnchorPane.leftAnchor="163.0">
+      <JFXToggleButton fx:id="text_toggle" alignment="CENTER_LEFT" layoutX="143.0" layoutY="228.0" onAction="#toggleZonesText" prefHeight="47.0" prefWidth="150.0" selected="true" size="6.0" text="Show text" AnchorPane.leftAnchor="163.0">
          <font>
             <Font name="Trebuchet MS" size="13.0" />
          </font></JFXToggleButton>

diff --git a/version-dev.txt b/version-dev.txt
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-v0.65-alpha
+v0.7-beta