From e924ee3036d8315b93c5c8d32216f8cc8b853c69 Mon Sep 17 00:00:00 2001 From: hendrik schutter Date: Thu, 5 Apr 2018 12:25:29 +0200 Subject: [PATCH] fixed bug with color 'Rot' added inverted text colors updates 'Ueber'-Button Dialog --- bin/application/DBController.class | Bin 7484 -> 7484 bytes bin/application/Main.class | Bin 4474 -> 4474 bytes bin/application/MainWindowController$1.class | Bin 2253 -> 2253 bytes bin/application/MainWindowController.class | Bin 24855 -> 25557 bytes src/application/DBController.java | 6 +- src/application/Main.java | 26 +--- src/application/MainWindowController.java | 125 ++++++++++--------- 7 files changed, 69 insertions(+), 88 deletions(-) diff --git a/bin/application/DBController.class b/bin/application/DBController.class index d06754a68031ebe6f8dcf595daeab14b7737aeed..bc292fe88e5e15674931ffd9e14634d113c57165 100644 GIT binary patch delta 40 ucmdmEwa02h4m(?7iUAO8E@Ic`!- z7o1VW=Z15ddGrcvf&jKRaX8rcvf&jKRaX2QIMxCHzN-mk diff --git a/bin/application/MainWindowController.class b/bin/application/MainWindowController.class index 95db9261affce4c0fd2336b2e06bedf9f81c9401..d696c4f24d5ecb1ddf7447d7545a838488fa0c6c 100644 GIT binary patch literal 25557 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 literal 24855 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 { - mwc.updateTimeLabel(); //update time + mwc.updateTimeLabel(); // update time })); timeline.setCycleCount(Animation.INDEFINITE); timeline.play(); diff --git a/src/application/MainWindowController.java b/src/application/MainWindowController.java index a1e0f00..81dfb64 100644 --- a/src/application/MainWindowController.java +++ b/src/application/MainWindowController.java @@ -2,11 +2,7 @@ package application; import javafx.fxml.FXML; import javafx.geometry.Insets; -import javafx.scene.Node; -import javafx.scene.control.Alert; -import javafx.scene.control.Alert.AlertType; import javafx.scene.control.Button; -import javafx.scene.control.ButtonBar.ButtonData; import javafx.scene.control.ButtonType; import javafx.scene.control.Dialog; import javafx.scene.control.TreeTableColumn; @@ -16,46 +12,29 @@ import javafx.scene.control.TreeItem; import javafx.scene.control.TitledPane; import javafx.scene.control.Tooltip; import javafx.scene.control.ChoiceBox; -import java.awt.Desktop; import java.awt.Toolkit; import java.awt.datatransfer.Clipboard; -import java.awt.datatransfer.StringSelection; -import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.net.URI; -import java.net.URISyntaxException; -import java.sql.DriverManager; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; -import java.util.Optional; import java.util.Properties; -import java.util.Timer; -import java.util.TimerTask; - -import javax.security.auth.callback.Callback; -import javax.swing.plaf.basic.BasicInternalFrameTitlePane.TitlePaneLayout; -import javafx.application.Platform; import javafx.beans.value.ChangeListener; import javafx.beans.value.ObservableValue; import javafx.collections.FXCollections; import javafx.collections.ObservableList; import javafx.event.ActionEvent; import javafx.scene.control.Label; -import javafx.scene.control.ListCell; -import javafx.scene.control.ListView; -import javafx.scene.control.PasswordField; import javafx.scene.layout.AnchorPane; import javafx.scene.layout.GridPane; import javafx.util.Pair; public class MainWindowController { - private static final String String = null; Toolkit toolkit = Toolkit.getDefaultToolkit(); @@ -273,6 +252,7 @@ public class MainWindowController @FXML private TextField tftNewDBName; + @SuppressWarnings("unused") private Main main; private DBController dbc; @@ -285,10 +265,8 @@ public class MainWindowController private String selectedColorName; private String databaseName; - - private boolean lockState = false; - + private boolean lockState = false; @FXML TreeItem rootCurrentJob = new TreeItem<>( @@ -311,7 +289,7 @@ public class MainWindowController Dialog> dialog = new Dialog<>(); dialog.setTitle("Über jFxKasse"); dialog.setHeaderText( - "Informationen und Lizenzen - Version 0.9 - Techdemo"); + "Informationen und Lizenzen - Version 0.9.1 - Techdemo"); dialog.getDialogPane().getButtonTypes().addAll(ButtonType.OK); @@ -320,11 +298,16 @@ public class MainWindowController grid.setVgap(10); grid.setPadding(new Insets(20, 150, 10, 10)); - grid.add(new Label("Datenbank: sqlite.org - Public Domain" - + " \nUI Design: eclipse.org/efxclipse/install.html - Eclipse Public License 1.0" - + " \nUI - Datenbank Integration: basierend auf Project-HomeFlix - github.com/Seil0/Project-HomeFlix - GPLv3 \n" - + " \nMaintainer: hendrik.schutter@coptersicht.de" - + " \n(c) 2018 Hendrik Schutter"), 0, 0); + grid.add(new Label( + "Einfaches Kassensystem für kleine bis mittel große Veranstaltungen mit Bon-Drucker\n" + + "\nUnter Lizenz GPL-3.0 abrufbar auf https://github.com/Windoofs/jFxKasse\n" + + "\nDatenbank: sqlite.org - Public Domain" + + " \nUI Design01: eclipse.org/efxclipse/install.html - Eclipse Public License 1.0" + + " \nUI Design02: http://www.jfoenix.com/ - Apache License 2.0" + + " \nUI - Datenbank Integration: basierend auf Project-HomeFlix - github.com/Seil0/Project-HomeFlix - GPLv3 \n" + + " \nMaintainer: hendrik.schutter@coptersicht.de" + + " \n(c) 2018 Hendrik Schutter"), + 0, 0); dialog.getDialogPane().setContent(grid); // Setzt die GridPane auf die dialog.setResizable(true); // DialogPane @@ -407,16 +390,15 @@ public class MainWindowController public void btnLockAction(ActionEvent event) { lockState = !lockState; - + blockUI(lockState); - - - if(lockState) { + + if (lockState) { btnLock.setText("Kasse entsperren"); - }else { + } else { btnLock.setText("Kasse sperren"); } - + } @FXML @@ -685,6 +667,20 @@ public class MainWindowController } }); + final Tooltip tooltipName = new Tooltip(); + tooltipName.setText("Name der neuen Position"); + tooltipName.setStyle("-fx-font: normal bold 20 Cantarell; " + + "-fx-base: #AE3522; " + "-fx-text-fill: orange;"); + tftNewPosition.setTooltip(tooltipName); + + final Tooltip tooltipValue = new Tooltip(); + tooltipValue + .setText("Preis der neuen Position.\nPunkt als Trennzeichen!"); + tooltipValue.setStyle("-fx-font: normal bold 20 Cantarell; " + + "-fx-base: #AE3522; " + "-fx-text-fill: orange;"); + tftNewValue.setTooltip(tooltipValue); + labelNewValue.setTooltip(tooltipValue); + } public void setMain(Main main, DBController dbc) @@ -762,7 +758,7 @@ public class MainWindowController { switch (pColorName) { case "Rot": - return "#FF0000"; + return "#ad0000"; case "Orange": return "#FF4500"; case "Braun": @@ -786,7 +782,7 @@ public class MainWindowController private String getColorNames(String pColorCode) { switch (pColorCode) { - case "#FF0000": + case "#ad0000": return "Rot"; case "#FF4500": return "Orange"; @@ -794,7 +790,7 @@ public class MainWindowController return "Braun"; case "#FAF0E6": return "Weiß"; - case "#FFD700b": + case "#FFD700": return "Gelb"; case "#556B2F": return "Gr\u00fcn"; @@ -811,7 +807,7 @@ public class MainWindowController private Integer getColorID(String pColorCode) { switch (pColorCode) { - case "#FF0000": + case "#ad0000": return 0; case "#FF4500": return 1; @@ -819,7 +815,7 @@ public class MainWindowController return 2; case "#FAF0E6": return 3; - case "#FFD700b": + case "#FFD700": return 4; case "#556B2F": return 5; @@ -843,10 +839,10 @@ public class MainWindowController btnSaveEntry.setDisable(pState); btnCancelJob.setDisable(pState); - for(int i = 0; i < 25; i++) { + for (int i = 0; i < 25; i++) { getButtonByID(i).setDisable(pState); } - + tftNewPosition.setDisable(pState); tftNewValue.setDisable(pState); colorChoise.setDisable(pState); @@ -865,28 +861,34 @@ public class MainWindowController { for (int i = 0; i < 25; i++) { - - getButtonByID(i).setText(dbc.getName(i+1)); - getButtonByID(i).setStyle("-fx-background-color: "+ dbc.getColor(i+1) +";"); - + + getButtonByID(i).setText(dbc.getName(i + 1)); + + if ((getColorID(dbc.getColor(i + 1)) == 0) + || (getColorID(dbc.getColor(i + 1)) == 7)) { + getButtonByID(i).setStyle("-fx-background-color: " + + dbc.getColor(i + 1) + "; -fx-text-fill: white;"); + } else { + getButtonByID(i).setStyle("-fx-background-color: " + + dbc.getColor(i + 1) + "; -fx-text-fill: black;"); + } + } - + for (int i = 0; i < 25; i++) { - - if(dbc.getName(i+1).equals("Noch frei")) { + + if (dbc.getName(i + 1).equals("Noch frei")) { getButtonByID(i).setVisible(false); - }else { + } else { getButtonByID(i).setVisible(true); } - - + } - - - + } - - public Button getButtonByID(int pID) { + + public Button getButtonByID(int pID) + { switch (pID) { case 0: return gridButton01; @@ -942,9 +944,10 @@ public class MainWindowController return gridButton01; } } - - public void updateTimeLabel () { - //System.out.println(getSystemTime()); + + public void updateTimeLabel() + { + // System.out.println(getSystemTime()); labelTime.setText("Uhrzeit: " + getSystemTime()); }