diff --git a/src/main/java/nsusbloader/AppPreferences.java b/src/main/java/nsusbloader/AppPreferences.java index fc5344d..fafb377 100644 --- a/src/main/java/nsusbloader/AppPreferences.java +++ b/src/main/java/nsusbloader/AppPreferences.java @@ -40,6 +40,25 @@ public class AppPreferences { //------------ SETTINGS ------------------// public boolean getNsIpValidationNeeded() {return preferences.getBoolean("NSIPVALIDATION", true);} public void setNsIpValidationNeeded(boolean need){preferences.putBoolean("NSIPVALIDATION", need);} + public boolean getExpertMode(){return preferences.getBoolean("EXPERTMODE", false);} public void setExpertMode(boolean mode){preferences.putBoolean("EXPERTMODE", mode);} + + public boolean getAutoDetectIp(){return preferences.getBoolean("AUTOHOSTIP", true);} + public void setAutoDetectIp(boolean mode){preferences.putBoolean("AUTOHOSTIP", mode);} + + public boolean getRandPort(){return preferences.getBoolean("RANDHOSTPORT", true);} + public void setRandPort(boolean mode){preferences.putBoolean("RANDHOSTPORT", mode);} + + public boolean getNotServeRequests(){return preferences.getBoolean("DONTSERVEREQ", false);} + public void setNotServeRequests(boolean mode){preferences.putBoolean("DONTSERVEREQ", mode);} + + public String getHostIp(){ return preferences.get("HOSTIP", "0.0.0.0");} + public void setHostIp(String ip){preferences.put("HOSTIP", ip);} + + public String getHostPort(){ return preferences.get("HOSTPORT", "6042");} + public void setHostPort(String port){preferences.put("HOSTPORT", port);} + + public String getHostPostfix(){ return preferences.get("HOSTPOSTFIX", "");} + public void setHostPostfix(String postfix){preferences.put("HOSTPOSTFIX", postfix);} } diff --git a/src/main/java/nsusbloader/Controllers/SettingsController.java b/src/main/java/nsusbloader/Controllers/SettingsController.java index eb0b73e..02fab64 100644 --- a/src/main/java/nsusbloader/Controllers/SettingsController.java +++ b/src/main/java/nsusbloader/Controllers/SettingsController.java @@ -3,7 +3,6 @@ package nsusbloader.Controllers; import javafx.fxml.FXML; import javafx.fxml.Initializable; import javafx.scene.control.CheckBox; -import javafx.scene.control.Label; import javafx.scene.control.TextField; import javafx.scene.layout.VBox; import nsusbloader.AppPreferences; @@ -40,18 +39,27 @@ public class SettingsController implements Initializable { public void initialize(URL url, ResourceBundle resourceBundle) { validateNSHostNameCb.setSelected(AppPreferences.getInstance().getNsIpValidationNeeded()); - expertSettingsVBox.setDisable(AppPreferences.getInstance().getExpertMode()); + expertSettingsVBox.setDisable(!AppPreferences.getInstance().getExpertMode()); + expertModeCb.setSelected(AppPreferences.getInstance().getExpertMode()); expertModeCb.setOnAction(e->{ if (expertModeCb.isSelected()) expertSettingsVBox.setDisable(false); else expertSettingsVBox.setDisable(true); }); + autoDetectIpCb.setSelected(AppPreferences.getInstance().getAutoDetectIp()); + + randPortCb.setSelected(AppPreferences.getInstance().getRandPort()); + + + + dontServeCb.setSelected(AppPreferences.getInstance().getNotServeRequests()); } public boolean getExpertModeSelected(){ return expertModeCb.isSelected(); } + public boolean isNsIpValidate(){ return validateNSHostNameCb.isSelected(); } } diff --git a/src/main/resources/SettingsTab.fxml b/src/main/resources/SettingsTab.fxml index 413848c..d3f4959 100644 --- a/src/main/resources/SettingsTab.fxml +++ b/src/main/resources/SettingsTab.fxml @@ -36,6 +36,8 @@