From c211b6fa4626ef36504a513961baf69c32ae5432 Mon Sep 17 00:00:00 2001
From: tobias <tobias.ullerich@icloud.com>
Date: Sat, 13 Aug 2016 17:42:46 +0200
Subject: [PATCH] Enable ErrorSummary Feature
---
.../desktop/DesktopMenuToolbarViewController.java | 3 ++-
.../viewcontroller/main/MainViewControllerV2.java | 13 +++++++++----
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java b/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java
index adc1a04d..b6fec8b7 100644
--- a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java
+++ b/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java
@@ -31,6 +31,7 @@ import de.tobias.playpad.settings.keys.KeyCollection;
import de.tobias.playpad.view.HelpMenuItem;
import de.tobias.playpad.view.main.MainLayoutConnect;
import de.tobias.playpad.view.main.MenuType;
+import de.tobias.playpad.viewcontroller.dialog.ErrorSummaryDialog;
import de.tobias.playpad.viewcontroller.dialog.ImportDialog;
import de.tobias.playpad.viewcontroller.dialog.NewProjectDialog;
import de.tobias.playpad.viewcontroller.dialog.PluginViewController;
@@ -453,7 +454,7 @@ public class DesktopMenuToolbarViewController extends BasicMenuToolbarViewContro
@FXML
void errorMenuHandler(ActionEvent event) {
- // TODO Implement
+ ErrorSummaryDialog.getInstance().getStage().show();
}
@FXML
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewControllerV2.java b/PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewControllerV2.java
index 0025fa6d..3fdfc641 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewControllerV2.java
+++ b/PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewControllerV2.java
@@ -31,6 +31,7 @@ import de.tobias.playpad.settings.ProfileSettings;
import de.tobias.playpad.settings.keys.KeyCollection;
import de.tobias.playpad.view.main.MainLayoutConnect;
import de.tobias.playpad.view.main.MainLayoutHandler;
+import de.tobias.playpad.viewcontroller.dialog.ErrorSummaryDialog;
import de.tobias.playpad.viewcontroller.pad.PadDragListener;
import de.tobias.utils.ui.BasicControllerSettings;
import de.tobias.utils.ui.NotificationHandler;
@@ -103,6 +104,9 @@ public class MainViewControllerV2 extends ViewController implements IMainViewCon
super("mainViewV2", "de/tobias/playpad/assets/view/main/", null, PlayPadMain.getUiResourceBundle());
padViews = new ArrayList<>();
+ // Init ErrorSummaryViewController
+ new ErrorSummaryDialog(getStage()); // Instance in ErrorSummaryViewController.getInstance()
+
// Layout Init
layoutActions = new ArrayList<>();
@@ -117,8 +121,7 @@ public class MainViewControllerV2 extends ViewController implements IMainViewCon
reloadSettings(null, Profile.currentProfile());
// Wenn sich die Toolbar ändert werden die Button neu erstellt. Das ist hier, weil es nur einmal als Listener da
- // sein muss. Die
- // Methode wird aber an unterschiedlichen stellen mehrmals aufgerufen
+ // sein muss. Die Methode wird aber an unterschiedlichen stellen mehrmals aufgerufen
performLayoutDependendAction((oldToolbar, newToolbar) ->
{
if (menuToolbarViewController != null)
@@ -272,7 +275,7 @@ public class MainViewControllerV2 extends ViewController implements IMainViewCon
@Override
public boolean closeRequest() {
- // TODO Close Error Window
+ ErrorSummaryDialog.getInstance().getStage().close();
if (Profile.currentProfile() != null) {
ProfileSettings profilSettings = Profile.currentProfile().getProfileSettings();
@@ -386,6 +389,7 @@ public class MainViewControllerV2 extends ViewController implements IMainViewCon
midiHandler.setProject(project);
keyboardHandler.setProject(project);
PadDragListener.setProject(project);
+ ErrorSummaryDialog.getInstance().setProject(openProject);
menuToolbarViewController.setOpenProject(openProject);
@@ -533,7 +537,8 @@ public class MainViewControllerV2 extends ViewController implements IMainViewCon
{
try {
Thread.sleep(PlayPadMain.displayTimeMillis * 2);
- } catch (Exception e) {}
+ } catch (Exception e) {
+ }
Platform.runLater(() ->
{
if (menuToolbarViewController != null)
--
GitLab