A modern Music Player Daemon based on Rockbox open source high quality audio player
libadwaita audio rust zig deno mpris rockbox mpd

Shopper: slightly improve plugin and manual

* improve manual (hopefully fixes fs#11988). Parts of the
description are taken from fs#10820.
* move ACTION_STD_CONTEXT from alternate select to alternate
menu action, as not all targets have ACTION_STD_MENU
* add menu entries for "Quit" and "Quit without saving"

Change-Id: Iec86a1608756a899f9f9d7ec7d479838dfd1d95f

authored by

Sebastian Leonhardt and committed by
Gerrit Rockbox
59928e6c 399904a9

+82 -4
+35 -3
apps/plugins/shopper.c
··· 320 320 continue; 321 321 switch (button) 322 322 { 323 - case ACTION_STD_CONTEXT: 324 323 case ACTION_STD_OK: 325 324 { 326 325 changed |= toggle(cur_sel); 327 326 break; 328 327 } 329 328 case ACTION_STD_MENU: 329 + case ACTION_STD_CONTEXT: 330 330 { 331 331 switch(view) 332 332 { ··· 338 338 "Mark all items", 339 339 category_string, 340 340 "Revert to saved", 341 - "Show Playback Menu",); 341 + "Show Playback Menu", 342 + "Quit without saving", 343 + "Quit"); 342 344 343 345 switch (rb->do_menu(&menu, NULL, NULL, false)) 344 346 { ··· 394 396 playback_control(NULL); 395 397 break; 396 398 } 399 + case 6: 400 + { 401 + /* Quit without saving */ 402 + exit = 1; 403 + break; 404 + } 405 + case 7: 406 + { 407 + /* Save and quit */ 408 + if (changed) 409 + save_changes(); 410 + exit = 1; 411 + break; 412 + } 397 413 default: 398 414 { 399 415 break; ··· 409 425 "Reset list", 410 426 category_string, 411 427 "Revert to saved", 412 - "Show Playback Menu",); 428 + "Show Playback Menu", 429 + "Quit without saving", 430 + "Quit"); 413 431 414 432 switch (rb->do_menu(&menu, NULL, NULL, false)) 415 433 { ··· 452 470 { 453 471 /* playback menu */ 454 472 playback_control(NULL); 473 + break; 474 + } 475 + case 5: 476 + { 477 + /* Quit without saving */ 478 + exit = 1; 479 + break; 480 + } 481 + case 6: 482 + { 483 + /* Save and quit */ 484 + if (changed) 485 + save_changes(); 486 + exit = 1; 455 487 break; 456 488 } 457 489 default:
+47 -1
manual/plugins/shopper.tex
··· 2 2 \subsection{Shopper} 3 3 \label{ref:Shopperplugin} 4 4 5 - Shopper is a shopping list plugin which allows you to maintain reusable shopping lists. 5 + Shopper is a plugin which allows you to maintain reusable shopping lists. 6 + To create a list, use a text editor to write down a list of items (one per 7 + line; note that the line length should not exceed 40 characters) and save the 8 + file as \fname{<name>.shopper}. If you want to separate the items you can do 9 + so by creating categories, which are prepended with `\#'. To open a 10 + \fname{.shopper} file just ``play'' it from the file browser. 11 + 12 + \begin{example} 13 + #groceries 14 + bananas 15 + cucumber 16 + 4 apples 17 + 6 apples 18 + #dairy 19 + milk 20 + cheese 21 + \end{example} 22 + Note that it isn't possible to choose exact quantities, but you can create a 23 + number of entries with different quantities in the name of the item, such as 24 + for the apples in the above example. 25 + 26 + There are two modes, \emph{edit mode} and \emph{view mode}. The edit mode 27 + shows all the items, and it allows you to select which of the items you want 28 + to buy. When you have finished selecting the items, use the menu to go to the 29 + view mode, and you will see only the items you wish to buy. If you `select' 30 + an item in view mode then that item will be removed from the list. 31 + 32 + When you exit Shopper the last view is saved, including which items you have 33 + selected, so if you re-open the shopping list it will be as you left it. There 34 + are additional menu options for clearing the list, selecting all items, showing 35 + and hiding the categories, toggling the categories, and displaying the playback 36 + menu. 37 + 38 + \subsubsection{Shopper Keys} 39 + \begin{btnmap} 40 + \ActionStdOk{} 41 + \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdOk} 42 + & Select or clear an item\\ 43 + 44 + \ActionStdMenu{} or \ActionStdContext{} 45 + \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdMenu{} or \ActionRCStdContext} 46 + & Show menu\\ 47 + 48 + \ActionStdCancel{} 49 + \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdCancel} 50 + & Exit\\ 51 + \end{btnmap}