Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
PlayWallDesktop
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
PlayWall
PlayWallDesktop
Commits
874c9e2d
Commit
874c9e2d
authored
6 years ago
by
Tobias Ullerich
Browse files
Options
Downloads
Patches
Plain Diff
Fix page duplication on cancel, change page rename dialog header
parent
a4da4b9b
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
PlayWall/src/main/java/de/tobias/playpad/layout/desktop/DesktopPageEditButtonView.java
+7
-2
7 additions, 2 deletions
...ias/playpad/layout/desktop/DesktopPageEditButtonView.java
PlayWall/src/main/resources/lang/_de.properties
+1
-1
1 addition, 1 deletion
PlayWall/src/main/resources/lang/_de.properties
with
8 additions
and
3 deletions
PlayWall/src/main/java/de/tobias/playpad/layout/desktop/DesktopPageEditButtonView.java
+
7
−
2
View file @
874c9e2d
...
@@ -111,7 +111,11 @@ public class DesktopPageEditButtonView extends HBox implements EventHandler<Acti
...
@@ -111,7 +111,11 @@ public class DesktopPageEditButtonView extends HBox implements EventHandler<Acti
Page
clone
=
page
.
clone
();
Page
clone
=
page
.
clone
();
// Show Rename dialog for cloned page
// Show Rename dialog for cloned page
showPageNameDialog
(
clone
);
boolean
success
=
showPageNameDialog
(
clone
);
if
(!
success
)
{
return
;
}
Project
project
=
page
.
getProject
();
Project
project
=
page
.
getProject
();
project
.
addPage
(
clone
);
project
.
addPage
(
clone
);
...
@@ -146,7 +150,7 @@ public class DesktopPageEditButtonView extends HBox implements EventHandler<Acti
...
@@ -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
());
TextInputDialog
dialog
=
new
TextInputDialog
(
page
.
getName
());
dialog
.
setHeaderText
(
Localization
.
getString
(
Strings
.
UI_Dialog_Page_Name_Header
));
dialog
.
setHeaderText
(
Localization
.
getString
(
Strings
.
UI_Dialog_Page_Name_Header
));
...
@@ -158,6 +162,7 @@ public class DesktopPageEditButtonView extends HBox implements EventHandler<Acti
...
@@ -158,6 +162,7 @@ public class DesktopPageEditButtonView extends HBox implements EventHandler<Acti
Optional
<
String
>
result
=
dialog
.
showAndWait
();
Optional
<
String
>
result
=
dialog
.
showAndWait
();
result
.
ifPresent
(
page:
:
setName
);
result
.
ifPresent
(
page:
:
setName
);
return
result
.
isPresent
();
}
}
}
}
This diff is collapsed.
Click to expand it.
PlayWall/src/main/resources/lang/_de.properties
+
1
−
1
View file @
874c9e2d
...
@@ -231,7 +231,7 @@ Search.Alert.NoMatches=Keine Treffer gefunden.
...
@@ -231,7 +231,7 @@ Search.Alert.NoMatches=Keine Treffer gefunden.
UI.Dialog.Page.Delete.Header
=
Seite l
\u
00F6schen
UI.Dialog.Page.Delete.Header
=
Seite l
\u
00F6schen
UI.Dialog.Page.Delete.Content
=
M
\u
00F6chten Sie die Seite unwiederbringlich l
\u
00F6schen?
UI.Dialog.Page.Delete.Content
=
M
\u
00F6chten Sie die Seite unwiederbringlich l
\u
00F6schen?
# UI - Dialog - Name - Delete
# 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
\u
00FCr die Seite ein.
UI.Dialog.Page.Name.Content
=
Geben Sie einen Namen f
\u
00FCr die Seite ein.
# UI - Dialog - PathMatch
# UI - Dialog - PathMatch
UI.Dialog.PathMatch.Status
=
{} fehlende Pfade
UI.Dialog.PathMatch.Status
=
{} fehlende Pfade
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment