diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/plugins/pictureflow/pictureflow.c | 28 | ||||
-rw-r--r-- | apps/plugins/rockpaint.c | 18 |
2 files changed, 18 insertions, 28 deletions
diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c index 34d1db5d5c..52209e60a2 100644 --- a/apps/plugins/pictureflow/pictureflow.c +++ b/apps/plugins/pictureflow/pictureflow.c | |||
@@ -879,7 +879,7 @@ retry: | |||
879 | } | 879 | } |
880 | goto retry; | 880 | goto retry; |
881 | } | 881 | } |
882 | 882 | ||
883 | avail -= len; | 883 | avail -= len; |
884 | tracks--; | 884 | tracks--; |
885 | tracks->sort = ((disc_num - 1) << 24) + (track_num << 14) + track_count; | 885 | tracks->sort = ((disc_num - 1) << 24) + (track_num << 14) + track_count; |
@@ -2053,21 +2053,6 @@ int create_empty_slide(bool force) | |||
2053 | } | 2053 | } |
2054 | 2054 | ||
2055 | /** | 2055 | /** |
2056 | Shows the album name setting menu | ||
2057 | */ | ||
2058 | int album_name_menu(void) | ||
2059 | { | ||
2060 | int selection = show_album_name; | ||
2061 | |||
2062 | MENUITEM_STRINGLIST(album_name_menu,"Show album title",NULL, | ||
2063 | "Hide album title", "Show at the bottom", "Show at the top"); | ||
2064 | rb->do_menu(&album_name_menu, &selection, NULL, false); | ||
2065 | |||
2066 | show_album_name = selection; | ||
2067 | return GO_TO_PREVIOUS; | ||
2068 | } | ||
2069 | |||
2070 | /** | ||
2071 | Shows the settings menu | 2056 | Shows the settings menu |
2072 | */ | 2057 | */ |
2073 | int settings_menu(void) | 2058 | int settings_menu(void) |
@@ -2079,6 +2064,12 @@ int settings_menu(void) | |||
2079 | "Spacing", "Centre margin", "Number of slides", "Zoom", | 2064 | "Spacing", "Centre margin", "Number of slides", "Zoom", |
2080 | "Show album title", "Resize Covers", "Rebuild cache"); | 2065 | "Show album title", "Resize Covers", "Rebuild cache"); |
2081 | 2066 | ||
2067 | static const struct opt_items album_name_options[] = { | ||
2068 | { "Hide album title", -1 }, | ||
2069 | { "Show at the bottom", -1 }, | ||
2070 | { "Show at the top", -1 } | ||
2071 | }; | ||
2072 | |||
2082 | do { | 2073 | do { |
2083 | selection=rb->do_menu(&settings_menu,&selection, NULL, false); | 2074 | selection=rb->do_menu(&settings_menu,&selection, NULL, false); |
2084 | switch(selection) { | 2075 | switch(selection) { |
@@ -2117,7 +2108,8 @@ int settings_menu(void) | |||
2117 | reset_slides(); | 2108 | reset_slides(); |
2118 | break; | 2109 | break; |
2119 | case 5: | 2110 | case 5: |
2120 | album_name_menu(); | 2111 | rb->set_option("Show album title", &show_album_name, |
2112 | INT, album_name_options, 3, NULL); | ||
2121 | reset_track_list(); | 2113 | reset_track_list(); |
2122 | recalc_offsets(); | 2114 | recalc_offsets(); |
2123 | reset_slides(); | 2115 | reset_slides(); |
@@ -2729,8 +2721,6 @@ int main(void) | |||
2729 | break; | 2721 | break; |
2730 | } | 2722 | } |
2731 | } | 2723 | } |
2732 | |||
2733 | |||
2734 | } | 2724 | } |
2735 | 2725 | ||
2736 | /*************************** Plugin entry point ****************************/ | 2726 | /*************************** Plugin entry point ****************************/ |
diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c index 2a848c2049..a4084a2ca7 100644 --- a/apps/plugins/rockpaint.c +++ b/apps/plugins/rockpaint.c | |||
@@ -551,12 +551,6 @@ MENUITEM_STRINGLIST(main_menu, "RockPaint", NULL, | |||
551 | "Brush Size", "Brush Speed", | 551 | "Brush Size", "Brush Speed", |
552 | "Choose Color", "Grid Size", | 552 | "Choose Color", "Grid Size", |
553 | "Playback Control", "Exit"); | 553 | "Playback Control", "Exit"); |
554 | MENUITEM_STRINGLIST(size_menu, "Choose Size", NULL, | ||
555 | "1x", "2x","4x", "8x"); | ||
556 | MENUITEM_STRINGLIST(speed_menu, "Choose Speed", NULL, | ||
557 | "1x", "2x","4x"); | ||
558 | MENUITEM_STRINGLIST(gridsize_menu, "Grid Size", NULL, | ||
559 | "No grid", "5px", "10px", "20px"); | ||
560 | MENUITEM_STRINGLIST(select_menu, "Select...", NULL, | 554 | MENUITEM_STRINGLIST(select_menu, "Select...", NULL, |
561 | "Cut", "Copy", | 555 | "Cut", "Copy", |
562 | "Invert", "Horizontal Flip", "Vertical Flip", | 556 | "Invert", "Horizontal Flip", "Vertical Flip", |
@@ -567,6 +561,12 @@ MENUITEM_STRINGLIST(text_menu, "Text", NULL, | |||
567 | "Preview", "Apply", "Cancel"); | 561 | "Preview", "Apply", "Cancel"); |
568 | static const int times_list[] = { 1, 2, 4, 8 }; | 562 | static const int times_list[] = { 1, 2, 4, 8 }; |
569 | static const int gridsize_list[] = { 0, 5, 10, 20 }; | 563 | static const int gridsize_list[] = { 0, 5, 10, 20 }; |
564 | static const struct opt_items times_options[] = { | ||
565 | { "1x", -1 }, { "2x", -1 }, { "4x", -1 }, { "8x", -1 } | ||
566 | }; | ||
567 | static const struct opt_items gridsize_options[] = { | ||
568 | { "No grid", -1 }, { "5px", -1 }, { "10px", -1 }, { "20px", -1 } | ||
569 | }; | ||
570 | 570 | ||
571 | static int draw_window( int height, int width, | 571 | static int draw_window( int height, int width, |
572 | int *top, int *left, | 572 | int *top, int *left, |
@@ -2502,7 +2502,7 @@ static void goto_menu(void) | |||
2502 | case MAIN_MENU_BRUSH_SIZE: | 2502 | case MAIN_MENU_BRUSH_SIZE: |
2503 | for(multi = 0; multi<4; multi++) | 2503 | for(multi = 0; multi<4; multi++) |
2504 | if(bsize == times_list[multi]) break; | 2504 | if(bsize == times_list[multi]) break; |
2505 | rb->do_menu( &size_menu, &multi, NULL, false ); | 2505 | rb->set_option( "Brush Size", &multi, INT, times_options, 4, NULL ); |
2506 | if( multi >= 0 ) | 2506 | if( multi >= 0 ) |
2507 | bsize = times_list[multi]; | 2507 | bsize = times_list[multi]; |
2508 | break; | 2508 | break; |
@@ -2510,7 +2510,7 @@ static void goto_menu(void) | |||
2510 | case MAIN_MENU_BRUSH_SPEED: | 2510 | case MAIN_MENU_BRUSH_SPEED: |
2511 | for(multi = 0; multi<3; multi++) | 2511 | for(multi = 0; multi<3; multi++) |
2512 | if(bspeed == times_list[multi]) break; | 2512 | if(bspeed == times_list[multi]) break; |
2513 | rb->do_menu( &speed_menu, &multi, NULL, false ); | 2513 | rb->set_option( "Brush Speed", &multi, INT, times_options, 3, NULL ); |
2514 | if( multi >= 0 ) | 2514 | if( multi >= 0 ) |
2515 | bspeed = times_list[multi]; | 2515 | bspeed = times_list[multi]; |
2516 | break; | 2516 | break; |
@@ -2522,7 +2522,7 @@ static void goto_menu(void) | |||
2522 | case MAIN_MENU_GRID_SIZE: | 2522 | case MAIN_MENU_GRID_SIZE: |
2523 | for(multi = 0; multi<4; multi++) | 2523 | for(multi = 0; multi<4; multi++) |
2524 | if(gridsize == gridsize_list[multi]) break; | 2524 | if(gridsize == gridsize_list[multi]) break; |
2525 | rb->do_menu( &gridsize_menu, &multi, NULL, false ); | 2525 | rb->set_option( "Grid Size", &multi, INT, gridsize_options, 4, NULL ); |
2526 | if( multi >= 0 ) | 2526 | if( multi >= 0 ) |
2527 | gridsize = gridsize_list[multi]; | 2527 | gridsize = gridsize_list[multi]; |
2528 | break; | 2528 | break; |