From d49bbbf9ead99f9ef52fe648d31a81f05a19e363 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Sun, 3 Jun 2018 13:13:32 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=D1=81=D1=8F=20=D1=81=D1=87=D0=B5=D1=82=D1=87=D0=B8=D0=BA=20?= =?UTF-8?q?=D0=BB=D1=8F=20=D0=BF=D0=BE=D0=B4=D1=81=D1=87=D0=B5=D1=82=D0=B0?= =?UTF-8?q?=20=D0=B3=D0=BE=D0=BD=D0=BE=D1=80=D0=B0=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/ru/dmitriymx/corrector1s/gui/Main.java | 2 +- .../corrector1s/gui/MainController.java | 11 ++++++----- .../corrector1s/gui/single_layout.fxml | 17 ++++++++++------- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/main/java/ru/dmitriymx/corrector1s/gui/Main.java b/src/main/java/ru/dmitriymx/corrector1s/gui/Main.java index 3cb4247..5db1d2b 100644 --- a/src/main/java/ru/dmitriymx/corrector1s/gui/Main.java +++ b/src/main/java/ru/dmitriymx/corrector1s/gui/Main.java @@ -25,7 +25,7 @@ public class Main extends Application { private Scene loadScene(Stage stage) throws IOException { FXMLLoader loader = new FXMLLoader(getClass().getResource("single_layout.fxml")); - Scene scene = new Scene(loader.load(), 350-10, 174-10); + Scene scene = new Scene(loader.load(), 350-10, 203-10); MainController controller = loader.getController(); controller.setStage(stage); return scene; diff --git a/src/main/java/ru/dmitriymx/corrector1s/gui/MainController.java b/src/main/java/ru/dmitriymx/corrector1s/gui/MainController.java index 084c099..28c2cce 100644 --- a/src/main/java/ru/dmitriymx/corrector1s/gui/MainController.java +++ b/src/main/java/ru/dmitriymx/corrector1s/gui/MainController.java @@ -2,10 +2,7 @@ package ru.dmitriymx.corrector1s.gui; import javafx.event.ActionEvent; import javafx.fxml.FXML; -import javafx.scene.control.Button; -import javafx.scene.control.CheckBox; -import javafx.scene.control.ProgressIndicator; -import javafx.scene.control.TextField; +import javafx.scene.control.*; import javafx.scene.layout.Pane; import javafx.stage.FileChooser; import javafx.stage.Stage; @@ -13,7 +10,6 @@ import javafx.stage.Stage; import java.io.File; import java.nio.file.Files; import java.nio.file.Paths; -import java.util.Timer; public class MainController { private Stage stage; @@ -35,6 +31,9 @@ public class MainController { private ProgressIndicator progressBar; @FXML private Button btnStartCorrect; + @FXML + private Spinner gonorar; + private SpinnerValueFactory gonorarValueFactory = new SpinnerValueFactory.IntegerSpinnerValueFactory(1, 100, 9); private FileChooser buildFileChooser(TextField textField) { FileChooser fileChooser = new FileChooser(); @@ -57,6 +56,8 @@ public class MainController { @FXML public void initialize() { + gonorar.setValueFactory(gonorarValueFactory); + saveAsCheckBox.selectedProperty().addListener((observable, oldValue, newValue) -> { saveAsFilePath.setDisable(!newValue); btnSaveAsFilePath.setDisable(!newValue); diff --git a/src/main/resources/ru/dmitriymx/corrector1s/gui/single_layout.fxml b/src/main/resources/ru/dmitriymx/corrector1s/gui/single_layout.fxml index 98d4de2..734c1aa 100644 --- a/src/main/resources/ru/dmitriymx/corrector1s/gui/single_layout.fxml +++ b/src/main/resources/ru/dmitriymx/corrector1s/gui/single_layout.fxml @@ -5,14 +5,15 @@ + - - + + @@ -22,16 +23,18 @@ - +