diff --git a/src/main/java/nsusbloader/Controllers/NSLMainController.java b/src/main/java/nsusbloader/Controllers/NSLMainController.java index ce203b1..fd2988d 100644 --- a/src/main/java/nsusbloader/Controllers/NSLMainController.java +++ b/src/main/java/nsusbloader/Controllers/NSLMainController.java @@ -39,6 +39,9 @@ public class NSLMainController implements Initializable { @FXML public FrontController FrontTabController; // Accessible from Mediator | todo: incapsulate + @FXML + private SplitMergeController SplitMergeTabController; + private Task usbNetCommunications; private Thread workThread; diff --git a/src/main/java/nsusbloader/Controllers/SplitMergeController.java b/src/main/java/nsusbloader/Controllers/SplitMergeController.java new file mode 100644 index 0000000..48bc6bc --- /dev/null +++ b/src/main/java/nsusbloader/Controllers/SplitMergeController.java @@ -0,0 +1,18 @@ +package nsusbloader.Controllers; + +import javafx.fxml.FXML; +import javafx.fxml.Initializable; +import javafx.scene.control.ToggleGroup; + +import java.net.URL; +import java.util.ResourceBundle; + +public class SplitMergeController implements Initializable { + @FXML + private ToggleGroup splitMergeTogGrp; + + @Override + public void initialize(URL url, ResourceBundle resourceBundle) { + splitMergeTogGrp.selectToggle(splitMergeTogGrp.getToggles().get(0)); + } +} \ No newline at end of file diff --git a/src/main/resources/NSLMain.fxml b/src/main/resources/NSLMain.fxml index d50cc42..16e4b21 100644 --- a/src/main/resources/NSLMain.fxml +++ b/src/main/resources/NSLMain.fxml @@ -12,7 +12,7 @@ - + @@ -50,6 +50,16 @@ + + + + + + + + + + diff --git a/src/main/resources/SplitMergeTab.fxml b/src/main/resources/SplitMergeTab.fxml new file mode 100644 index 0000000..a0ba476 --- /dev/null +++ b/src/main/resources/SplitMergeTab.fxml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/res/app_dark.css b/src/main/resources/res/app_dark.css index 67dda00..4dd7f07 100644 --- a/src/main/resources/res/app_dark.css +++ b/src/main/resources/res/app_dark.css @@ -307,7 +307,6 @@ -fx-background-radius: 5; -fx-border-color: #2d2d2d; -fx-border-radius: 3; - } .check-box:hover .box { @@ -324,6 +323,32 @@ .check-box:selected .mark, .check-box:selected:hover .mark{ -fx-background-color: #4f4f4f; } +/*-======================= Radio Button =====================-*/ +.radio-button .radio, .radio-button:selected .radio { + -fx-background-color: #4f4f4f; + -fx-background-insets: 0 0 0 0, 0, 1, 1; + -fx-background-radius: 45; + -fx-border-color: transparent; + -fx-border-radius: 45; +} + +.radio-button:hover .radio { + -fx-background-color: #4f4f4f; + -fx-background-insets: 0 0 0 0, 0, 1, 1; + -fx-background-radius: 45; + -fx-border-color: #a4ffff; + -fx-border-radius: 45; +} + +.radio-button:selected .radio, .radio-button:selected:hover .radio { + -fx-background-color: #71e016; +} +.radio-button:selected .dot, .radio-button:selected:hover .dot{ + -fx-background-color: #2d2d2d; + -fx-shape: "M9,20.42L2.79,14.21L5.62,11.38L9,14.77L18.88,4.88L21.71,7.71L9,20.42Z"; + -fx-scale-x: 1.2; + -fx-scale-y: 1.2; +} /***********************************************************/ .regionUpload{ -fx-shape: "M 4.0078125,0 C 1.5078125,0 0,1.4882812 0,3.984375 V 15.988281 C 0,18.417969 1.4927148,20 4.0078125,20 H 6.5 V 0 Z M 15,2.9 7,13 h 5 c 0,1.661689 -0.0097,6.246588 -0.0098,7.011719 H 18 V 13 h 5 z M 23.5,0 v 20 c 1.004057,-7.06e-4 1.659943,0 2.492187,0 C 28.414063,20 30,18.496094 30,15.996094 V 3.9765625 C 30,1.5195311 28.508727,0 26.003907,0 Z M 3.1015625,2.9570312 C 4.1485235,2.9562481 4.9977514,3.8046013 4.9980469,4.8515625 4.998831,5.8992865 4.1492865,6.748831 3.1015625,6.7480469 2.0546013,6.7477514 1.2062481,5.8985235 1.2070312,4.8515625 1.2073268,3.8053642 2.0553642,2.9573267 3.1015625,2.9570312 Z M 26.865234,11.148438 c 1.047724,-7.85e-4 1.897269,0.84876 1.896485,1.896484 -2.96e-4,1.046961 -0.849524,1.895314 -1.896485,1.894531 -1.046198,-2.95e-4 -1.894235,-0.848333 -1.894531,-1.894531 -7.83e-4,-1.046961 0.84757,-1.896189 1.894531,-1.896484 z";