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

Settings-tab refactoring: move Tinfoil-related options block to separate fxml, create controller, update names, remove code redundancy and simplify.

Browse source
This commit is contained in:
Dmitry Isaenko 2020-07-30 02:31:37 +03:00
parent ceb6949667
commit d1500f264b
6 changed files with 262 additions and 200 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" disable="true">
<Tab closable="false" >
<content>
<fx:include fx:id="NXDTab" source="NXDTab.fxml" VBox.vgrow="ALWAYS" />
</content>

80
src/main/resources/SettingsBlockTinfoil.fxml Normal file
View file

@ -0,0 +1,80 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.CheckBox?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.TextField?>
<?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.SettingsBlockTinfoilController">
<children>
<Label text="Tinfoil" />
<CheckBox mnemonicParsing="false" text="%tab2_Cb_AllowXciNszXcz" fx:id="xciNszXczSupportCB">
<VBox.margin>
<Insets left="5.0" />
</VBox.margin></CheckBox>
<Label disable="true" text="%tab2_Lbl_AllowXciNszXczDesc" wrapText="true">
<VBox.margin>
<Insets left="5.0" />
</VBox.margin></Label>
<CheckBox fx:id="validateNSHostNameCB" mnemonicParsing="false" text="%tab2_Cb_ValidateNSHostName">
<VBox.margin>
<Insets left="5.0" />
</VBox.margin>
</CheckBox>
<CheckBox fx:id="networkExpertModeCB" mnemonicParsing="false" text="%tab2_Cb_ExpertMode">
<VBox.margin>
<Insets left="5.0" />
</VBox.margin></CheckBox>
<VBox fx:id="networkExpertSettingsVBox" spacing="5.0">
<children>
<CheckBox fx:id="autoDetectIpCB" mnemonicParsing="false" text="%tab2_Cb_AutoDetectIp">
<VBox.margin>
<Insets />
</VBox.margin>
</CheckBox>
<CheckBox fx:id="randomlySelectPortCB" mnemonicParsing="false" text="%tab2_Cb_RandSelectPort">
<VBox.margin>
<Insets />
</VBox.margin>
</CheckBox>
<HBox>
<children>
<Label text="%tab2_Lbl_HostIP" />
<Label text=":" />
<Label text="%tab2_Lbl_HostPort" />
<Label text="/" />
<Label text="%tab2_Lbl_HostExtra" />
</children>
</HBox>
<HBox>
<children>
<TextField fx:id="pcIpTF" promptText="XXX.XXX.XXX.XXX" />
<Label text=":" />
<TextField fx:id="pcPortTF" promptText="0-65535" />
<Label text="/" />
<TextField fx:id="pcExtraTF" HBox.hgrow="ALWAYS">
<HBox.margin>
<Insets />
</HBox.margin>
</TextField>
</children>
</HBox>
<CheckBox fx:id="noRequestsServeCB" mnemonicParsing="false" text="%tab2_Cb_DontServeRequests">
<VBox.margin>
<Insets />
</VBox.margin>
</CheckBox>
<Label disable="true" text="%tab2_Lbl_DontServeRequestsDesc" wrapText="true">
<VBox.margin>
<Insets />
</VBox.margin>
</Label>
</children>
<padding>
<Insets left="15.0" />
</padding>
</VBox>
</children>
</VBox>

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

@ -63,73 +63,7 @@
</VBox.margin>
</HBox>
<Separator prefWidth="200.0" />
<Label text="Tinfoil" />
<CheckBox fx:id="tfXciSpprtCb" mnemonicParsing="false" text="%tab2_Cb_AllowXciNszXcz">
<VBox.margin>
<Insets left="5.0" />
</VBox.margin></CheckBox>
<Label disable="true" text="%tab2_Lbl_AllowXciNszXczDesc" wrapText="true">
<VBox.margin>
<Insets left="5.0" />
</VBox.margin></Label>
<CheckBox fx:id="validateNSHostNameCb" mnemonicParsing="false" text="%tab2_Cb_ValidateNSHostName">
<VBox.margin>
<Insets left="5.0" />
</VBox.margin>
</CheckBox>
<CheckBox fx:id="expertModeCb" mnemonicParsing="false" text="%tab2_Cb_ExpertMode">
<VBox.margin>
<Insets left="5.0" />
</VBox.margin></CheckBox>
<VBox fx:id="expertSettingsVBox" spacing="5.0">
<children>
<CheckBox fx:id="autoDetectIpCb" mnemonicParsing="false" text="%tab2_Cb_AutoDetectIp">
<VBox.margin>
<Insets />
</VBox.margin>
</CheckBox>
<CheckBox fx:id="randPortCb" mnemonicParsing="false" text="%tab2_Cb_RandSelectPort">
<VBox.margin>
<Insets />
</VBox.margin>
</CheckBox>
<HBox>
<children>
<Label text="%tab2_Lbl_HostIP" />
<Label text=":" />
<Label text="%tab2_Lbl_HostPort" />
<Label text="/" />
<Label text="%tab2_Lbl_HostExtra" />
</children>
</HBox>
<HBox>
<children>
<TextField fx:id="pcIpTextField" promptText="XXX.XXX.XXX.XXX" />
<Label text=":" />
<TextField fx:id="pcPortTextField" promptText="0-65535" />
<Label text="/" />
<TextField fx:id="pcExtraTextField" HBox.hgrow="ALWAYS">
<HBox.margin>
<Insets />
</HBox.margin>
</TextField>
</children>
</HBox>
<CheckBox fx:id="dontServeCb" mnemonicParsing="false" text="%tab2_Cb_DontServeRequests">
<VBox.margin>
<Insets />
</VBox.margin>
</CheckBox>
<Label disable="true" text="%tab2_Lbl_DontServeRequestsDesc" wrapText="true">
<VBox.margin>
<Insets />
</VBox.margin>
</Label>
</children>
<padding>
<Insets left="15.0" />
</padding>
</VBox>
<fx:include fx:id="settingsBlockTinfoil" source="SettingsBlockTinfoil.fxml"/>
</children>
<padding>
<Insets bottom="5.0" left="15.0" right="15.0" top="5.0" />