Move the info and manage settings menus to the new system

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12311 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 0 insertions, 252 deletions

diff --git a/apps/main_menu.c b/apps/main_menu.c
index 078e7669f2..de4c9a6263 100644
--- a/apps/main_menu.c
+++ b/apps/main_menu.c
@@ -56,231 +56,6 @@
 #include "recording.h"
 #endif
 
-static bool show_credits(void)
-{
-    plugin_load("/.rockbox/rocks/credits.rock",NULL);
-    return false;
-}
-
-#ifdef SIMULATOR
-extern bool simulate_usb(void);
-#endif
-
-#ifdef HAVE_LCD_CHARCELLS
-#define SIZE_FMT "%s%s"
-#else
-#define SIZE_FMT "%s %s"
-#endif
-
-static bool show_info(void)
-{
-    char s[64], s1[32];
-    unsigned long size, free;
-    long buflen = ((audiobufend - audiobuf) * 2) / 2097;  /* avoid overflow */
-    int key;
-    int i;
-    bool done = false;
-    bool new_info = true;
-#ifdef HAVE_MULTIVOLUME
-    char s2[32];
-    unsigned long size2, free2;
-#endif
-#ifdef HAVE_LCD_CHARCELLS
-    int page = 0;
-#endif
-
-    const unsigned char *kbyte_units[] = {
-        ID2P(LANG_KILOBYTE),
-        ID2P(LANG_MEGABYTE),
-        ID2P(LANG_GIGABYTE)
-    };
-    
-    while (!done)
-    {
-        int y=0;
-
-        if (new_info)
-        {
-            fat_size( IF_MV2(0,) &size, &free );
-#ifdef HAVE_MULTIVOLUME
-            if (fat_ismounted(1))
-                fat_size( 1, &size2, &free2 );
-            else
-                size2 = 0;
-#endif
-
-            if (global_settings.talk_menu)
-            {   /* say whatever is reasonable, no real connection to the screen */
-                bool enqueue = false; /* enqueue all but the first */
-                if (battery_level() >= 0)
-                {
-                    talk_id(LANG_BATTERY_TIME, enqueue);
-                    enqueue = true;
-                    talk_value(battery_level(), UNIT_PERCENT, true);
-#if CONFIG_CHARGING >= CHARGING_MONITOR
-                    if (charge_state == CHARGING)
-                        talk_id(LANG_BATTERY_CHARGE, true);               
-                    else if (charge_state == TOPOFF)
-                        talk_id(LANG_BATTERY_TOPOFF_CHARGE, true);
-                    else if (charge_state == TRICKLE)
-                        talk_id(LANG_BATTERY_TRICKLE_CHARGE, true);
-#endif
-                }
-
-                talk_id(LANG_DISK_FREE_INFO, enqueue);
-#ifdef HAVE_MULTIVOLUME
-                talk_id(LANG_DISK_NAME_INTERNAL, true);
-                output_dyn_value(NULL, 0, free, kbyte_units, true);
-                if (size2)
-                {
-                    talk_id(LANG_DISK_NAME_MMC, true);
-                    output_dyn_value(NULL, 0, free2, kbyte_units, true);
-                }
-#else
-                output_dyn_value(NULL, 0, free, kbyte_units, true);
-#endif
-
-#ifdef CONFIG_RTC
-                {
-                    struct tm* tm = get_time();
-                    talk_id(VOICE_CURRENT_TIME, true);
-                    talk_value(tm->tm_hour, UNIT_HOUR, true);
-                    talk_value(tm->tm_min, UNIT_MIN, true);
-                    talk_value(tm->tm_sec, UNIT_SEC, true);
-                    talk_id(LANG_MONTH_JANUARY + tm->tm_mon, true);
-                    talk_number(tm->tm_mday, true);
-                    talk_number(1900 + tm->tm_year, true);
-                }
-#endif
-            }
-            new_info = false;
-        }
-
-        FOR_NB_SCREENS(i)
-        {
-            screens[i].clear_display();
-#ifdef HAVE_LCD_BITMAP
-            screens[i].puts(0, y, str(LANG_ROCKBOX_INFO));
-#endif
-        }
-#ifdef HAVE_LCD_BITMAP
-        y += 2;
-#endif
-
-#ifdef HAVE_LCD_CHARCELLS
-        if (page == 0)
-#endif
-        {
-            int integer = buflen / 1000;
-            int decimal = buflen % 1000;
-
-#ifdef HAVE_LCD_CHARCELLS
-            snprintf(s, sizeof(s), (char *)str(LANG_BUFFER_STAT_PLAYER),
-                     integer, decimal);
-#else
-            snprintf(s, sizeof(s), (char *)str(LANG_BUFFER_STAT_RECORDER),
-                     integer, decimal);
-#endif
-            FOR_NB_SCREENS(i)
-                screens[i].puts_scroll(0, y, (unsigned char *)s);
-            y++;
-#if CONFIG_CHARGING == CHARGING_CONTROL
-            if (charge_state == CHARGING)
-                snprintf(s, sizeof(s), (char *)str(LANG_BATTERY_CHARGE));
-            else if (charge_state == TOPOFF)
-                snprintf(s, sizeof(s), (char *)str(LANG_BATTERY_TOPOFF_CHARGE));
-            else if (charge_state == TRICKLE)
-                snprintf(s, sizeof(s), (char *)str(LANG_BATTERY_TRICKLE_CHARGE));
-            else
-#endif
-            if (battery_level() >= 0)
-                snprintf(s, sizeof(s), (char *)str(LANG_BATTERY_TIME), battery_level(),
-                         battery_time() / 60, battery_time() % 60);
-            else
-                strncpy(s, "(n/a)", sizeof(s));
-            FOR_NB_SCREENS(i)
-                screens[i].puts_scroll(0, y, (unsigned char *)s); 
-            y++;
-        }
-
-#ifdef HAVE_LCD_CHARCELLS
-        if (page == 1)
-#endif
-        {
-#ifdef HAVE_MULTIVOLUME
-            output_dyn_value(s1, sizeof s1, free, kbyte_units, true);
-            output_dyn_value(s2, sizeof s2, size, kbyte_units, true);
-            snprintf(s, sizeof s, "%s %s/%s", str(LANG_DISK_NAME_INTERNAL),
-                     s1, s2);
-            FOR_NB_SCREENS(i)
-                screens[i].puts_scroll(0, y, (unsigned char *)s);
-            y++;
-
-            if (size2) {
-                output_dyn_value(s1, sizeof s1, free2, kbyte_units, true);
-                output_dyn_value(s2, sizeof s2, size2, kbyte_units, true);
-                snprintf(s, sizeof s, "%s %s/%s", str(LANG_DISK_NAME_MMC),
-                         s1, s2);
-                FOR_NB_SCREENS(i)
-                    screens[i].puts_scroll(0, y, (unsigned char *)s);
-                y++;
-            }
-#else
-            output_dyn_value(s1, sizeof s1, size, kbyte_units, true);
-            snprintf(s, sizeof s, SIZE_FMT, str(LANG_DISK_SIZE_INFO), s1);
-            FOR_NB_SCREENS(i)
-                screens[i].puts_scroll(0, y, (unsigned char *)s);
-            y++;
-            output_dyn_value(s1, sizeof s1, free, kbyte_units, true);
-            snprintf(s, sizeof s, SIZE_FMT, str(LANG_DISK_FREE_INFO), s1);
-            FOR_NB_SCREENS(i)
-                screens[i].puts_scroll(0, y, (unsigned char *)s);
-            y++;
-#endif
-        }
-
-#if defined(HAVE_LCD_BITMAP) || defined(SIMULATOR)
-        FOR_NB_SCREENS(i)
-                screens[i].update();
-#endif
-
-        /* Wait for a key to be pushed */
-        key = get_action(CONTEXT_MAINMENU,HZ*5);
-        switch(key) {
-
-            case ACTION_STD_CANCEL:
-                done = true;
-                break;
-
-#ifdef HAVE_LCD_CHARCELLS
-            case ACTION_STD_NEXT:
-            case ACTION_STD_PREV:
-                page = (page == 0) ? 1 : 0;
-                break;
-#endif
-
-#ifndef SIMULATOR
-            case ACTION_STD_OK:
-                gui_syncsplash(0, true, str(LANG_DIRCACHE_BUILDING));
-                fat_recalc_free(IF_MV(0));
-#ifdef HAVE_MULTIVOLUME
-                if (fat_ismounted(1))
-                    fat_recalc_free(1);
-#endif
-                new_info = true;
-                break;
-#endif
-
-            default:
-                if (default_event_handler(key) == SYS_USB_CONNECTED)
-                    return true;
-                break;
-        }
-    }
-    action_signalscreenchange();
-    return false;
-}
-
 #ifdef HAVE_RECORDING
 
 static bool rec_menu_recording_screen(void)
@@ -330,33 +105,6 @@ bool rec_menu(void)
 }
 #endif
 
-bool info_menu(void)
-{
-    int m;
-    bool result;
-
-    /* info menu */
-    static const struct menu_item items[] = {
-        { ID2P(LANG_INFO_MENU),          show_info         },
-        { ID2P(LANG_VERSION),            show_credits      },
-        { ID2P(LANG_RUNNING_TIME),       view_runtime      },
-        { ID2P(LANG_DEBUG),              debug_menu        },
-#ifdef SIMULATOR
-        { ID2P(LANG_USB),                simulate_usb      },
-#ifdef ROCKBOX_HAS_LOGF
-        {"logf", logfdisplay },
-        {"logfdump", logfdump },
-#endif
-#endif
-    };
-
-    m=menu_init( items, sizeof(items) / sizeof(*items), NULL,
-                 NULL, NULL, NULL);
-    result = menu_run(m);
-    menu_exit(m);
-
-    return result;
-}
 
 #if 0
 #ifdef HAVE_LCD_CHARCELLS