[feat] Log Fenster

pom.xml

@@ -86,7 +86,7 @@
     <dependency>
       <groupId>com.github.weichware10</groupId>
       <artifactId>util</artifactId>
-      <version>v1.1</version>
+      <version>c2f1b79</version>
     </dependency>
   </dependencies>
 

src/main/java/github/weichware10/toolbox/Main.java

@@ -2,8 +2,9 @@
 
 import github.weichware10.toolbox.gui.App;
 import github.weichware10.toolbox.gui.dialogs.ConfirmDialog;
+import github.weichware10.toolbox.gui.util.Log;
+import github.weichware10.util.Logger;
 import io.github.cdimascio.dotenv.Dotenv;
-import java.io.PrintStream;
 import javafx.application.Application;
 import javafx.geometry.Rectangle2D;
 import javafx.scene.image.Image;
@@ -26,12 +27,7 @@ public static void main(String[] args) {
         // in Datei und Konsole loggen
         String logfile = String.format(
                 Dotenv.load().get("LOGS") + "/%s.log", DateTime.now().toString("yMMdd-HHmmss"));
-        Console.setLogfile(logfile);
-        Console.setOut(System.out);
-        PrintStream ps = new PrintStream(new Console(), true);
-        System.setOut(ps);
-        System.setErr(ps);
-
+        Logger.setLogfile(logfile);
         launch(args);
     }
 
@@ -43,6 +39,8 @@ public static void main(String[] args) {
     @Override
     public void start(Stage primaryStage) {
 
+        Log.start();
+
         // ICON und TITLE
         primaryStage.getIcons().add(new Image("app-icon.png"));
 
@@ -77,5 +75,6 @@ private void closeRequestFilter(WindowEvent event) {
         if (!confirmation) {
             event.consume();
         }
+        Log.close();
     }
 }

src/main/java/github/weichware10/toolbox/gui/App.java

@@ -1,7 +1,6 @@
 package github.weichware10.toolbox.gui;
 
 import github.weichware10.toolbox.gui.dialogs.DataBaseDialog;
-import github.weichware10.toolbox.gui.dialogs.LogDialog;
 import github.weichware10.util.Logger;
 import github.weichware10.util.config.CodeChartsConfiguration;
 import github.weichware10.util.config.ConfigClient;
@@ -149,15 +148,17 @@ protected void createZoomMapsTestTrial(TextField trialIdInput) {
         }
 
         ZoomMapsConfiguration zoomMapsConfiguration = new ZoomMapsConfiguration(
-                4.2f,
-                true,
-                Arrays.asList(
-                        "https://media.discordapp.net/attachments/707505654218358818/836645130417078282/TBY5IslL.png",
-                        "url2", "url3"));
+                4.2,
+                600,
+                600,
+                true);
 
         createTestTrial(new Configuration(
                 "dunno yet",
                 "Test Question?",
+                "https://media.discordapp.net/attachments/707505654218358818/927231793348894822/iu.png",
+                "I wish you a warm welcome to a wonderful ZoomMaps Trial",
+                "Thank you for partaking in this Trial!",
                 zoomMapsConfiguration),
                 trialIdInput);
     }
@@ -178,14 +179,14 @@ protected void createCodeChartsTestTrial(TextField trialIdInput) {
                 Arrays.asList("string1", "string2"),
                 new int[] { 10, 10 },
                 new long[] { 100, 100 },
-                true,
-                Arrays.asList(
-                        "https://media.discordapp.net/attachments/707505654218358818/836645130417078282/TBY5IslL.png",
-                        "url2", "url3"));
+                true);
 
         createTestTrial(new Configuration(
                 "dunno yet",
                 "Test Question?",
+                "https://media.discordapp.net/attachments/707505654218358818/836645130417078282/TBY5IslL.png",
+                "Welcome to this magnificent CodeCharts Trial",
+                "Thanks for participating in this extraordinary CodeCharts Trial!",
                 codeChartsConfiguration),
                 trialIdInput);
     }
@@ -278,9 +279,4 @@ private void setPermissionAccess() {
         controller.setAdminMenuVisibile(false);
         controller.setTrialInputDisable(false);
     }
-
-    protected void showLogs() {
-        new LogDialog();
-    }
-
 }

src/main/java/github/weichware10/toolbox/gui/AppController.java

@@ -1,9 +1,12 @@
 package github.weichware10.toolbox.gui;
 
+import github.weichware10.toolbox.gui.util.Log;
 import github.weichware10.util.Logger;
+import javafx.beans.value.ObservableBooleanValue;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.Menu;
+import javafx.scene.control.MenuItem;
 import javafx.scene.control.TextField;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
@@ -24,6 +27,8 @@ public class AppController {
     private TextField trialIdField;
     @FXML
     private Text warnText;
+    @FXML
+    private MenuItem logsMenu;
 
     protected void setApp(App app) {
         this.app = app;
@@ -98,9 +103,21 @@ void createCodeChartsTestTrial() {
     }
 
     @FXML
-    void showLogs() {
-        Logger.info("app:menu Showing logs");
-        app.showLogs();
+    void toggleLogs() {
+        Logger.info("app:menu Toggling logs");
+        if (Log.visible.get()) {
+            Log.hide();
+        } else {
+            Log.show();
+        }
+    }
+
+    void setLogText(ObservableBooleanValue visible) {
+        if (visible.get()) {
+            logsMenu.setText("hide logs");
+        } else {
+            logsMenu.setText("show logs");
+        }
     }
 
     @FXML
@@ -113,6 +130,10 @@ void initialize() {
                 : "fx:id=\"adminMenu\" not injected: check 'App.fxml'.";
         assert startButton != null
                 : "fx:id=\"startButton\" not injected: check 'App.fxml'.";
+        assert logsMenu != null
+                : "fx:id=\"logsMenu\" not injected: check 'App.fxml'.";
+
+        Log.visible.addListener(obs -> setLogText((ObservableBooleanValue) obs));
     }
 
 }

src/main/java/github/weichware10/toolbox/gui/End.java

@@ -1,5 +1,6 @@
 package github.weichware10.toolbox.gui;
 
+import github.weichware10.toolbox.gui.util.Log;
 import github.weichware10.util.Logger;
 import github.weichware10.util.data.TrialData;
 import github.weichware10.util.db.DataBaseClient;
@@ -52,6 +53,7 @@ public End(Stage primaryStage, DataBaseClient dataBaseClient, TrialData trialDat
      */
     protected void closeProgramm() {
         primaryStage.close();
+        Log.close();
     }
 
     /**