Skip to content
Snippets Groups Projects
Commit b96d4505 authored by Robert Goldmann's avatar Robert Goldmann
Browse files

added radiobuttons for activation of rest to settings tab

(doesn't affect any database requests yet)
parent cfb4877f
Branches
Tags
1 merge request!58merge new_database_structure into master
...@@ -4,6 +4,7 @@ public class Settings ...@@ -4,6 +4,7 @@ public class Settings
{ {
private String url; private String url;
private String secret; private String secret;
private boolean restActivated;
public Settings() public Settings()
{ {
...@@ -29,4 +30,14 @@ public class Settings ...@@ -29,4 +30,14 @@ public class Settings
{ {
this.secret = secret; this.secret = secret;
} }
public boolean isRestActivated()
{
return restActivated;
}
public void setRestActivated(boolean restActivated)
{
this.restActivated = restActivated;
}
} }
\ No newline at end of file
...@@ -6,7 +6,9 @@ import javafx.fxml.FXML; ...@@ -6,7 +6,9 @@ import javafx.fxml.FXML;
import javafx.scene.control.Alert.AlertType; import javafx.scene.control.Alert.AlertType;
import javafx.scene.control.Button; import javafx.scene.control.Button;
import javafx.scene.control.Label; import javafx.scene.control.Label;
import javafx.scene.control.RadioButton;
import javafx.scene.control.TextField; import javafx.scene.control.TextField;
import javafx.scene.control.ToggleGroup;
import javafx.scene.layout.AnchorPane; import javafx.scene.layout.AnchorPane;
import tools.AlertGenerator; import tools.AlertGenerator;
...@@ -18,6 +20,8 @@ public class SettingsController ...@@ -18,6 +20,8 @@ public class SettingsController
@FXML private TextField textFieldSecret; @FXML private TextField textFieldSecret;
@FXML private Label labelSecret; @FXML private Label labelSecret;
@FXML private Button buttonSave; @FXML private Button buttonSave;
@FXML private RadioButton radioButtonRestActivated;
@FXML private RadioButton radioButtonRestDeactivated;
private Controller controller; private Controller controller;
...@@ -28,6 +32,14 @@ public class SettingsController ...@@ -28,6 +32,14 @@ public class SettingsController
{ {
textFieldURL.setText(controller.getSettings().getUrl()); textFieldURL.setText(controller.getSettings().getUrl());
textFieldSecret.setText(controller.getSettings().getSecret()); textFieldSecret.setText(controller.getSettings().getSecret());
if(controller.getSettings().isRestActivated())
{
radioButtonRestActivated.setSelected(true);
}
else
{
radioButtonRestDeactivated.setSelected(true);
}
} }
anchorPaneMain.setStyle("-fx-background-color: #F4F4F4;"); anchorPaneMain.setStyle("-fx-background-color: #F4F4F4;");
...@@ -35,6 +47,10 @@ public class SettingsController ...@@ -35,6 +47,10 @@ public class SettingsController
labelURL.setStyle("-fx-text-fill: " + controller.getBundle().getString("color.text")); labelURL.setStyle("-fx-text-fill: " + controller.getBundle().getString("color.text"));
buttonSave.setStyle("-fx-background-color: #2E79B9; -fx-text-fill: white; -fx-font-weight: bold; -fx-font-size: 16;"); buttonSave.setStyle("-fx-background-color: #2E79B9; -fx-text-fill: white; -fx-font-weight: bold; -fx-font-size: 16;");
textFieldURL.setPromptText("z.B. https://yourdomain.de"); textFieldURL.setPromptText("z.B. https://yourdomain.de");
ToggleGroup toggleGroup = new ToggleGroup();
radioButtonRestActivated.setToggleGroup(toggleGroup);
radioButtonRestDeactivated.setToggleGroup(toggleGroup);
} }
public void save() public void save()
...@@ -49,12 +65,14 @@ public class SettingsController ...@@ -49,12 +65,14 @@ public class SettingsController
{ {
controller.getSettings().setUrl(url); controller.getSettings().setUrl(url);
controller.getSettings().setSecret(secret); controller.getSettings().setSecret(secret);
controller.getSettings().setRestActivated(radioButtonRestActivated.isSelected());
} }
else else
{ {
Settings settings = new Settings(); Settings settings = new Settings();
settings.setUrl(url); settings.setUrl(url);
settings.setSecret(secret); settings.setSecret(secret);
settings.setRestActivated(radioButtonRestActivated.isSelected());
controller.setSettings(settings); controller.setSettings(settings);
} }
Utils.saveSettings(controller.getSettings()); Utils.saveSettings(controller.getSettings());
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<?import javafx.geometry.Insets?> <?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?> <?import javafx.scene.control.Button?>
<?import javafx.scene.control.Label?> <?import javafx.scene.control.Label?>
<?import javafx.scene.control.RadioButton?>
<?import javafx.scene.control.TextField?> <?import javafx.scene.control.TextField?>
<?import javafx.scene.layout.AnchorPane?> <?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.HBox?> <?import javafx.scene.layout.HBox?>
...@@ -30,6 +31,11 @@ ...@@ -30,6 +31,11 @@
<Font name="System Bold" size="16.0" /> <Font name="System Bold" size="16.0" />
</font> </font>
</Label> </Label>
<Label fx:id="labelSecret1" prefHeight="25.0" text="Übertrag:">
<font>
<Font name="System Bold" size="16.0" />
</font>
</Label>
</children> </children>
<HBox.margin> <HBox.margin>
<Insets right="25.0" /> <Insets right="25.0" />
...@@ -39,6 +45,23 @@ ...@@ -39,6 +45,23 @@
<children> <children>
<TextField fx:id="textFieldURL" /> <TextField fx:id="textFieldURL" />
<TextField fx:id="textFieldSecret" /> <TextField fx:id="textFieldSecret" />
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
<children>
<RadioButton fx:id="radioButtonRestActivated" maxWidth="1.7976931348623157E308" mnemonicParsing="false" text="aktiviert">
<font>
<Font size="14.0" />
</font>
<HBox.margin>
<Insets right="30.0" />
</HBox.margin>
</RadioButton>
<RadioButton fx:id="radioButtonRestDeactivated" maxWidth="1.7976931348623157E308" mnemonicParsing="false" text="deaktiviert" HBox.hgrow="ALWAYS">
<font>
<Font size="14.0" />
</font>
</RadioButton>
</children>
</HBox>
</children> </children>
</VBox> </VBox>
</children> </children>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment