server

Clone or download

Replaced ToggleButton with ToggleSwitch in Helper and UIPropertyBox

Modified Files

--- 'a/src/main/java/com/stream_pi/server/uipropertybox/UIPropertyBox.java'
+++ b/src/main/java/com/stream_pi/server/uipropertybox/UIPropertyBox.java
@@ -8,6 +8,7 @@ import javafx.scene.control.ComboBox;
import javafx.scene.control.Slider;
import javafx.scene.control.TextField;
import javafx.scene.control.ToggleButton;
+import org.controlsfx.control.ToggleSwitch;
public class UIPropertyBox
{
@@ -71,8 +72,8 @@ public class UIPropertyBox
else if (controlType == ControlType.SLIDER_INTEGER)
rawValue = Math.round(((Slider) controlNode).getValue()) + "";
else if (controlType == ControlType.TOGGLE) {
- ToggleButton toggleButton = ((ToggleButton) controlNode);
- if (toggleButton.isSelected())
+ ToggleSwitch toggleSwitch = ((ToggleSwitch) controlNode);
+ if (toggleSwitch.isSelected())
rawValue = "true";
else
rawValue = "false";
--- 'a/src/main/java/com/stream_pi/server/window/helper/Helper.java'
+++ b/src/main/java/com/stream_pi/server/window/helper/Helper.java
@@ -11,6 +11,7 @@ import javafx.scene.Node;
import javafx.scene.control.*;
import javafx.stage.FileChooser;
import javafx.util.Callback;
+import org.controlsfx.control.ToggleSwitch;
public class Helper
{
@@ -86,22 +87,9 @@ public class Helper
}
else if(property.getControlType() == ControlType.TOGGLE)
{
- ToggleButton toggleButton = new ToggleButton();
- toggleButton.setSelected(property.getBoolValue());
-
- if(property.getBoolValue())
- toggleButton.setText("ON");
- else
- toggleButton.setText("OFF");
-
- toggleButton.selectedProperty().addListener((observableValue, aBoolean, t1) -> {
- if(t1)
- toggleButton.setText("ON");
- else
- toggleButton.setText("OFF");
- });
-
- controlNode = toggleButton;
+ ToggleSwitch toggleSwitch = new ToggleSwitch();
+ toggleSwitch.setSelected(property.getBoolValue());
+ controlNode = toggleSwitch;
}
else if(property.getControlType() == ControlType.SLIDER_DOUBLE)
{