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:
             }
             goto retry;
         }
-            
+
         avail -= len;
         tracks--;
         tracks->sort = ((disc_num - 1) << 24) + (track_num << 14) + track_count;
@@ -2053,21 +2053,6 @@ int create_empty_slide(bool force)
 }
 
 /**
-    Shows the album name setting menu
-*/
-int album_name_menu(void)
-{
-    int selection = show_album_name;
-
-    MENUITEM_STRINGLIST(album_name_menu,"Show album title",NULL,
-            "Hide album title", "Show at the bottom", "Show at the top");
-    rb->do_menu(&album_name_menu, &selection, NULL, false);
-
-    show_album_name = selection;
-    return GO_TO_PREVIOUS;
-}
-
-/**
   Shows the settings menu
  */
 int settings_menu(void)
@@ -2079,6 +2064,12 @@ int settings_menu(void)
                         "Spacing", "Centre margin", "Number of slides", "Zoom",
                         "Show album title", "Resize Covers", "Rebuild cache");
 
+    static const struct opt_items album_name_options[] = {
+        { "Hide album title", -1 },
+        { "Show at the bottom", -1 },
+        { "Show at the top", -1 }
+    };
+
     do {
         selection=rb->do_menu(&settings_menu,&selection, NULL, false);
         switch(selection) {
@@ -2117,7 +2108,8 @@ int settings_menu(void)
                 reset_slides();
                 break;
             case 5:
-                album_name_menu();
+                rb->set_option("Show album title", &show_album_name,
+                               INT, album_name_options, 3, NULL);
                 reset_track_list();
                 recalc_offsets();
                 reset_slides();
@@ -2729,8 +2721,6 @@ int main(void)
             break;
         }
     }
-
-
 }
 
 /*************************** 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,
                     "Brush Size", "Brush Speed",
                     "Choose Color", "Grid Size",
                     "Playback Control", "Exit");
-MENUITEM_STRINGLIST(size_menu, "Choose Size", NULL,
-                    "1x", "2x","4x", "8x");
-MENUITEM_STRINGLIST(speed_menu, "Choose Speed", NULL,
-                    "1x", "2x","4x");
-MENUITEM_STRINGLIST(gridsize_menu, "Grid Size", NULL,
-                    "No grid", "5px", "10px", "20px");
 MENUITEM_STRINGLIST(select_menu, "Select...", NULL,
                     "Cut", "Copy",
                     "Invert", "Horizontal Flip", "Vertical Flip",
@@ -567,6 +561,12 @@ MENUITEM_STRINGLIST(text_menu, "Text", NULL,
                     "Preview", "Apply", "Cancel");
 static const int times_list[] = { 1, 2, 4, 8 };
 static const int gridsize_list[] = { 0, 5, 10, 20 };
+static const struct opt_items times_options[] = {
+    { "1x", -1 }, { "2x", -1 }, { "4x", -1 }, { "8x", -1 }
+};
+static const struct opt_items gridsize_options[] = {
+    { "No grid", -1 }, { "5px", -1 }, { "10px", -1 }, { "20px", -1 }
+};
 
 static int draw_window( int height, int width,
                          int *top, int *left,
@@ -2502,7 +2502,7 @@ static void goto_menu(void)
             case MAIN_MENU_BRUSH_SIZE:
                 for(multi = 0; multi<4; multi++)
                     if(bsize == times_list[multi]) break;
-                rb->do_menu( &size_menu, &multi, NULL, false );
+                rb->set_option( "Brush Size", &multi, INT, times_options, 4, NULL );
                 if( multi >= 0 )
                     bsize = times_list[multi];
                 break;
@@ -2510,7 +2510,7 @@ static void goto_menu(void)
             case MAIN_MENU_BRUSH_SPEED:
                 for(multi = 0; multi<3; multi++)
                     if(bspeed == times_list[multi]) break;
-                rb->do_menu( &speed_menu, &multi, NULL, false );
+                rb->set_option( "Brush Speed", &multi, INT, times_options, 3, NULL );
                 if( multi >= 0 )
                     bspeed = times_list[multi];
                 break;
@@ -2522,7 +2522,7 @@ static void goto_menu(void)
             case MAIN_MENU_GRID_SIZE:
                 for(multi = 0; multi<4; multi++)
                     if(gridsize == gridsize_list[multi]) break;
-                rb->do_menu( &gridsize_menu, &multi, NULL, false );
+                rb->set_option( "Grid Size", &multi, INT, gridsize_options, 4, NULL );
                 if( multi >= 0 )
                     gridsize = gridsize_list[multi];
                 break;