#178: use styling for buttons

Death111 · Death111 · commit 887fa973583b · 2025-03-17T23:16:56.000+01:00
diff --git a/src/main/java/de/doubleslash/keeptime/common/Resources.java b/src/main/java/de/doubleslash/keeptime/common/Resources.java
@@ -81,8 +81,10 @@ public enum RESOURCE {
 
       SVG_ROTATE_ICON("/svgs/rotate-solid.svg"),
 
-      ICON_MAIN("/icons/icon.png")
+      ICON_MAIN("/icons/icon.png"),
 
+      /** CSS **/
+      CSS_BUTTONS("/css/buttons.css")
       ;
 
       String resourceLocation;
diff --git a/src/main/java/de/doubleslash/keeptime/view/MapExternalProjectsController.java b/src/main/java/de/doubleslash/keeptime/view/MapExternalProjectsController.java
@@ -17,6 +17,7 @@
 package de.doubleslash.keeptime.view;
 
 import de.doubleslash.keeptime.common.ColorHelper;
+import de.doubleslash.keeptime.common.Resources;
 import de.doubleslash.keeptime.controller.Controller;
 import de.doubleslash.keeptime.controller.HeimatController;
 import de.doubleslash.keeptime.model.Model;
@@ -170,7 +171,7 @@ protected void updateItem(HeimatTask item, boolean empty) {
                                                      && mapping.getHeimatTask().id() == ht.id());
             return !alreadyMapped;
          }).toList();
-         List<HeimatTask> selectedItems = showMultiSelectDialog(externalProjectsObservableList, unmappedHeimatTasks);
+         List<HeimatTask> selectedItems = showMultiSelectDialog(externalProjects, unmappedHeimatTasks);
          for (HeimatTask toBeCreatedHeimatTask : selectedItems) {
             final int sortIndex = model.getAvailableProjects().size();
             final Project project = controller.addNewProject(
@@ -193,7 +194,7 @@ protected void updateItem(HeimatTask item, boolean empty) {
       }
    }
 
-   private List<HeimatTask> showMultiSelectDialog(final ObservableList<HeimatTask> externalProjectsObservableList,
+   private List<HeimatTask> showMultiSelectDialog(final List<HeimatTask> externalProjects,
          List<HeimatTask> unmappedHeimatTasks) {
       Dialog<List<HeimatTask>> dialog = new Dialog<>();
       dialog.setTitle("Import HEIMAT projects");
@@ -222,9 +223,10 @@ protected void updateItem(HeimatTask item, boolean empty) {
          }
       });
       listView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
-      listView.setItems(externalProjectsObservableList);
+      listView.setItems(FXCollections.observableArrayList(externalProjects));
 
-      Button selectAllUnmappedButton = new Button("Select All Unmapped");
+      Button selectAllUnmappedButton = new Button("Select unmapped projects (" + unmappedHeimatTasks.size() + ")");
+      selectAllUnmappedButton.getStyleClass().add("secondary-button");
       selectAllUnmappedButton.setOnAction(e -> {
          listView.getSelectionModel().clearSelection();
          for (HeimatTask ht : unmappedHeimatTasks) {
@@ -236,18 +238,22 @@ protected void updateItem(HeimatTask item, boolean empty) {
       VBox content = new VBox(10, selectAllUnmappedButton, listView);
       dialog.getDialogPane().setContent(content);
       final List<HeimatTask> emptyList = List.of();
-      // Handle result when OK is clicked
       dialog.setResultConverter(dialogButton -> {
          if (dialogButton == okButtonType) {
             return listView.getSelectionModel().getSelectedItems().stream().toList();
          }
-         return emptyList; // Cancel was clicked
+         return emptyList; // cancel was clicked
       });
 
       Button okButton = (Button) dialog.getDialogPane().lookupButton(okButtonType);
-      okButton.setText("Import (0)"); // Initial state
+      okButton.setText("Import (0)");
+      okButton.setPrefWidth(100);
+      okButton.getStyleClass().add("primary-button");
+      Button dialogCancelButton = (Button) dialog.getDialogPane().lookupButton(cancelButtonType);
+      dialogCancelButton.getStyleClass().add("secondary-button");
+      dialog.getDialogPane().getStylesheets().add(Resources.getResource(Resources.RESOURCE.CSS_BUTTONS).toExternalForm());
+
 
-      // Listen for selection changes and update button text
       listView.getSelectionModel().getSelectedItems().addListener((ListChangeListener<HeimatTask>) change -> {
          int selectedCount = listView.getSelectionModel().getSelectedItems().size();
          okButton.setText("Import (" + selectedCount + ")");
diff --git a/src/main/java/de/doubleslash/keeptime/view/ProjectsListViewController.java b/src/main/java/de/doubleslash/keeptime/view/ProjectsListViewController.java
@@ -380,6 +380,10 @@ private GridPane setUpEditProjectGridPane(final Project p, final Dialog<Project>
          return null;
       });
 
+      dialog.getDialogPane().lookupButton(ButtonType.OK).getStyleClass().add("primary-button");
+      dialog.getDialogPane().lookupButton(ButtonType.CANCEL).getStyleClass().add("secondary-button");
+      dialog.getDialogPane().getStylesheets().add(Resources.getResource(Resources.RESOURCE.CSS_BUTTONS).toExternalForm());
+
       return grid;
    }
 
diff --git a/src/main/java/de/doubleslash/keeptime/view/ViewController.java b/src/main/java/de/doubleslash/keeptime/view/ViewController.java
@@ -502,6 +502,9 @@ private GridPane setUpAddNewProjectGridPane(final Dialog<Project> dialog) {
       final ManageProjectController manageProjectController = loader.getController();
 
       dialog.getDialogPane().lookupButton(ButtonType.OK).disableProperty().bind(manageProjectController.formValidProperty().not());
+      dialog.getDialogPane().lookupButton(ButtonType.OK).getStyleClass().add("primary-button");
+      dialog.getDialogPane().lookupButton(ButtonType.CANCEL).getStyleClass().add("secondary-button");
+      dialog.getDialogPane().getStylesheets().add(Resources.getResource(Resources.RESOURCE.CSS_BUTTONS).toExternalForm());
 
       dialogResultConverter(dialog, manageProjectController);
 
diff --git a/src/main/resources/css/application.css b/src/main/resources/css/application.css
@@ -91,4 +91,4 @@
 .list-view .scroll-bar:vertical .increment-button:hover,
 .list-view .scroll-bar:vertical .decrement-button:hover {
 	-fx-background-color: transparent;
-}
+}
diff --git a/src/main/resources/css/buttons.css b/src/main/resources/css/buttons.css
@@ -0,0 +1,19 @@
+.primary-button {
+    -fx-background-color: #00759e;
+    -fx-text-fill: white;
+
+    -fx-background-radius: 5px;
+    -fx-border-radius: 5px;
+    -fx-border-width: 1px;
+    -fx-border-color: #00759e;
+}
+
+.secondary-button {
+    -fx-background-color: transparent;
+    -fx-text-fill: #00759e;
+
+    -fx-background-radius: 5px;
+    -fx-border-radius: 5px;
+    -fx-border-width: 1px;
+    -fx-border-color: #00759e;
+}
diff --git a/src/main/resources/css/settingsv2.css b/src/main/resources/css/settingsv2.css
@@ -6,13 +6,6 @@
 	-fx-padding: 0 0 5 0;
 }
 
-.saveCancelHboxBorder{
-	
-	-fx-border-color: lightgrey;
-	-fx-border-style: solid hidden hidden hidden;
-	-fx-padding: 2px;
-	-fx-spacing: 15px;
-}
 .tab-pane > .tab-header-area > .headers-region > .tab > .tab-container {
 	-fx-rotate: 90;
 }
@@ -43,12 +36,7 @@
 {
 	-fx-background-color: #eaeaea;
 }
-.button{
-	-fx-background-color: white;
-	-fx-border-color: lightgrey;
-	-fx-border-radius: 2 2 2 2;
 
-}
 .button:hover{
 	-fx-border-color: grey;
 }
diff --git a/src/main/resources/layouts/externalProjectMapping.fxml b/src/main/resources/layouts/externalProjectMapping.fxml
@@ -6,18 +6,18 @@
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.HBox?>
 
-<AnchorPane prefHeight="600.0" prefWidth="700.0" style="-fx-background-color: white;" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.doubleslash.keeptime.view.MapExternalProjectsController">
+<AnchorPane prefHeight="600.0" prefWidth="700.0" style="-fx-background-color: white;" stylesheets="@../css/buttons.css" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.doubleslash.keeptime.view.MapExternalProjectsController">
    <children>
       <TableView fx:id="mappingTableView" layoutY="50.0" prefHeight="500.0" prefWidth="600.0" AnchorPane.bottomAnchor="40.0" AnchorPane.leftAnchor="5.0" AnchorPane.rightAnchor="5.0" AnchorPane.topAnchor="40.0" />
       <HBox layoutX="429.0" layoutY="555.0" spacing="5.0" AnchorPane.bottomAnchor="5.0" AnchorPane.rightAnchor="5.0">
          <children>
-            <Button fx:id="saveButton" mnemonicParsing="false" text="Save" />
-            <Button fx:id="cancelButton" mnemonicParsing="false" text="Cancel" />
+            <Button fx:id="saveButton" mnemonicParsing="false" styleClass="primary-button" text="Save" />
+            <Button fx:id="cancelButton" mnemonicParsing="false" styleClass="secondary-button" text="Cancel" />
          </children>
       </HBox>
       <HBox layoutX="5.0" layoutY="564.0" spacing="5.0" AnchorPane.leftAnchor="5.0" AnchorPane.topAnchor="5.0">
          <children>
-            <Button fx:id="addNewProjectButton" mnemonicParsing="false" text="Import project(s)" />
+            <Button fx:id="addNewProjectButton" mnemonicParsing="false" styleClass="secondary-button" text="Import project(s)..." />
          </children>
       </HBox>
       <DatePicker fx:id="tasksForDateDatePicker" layoutX="371.0" layoutY="16.0" AnchorPane.rightAnchor="5.0" AnchorPane.topAnchor="5.0" />
diff --git a/src/main/resources/layouts/externalProjectSync.fxml b/src/main/resources/layouts/externalProjectSync.fxml
@@ -11,7 +11,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<StackPane style="-fx-background-color: white;" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.doubleslash.keeptime.view.ExternalProjectsSyncController">
+<StackPane style="-fx-background-color: white;" stylesheets="@../css/buttons.css" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.doubleslash.keeptime.view.ExternalProjectsSyncController">
    <children>
       <AnchorPane fx:id="pane" prefHeight="600.0" prefWidth="1000.0">
          <children>
@@ -54,13 +54,13 @@
                   <HBox spacing="5.0">
                      <children>
                         <ComboBox fx:id="heimatTaskComboBox" prefHeight="25.0" prefWidth="254.0" />
-                        <Button fx:id="addHeimatTaskButton" mnemonicParsing="false" prefHeight="25.0" text="Add" />
+                        <Button fx:id="addHeimatTaskButton" mnemonicParsing="false" prefHeight="25.0" styleClass="secondary-button" text="Add" />
                      </children>
                   </HBox>
                   <HBox alignment="TOP_RIGHT" spacing="5.0">
                      <children>
-                        <Button fx:id="saveButton" mnemonicParsing="false" text="Save" />
-                        <Button fx:id="cancelButton" mnemonicParsing="false" text="Cancel" />
+                        <Button fx:id="saveButton" mnemonicParsing="false" styleClass="primary-button" text="Save" />
+                        <Button fx:id="cancelButton" mnemonicParsing="false" styleClass="secondary-button" text="Cancel" />
                      </children>
                   </HBox>
                </children>
diff --git a/src/main/resources/layouts/manage-project.fxml b/src/main/resources/layouts/manage-project.fxml
@@ -14,7 +14,7 @@
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.VBox?>
 
-<GridPane fx:id="grid" hgap="5.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" vgap="5.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.doubleslash.keeptime.view.ManageProjectController">
+<GridPane fx:id="grid" hgap="5.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" stylesheets="@../css/buttons.css" vgap="5.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.doubleslash.keeptime.view.ManageProjectController">
   <columnConstraints>
       <ColumnConstraints hgrow="SOMETIMES" />
     <ColumnConstraints hgrow="SOMETIMES" />
@@ -39,7 +39,7 @@
       <HBox spacing="5.0" GridPane.columnIndex="1" GridPane.rowIndex="4">
          <children>
             <ColorPicker fx:id="textFillColorPicker" />
-            <Button fx:id="randomColorButton" mnemonicParsing="false" text="Random" />
+            <Button fx:id="randomColorButton" mnemonicParsing="false" styleClass="secondary-button" text="Random" />
          </children>
       </HBox>
       <CheckBox fx:id="isWorkCheckBox" mnemonicParsing="false" selected="true" GridPane.columnIndex="1" GridPane.rowIndex="5" />
diff --git a/src/main/resources/layouts/report.fxml b/src/main/resources/layouts/report.fxml
@@ -27,7 +27,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane fx:id="reportRoot" focusTraversable="true" prefWidth="500.0" style="-fx-background-color: white;" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.doubleslash.keeptime.view.ReportController">
+<AnchorPane fx:id="reportRoot" focusTraversable="true" prefWidth="500.0" style="-fx-background-color: white;" stylesheets="@../css/buttons.css" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.doubleslash.keeptime.view.ReportController">
    <children>
       <VBox>
          <children>
@@ -87,10 +87,10 @@
             </BorderPane>
             <BorderPane>
                <left>
-                  <Button fx:id="expandCollapseButton" mnemonicParsing="false" prefHeight="25.0" prefWidth="80.0" text="Collapse" />
+                  <Button fx:id="expandCollapseButton" mnemonicParsing="false" prefHeight="25.0" prefWidth="80.0" styleClass="secondary-button" text="Collapse" />
                </left>
                <right>
-                  <Button fx:id="heimatSyncButton" mnemonicParsing="false" text="Sync2Heimat" />
+                  <Button fx:id="heimatSyncButton" mnemonicParsing="false" styleClass="secondary-button" text="Sync2Heimat" />
                </right>
                <padding>
                   <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
diff --git a/src/main/resources/layouts/settings.fxml b/src/main/resources/layouts/settings.fxml

Original file line number	Diff line number	Diff line change
`@@ -81,8 +81,10 @@ public enum RESOURCE {`
`81`	`81`
`82`	`82`	`SVG_ROTATE_ICON("/svgs/rotate-solid.svg"),`
`83`	`83`
`84`		`- ICON_MAIN("/icons/icon.png")`
	`84`	`+ ICON_MAIN("/icons/icon.png"),`
`85`	`85`
	`86`	`+ / CSS /`
	`87`	`+ CSS_BUTTONS("/css/buttons.css")`
`86`	`88`	`;`
`87`	`89`
`88`	`90`	`String resourceLocation;`
Original file line number	Diff line number	Diff line change
`@@ -380,6 +380,10 @@ private GridPane setUpEditProjectGridPane(final Project p, final Dialog<Project>`
`380`	`380`	`return null;`
`381`	`381`	`});`
`382`	`382`
	`383`	`+ dialog.getDialogPane().lookupButton(ButtonType.OK).getStyleClass().add("primary-button");`
	`384`	`+ dialog.getDialogPane().lookupButton(ButtonType.CANCEL).getStyleClass().add("secondary-button");`
	`385`	`+ dialog.getDialogPane().getStylesheets().add(Resources.getResource(Resources.RESOURCE.CSS_BUTTONS).toExternalForm());`
	`386`	`+`
`383`	`387`	`return grid;`
`384`	`388`	`}`
`385`	`389`
Original file line number	Diff line number	Diff line change
`@@ -6,13 +6,6 @@`
`6`	`6`	`-fx-padding: 0 0 5 0;`
`7`	`7`	`}`
`8`	`8`
`9`		`-.saveCancelHboxBorder{`
`10`		`-`
`11`		`- -fx-border-color: lightgrey;`
`12`		`- -fx-border-style: solid hidden hidden hidden;`
`13`		`- -fx-padding: 2px;`
`14`		`- -fx-spacing: 15px;`
`15`		`-}`
`16`	`9`	`.tab-pane > .tab-header-area > .headers-region > .tab > .tab-container {`
`17`	`10`	`-fx-rotate: 90;`
`18`	`11`	`}`
`@@ -43,12 +36,7 @@`
`43`	`36`	`{`
`44`	`37`	`-fx-background-color: #eaeaea;`
`45`	`38`	`}`
`46`		`-.button{`
`47`		`- -fx-background-color: white;`
`48`		`- -fx-border-color: lightgrey;`
`49`		`- -fx-border-radius: 2 2 2 2;`
`50`	`39`
`51`		`-}`
`52`	`40`	`.button:hover{`
`53`	`41`	`-fx-border-color: grey;`
`54`	`42`	`}`