Skip to content

Commit a781629

Browse files
committed
Document dialogs and fix inconsistencies.
1 parent 6c1251d commit a781629

File tree

8 files changed

+269
-69
lines changed

8 files changed

+269
-69
lines changed

UIDL.md

Lines changed: 250 additions & 50 deletions
Large diffs are not rendered by default.

examples/openFile.uidl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ uidl 1
44
window main(title="Open File", width=800, height=600, exitCode=1) {
55
dialog openFile (
66
type="openFile",
7-
confirmText="Open",
8-
dismissText="Go back",
7+
chooseText="Open",
8+
cancelText="Go back",
99
extensions=[".jpg", ".jpeg"],
1010
width=800, height=600,
1111
) {

examples/openFolder.uidl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ uidl 1
44
window main(title="Open Folder", width=800, height=600, exitCode=1) {
55
dialog openFolder (
66
type="openFolder",
7-
confirmText="Open",
8-
dismissText="Cancel",
7+
chooseText="Open",
8+
cancelText="Cancel",
99
width=800, height=600,
1010
) {
1111
action choose(type="group") {

examples/pickColor.uidl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ window main(title="Pick Color", width=500, height=500, exitCode=1) {
55
dialog pickColor (
66
type="pickColor",
77
title="Pick Color",
8-
buttonText="Cancel",
8+
cancelText="Cancel",
99
initialColor="#1f8f2f",
1010
advanced=true,
1111
width=500, height=500,

examples/saveFile.uidl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ uidl 1
44
window main(title="Save File", width=800, height=600, exitCode=1) {
55
dialog saveFile (
66
type="saveFile",
7-
confirmText="Save",
8-
dismissText="Cancel",
7+
chooseText="Save",
8+
cancelText="Cancel",
99
extensions=[".jpg", ".jpeg"],
1010
width=800, height=600,
1111
) {

ui/dialog/color.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func runPickColor(colorDescr ui.AttributesDescr, fullName string, win fyne.Windo
3535
})
3636
picker.Refresh() // update the picker internal UI to prevent nil pointer dereference
3737

38-
value = colorDescr["buttonText"]
38+
value = colorDescr["cancelText"]
3939
if value != nil {
4040
picker.SetDismissText(value.(string))
4141
}

ui/dialog/dialog.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,10 @@ func RegisterAll() error {
140140
Validate: valid.ListValidator(1, math.MaxInt,
141141
valid.StringValidator(2, 0, extensionRegex)),
142142
},
143-
"dismissText": {
143+
"cancelText": {
144144
Validate: valid.StringValidator(1, 0, nil),
145145
},
146-
"confirmText": {
146+
"chooseText": {
147147
Validate: valid.StringValidator(1, 0, nil),
148148
},
149149
"width": {
@@ -177,10 +177,10 @@ func RegisterAll() error {
177177
Validate: valid.ListValidator(1, math.MaxInt,
178178
valid.StringValidator(2, 0, extensionRegex)),
179179
},
180-
"dismissText": {
180+
"cancelText": {
181181
Validate: valid.StringValidator(1, 0, nil),
182182
},
183-
"confirmText": {
183+
"chooseText": {
184184
Validate: valid.StringValidator(1, 0, nil),
185185
},
186186
"width": {
@@ -210,10 +210,10 @@ func RegisterAll() error {
210210
Required: true,
211211
Validate: valid.ExactStringValidator("openFolder"),
212212
},
213-
"dismissText": {
213+
"cancelText": {
214214
Validate: valid.StringValidator(1, 0, nil),
215215
},
216-
"confirmText": {
216+
"chooseText": {
217217
Validate: valid.StringValidator(1, 0, nil),
218218
},
219219
"width": {
@@ -246,7 +246,7 @@ func RegisterAll() error {
246246
"title": {
247247
Validate: valid.StringValidator(1, 0, nil),
248248
},
249-
"buttonText": {
249+
"cancelText": {
250250
Validate: valid.StringValidator(1, 0, nil),
251251
},
252252
"width": {

ui/dialog/file.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,11 @@ func runSaveFile(sfDescr ui.AttributesDescr, fullName string, win fyne.Window, u
8585
sfDialog.SetFilter(storage.NewExtensionFileFilter(ui.AnysToStrings(extAttr)))
8686
}
8787

88-
value := sfDescr["confirmText"]
88+
value := sfDescr["chooseText"]
8989
if value != nil {
9090
sfDialog.SetConfirmText(value.(string))
9191
}
92-
value = sfDescr["dismissText"]
92+
value = sfDescr["cancelText"]
9393
if value != nil {
9494
sfDialog.SetDismissText(value.(string))
9595
}
@@ -129,11 +129,11 @@ func runOpenFolder(ofDescr ui.AttributesDescr, fullName string, win fyne.Window,
129129
callback(true)
130130
}, win)
131131

132-
value := ofDescr["confirmText"]
132+
value := ofDescr["chooseText"]
133133
if value != nil {
134134
ofDialog.SetConfirmText(value.(string))
135135
}
136-
value = ofDescr["dismissText"]
136+
value = ofDescr["cancelText"]
137137
if value != nil {
138138
ofDialog.SetDismissText(value.(string))
139139
}

0 commit comments

Comments
 (0)