mmenu; larger font in list view; added to config file and config menu; default folders

[pandora-libraries.git] / minimenu / mmconf.c

diff --git a/minimenu/mmconf.c b/minimenu/mmconf.c
index 7621802..2da4da8 100644 (file)
--- a/minimenu/mmconf.c
+++ b/minimenu/mmconf.c
@@ -33,9 +33,10 @@ confitem_t page_general[] = {
   { "Show 'All' tab",                "Whethor an All tab is shown or not",                      "1",                "categories.do_all_cat",   ct_boolean },
   { "Show directory browser tabs",   "Show a tab for each SD card?",                            "0",                "filesystem.do_browser",   ct_boolean },
   { "Detail panel on start?",        "Show or hide the detail panel when menu starts",          "1",                "display.show_detail_pane", ct_boolean },
+  { "Default list view not icons?",  "Normally we default to icons view not list",              "0",                "display.viewmode_list",   ct_boolean },
   { "Sub-categories as folders?",    "If no, uses tabs instead of folders within tabs.",        "1",                "tabs.subcat_as_folders",  ct_boolean },
-  { "Sub-category apps in main cat?","If no, apps with subcategories are only in subcategories","1",                "tabs.subcat_to_parent",   ct_boolean },
-  { "Start with app selected",       "Whethor selection is placed by default or not",           "0",                "minimenu.start_selected", ct_boolean },
+  { "Sub-category apps in their main cat?","If no, apps with subcategories are only in subcategories","1",          "tabs.subcat_to_parent",   ct_boolean },
+  { "Remember selected app",         "On return to menu select previous app; default to selected", "1",             "minimenu.start_selected", ct_boolean },
   { "Auto discover pnd apps?",       "If no, turn on diectory browser to manually find apps",   "1",                "filesystem.do_pnd_disco", ct_boolean },
   // dropped option -- we now strictly enforce free desktop categories (or user defined, but no more bogus PXML categories)
   //    { "Keep bad categories in Other?", "Lazy dev! Put broken categories into Other to keep clean", "1",               "categories.good_cats_only", ct_boolean },
@@ -66,6 +67,8 @@ confitem_t pages[] = {
   { "General Options",           "Miscellaneous handy options",                             NULL /* default */, NULL,                      ct_switch_page, page_general },
   { "Show/Hide Applications",    "Each application can be hidden/revealed",                 NULL /* default */, NULL,                      ct_switch_page, page_appshowhide },
   { "Show/Hide/Order Tabs",      "Each tab can be hidden/revealed or re-ordered",           NULL /* default */, NULL,                      ct_switch_page, page_tabshowhide },
+  { "Manage Custom Categories",  "Can make your own categories/tabs",                       NULL /* default */, NULL,                      ct_go_manage_categories },
+  { "Select a Minimenu Skin",    "Download alternate look and feels!",                      NULL /* default */, NULL,                      ct_go_manage_skins },
   { "",                          "",                                                        NULL,               NULL,                      ct_nil },
   { "Exit configuration",        "Quit and save configuration",                             NULL /* default */, NULL,                      ct_exit },
   { "",                          "",                                                        NULL,               NULL,                      ct_nil },
@@ -224,6 +227,8 @@ unsigned char conf_run_menu ( confitem_t *toplevel ) {
            break;
 
          case ct_nil:
+         case ct_go_manage_categories:
+         case ct_go_manage_skins:
          case ct_switch_page:
          case ct_reset:
          case ct_exit:
@@ -253,6 +258,14 @@ unsigned char conf_run_menu ( confitem_t *toplevel ) {
            page = page [ sel ].newhead;
            sel = 0; // should use a stack..
            break;
+         case ct_go_manage_categories:
+           ui_manage_categories();
+           break;
+         case ct_go_manage_skins:
+           if ( ui_pick_skin() ) {
+             emit_and_quit ( MM_RESTART );
+           }
+           break;
          case ct_filename:
            break;
          case ct_nil:
@@ -373,6 +386,8 @@ void conf_display_page ( confitem_t *page, unsigned int selitem, unsigned int fi
       break;
     case ct_exit:
       break;
+    case ct_go_manage_categories:
+    case ct_go_manage_skins:
     case ct_nil:
       break;
     } // switch
@@ -409,6 +424,8 @@ void conf_display_page ( confitem_t *page, unsigned int selitem, unsigned int fi
     case ct_reset:
     case ct_exit:
     case ct_visible_tab_list:
+    case ct_go_manage_categories:
+    case ct_go_manage_skins:
       break;
     } // switch
 
@@ -513,6 +530,8 @@ char *conf_format_int ( int v, change_type_e c ) {
   case ct_switch_page:
   case ct_visible_tab_list:
   case ct_nil:
+  case ct_go_manage_categories:
+  case ct_go_manage_skins:
     break;
 
   } // switch
@@ -664,7 +683,7 @@ unsigned char conf_write ( pnd_conf_handle h, char *fullpath ) {
     // does item begin with app or tab tag?
     char *k = pnd_box_get_key ( v );
 
-    if ( k && 
+    if ( k &&
         ( strncasecmp ( k, "appshow.", 8 ) == 0 ||
           strncasecmp ( k, "tabshow.", 8 ) == 0 )
        )
@@ -675,6 +694,22 @@ unsigned char conf_write ( pnd_conf_handle h, char *fullpath ) {
     v = pnd_box_get_next ( v );
   } // while
 
+  // really, should write out keys that are not found in the conf items..
+  // but since g_conf is merged with other conf files, that may just
+  // make for big dumps erroneously.. hmm :/
+  char *previous_unique_id = pnd_conf_get_as_char ( g_conf, "minimenu.last_known_app_uid" );
+  char *lastcat = pnd_conf_get_as_char ( g_conf, "minimenu.last_known_catname" );
+  char *lastparentcat = pnd_conf_get_as_char ( g_conf, "minimenu.last_known_parentcatname" );
+  if ( previous_unique_id ) {
+    fprintf ( f, "%s\t%s\n", "minimenu.last_known_app_uid", previous_unique_id );
+  }
+  if ( lastcat ) {
+    fprintf ( f, "%s\t%s\n", "minimenu.last_known_catname", lastcat );
+  }
+  if ( lastparentcat ) {
+    fprintf ( f, "%s\t%s\n", "minimenu.last_known_parentcatname", lastparentcat );
+  }
+
   fclose ( f );
 
   return ( 1 );
@@ -800,7 +835,7 @@ void conf_reset_to_default ( pnd_conf_handle h ) {
     // does item begin with app or tab tag?
     char *k = pnd_box_get_key ( v );
 
-    if ( k && 
+    if ( k &&
         ( strncasecmp ( k, "appshow.", 8 ) == 0 ||
           strncasecmp ( k, "tabshow.", 8 ) == 0 )
        )