Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
BudgetMaster
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD 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
Robert Goldmann
BudgetMaster
Commits
58772f72
Commit
58772f72
authored
Apr 22, 2017
by
Robert Goldmann
Browse files
Options
Downloads
Patches
Plain Diff
typo, swapped buttons in ColorPickerGUI
parent
d082f087
No related branches found
No related tags found
2 merge requests
!104
merge v_1_2_0 into master
,
!100
merge charts into v_1_2_0
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/de/deadlocker8/budgetmaster/ui/cells/PaymentCell.java
+4
-4
4 additions, 4 deletions
src/de/deadlocker8/budgetmaster/ui/cells/PaymentCell.java
src/de/deadlocker8/budgetmaster/ui/colorPick/ColorPickGUI.fxml
+2
-2
2 additions, 2 deletions
...e/deadlocker8/budgetmaster/ui/colorPick/ColorPickGUI.fxml
with
6 additions
and
6 deletions
src/de/deadlocker8/budgetmaster/ui/cells/PaymentCell.java
+
4
−
4
View file @
58772f72
...
@@ -150,17 +150,17 @@ public class PaymentCell extends ListCell<Payment>
...
@@ -150,17 +150,17 @@ public class PaymentCell extends ListCell<Payment>
Alert
alert
=
new
Alert
(
Alert
.
AlertType
.
CONFIRMATION
);
Alert
alert
=
new
Alert
(
Alert
.
AlertType
.
CONFIRMATION
);
alert
.
setTitle
(
"Zahlung löschen"
);
alert
.
setTitle
(
"Zahlung löschen"
);
alert
.
setHeaderText
(
""
);
alert
.
setHeaderText
(
""
);
alert
.
setContentText
(
"Diese Zahlung wirklich unwi
e
derruflich löschen?"
);
alert
.
setContentText
(
"Diese Zahlung wirklich unwiderruflich löschen?"
);
Stage
dialogStage
=
(
Stage
)
alert
.
getDialogPane
().
getScene
().
getWindow
();
Stage
dialogStage
=
(
Stage
)
alert
.
getDialogPane
().
getScene
().
getWindow
();
dialogStage
.
getIcons
().
add
(
paymentController
.
getController
().
getIcon
());
dialogStage
.
getIcons
().
add
(
paymentController
.
getController
().
getIcon
());
dialogStage
.
centerOnScreen
();
dialogStage
.
centerOnScreen
();
if
(
item
instanceof
RepeatingPaymentEntry
)
if
(
item
instanceof
RepeatingPaymentEntry
)
{
{
alert
.
setContentText
(
"Es handelt sich um eine wiederkehrende Zahlung. W
i
e soll gelöscht werden?"
);
alert
.
setContentText
(
"Es handelt sich um eine wiederkehrende Zahlung. We
lche Zahlungen
soll
en
gelöscht werden?"
);
ButtonType
buttonTypeOne
=
new
ButtonType
(
"
Komplett löschen
"
);
ButtonType
buttonTypeOne
=
new
ButtonType
(
"
Alle
"
);
ButtonType
buttonTypeTwo
=
new
ButtonType
(
"Alle zukünftigen
Löschen
"
);
ButtonType
buttonTypeTwo
=
new
ButtonType
(
"Alle zukünftigen"
);
ButtonType
buttonTypeCancel
=
new
ButtonType
(
"Abbrechen"
,
ButtonData
.
CANCEL_CLOSE
);
ButtonType
buttonTypeCancel
=
new
ButtonType
(
"Abbrechen"
,
ButtonData
.
CANCEL_CLOSE
);
alert
.
getButtonTypes
().
setAll
(
buttonTypeOne
,
buttonTypeTwo
,
buttonTypeCancel
);
alert
.
getButtonTypes
().
setAll
(
buttonTypeOne
,
buttonTypeTwo
,
buttonTypeCancel
);
...
...
This diff is collapsed.
Click to expand it.
src/de/deadlocker8/budgetmaster/ui/colorPick/ColorPickGUI.fxml
+
2
−
2
View file @
58772f72
...
@@ -90,12 +90,12 @@
...
@@ -90,12 +90,12 @@
</HBox>
</HBox>
<HBox
alignment=
"BOTTOM_CENTER"
prefHeight=
"0.0"
prefWidth=
"299.0"
spacing=
"25.0"
VBox.vgrow=
"ALWAYS"
>
<HBox
alignment=
"BOTTOM_CENTER"
prefHeight=
"0.0"
prefWidth=
"299.0"
spacing=
"25.0"
VBox.vgrow=
"ALWAYS"
>
<children>
<children>
<Button
fx:id=
"button
Save
"
mnemonicParsing=
"false"
onAction=
"#
save
"
text=
"
Spei
che
r
n"
>
<Button
fx:id=
"button
Cancel
"
mnemonicParsing=
"false"
onAction=
"#
cancel
"
text=
"
Abbre
chen"
>
<font>
<font>
<Font
name=
"System Bold"
size=
"14.0"
/>
<Font
name=
"System Bold"
size=
"14.0"
/>
</font>
</font>
</Button>
</Button>
<Button
fx:id=
"button
Cancel
"
mnemonicParsing=
"false"
onAction=
"#
cancel
"
text=
"
Abbre
chen"
>
<Button
fx:id=
"button
Save
"
mnemonicParsing=
"false"
onAction=
"#
save
"
text=
"
Spei
che
r
n"
>
<font>
<font>
<Font
name=
"System Bold"
size=
"14.0"
/>
<Font
name=
"System Bold"
size=
"14.0"
/>
</font>
</font>
...
...
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