diff options
Diffstat (limited to 'apps/settings_menu.c')
-rw-r--r-- | apps/settings_menu.c | 88 |
1 files changed, 55 insertions, 33 deletions
diff --git a/apps/settings_menu.c b/apps/settings_menu.c index ea2738f176..64df007afe 100644 --- a/apps/settings_menu.c +++ b/apps/settings_menu.c | |||
@@ -402,7 +402,7 @@ static bool peak_meter_menu(void) | |||
402 | int m; | 402 | int m; |
403 | bool result; | 403 | bool result; |
404 | 404 | ||
405 | struct menu_items items[] = { | 405 | struct menu_item items[] = { |
406 | { STR(LANG_PM_RELEASE) , peak_meter_release }, | 406 | { STR(LANG_PM_RELEASE) , peak_meter_release }, |
407 | { STR(LANG_PM_PEAK_HOLD), peak_meter_hold }, | 407 | { STR(LANG_PM_PEAK_HOLD), peak_meter_hold }, |
408 | { STR(LANG_PM_CLIP_HOLD), peak_meter_clip_hold }, | 408 | { STR(LANG_PM_CLIP_HOLD), peak_meter_clip_hold }, |
@@ -414,8 +414,9 @@ static bool peak_meter_menu(void) | |||
414 | { STR(LANG_PM_MIN) , peak_meter_min }, | 414 | { STR(LANG_PM_MIN) , peak_meter_min }, |
415 | { STR(LANG_PM_MAX) , peak_meter_max }, | 415 | { STR(LANG_PM_MAX) , peak_meter_max }, |
416 | }; | 416 | }; |
417 | 417 | ||
418 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL ); | 418 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL, |
419 | NULL, NULL, NULL ); | ||
419 | result = menu_run(m); | 420 | result = menu_run(m); |
420 | menu_exit(m); | 421 | menu_exit(m); |
421 | return result; | 422 | return result; |
@@ -882,6 +883,11 @@ static bool status_bar(void) | |||
882 | { | 883 | { |
883 | return set_bool( str(LANG_STATUS_BAR), &global_settings.statusbar ); | 884 | return set_bool( str(LANG_STATUS_BAR), &global_settings.statusbar ); |
884 | } | 885 | } |
886 | |||
887 | static bool button_bar(void) | ||
888 | { | ||
889 | return set_bool( str(LANG_BUTTON_BAR), &global_settings.buttonbar ); | ||
890 | } | ||
885 | #endif | 891 | #endif |
886 | 892 | ||
887 | static bool ff_rewind_settings_menu(void) | 893 | static bool ff_rewind_settings_menu(void) |
@@ -889,12 +895,13 @@ static bool ff_rewind_settings_menu(void) | |||
889 | int m; | 895 | int m; |
890 | bool result; | 896 | bool result; |
891 | 897 | ||
892 | struct menu_items items[] = { | 898 | struct menu_item items[] = { |
893 | { STR(LANG_FFRW_STEP), ff_rewind_min_step }, | 899 | { STR(LANG_FFRW_STEP), ff_rewind_min_step }, |
894 | { STR(LANG_FFRW_ACCEL), ff_rewind_accel }, | 900 | { STR(LANG_FFRW_ACCEL), ff_rewind_accel }, |
895 | }; | 901 | }; |
896 | 902 | ||
897 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL ); | 903 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL, |
904 | NULL, NULL, NULL); | ||
898 | result = menu_run(m); | 905 | result = menu_run(m); |
899 | menu_exit(m); | 906 | menu_exit(m); |
900 | 907 | ||
@@ -906,7 +913,7 @@ static bool playback_settings_menu(void) | |||
906 | int m; | 913 | int m; |
907 | bool result; | 914 | bool result; |
908 | 915 | ||
909 | struct menu_items items[] = { | 916 | struct menu_item items[] = { |
910 | { STR(LANG_SHUFFLE), shuffle }, | 917 | { STR(LANG_SHUFFLE), shuffle }, |
911 | { STR(LANG_REPEAT), repeat_mode }, | 918 | { STR(LANG_REPEAT), repeat_mode }, |
912 | { STR(LANG_PLAY_SELECTED), play_selected }, | 919 | { STR(LANG_PLAY_SELECTED), play_selected }, |
@@ -918,7 +925,8 @@ static bool playback_settings_menu(void) | |||
918 | 925 | ||
919 | bool old_shuffle = global_settings.playlist_shuffle; | 926 | bool old_shuffle = global_settings.playlist_shuffle; |
920 | 927 | ||
921 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL ); | 928 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL, |
929 | NULL, NULL, NULL); | ||
922 | result = menu_run(m); | 930 | result = menu_run(m); |
923 | menu_exit(m); | 931 | menu_exit(m); |
924 | 932 | ||
@@ -941,13 +949,14 @@ static bool bookmark_settings_menu(void) | |||
941 | int m; | 949 | int m; |
942 | bool result; | 950 | bool result; |
943 | 951 | ||
944 | struct menu_items items[] = { | 952 | struct menu_item items[] = { |
945 | { STR(LANG_BOOKMARK_SETTINGS_AUTOCREATE), autocreatebookmark}, | 953 | { STR(LANG_BOOKMARK_SETTINGS_AUTOCREATE), autocreatebookmark}, |
946 | { STR(LANG_BOOKMARK_SETTINGS_AUTOLOAD), autoloadbookmark}, | 954 | { STR(LANG_BOOKMARK_SETTINGS_AUTOLOAD), autoloadbookmark}, |
947 | { STR(LANG_BOOKMARK_SETTINGS_MAINTAIN_RECENT_BOOKMARKS), useMRB}, | 955 | { STR(LANG_BOOKMARK_SETTINGS_MAINTAIN_RECENT_BOOKMARKS), useMRB}, |
948 | }; | 956 | }; |
949 | 957 | ||
950 | m=menu_init( items, sizeof items / sizeof(struct menu_items), NULL ); | 958 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL, |
959 | NULL, NULL, NULL); | ||
951 | result = menu_run(m); | 960 | result = menu_run(m); |
952 | menu_exit(m); | 961 | menu_exit(m); |
953 | 962 | ||
@@ -1008,14 +1017,15 @@ static bool fileview_settings_menu(void) | |||
1008 | int m; | 1017 | int m; |
1009 | bool result; | 1018 | bool result; |
1010 | 1019 | ||
1011 | struct menu_items items[] = { | 1020 | struct menu_item items[] = { |
1012 | { STR(LANG_CASE_MENU), sort_case }, | 1021 | { STR(LANG_CASE_MENU), sort_case }, |
1013 | { STR(LANG_FILTER), dir_filter }, | 1022 | { STR(LANG_FILTER), dir_filter }, |
1014 | { STR(LANG_FOLLOW), browse_current }, | 1023 | { STR(LANG_FOLLOW), browse_current }, |
1015 | { STR(LANG_SHOW_ICONS), show_icons }, | 1024 | { STR(LANG_SHOW_ICONS), show_icons }, |
1016 | }; | 1025 | }; |
1017 | 1026 | ||
1018 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL ); | 1027 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL, |
1028 | NULL, NULL, NULL); | ||
1019 | result = menu_run(m); | 1029 | result = menu_run(m); |
1020 | menu_exit(m); | 1030 | menu_exit(m); |
1021 | return result; | 1031 | return result; |
@@ -1027,7 +1037,7 @@ static bool scroll_settings_menu(void) | |||
1027 | int m; | 1037 | int m; |
1028 | bool result; | 1038 | bool result; |
1029 | 1039 | ||
1030 | struct menu_items items[] = { | 1040 | struct menu_item items[] = { |
1031 | { STR(LANG_SCROLL_SPEED), scroll_speed }, | 1041 | { STR(LANG_SCROLL_SPEED), scroll_speed }, |
1032 | { STR(LANG_SCROLL_DELAY), scroll_delay }, | 1042 | { STR(LANG_SCROLL_DELAY), scroll_delay }, |
1033 | #ifdef HAVE_LCD_BITMAP | 1043 | #ifdef HAVE_LCD_BITMAP |
@@ -1040,7 +1050,8 @@ static bool scroll_settings_menu(void) | |||
1040 | #endif | 1050 | #endif |
1041 | }; | 1051 | }; |
1042 | 1052 | ||
1043 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL ); | 1053 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL, |
1054 | NULL, NULL, NULL); | ||
1044 | result = menu_run(m); | 1055 | result = menu_run(m); |
1045 | menu_exit(m); | 1056 | menu_exit(m); |
1046 | return result; | 1057 | return result; |
@@ -1051,7 +1062,7 @@ static bool lcd_settings_menu(void) | |||
1051 | int m; | 1062 | int m; |
1052 | bool result; | 1063 | bool result; |
1053 | 1064 | ||
1054 | struct menu_items items[] = { | 1065 | struct menu_item items[] = { |
1055 | { STR(LANG_BACKLIGHT), backlight_timer }, | 1066 | { STR(LANG_BACKLIGHT), backlight_timer }, |
1056 | { STR(LANG_BACKLIGHT_ON_WHEN_CHARGING), backlight_on_when_charging }, | 1067 | { STR(LANG_BACKLIGHT_ON_WHEN_CHARGING), backlight_on_when_charging }, |
1057 | { STR(LANG_CAPTION_BACKLIGHT), caption_backlight }, | 1068 | { STR(LANG_CAPTION_BACKLIGHT), caption_backlight }, |
@@ -1063,7 +1074,8 @@ static bool lcd_settings_menu(void) | |||
1063 | #endif | 1074 | #endif |
1064 | }; | 1075 | }; |
1065 | 1076 | ||
1066 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL ); | 1077 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL, |
1078 | NULL, NULL, NULL); | ||
1067 | result = menu_run(m); | 1079 | result = menu_run(m); |
1068 | menu_exit(m); | 1080 | menu_exit(m); |
1069 | return result; | 1081 | return result; |
@@ -1075,14 +1087,16 @@ static bool bars_settings_menu(void) | |||
1075 | int m; | 1087 | int m; |
1076 | bool result; | 1088 | bool result; |
1077 | 1089 | ||
1078 | struct menu_items items[] = { | 1090 | struct menu_item items[] = { |
1079 | { STR(LANG_SCROLL_BAR), scroll_bar }, | 1091 | { STR(LANG_SCROLL_BAR), scroll_bar }, |
1080 | { STR(LANG_STATUS_BAR), status_bar }, | 1092 | { STR(LANG_STATUS_BAR), status_bar }, |
1093 | { STR(LANG_BUTTON_BAR), button_bar }, | ||
1081 | { STR(LANG_VOLUME_DISPLAY), volume_type }, | 1094 | { STR(LANG_VOLUME_DISPLAY), volume_type }, |
1082 | { STR(LANG_BATTERY_DISPLAY), battery_type }, | 1095 | { STR(LANG_BATTERY_DISPLAY), battery_type }, |
1083 | }; | 1096 | }; |
1084 | 1097 | ||
1085 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL ); | 1098 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL, |
1099 | NULL, NULL, NULL); | ||
1086 | result = menu_run(m); | 1100 | result = menu_run(m); |
1087 | menu_exit(m); | 1101 | menu_exit(m); |
1088 | return result; | 1102 | return result; |
@@ -1095,7 +1109,7 @@ static bool display_settings_menu(void) | |||
1095 | int m; | 1109 | int m; |
1096 | bool result; | 1110 | bool result; |
1097 | 1111 | ||
1098 | struct menu_items items[] = { | 1112 | struct menu_item items[] = { |
1099 | #ifdef HAVE_LCD_BITMAP | 1113 | #ifdef HAVE_LCD_BITMAP |
1100 | { STR(LANG_CUSTOM_FONT), font_browse }, | 1114 | { STR(LANG_CUSTOM_FONT), font_browse }, |
1101 | #endif | 1115 | #endif |
@@ -1108,7 +1122,8 @@ static bool display_settings_menu(void) | |||
1108 | #endif | 1122 | #endif |
1109 | }; | 1123 | }; |
1110 | 1124 | ||
1111 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL ); | 1125 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL, |
1126 | NULL, NULL, NULL); | ||
1112 | result = menu_run(m); | 1127 | result = menu_run(m); |
1113 | menu_exit(m); | 1128 | menu_exit(m); |
1114 | return result; | 1129 | return result; |
@@ -1125,7 +1140,7 @@ static bool battery_settings_menu(void) | |||
1125 | int m; | 1140 | int m; |
1126 | bool result; | 1141 | bool result; |
1127 | 1142 | ||
1128 | struct menu_items items[] = { | 1143 | struct menu_item items[] = { |
1129 | #ifdef HAVE_CHARGE_CTRL | 1144 | #ifdef HAVE_CHARGE_CTRL |
1130 | { STR(LANG_DISCHARGE), deep_discharge }, | 1145 | { STR(LANG_DISCHARGE), deep_discharge }, |
1131 | { STR(LANG_TRICKLE_CHARGE), trickle_charge }, | 1146 | { STR(LANG_TRICKLE_CHARGE), trickle_charge }, |
@@ -1135,7 +1150,8 @@ static bool battery_settings_menu(void) | |||
1135 | #endif | 1150 | #endif |
1136 | }; | 1151 | }; |
1137 | 1152 | ||
1138 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL ); | 1153 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL, |
1154 | NULL, NULL, NULL); | ||
1139 | result = menu_run(m); | 1155 | result = menu_run(m); |
1140 | menu_exit(m); | 1156 | menu_exit(m); |
1141 | return result; | 1157 | return result; |
@@ -1146,14 +1162,15 @@ static bool disk_settings_menu(void) | |||
1146 | int m; | 1162 | int m; |
1147 | bool result; | 1163 | bool result; |
1148 | 1164 | ||
1149 | struct menu_items items[] = { | 1165 | struct menu_item items[] = { |
1150 | { STR(LANG_SPINDOWN), spindown }, | 1166 | { STR(LANG_SPINDOWN), spindown }, |
1151 | #ifdef HAVE_ATA_POWER_OFF | 1167 | #ifdef HAVE_ATA_POWER_OFF |
1152 | { STR(LANG_POWEROFF), poweroff }, | 1168 | { STR(LANG_POWEROFF), poweroff }, |
1153 | #endif | 1169 | #endif |
1154 | }; | 1170 | }; |
1155 | 1171 | ||
1156 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL ); | 1172 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL, |
1173 | NULL, NULL, NULL); | ||
1157 | result = menu_run(m); | 1174 | result = menu_run(m); |
1158 | menu_exit(m); | 1175 | menu_exit(m); |
1159 | return result; | 1176 | return result; |
@@ -1165,12 +1182,13 @@ static bool time_settings_menu(void) | |||
1165 | int m; | 1182 | int m; |
1166 | bool result; | 1183 | bool result; |
1167 | 1184 | ||
1168 | struct menu_items items[] = { | 1185 | struct menu_item items[] = { |
1169 | { STR(LANG_TIME), timedate_set }, | 1186 | { STR(LANG_TIME), timedate_set }, |
1170 | { STR(LANG_TIMEFORMAT), timeformat_set }, | 1187 | { STR(LANG_TIMEFORMAT), timeformat_set }, |
1171 | }; | 1188 | }; |
1172 | 1189 | ||
1173 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL ); | 1190 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL, |
1191 | NULL, NULL, NULL); | ||
1174 | result = menu_run(m); | 1192 | result = menu_run(m); |
1175 | menu_exit(m); | 1193 | menu_exit(m); |
1176 | return result; | 1194 | return result; |
@@ -1182,14 +1200,15 @@ static bool manage_settings_menu(void) | |||
1182 | int m; | 1200 | int m; |
1183 | bool result; | 1201 | bool result; |
1184 | 1202 | ||
1185 | struct menu_items items[] = { | 1203 | struct menu_item items[] = { |
1186 | { STR(LANG_CUSTOM_CFG), custom_cfg_browse }, | 1204 | { STR(LANG_CUSTOM_CFG), custom_cfg_browse }, |
1187 | { STR(LANG_FIRMWARE), firmware_browse }, | 1205 | { STR(LANG_FIRMWARE), firmware_browse }, |
1188 | { STR(LANG_RESET), reset_settings }, | 1206 | { STR(LANG_RESET), reset_settings }, |
1189 | { STR(LANG_SAVE_SETTINGS), settings_save_config }, | 1207 | { STR(LANG_SAVE_SETTINGS), settings_save_config }, |
1190 | }; | 1208 | }; |
1191 | 1209 | ||
1192 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL ); | 1210 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL, |
1211 | NULL, NULL, NULL); | ||
1193 | result = menu_run(m); | 1212 | result = menu_run(m); |
1194 | menu_exit(m); | 1213 | menu_exit(m); |
1195 | return result; | 1214 | return result; |
@@ -1200,12 +1219,13 @@ static bool limits_settings_menu(void) | |||
1200 | int m; | 1219 | int m; |
1201 | bool result; | 1220 | bool result; |
1202 | 1221 | ||
1203 | struct menu_items items[] = { | 1222 | struct menu_item items[] = { |
1204 | { STR(LANG_MAX_FILES_IN_DIR), max_files_in_dir }, | 1223 | { STR(LANG_MAX_FILES_IN_DIR), max_files_in_dir }, |
1205 | { STR(LANG_MAX_FILES_IN_PLAYLIST), max_files_in_playlist }, | 1224 | { STR(LANG_MAX_FILES_IN_PLAYLIST), max_files_in_playlist }, |
1206 | }; | 1225 | }; |
1207 | 1226 | ||
1208 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL ); | 1227 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL, |
1228 | NULL, NULL, NULL); | ||
1209 | result = menu_run(m); | 1229 | result = menu_run(m); |
1210 | menu_exit(m); | 1230 | menu_exit(m); |
1211 | return result; | 1231 | return result; |
@@ -1217,7 +1237,7 @@ static bool system_settings_menu(void) | |||
1217 | int m; | 1237 | int m; |
1218 | bool result; | 1238 | bool result; |
1219 | 1239 | ||
1220 | struct menu_items items[] = { | 1240 | struct menu_item items[] = { |
1221 | { STR(LANG_BATTERY_MENU), battery_settings_menu }, | 1241 | { STR(LANG_BATTERY_MENU), battery_settings_menu }, |
1222 | { STR(LANG_DISK_MENU), disk_settings_menu }, | 1242 | { STR(LANG_DISK_MENU), disk_settings_menu }, |
1223 | #ifdef HAVE_RTC | 1243 | #ifdef HAVE_RTC |
@@ -1236,7 +1256,8 @@ static bool system_settings_menu(void) | |||
1236 | { STR(LANG_MANAGE_MENU), manage_settings_menu }, | 1256 | { STR(LANG_MANAGE_MENU), manage_settings_menu }, |
1237 | }; | 1257 | }; |
1238 | 1258 | ||
1239 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL ); | 1259 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL, |
1260 | NULL, NULL, NULL); | ||
1240 | result = menu_run(m); | 1261 | result = menu_run(m); |
1241 | menu_exit(m); | 1262 | menu_exit(m); |
1242 | return result; | 1263 | return result; |
@@ -1247,7 +1268,7 @@ bool settings_menu(void) | |||
1247 | int m; | 1268 | int m; |
1248 | bool result; | 1269 | bool result; |
1249 | 1270 | ||
1250 | struct menu_items items[] = { | 1271 | struct menu_item items[] = { |
1251 | { STR(LANG_PLAYBACK), playback_settings_menu }, | 1272 | { STR(LANG_PLAYBACK), playback_settings_menu }, |
1252 | { STR(LANG_FILE), fileview_settings_menu }, | 1273 | { STR(LANG_FILE), fileview_settings_menu }, |
1253 | { STR(LANG_DISPLAY), display_settings_menu }, | 1274 | { STR(LANG_DISPLAY), display_settings_menu }, |
@@ -1256,7 +1277,8 @@ bool settings_menu(void) | |||
1256 | { STR(LANG_LANGUAGE), language_browse }, | 1277 | { STR(LANG_LANGUAGE), language_browse }, |
1257 | }; | 1278 | }; |
1258 | 1279 | ||
1259 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL ); | 1280 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL, |
1281 | NULL, NULL, NULL); | ||
1260 | result = menu_run(m); | 1282 | result = menu_run(m); |
1261 | menu_exit(m); | 1283 | menu_exit(m); |
1262 | return result; | 1284 | return result; |