File tree Expand file tree Collapse file tree 3 files changed +5
-19
lines changed
java/de/doubleslash/keeptime/view Expand file tree Collapse file tree 3 files changed +5
-19
lines changed Original file line number Diff line number Diff line change 88import org .slf4j .Logger ;
99import org .slf4j .LoggerFactory ;
1010
11- import de .doubleslash .keeptime .Main ;
1211import de .doubleslash .keeptime .common .ConfigParser ;
1312import de .doubleslash .keeptime .common .Resources ;
1413import de .doubleslash .keeptime .common .Resources .RESOURCE ;
@@ -78,9 +77,6 @@ public class SettingsController {
7877 @ FXML
7978 private Button aboutButton ;
8079
81- @ FXML
82- private Label versionLabel ;
83-
8480 @ FXML
8581 private Label hotkeyLabel ;
8682 @ FXML
@@ -100,7 +96,6 @@ private void initialize() {
10096 LOG .debug ("load substages" );
10197 loadSubStages ();
10298 LOG .debug ("set version label text" );
103- versionLabel .setText (Main .VERSION );
10499
105100 if (System .getProperty (OS_NAME ).contains ("Linux" )) {
106101 if (useHotkeyCheckBox != null ) {
Original file line number Diff line number Diff line change @@ -449,7 +449,7 @@ private void loadSubStages() {
449449 settingsStage .setScene (new Scene (root1 ));
450450 settingsStage .setOnHiding (e -> this .mainStage .setAlwaysOnTop (true ));
451451 } catch (final IOException e ) {
452- LOG .error ("Error while initialising report or settings stage" , e );
452+ LOG .error ("Error while loading sub stage" );
453453 throw new FXMLLoaderException (e );
454454 }
455455 }
Original file line number Diff line number Diff line change 11<?xml version =" 1.0" encoding =" UTF-8" ?>
2+
23<!-- Copyright 2019 doubleSlash Net Business GmbH -->
3- <?import java .lang.*?>
4- <?import javafx .geometry.*?>
5- <?import javafx .scene.*?>
6- <?import javafx .scene.control.*?>
7- <?import javafx .scene.layout.*?>
8- <?import javafx .scene.text.*?>
4+
95<?import javafx .geometry.Insets?>
106<?import javafx .scene.Group?>
117<?import javafx .scene.control.Button?>
1713<?import javafx .scene.layout.VBox?>
1814<?import javafx .scene.text.Font?>
1915
20- <AnchorPane xmlns =" http://javafx.com/javafx/8" xmlns : fx =" http://javafx.com/fxml/1" fx : controller =" de.doubleslash.keeptime.view.SettingsController" >
16+ <AnchorPane xmlns =" http://javafx.com/javafx/8.0.171 " xmlns : fx =" http://javafx.com/fxml/1" fx : controller =" de.doubleslash.keeptime.view.SettingsController" >
2117 <children >
2218 <VBox stylesheets =" @../css/menu.css" >
2319 <children >
215211 <font >
216212 <Font name =" Open Sans Regular" size =" 12.0" />
217213 </font ></Button >
218- <Button fx : id =" aboutButton" mnemonicParsing =" false" text =" About" />
214+ <Button fx : id =" aboutButton" mnemonicParsing =" false" prefHeight = " 25.0 " prefWidth = " 70.0 " text =" About" HBox.hgrow= " ALWAYS " />
219215 </children >
220216 </HBox >
221217 </children >
225221 <Insets bottom =" 5.0" left =" 5.0" right =" 5.0" top =" 5.0" />
226222 </padding >
227223 </VBox >
228- <Label fx : id =" versionLabel" alignment =" CENTER_RIGHT" disable =" true" layoutX =" 260.0" layoutY =" 330.0" prefHeight =" 17.0" prefWidth =" 52.0" text =" v1.0.0" AnchorPane.rightAnchor=" 10.0" >
229- <font >
230- <Font name =" Open Sans Regular" size =" 12.0" />
231- </font ></Label >
232- <Region layoutX =" 212.0" layoutY =" 41.0" prefHeight =" 200.0" prefWidth =" 125.0" />
233224 </children >
234225</AnchorPane >
You can’t perform that action at this time.
0 commit comments