Launcher: All launcher-related options to the "Launcher options" submenu

Author: ducalex

launcher/main/main.c

@@ -142,24 +142,6 @@ static rg_gui_event_t startup_app_cb(rg_gui_option_t *option, rg_gui_event_t eve
     return RG_DIALOG_VOID;
 }
 
-static rg_gui_event_t launcher_options_cb(rg_gui_option_t *option, rg_gui_event_t event)
-{
-    if (event == RG_DIALOG_ENTER)
-    {
-        const rg_gui_option_t options[] = {
-            {0, "Color theme ", "...", 1, &color_theme_cb},
-            {0, "Preview     ", "...", 1, &show_preview_cb},
-            {0, "Scroll mode ", "...", 1, &scroll_mode_cb},
-            {0, "Start screen", "...", 1, &start_screen_cb},
-            {0, "Hide tabs   ", "...", 1, &toggle_tabs_cb},
-            RG_DIALOG_END,
-        };
-        gui_redraw(); // clear main menu
-        rg_gui_dialog("Launcher Options", options, 0);
-    }
-    return RG_DIALOG_VOID;
-}
-
 #ifdef RG_ENABLE_NETWORKING
 static rg_gui_event_t updater_cb(rg_gui_option_t *option, rg_gui_event_t event)
 {
@@ -192,6 +174,28 @@ static rg_gui_event_t webui_switch_cb(rg_gui_option_t *option, rg_gui_event_t ev
 }
 #endif
 
+static rg_gui_event_t launcher_options_cb(rg_gui_option_t *option, rg_gui_event_t event)
+{
+    if (event == RG_DIALOG_ENTER)
+    {
+        const rg_gui_option_t options[] = {
+            {0, "Color theme ", "-", RG_DIALOG_FLAG_NORMAL, &color_theme_cb},
+            {0, "Preview     ", "-", RG_DIALOG_FLAG_NORMAL, &show_preview_cb},
+            {0, "Scroll mode ", "-", RG_DIALOG_FLAG_NORMAL, &scroll_mode_cb},
+            {0, "Start screen", "-", RG_DIALOG_FLAG_NORMAL, &start_screen_cb},
+            {0, "Hide tabs   ", "-", RG_DIALOG_FLAG_NORMAL, &toggle_tabs_cb},
+            #ifdef RG_ENABLE_NETWORKING
+            {0, "File server ", "-", RG_DIALOG_FLAG_NORMAL, &webui_switch_cb},
+            #endif
+            {0, "Startup app ", "-", RG_DIALOG_FLAG_NORMAL, &startup_app_cb},
+            RG_DIALOG_END,
+        };
+        gui_redraw(); // clear main menu
+        rg_gui_dialog("Launcher Options", options, 0);
+    }
+    return RG_DIALOG_VOID;
+}
+
 static rg_gui_event_t prebuild_cache_cb(rg_gui_option_t *option, rg_gui_event_t event)
 {
     if (event == RG_DIALOG_ENTER)
@@ -432,11 +436,7 @@ void app_main(void)
         .event = &event_handler,
     };
     const rg_gui_option_t options[] = {
-        #ifdef RG_ENABLE_NETWORKING
-        {0, "File server" ,  "-", RG_DIALOG_FLAG_NORMAL, &webui_switch_cb},
-        #endif
-        {0, "Startup app ", "...", 1, &startup_app_cb},
-        {0, "Launcher options", NULL,  1, &launcher_options_cb},
+        {0, "Launcher options", NULL, RG_DIALOG_FLAG_NORMAL, &launcher_options_cb},
         RG_DIALOG_END,
     };