From 874c9e2d4fecd07265cdc11674d4db5d35914266 Mon Sep 17 00:00:00 2001
From: tobias <thinkdifferent055@gmail.com>
Date: Thu, 21 Mar 2019 13:16:36 +0100
Subject: [PATCH] Fix page duplication on cancel, change page rename dialog
header
---
.../layout/desktop/DesktopPageEditButtonView.java | 9 +++++++--
PlayWall/src/main/resources/lang/_de.properties | 2 +-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/DesktopPageEditButtonView.java b/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/DesktopPageEditButtonView.java
index 39bde41d..ed22b64f 100644
--- a/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/DesktopPageEditButtonView.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/DesktopPageEditButtonView.java
@@ -111,7 +111,11 @@ public class DesktopPageEditButtonView extends HBox implements EventHandler<Acti
Page clone = page.clone();
// Show Rename dialog for cloned page
- showPageNameDialog(clone);
+ boolean success = showPageNameDialog(clone);
+
+ if (!success) {
+ return;
+ }
Project project = page.getProject();
project.addPage(clone);
@@ -146,7 +150,7 @@ public class DesktopPageEditButtonView extends HBox implements EventHandler<Acti
}
}
- private void showPageNameDialog(Page page) {
+ private boolean showPageNameDialog(Page page) {
TextInputDialog dialog = new TextInputDialog(page.getName());
dialog.setHeaderText(Localization.getString(Strings.UI_Dialog_Page_Name_Header));
@@ -158,6 +162,7 @@ public class DesktopPageEditButtonView extends HBox implements EventHandler<Acti
Optional<String> result = dialog.showAndWait();
result.ifPresent(page::setName);
+ return result.isPresent();
}
}
diff --git a/PlayWall/src/main/resources/lang/_de.properties b/PlayWall/src/main/resources/lang/_de.properties
index 1a0820b4..d748a318 100755
--- a/PlayWall/src/main/resources/lang/_de.properties
+++ b/PlayWall/src/main/resources/lang/_de.properties
@@ -231,7 +231,7 @@ Search.Alert.NoMatches=Keine Treffer gefunden.
UI.Dialog.Page.Delete.Header=Seite l\u00F6schen
UI.Dialog.Page.Delete.Content=M\u00F6chten Sie die Seite unwiederbringlich l\u00F6schen?
# UI - Dialog - Name - Delete
-UI.Dialog.Page.Name.Header=Seite umbenennen
+UI.Dialog.Page.Name.Header=Name der Seite
UI.Dialog.Page.Name.Content=Geben Sie einen Namen f\u00FCr die Seite ein.
# UI - Dialog - PathMatch
UI.Dialog.PathMatch.Status={} fehlende Pfade
--
GitLab