diff options
author | Linus Nielsen Feltzing <linus@haxx.se> | 2004-03-12 10:20:33 +0000 |
---|---|---|
committer | Linus Nielsen Feltzing <linus@haxx.se> | 2004-03-12 10:20:33 +0000 |
commit | 10b92c44b3bac97e01be91409df6e7ccb94ea045 (patch) | |
tree | 4f98b439e02091abcfe5fe977f5179a9ac86e646 /apps/settings_menu.c | |
parent | 5c09ed38c6dc19fd03eb47971433993d7afd8605 (diff) | |
download | rockbox-10b92c44b3bac97e01be91409df6e7ccb94ea045.tar.gz rockbox-10b92c44b3bac97e01be91409df6e7ccb94ea045.zip |
First step towards context sensitive and configurable menus, by Brent Coutts
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4370 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings_menu.c')
-rw-r--r-- | apps/settings_menu.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/apps/settings_menu.c b/apps/settings_menu.c index 24a67adc47..7c060c4533 100644 --- a/apps/settings_menu.c +++ b/apps/settings_menu.c | |||
@@ -380,7 +380,7 @@ static bool peak_meter_menu(void) | |||
380 | { str(LANG_PM_MAX) , peak_meter_max }, | 380 | { str(LANG_PM_MAX) , peak_meter_max }, |
381 | }; | 381 | }; |
382 | 382 | ||
383 | m=menu_init( items, sizeof(items) / sizeof(*items) ); | 383 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL ); |
384 | result = menu_run(m); | 384 | result = menu_run(m); |
385 | menu_exit(m); | 385 | menu_exit(m); |
386 | return result; | 386 | return result; |
@@ -795,7 +795,7 @@ static bool ff_rewind_settings_menu(void) | |||
795 | { str(LANG_FFRW_ACCEL), ff_rewind_accel }, | 795 | { str(LANG_FFRW_ACCEL), ff_rewind_accel }, |
796 | }; | 796 | }; |
797 | 797 | ||
798 | m=menu_init( items, sizeof(items) / sizeof(*items) ); | 798 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL ); |
799 | result = menu_run(m); | 799 | result = menu_run(m); |
800 | menu_exit(m); | 800 | menu_exit(m); |
801 | 801 | ||
@@ -819,7 +819,7 @@ static bool playback_settings_menu(void) | |||
819 | 819 | ||
820 | bool old_shuffle = global_settings.playlist_shuffle; | 820 | bool old_shuffle = global_settings.playlist_shuffle; |
821 | 821 | ||
822 | m=menu_init( items, sizeof(items) / sizeof(*items) ); | 822 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL ); |
823 | result = menu_run(m); | 823 | result = menu_run(m); |
824 | menu_exit(m); | 824 | menu_exit(m); |
825 | 825 | ||
@@ -848,7 +848,7 @@ static bool bookmark_settings_menu(void) | |||
848 | { str(LANG_BOOKMARK_SETTINGS_MAINTAIN_RECENT_BOOKMARKS), useMRB}, | 848 | { str(LANG_BOOKMARK_SETTINGS_MAINTAIN_RECENT_BOOKMARKS), useMRB}, |
849 | }; | 849 | }; |
850 | 850 | ||
851 | m=menu_init( items, sizeof items / sizeof(struct menu_items) ); | 851 | m=menu_init( items, sizeof items / sizeof(struct menu_items), NULL ); |
852 | result = menu_run(m); | 852 | result = menu_run(m); |
853 | menu_exit(m); | 853 | menu_exit(m); |
854 | 854 | ||
@@ -916,7 +916,7 @@ static bool fileview_settings_menu(void) | |||
916 | { str(LANG_SHOW_ICONS), show_icons }, | 916 | { str(LANG_SHOW_ICONS), show_icons }, |
917 | }; | 917 | }; |
918 | 918 | ||
919 | m=menu_init( items, sizeof(items) / sizeof(*items) ); | 919 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL ); |
920 | result = menu_run(m); | 920 | result = menu_run(m); |
921 | menu_exit(m); | 921 | menu_exit(m); |
922 | return result; | 922 | return result; |
@@ -941,7 +941,7 @@ static bool scroll_settings_menu(void) | |||
941 | #endif | 941 | #endif |
942 | }; | 942 | }; |
943 | 943 | ||
944 | m=menu_init( items, sizeof(items) / sizeof(*items) ); | 944 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL ); |
945 | result = menu_run(m); | 945 | result = menu_run(m); |
946 | menu_exit(m); | 946 | menu_exit(m); |
947 | return result; | 947 | return result; |
@@ -964,7 +964,7 @@ static bool lcd_settings_menu(void) | |||
964 | #endif | 964 | #endif |
965 | }; | 965 | }; |
966 | 966 | ||
967 | m=menu_init( items, sizeof(items) / sizeof(*items) ); | 967 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL ); |
968 | result = menu_run(m); | 968 | result = menu_run(m); |
969 | menu_exit(m); | 969 | menu_exit(m); |
970 | return result; | 970 | return result; |
@@ -983,7 +983,7 @@ static bool bars_settings_menu(void) | |||
983 | { str(LANG_BATTERY_DISPLAY), battery_type }, | 983 | { str(LANG_BATTERY_DISPLAY), battery_type }, |
984 | }; | 984 | }; |
985 | 985 | ||
986 | m=menu_init( items, sizeof(items) / sizeof(*items) ); | 986 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL ); |
987 | result = menu_run(m); | 987 | result = menu_run(m); |
988 | menu_exit(m); | 988 | menu_exit(m); |
989 | return result; | 989 | return result; |
@@ -1009,7 +1009,7 @@ static bool display_settings_menu(void) | |||
1009 | #endif | 1009 | #endif |
1010 | }; | 1010 | }; |
1011 | 1011 | ||
1012 | m=menu_init( items, sizeof(items) / sizeof(*items) ); | 1012 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL ); |
1013 | result = menu_run(m); | 1013 | result = menu_run(m); |
1014 | menu_exit(m); | 1014 | menu_exit(m); |
1015 | return result; | 1015 | return result; |
@@ -1036,7 +1036,7 @@ static bool battery_settings_menu(void) | |||
1036 | #endif | 1036 | #endif |
1037 | }; | 1037 | }; |
1038 | 1038 | ||
1039 | m=menu_init( items, sizeof(items) / sizeof(*items) ); | 1039 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL ); |
1040 | result = menu_run(m); | 1040 | result = menu_run(m); |
1041 | menu_exit(m); | 1041 | menu_exit(m); |
1042 | return result; | 1042 | return result; |
@@ -1054,7 +1054,7 @@ static bool disk_settings_menu(void) | |||
1054 | #endif | 1054 | #endif |
1055 | }; | 1055 | }; |
1056 | 1056 | ||
1057 | m=menu_init( items, sizeof(items) / sizeof(*items) ); | 1057 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL ); |
1058 | result = menu_run(m); | 1058 | result = menu_run(m); |
1059 | menu_exit(m); | 1059 | menu_exit(m); |
1060 | return result; | 1060 | return result; |
@@ -1071,7 +1071,7 @@ static bool time_settings_menu(void) | |||
1071 | { str(LANG_TIMEFORMAT), timeformat_set }, | 1071 | { str(LANG_TIMEFORMAT), timeformat_set }, |
1072 | }; | 1072 | }; |
1073 | 1073 | ||
1074 | m=menu_init( items, sizeof(items) / sizeof(*items) ); | 1074 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL ); |
1075 | result = menu_run(m); | 1075 | result = menu_run(m); |
1076 | menu_exit(m); | 1076 | menu_exit(m); |
1077 | return result; | 1077 | return result; |
@@ -1090,7 +1090,7 @@ static bool manage_settings_menu(void) | |||
1090 | { str(LANG_SAVE_SETTINGS), settings_save_config }, | 1090 | { str(LANG_SAVE_SETTINGS), settings_save_config }, |
1091 | }; | 1091 | }; |
1092 | 1092 | ||
1093 | m=menu_init( items, sizeof(items) / sizeof(*items) ); | 1093 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL ); |
1094 | result = menu_run(m); | 1094 | result = menu_run(m); |
1095 | menu_exit(m); | 1095 | menu_exit(m); |
1096 | return result; | 1096 | return result; |
@@ -1106,7 +1106,7 @@ static bool limits_settings_menu(void) | |||
1106 | { str(LANG_MAX_FILES_IN_PLAYLIST), max_files_in_playlist }, | 1106 | { str(LANG_MAX_FILES_IN_PLAYLIST), max_files_in_playlist }, |
1107 | }; | 1107 | }; |
1108 | 1108 | ||
1109 | m=menu_init( items, sizeof(items) / sizeof(*items) ); | 1109 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL ); |
1110 | result = menu_run(m); | 1110 | result = menu_run(m); |
1111 | menu_exit(m); | 1111 | menu_exit(m); |
1112 | return result; | 1112 | return result; |
@@ -1137,7 +1137,7 @@ static bool system_settings_menu(void) | |||
1137 | { str(LANG_MANAGE_MENU), manage_settings_menu }, | 1137 | { str(LANG_MANAGE_MENU), manage_settings_menu }, |
1138 | }; | 1138 | }; |
1139 | 1139 | ||
1140 | m=menu_init( items, sizeof(items) / sizeof(*items) ); | 1140 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL ); |
1141 | result = menu_run(m); | 1141 | result = menu_run(m); |
1142 | menu_exit(m); | 1142 | menu_exit(m); |
1143 | return result; | 1143 | return result; |
@@ -1157,7 +1157,7 @@ bool settings_menu(void) | |||
1157 | { str(LANG_LANGUAGE), language_browse }, | 1157 | { str(LANG_LANGUAGE), language_browse }, |
1158 | }; | 1158 | }; |
1159 | 1159 | ||
1160 | m=menu_init( items, sizeof(items) / sizeof(*items) ); | 1160 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL ); |
1161 | result = menu_run(m); | 1161 | result = menu_run(m); |
1162 | menu_exit(m); | 1162 | menu_exit(m); |
1163 | return result; | 1163 | return result; |