mirrors/ns-usbloader
1
0
Fork 0
mirror of https://github.com/developersu/ns-usbloader.git synced 2025-06-08 02:24:42 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Settings-tab refactoring: move General-application and Goldleaf-related options blocks to separate fxmls.

Browse source 
Move list of the GoldLeaf supported versions to the AppPreferences class.
This commit is contained in:
Dmitry Isaenko 2020-07-30 16:46:32 +03:00
parent d1500f264b
commit 63d3f7d527
15 changed files with 311 additions and 220 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/resources/NSLMain.fxml
View file

@ -71,7 +71,7 @@ Steps to roll NXDT functionality back:
<SVGPath content="M9,22A1,1 0 0,1 8,21V18H4A2,2 0 0,1 2,16V4C2,2.89 2.9,2 4,2H20A2,2 0 0,1 22,4V16A2,2 0 0,1 20,18H13.9L10.2,21.71C10,21.9 9.75,22 9.5,22V22H9M10,16V19.08L13.08,16H20V4H4V16H10M17,11H15V9H17V11M13,11H11V9H13V11M9,11H7V9H9V11Z" />
</graphic>
</Tab>
<Tab closable="false" >
<Tab closable="false" disable="true">
<content>
<fx:include fx:id="NXDTab" source="NXDTab.fxml" VBox.vgrow="ALWAYS" />
</content>

47
src/main/resources/SettingsBlockGeneric.fxml Normal file
View file

@ -0,0 +1,47 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.CheckBox?>
<?import javafx.scene.control.ChoiceBox?>
<?import javafx.scene.control.Hyperlink?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.Pane?>
<?import javafx.scene.layout.VBox?>
<VBox spacing="5.0" xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1" fx:controller="nsusbloader.Controllers.SettingsBlockGenericController">
<children>
<Label text="%tab2_Lbl_ApplicationSettings" />
<HBox alignment="CENTER_LEFT" spacing="5.0">
<children>
<Label text="%tab2_Lbl_Language" />
<ChoiceBox fx:id="languagesChB" prefWidth="180.0" />
<Button fx:id="submitLanguageBtn" mnemonicParsing="false" text="OK" />
<VBox alignment="CENTER_RIGHT" HBox.hgrow="ALWAYS">
<children>
<Button fx:id="driversInstallBtn" mnemonicParsing="false" text="%tab2_Btn_InstallDrivers" visible="false" />
</children>
</VBox>
</children>
<VBox.margin>
<Insets left="5.0" />
</VBox.margin>
</HBox>
<HBox>
<children>
<VBox>
<children>
<CheckBox fx:id="autoCheckForUpdatesCB" mnemonicParsing="false" text="%tab2_Cb_AutoCheckForUpdates" />
<Hyperlink fx:id="newVersionHyperlink" />
</children>
</VBox>
<Pane HBox.hgrow="ALWAYS" />
<Button fx:id="checkForUpdBtn" mnemonicParsing="false" />
</children>
<VBox.margin>
<Insets left="5.0" />
</VBox.margin>
</HBox>
</children>
</VBox>

29
src/main/resources/SettingsBlockGoldleaf.fxml Normal file
View file

@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.CheckBox?>
<?import javafx.scene.control.ChoiceBox?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?>
<VBox spacing="5.0" xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="nsusbloader.Controllers.SettingsBlockGoldleafController">
<children>
<Label text="GoldLeaf" />
<CheckBox fx:id="nspFilesFilterForGLCB" mnemonicParsing="false" text="%tab2_Cb_GLshowNspOnly">
<VBox.margin>
<Insets left="5.0" />
</VBox.margin></CheckBox>
<HBox alignment="CENTER_LEFT" spacing="5.0">
<children>
<Label text="%tab2_Cb_GlVersion" />
<ChoiceBox fx:id="glVersionChoiceBox" prefWidth="75.0" />
</children>
<VBox.margin>
<Insets left="5.0" />
</VBox.margin>
</HBox>
</children>
</VBox>

59
src/main/resources/SettingsTab.fxml
View file

@ -1,72 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.CheckBox?>
<?import javafx.scene.control.ChoiceBox?>
<?import javafx.scene.control.Hyperlink?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.ScrollPane?>
<?import javafx.scene.control.Separator?>
<?import javafx.scene.control.TextField?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.Pane?>
<?import javafx.scene.layout.VBox?>
<ScrollPane fitToWidth="true" xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1" fx:controller="nsusbloader.Controllers.SettingsController">
<VBox spacing="5.0">
<VBox spacing="5.0">
<children>
<Label text="%tab2_Lbl_ApplicationSettings" />
<HBox alignment="CENTER_LEFT" spacing="5.0">
<children>
<Label text="%tab2_Lbl_Language" />
<ChoiceBox fx:id="langCB" prefWidth="180.0" />
<Button fx:id="langBtn" mnemonicParsing="false" text="OK" />
<VBox alignment="CENTER_RIGHT" HBox.hgrow="ALWAYS">
<children>
<Button fx:id="drvInstBtn" mnemonicParsing="false" text="%tab2_Btn_InstallDrivers" visible="false" />
</children>
</VBox>
</children>
<VBox.margin>
<Insets left="5.0" />
</VBox.margin>
</HBox>
<HBox>
<children>
<VBox>
<children>
<CheckBox fx:id="autoCheckUpdCb" mnemonicParsing="false" text="%tab2_Cb_AutoCheckForUpdates" />
<Hyperlink fx:id="newVersionLink" />
</children>
</VBox>
<Pane HBox.hgrow="ALWAYS" />
<Button fx:id="checkForUpdBtn" mnemonicParsing="false" />
</children>
<VBox.margin>
<Insets left="5.0" />
</VBox.margin>
</HBox>
<fx:include fx:id="settingsBlockGeneric" source="SettingsBlockGeneric.fxml"/>
<Separator prefWidth="200.0" />
<Label text="GoldLeaf" />
<CheckBox fx:id="nspFilesFilterForGLCB" mnemonicParsing="false" text="%tab2_Cb_GLshowNspOnly">
<VBox.margin>
<Insets left="5.0" />
</VBox.margin></CheckBox>
<HBox alignment="CENTER_LEFT" spacing="5.0">
<children>
<Label text="%tab2_Cb_GlVersion" />
<ChoiceBox fx:id="glVersionChoiceBox" prefWidth="75.0" />
</children>
<VBox.margin>
<Insets left="5.0" />
</VBox.margin>
</HBox>
<fx:include fx:id="settingsBlockGoldleaf" source="SettingsBlockGoldleaf.fxml"/>
<Separator prefWidth="200.0" />
<fx:include fx:id="settingsBlockTinfoil" source="SettingsBlockTinfoil.fxml"/>
</children>
<padding>
<Insets bottom="5.0" left="15.0" right="15.0" top="5.0" />
</padding>
</VBox>
</VBox>
</ScrollPane>