From 5244a615ca4aa3bdd93f8d14b9f89d6d24ce7523 Mon Sep 17 00:00:00 2001 From: hendrik Date: Sat, 31 Mar 2018 23:50:17 +0200 Subject: [PATCH] dbcontroller and mainwindowcontroller changes --- bin/application/DBController$1.class | Bin 1035 -> 1035 bytes bin/application/DBController.class | Bin 9333 -> 9784 bytes bin/application/Main.class | Bin 3431 -> 3317 bytes bin/application/MainWindow.fxml | 32 +++++ bin/application/MainWindowController.class | Bin 16215 -> 15035 bytes src/application/DBController.java | 60 ++++++---- src/application/Main.java | 29 +++-- src/application/MainWindow.fxml | 32 +++++ src/application/MainWindowController.java | 132 +++++++++++++++++---- 9 files changed, 228 insertions(+), 57 deletions(-) diff --git a/bin/application/DBController$1.class b/bin/application/DBController$1.class index 7674412fb095d17872b27cfda1ce6346cc8e412e..0df6e18dca0c46da0c35b19273a372443c2337a8 100644 GIT binary patch delta 43 ycmeC?=;qj<#LQ?nS(&*>(uqNm!I?po!G*zu!Ii;^!JWa5!Gpnx!E5q9W?ulhp$J0& delta 43 ycmeC?=;qj<#LVb4S(&*>(v3lq!JR>s!Gpns!IQy?!JEO3!H2<#!Ef?DW?ulk2?%2V diff --git a/bin/application/DBController.class b/bin/application/DBController.class index f8dc48144644e24c9d41db9ad6e95fe7486d8987..9046e42a5f36453c6b9272a972179bf61a50d071 100644 GIT binary patch literal 9784 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 literal 9333 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 diff --git a/bin/application/MainWindow.fxml b/bin/application/MainWindow.fxml index 4639820..386de26 100644 --- a/bin/application/MainWindow.fxml +++ b/bin/application/MainWindow.fxml @@ -26,6 +26,38 @@ + + + + + + + + diff --git a/bin/application/MainWindowController.class b/bin/application/MainWindowController.class index d81d294cda52ce0dc71b8df950a0543cd336f2a0..0f36ac7560ee7e2345b027b104405f6e94758498 100644 GIT binary patch literal 15035 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

n~rp62n#`TmJa z<^_}@{zbcx$>4Vq7$8Loky_I7CY8NBAekBxH8%r$5UKK_uvl!K`IH0#`&|oWBgRtI6sZ7_zPqF zrSAF_S^o02hKJDYCc>^1gA~*((lwiA<5{B((E{yiwX~bPFY=ZSQVoBNzmA1!P#gFL zZbFR~K+&$fu>7V4tuW9fZ){PTe!Is`Jv4fhHHmGZw;0o zN@1p)fry7O4Hz#@n1m|SY4;XPo|d1C-(q=_FT>VL`d=kR{Nm*0KMealsu0}DN>zSi zs`x)@V_1I6G^?3f%a9}BQ&6$pp-UB*W-C3+Ba!gxMcTjU7WpO`#;TgO`2PT2lhSzr literal 16215 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 erster Start System.out.println("keine XML gefunden!"); if (System.getProperty("os.name").equals("Linux")) { File dir = new File( - System.getProperty("user.home") + "/bin/PWMaster"); // Erstellt + System.getProperty("user.home") + "/bin/jFxKasse"); // Erstellt // den // Unterordner dir.mkdir(); // Erstellt den Unterordner } else { - File dir = new File("C:/ProgramData/PWMaster/"); // Erstellt den + File dir = new File("C:/ProgramData/jFxKasse/"); // Erstellt den // Unterordner dir.mkdir(); // Erstellt den Unterordner } - mwc.saveSettings(schluesselNutzer, "dd"); // speichert das Passwort und + // mwc.saveSettings(mwc.getDatabaseName(), "dd"); // speichert das Passwort und // den Individueller // Schlüssel für die API in // der XML - dbc.verbindeDatenbank(); // Verbindet mit der Datenbank-Datei - dbc.erstelleDatenbank(); // Neue Datenbank-Datei wird erstellt - System.exit(0); // Programm wird beendet + //dbc.verbindeDatenbank(); // Verbindet mit der Datenbank-Datei + //dbc.erstelleDatenbank(); // Neue Datenbank-Datei wird erstellt + //System.exit(0); // Programm wird beendet } } diff --git a/src/application/MainWindow.fxml b/src/application/MainWindow.fxml index 4639820..386de26 100644 --- a/src/application/MainWindow.fxml +++ b/src/application/MainWindow.fxml @@ -26,6 +26,38 @@ + + + + + + + + diff --git a/src/application/MainWindowController.java b/src/application/MainWindowController.java index f185b20..2cc5d6f 100644 --- a/src/application/MainWindowController.java +++ b/src/application/MainWindowController.java @@ -14,7 +14,11 @@ import javafx.scene.control.TreeTableView; import javafx.scene.control.TextField; import javafx.scene.control.TreeItem; import javafx.scene.control.TitledPane; +import javafx.scene.control.Tooltip; + import com.jfoenix.controls.JFXColorPicker; +//import com.sun.java.swing.action.NewAction; + import java.awt.Desktop; import java.awt.Toolkit; import java.awt.datatransfer.Clipboard; @@ -51,6 +55,9 @@ public class MainWindowController @FXML private AnchorPane mainAnchorpane; + @FXML + private AnchorPane paneDB; + @FXML private TreeTableView tableCurrentOrder; @@ -207,6 +214,12 @@ public class MainWindowController @FXML private Button btnClearEntry; + @FXML + private Button btnCreateNewDatabase; + + @FXML + private Button btnOpenFolder; + @FXML private Label labelAllPrize; @@ -234,6 +247,12 @@ public class MainWindowController @FXML private Label lableNewColor; + @FXML + private Label labelDBStatus; + + @FXML + private Label labelDBName; + @FXML private TitledPane titlePaneStats; @@ -243,6 +262,9 @@ public class MainWindowController @FXML private TextField tftNewValue; + @FXML + private TextField tftNewDBName; + @FXML private JFXColorPicker colorChooser; @@ -250,14 +272,13 @@ public class MainWindowController private DBController dbc; - // Pfad wo die XML liegt - private String filepathXMLWin = "C:/ProgramData/PWMaster/config.xml"; - private String filepathXMLLinux = System.getProperty("user.home") - + "/bin/PWMaster/config.xml"; // Pfad wo die XML liegt + + "/bin/jFxKasse/config.xml"; // Pfad wo die XML liegt private int id; + private String databaseName; + @FXML TreeItem root = new TreeItem<>(new tableData(0, "0", "0")); @@ -270,7 +291,8 @@ public class MainWindowController // Erstellt einen Dialog Dialog> dialog = new Dialog<>(); dialog.setTitle("Über jFxKasse"); - dialog.setHeaderText("Informationen und Lizenzen - Version 0.7 - UI Techdemo"); + dialog.setHeaderText( + "Informationen und Lizenzen - Version 0.7 - UI Techdemo"); // Erzeugt den Button dialog.getDialogPane().getButtonTypes().addAll(ButtonType.OK); @@ -288,10 +310,42 @@ public class MainWindowController + " \n(c) 2018 Hendrik Schutter"), 0, 0); dialog.getDialogPane().setContent(grid); // Setzt die GridPane auf die - dialog.setResizable(true); // DialogPane + dialog.setResizable(true); // DialogPane dialog.showAndWait(); } + @FXML + public void btnOpenFolderAction(ActionEvent event) throws IOException + { + Runtime.getRuntime().exec("xdg-open " + System.getProperty("user.home") + "/bin/jFxKasse" ); + + } + + @FXML + public void btnCreateNewDatabaseAction(ActionEvent event) throws Exception + { + System.out.println("Button!"); + + System.out.println(tftNewDBName.getText()); + + setDatabaseName(tftNewDBName.getText()); + dbc.dbname = getDatabaseName(); + dbc.verbindeDatenbank(); // Verbindet mit der Datenbank-Datei + dbc.erstelleTabellePositionen(); + dbc.erstelleTabelleJobs(); + + try { + saveSettings(getDatabaseName()); + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + setDBLabel(); + initUI(); // Startet die UI + + } + @FXML public void btnSaveEntryAction(ActionEvent event) { @@ -507,11 +561,16 @@ public class MainWindowController public void initUI() { + System.out.println("initUI"); + + tftNewDBName.setText(getDatabaseName()); + tableCurrentOrder.setRoot(root); tableCurrentOrder.setShowRoot(false); tableCurrentOrder.setEditable(false); // Setzt die Textfelder + /* idSpalte01.setCellValueFactory( cellData -> cellData.getValue().getValue().idProperty().asObject()); columnQuantity.setCellValueFactory( @@ -547,6 +606,8 @@ public class MainWindowController } } }); + + */ } public void setMain(Main main, DBController dbc) @@ -564,21 +625,16 @@ public class MainWindowController return heutigesDatum; } - public void saveSettings(String schluessel, String base32Secret) - throws Exception + public void saveSettings(String databasename) throws Exception { OutputStream outputStream; // new output-stream try { - // props.setProperty("key", crypo.verschluesseln(schluessel, - // crypo.getProgrammSchluessel())); //writes path into property - // props.setProperty("TOTPkey", crypo.verschluesseln(base32Secret, - // crypo.getProgrammSchluessel())); //writes path into property - if (System.getProperty("os.name").equals("Linux")) { + props.setProperty("databasename", databasename); // writes dbname into + // property + outputStream = new FileOutputStream(filepathXMLLinux); - } else { - outputStream = new FileOutputStream(filepathXMLWin); - } - props.storeToXML(outputStream, "PWMaster settings"); // writes new .xml + + props.storeToXML(outputStream, "jFxKasse settings"); // writes new .xml outputStream.close(); } catch (IOException e) { } @@ -588,13 +644,12 @@ public class MainWindowController { // Ladt die Daten aus der XML InputStream inputStream; try { - if (System.getProperty("os.name").equals("Linux")) { + inputStream = new FileInputStream(filepathXMLLinux); - } else { - inputStream = new FileInputStream(filepathXMLWin); - } + props.loadFromXML(inputStream); - // schluessel = crypo.entschluesseln(props.getProperty("key"), + setDatabaseName(props.getProperty("databasename")); + // = crypo.entschluesseln(props.getProperty("key"), // crypo.getProgrammSchluessel()); //liest schluessel von property // base32Secret = crypo.entschluesseln(props.getProperty("TOTPkey"), // crypo.getProgrammSchluessel()); //liest schluessel von property @@ -611,10 +666,35 @@ public class MainWindowController dbc.verbindeDatenbank(); } - public void erzeugeDB() - { // Erzeuge die Datenbank - dbc.erstelleDatenbank(); - dbc.verbindeDatenbank(); + + + public String getDatabaseName() + { + return databaseName; + } + + public void setDatabaseName(String NewDatabaseName) + { + databaseName = NewDatabaseName; + } + + public void setDBLabel() throws Exception + { + if (loadSettings() == true) { + labelDBStatus + .setText("Geladene Datenbank: " + getDatabaseName() + ".db"); + btnCreateNewDatabase.setDisable(true); + tftNewDBName.setDisable(true); + labelDBName.setTooltip(new Tooltip( + "Um eine neue Datenbank zu erzeugen muss die vorherige config.xml und " + + getDatabaseName() + ".db gelöscht werden! Anwendung danach neustarten!")); + labelDBStatus.setTooltip(new Tooltip( + "Um eine neue Datenbank zu erzeugen muss die vorherige config.xml und " + + getDatabaseName() + ".db gelöscht werden! Anwendung danach neustarten!")); + } else { + labelDBStatus.setText("Keine Datenbank gefunden!"); + } + } }