Rockbox open source high quality audio player as a Music Player Daemon
mpris
rockbox
mpd
libadwaita
audio
rust
zig
deno
Minor confirm prompt adjustments
* Rename LANG_RESET_ASK to LANG_ARE_YOU_SURE,
so that it matches the actual language string
(translations remain valid), and can be repurposed
for generic confirmation prompts, where the
first line says "Are you sure?", and the second
line reiterates the selected action
* Add "Reset Settings" as second line to the prompt
shown before resetting settings, instead of just
asking "Are you sure?"
* Make Shuffle prompt consistent between WPS and
Playlist Viewer, and ask whether user is sure they
want to Shuffle instead of warning them that the
current playlist will be erased, which was a bit
misleading
* Explicitly say "Cancelled" when user answers NO to
erasing the current playlist or to overwriting a file.
Improves consistency with other prompts that are
displayed for potentially destructive actions, e.g.
before items are deleted, renamed, saved, or reset.
* PictureFlow: Prompt before rebuilding/updating cache
Change-Id: Id8ae36db7187315eb1a374701307e6ab4dcdbd1d
+169
-114
+3
-1
apps/fileop.c
+3
-1
apps/fileop.c
···
510
510
int rc;
511
511
if (file_exists(dst.path)) {
512
512
/* If user chooses not to overwrite, cancel */
513
-
if (!yesno_pop(ID2P(LANG_REALLY_OVERWRITE))) {
513
+
if (!yesno_pop(ID2P(LANG_REALLY_OVERWRITE)))
514
+
{
515
+
splash(HZ, ID2P(LANG_CANCEL));
514
516
return FORC_NOOVERWRT;
515
517
}
516
518
+26
-5
apps/gui/yesno.c
+26
-5
apps/gui/yesno.c
···
368
368
main_message, yes_message, no_message);
369
369
}
370
370
371
-
/* Function to manipulate all yesno dialogues.
372
-
This function needs the prompt text as an argument. */
373
-
bool yesno_pop(const char* text)
371
+
static bool yesno_pop_lines(const char *lines[], int line_cnt)
374
372
{
375
-
const char *lines[]={text};
376
-
const struct text_message message={lines, 1};
373
+
const struct text_message message={lines, line_cnt};
377
374
bool ret = (gui_syncyesno_run(&message,NULL,NULL)== YESNO_YES);
378
375
FOR_NB_SCREENS(i)
379
376
screens[i].clear_viewport();
380
377
return ret;
381
378
}
379
+
380
+
/* YES/NO dialog, uses text parameter as prompt */
381
+
bool yesno_pop(const char* text)
382
+
{
383
+
const char *lines[]= {text};
384
+
return yesno_pop_lines(lines, 1);
385
+
}
386
+
387
+
/* YES/NO dialog, asks "Are you sure?", displays
388
+
text parameter on second line.
389
+
390
+
Says "Cancelled" if answered negatively.
391
+
*/
392
+
bool yesno_pop_confirm(const char* text)
393
+
{
394
+
bool confirmed;
395
+
const char *lines[] = {ID2P(LANG_ARE_YOU_SURE), text};
396
+
confirmed = yesno_pop_lines(lines, 2);
397
+
398
+
if (!confirmed)
399
+
splash(HZ, ID2P(LANG_CANCEL));
400
+
401
+
return confirmed;
402
+
}
+1
apps/gui/yesno.h
+1
apps/gui/yesno.h
+26
-5
apps/hosted/android/yesno.c
+26
-5
apps/hosted/android/yesno.c
···
130
130
131
131
#endif
132
132
133
-
/* Function to manipulate all yesno dialogues.
134
-
This function needs the output text as an argument. */
135
-
bool yesno_pop(const char* text)
133
+
static bool yesno_pop_lines(const char *lines[], int line_cnt)
136
134
{
137
-
const char *lines[]={text};
138
-
const struct text_message message={lines, 1};
135
+
const struct text_message message={lines, line_cnt};
139
136
bool ret = (gui_syncyesno_run(&message,NULL,NULL)== YESNO_YES);
140
137
FOR_NB_SCREENS(i)
141
138
screens[i].clear_viewport();
142
139
return ret;
143
140
}
141
+
142
+
/* YES/NO dialog, uses text parameter as prompt */
143
+
bool yesno_pop(const char* text)
144
+
{
145
+
const char *lines[]= {text};
146
+
return yesno_pop_lines(lines, 1);
147
+
}
148
+
149
+
/* YES/NO dialog, asks "Are you sure?", displays
150
+
text parameter on second line.
151
+
152
+
Says "Cancelled" if answered negatively.
153
+
*/
154
+
bool yesno_pop_confirm(const char* text)
155
+
{
156
+
bool confirmed;
157
+
const char *lines[] = {ID2P(LANG_ARE_YOU_SURE), text};
158
+
confirmed = yesno_pop_lines(lines, 2);
159
+
160
+
if (!confirmed)
161
+
splash(HZ, ID2P(LANG_CANCEL));
162
+
163
+
return confirmed;
164
+
}
+2
-2
apps/lang/arabic.lang
+2
-2
apps/lang/arabic.lang
+2
-2
apps/lang/basque.lang
+2
-2
apps/lang/basque.lang
+2
-2
apps/lang/bulgarian.lang
+2
-2
apps/lang/bulgarian.lang
+2
-2
apps/lang/catala.lang
+2
-2
apps/lang/catala.lang
+2
-2
apps/lang/chinese-simp.lang
+2
-2
apps/lang/chinese-simp.lang
+2
-2
apps/lang/chinese-trad.lang
+2
-2
apps/lang/chinese-trad.lang
+2
-2
apps/lang/czech.lang
+2
-2
apps/lang/czech.lang
+2
-2
apps/lang/dansk.lang
+2
-2
apps/lang/dansk.lang
+2
-2
apps/lang/deutsch.lang
+2
-2
apps/lang/deutsch.lang
+2
-2
apps/lang/english-us.lang
+2
-2
apps/lang/english-us.lang
+2
-2
apps/lang/english.lang
+2
-2
apps/lang/english.lang
+2
-2
apps/lang/espanol.lang
+2
-2
apps/lang/espanol.lang
+2
-2
apps/lang/finnish.lang
+2
-2
apps/lang/finnish.lang
+2
-2
apps/lang/francais.lang
+2
-2
apps/lang/francais.lang
+2
-2
apps/lang/galego.lang
+2
-2
apps/lang/galego.lang
+2
-2
apps/lang/greek.lang
+2
-2
apps/lang/greek.lang
+2
-2
apps/lang/hebrew.lang
+2
-2
apps/lang/hebrew.lang
+2
-2
apps/lang/hrvatski.lang
+2
-2
apps/lang/hrvatski.lang
+2
-2
apps/lang/italiano.lang
+2
-2
apps/lang/italiano.lang
+2
-2
apps/lang/japanese.lang
+2
-2
apps/lang/japanese.lang
+2
-2
apps/lang/korean.lang
+2
-2
apps/lang/korean.lang
+2
-2
apps/lang/latviesu.lang
+2
-2
apps/lang/latviesu.lang
+2
-2
apps/lang/lietuviu.lang
+2
-2
apps/lang/lietuviu.lang
+2
-2
apps/lang/magyar.lang
+2
-2
apps/lang/magyar.lang
+2
-2
apps/lang/moldoveneste.lang
+2
-2
apps/lang/moldoveneste.lang
+2
-2
apps/lang/nederlands.lang
+2
-2
apps/lang/nederlands.lang
+2
-2
apps/lang/norsk-nynorsk.lang
+2
-2
apps/lang/norsk-nynorsk.lang
+2
-2
apps/lang/norsk.lang
+2
-2
apps/lang/norsk.lang
+2
-2
apps/lang/polski.lang
+2
-2
apps/lang/polski.lang
+2
-2
apps/lang/portugues-brasileiro.lang
+2
-2
apps/lang/portugues-brasileiro.lang
+2
-2
apps/lang/portugues.lang
+2
-2
apps/lang/portugues.lang
+2
-2
apps/lang/romaneste.lang
+2
-2
apps/lang/romaneste.lang
+2
-2
apps/lang/russian.lang
+2
-2
apps/lang/russian.lang
+2
-2
apps/lang/slovak.lang
+2
-2
apps/lang/slovak.lang
+2
-2
apps/lang/slovenscina.lang
+2
-2
apps/lang/slovenscina.lang
+2
-2
apps/lang/srpski.lang
+2
-2
apps/lang/srpski.lang
+2
-2
apps/lang/svenska.lang
+2
-2
apps/lang/svenska.lang
+2
-2
apps/lang/tagalog.lang
+2
-2
apps/lang/tagalog.lang
+2
-2
apps/lang/thai.lang
+2
-2
apps/lang/thai.lang
+2
-2
apps/lang/turkce.lang
+2
-2
apps/lang/turkce.lang
+2
-2
apps/lang/ukrainian.lang
+2
-2
apps/lang/ukrainian.lang
+2
-2
apps/lang/vlaams.lang
+2
-2
apps/lang/vlaams.lang
+2
-2
apps/lang/walon.lang
+2
-2
apps/lang/walon.lang
+7
-1
apps/misc.c
+7
-1
apps/misc.c
···
196
196
{ID2P(LANG_WARN_ERASEDYNPLAYLIST_PROMPT)};
197
197
static const struct text_message message={lines, 1};
198
198
199
-
return (gui_syncyesno_run(&message, NULL, NULL) == YESNO_YES);
199
+
if (gui_syncyesno_run(&message, NULL, NULL) == YESNO_YES)
200
+
return true;
201
+
else
202
+
{
203
+
splash(HZ, ID2P(LANG_CANCEL));
204
+
return false;
205
+
}
200
206
}
201
207
else
202
208
return true;
+1
-1
apps/onplay.c
+1
-1
apps/onplay.c
+2
apps/playlist_viewer.c
+2
apps/playlist_viewer.c
···
774
774
return show_track_info(current_track);
775
775
case 5:
776
776
/* shuffle */
777
+
if (!yesno_pop_confirm(ID2P(LANG_SHUFFLE)))
778
+
return PV_CONTEXT_UNCHANGED;
777
779
playlist_sort(viewer.playlist, !viewer.playlist);
778
780
playlist_randomise(viewer.playlist, current_tick, !viewer.playlist);
779
781
viewer.selected_track = 0;
+1
apps/plugin.c
+1
apps/plugin.c
+1
apps/plugin.h
+1
apps/plugin.h
+9
apps/plugins/pictureflow/pictureflow.c
+9
apps/plugins/pictureflow/pictureflow.c
···
3590
3590
rb->set_bool(rb->str(LANG_RESIZE_COVERS), &pf_cfg.resize);
3591
3591
if (old_val == pf_cfg.resize) /* changed? */
3592
3592
break;
3593
+
else if (!rb->yesno_pop_confirm(ID2P(LANG_RESIZE_COVERS)))
3594
+
{
3595
+
pf_cfg.resize = old_val;
3596
+
break;
3597
+
}
3593
3598
3594
3599
pf_cfg.update_albumart = false;
3595
3600
pf_cfg.cache_version = CACHE_REBUILD;
···
3766
3771
break;
3767
3772
#endif
3768
3773
case PF_REBUILD_CACHE:
3774
+
if (!rb->yesno_pop_confirm(ID2P(LANG_REBUILD_CACHE)))
3775
+
break;
3769
3776
pf_cfg.update_albumart = false;
3770
3777
pf_cfg.cache_version = CACHE_REBUILD;
3771
3778
rb->remove(EMPTY_SLIDE);
···
3773
3780
CONFIG_NUM_ITEMS, CONFIG_VERSION);
3774
3781
return -3; /* re-init */
3775
3782
case PF_UPDATE_CACHE:
3783
+
if (!rb->yesno_pop_confirm(ID2P(LANG_UPDATE_CACHE)))
3784
+
break;
3776
3785
pf_cfg.update_albumart = true;
3777
3786
pf_cfg.cache_version = CACHE_REBUILD;
3778
3787
rb->remove(EMPTY_SLIDE);