diff options
Diffstat (limited to 'apps/menus/theme_menu.c')
-rw-r--r-- | apps/menus/theme_menu.c | 56 |
1 files changed, 24 insertions, 32 deletions
diff --git a/apps/menus/theme_menu.c b/apps/menus/theme_menu.c index de81169c66..60a2a27ef4 100644 --- a/apps/menus/theme_menu.c +++ b/apps/menus/theme_menu.c | |||
@@ -62,7 +62,7 @@ static int clear_main_backdrop(void) | |||
62 | return 0; | 62 | return 0; |
63 | } | 63 | } |
64 | MENUITEM_FUNCTION(clear_main_bd, 0, ID2P(LANG_CLEAR_BACKDROP), | 64 | MENUITEM_FUNCTION(clear_main_bd, 0, ID2P(LANG_CLEAR_BACKDROP), |
65 | clear_main_backdrop, NULL, NULL, Icon_NOICON); | 65 | clear_main_backdrop, NULL, Icon_NOICON); |
66 | #endif | 66 | #endif |
67 | #ifdef HAVE_LCD_COLOR | 67 | #ifdef HAVE_LCD_COLOR |
68 | 68 | ||
@@ -130,19 +130,19 @@ static int reset_color(void) | |||
130 | return 0; | 130 | return 0; |
131 | } | 131 | } |
132 | MENUITEM_FUNCTION_W_PARAM(set_bg_col, 0, ID2P(LANG_BACKGROUND_COLOR), | 132 | MENUITEM_FUNCTION_W_PARAM(set_bg_col, 0, ID2P(LANG_BACKGROUND_COLOR), |
133 | set_color_func, (void*)COLOR_BG, NULL, Icon_NOICON); | 133 | set_color_func, (void*)COLOR_BG, NULL, Icon_NOICON); |
134 | MENUITEM_FUNCTION_W_PARAM(set_fg_col, 0, ID2P(LANG_FOREGROUND_COLOR), | 134 | MENUITEM_FUNCTION_W_PARAM(set_fg_col, 0, ID2P(LANG_FOREGROUND_COLOR), |
135 | set_color_func, (void*)COLOR_FG, NULL, Icon_NOICON); | 135 | set_color_func, (void*)COLOR_FG, NULL, Icon_NOICON); |
136 | MENUITEM_FUNCTION_W_PARAM(set_lss_col, 0, ID2P(LANG_SELECTOR_START_COLOR), | 136 | MENUITEM_FUNCTION_W_PARAM(set_lss_col, 0, ID2P(LANG_SELECTOR_START_COLOR), |
137 | set_color_func, (void*)COLOR_LSS, NULL, Icon_NOICON); | 137 | set_color_func, (void*)COLOR_LSS, NULL, Icon_NOICON); |
138 | MENUITEM_FUNCTION_W_PARAM(set_lse_col, 0, ID2P(LANG_SELECTOR_END_COLOR), | 138 | MENUITEM_FUNCTION_W_PARAM(set_lse_col, 0, ID2P(LANG_SELECTOR_END_COLOR), |
139 | set_color_func, (void*)COLOR_LSE, NULL, Icon_NOICON); | 139 | set_color_func, (void*)COLOR_LSE, NULL, Icon_NOICON); |
140 | MENUITEM_FUNCTION_W_PARAM(set_lst_col, 0, ID2P(LANG_SELECTOR_TEXT_COLOR), | 140 | MENUITEM_FUNCTION_W_PARAM(set_lst_col, 0, ID2P(LANG_SELECTOR_TEXT_COLOR), |
141 | set_color_func, (void*)COLOR_LST, NULL, Icon_NOICON); | 141 | set_color_func, (void*)COLOR_LST, NULL, Icon_NOICON); |
142 | MENUITEM_FUNCTION_W_PARAM(set_sep_col, 0, ID2P(LANG_LIST_SEPARATOR_COLOR), | 142 | MENUITEM_FUNCTION_W_PARAM(set_sep_col, 0, ID2P(LANG_LIST_SEPARATOR_COLOR), |
143 | set_color_func, (void*)COLOR_SEP, NULL, Icon_NOICON); | 143 | set_color_func, (void*)COLOR_SEP, NULL, Icon_NOICON); |
144 | MENUITEM_FUNCTION(reset_colors, 0, ID2P(LANG_RESET_COLORS), | 144 | MENUITEM_FUNCTION(reset_colors, 0, ID2P(LANG_RESET_COLORS), |
145 | reset_color, NULL, NULL, Icon_NOICON); | 145 | reset_color, NULL, Icon_NOICON); |
146 | 146 | ||
147 | MAKE_MENU(lss_settings, ID2P(LANG_SELECTOR_COLOR_MENU), | 147 | MAKE_MENU(lss_settings, ID2P(LANG_SELECTOR_COLOR_MENU), |
148 | NULL, Icon_NOICON, | 148 | NULL, Icon_NOICON, |
@@ -323,32 +323,25 @@ int browse_folder(void *param) | |||
323 | return rockbox_browse(&browse); | 323 | return rockbox_browse(&browse); |
324 | } | 324 | } |
325 | 325 | ||
326 | MENUITEM_FUNCTION_W_PARAM(browse_fonts, 0, | 326 | MENUITEM_FUNCTION_W_PARAM(browse_fonts, 0, ID2P(LANG_CUSTOM_FONT), |
327 | ID2P(LANG_CUSTOM_FONT), | 327 | browse_folder, (void*)&fonts, NULL, Icon_Font); |
328 | browse_folder, (void*)&fonts, NULL, Icon_Font); | ||
329 | 328 | ||
330 | MENUITEM_FUNCTION_W_PARAM(browse_sbs, 0, | 329 | MENUITEM_FUNCTION_W_PARAM(browse_sbs, 0, ID2P(LANG_BASE_SKIN), |
331 | ID2P(LANG_BASE_SKIN), | 330 | browse_folder, (void*)&sbs, NULL, Icon_Wps); |
332 | browse_folder, (void*)&sbs, NULL, Icon_Wps); | ||
333 | #if CONFIG_TUNER | 331 | #if CONFIG_TUNER |
334 | MENUITEM_FUNCTION_W_PARAM(browse_fms, 0, | 332 | MENUITEM_FUNCTION_W_PARAM(browse_fms, 0, ID2P(LANG_RADIOSCREEN), |
335 | ID2P(LANG_RADIOSCREEN), | 333 | browse_folder, (void*)&fms, NULL, Icon_Wps); |
336 | browse_folder, (void*)&fms, NULL, Icon_Wps); | ||
337 | #endif | 334 | #endif |
338 | MENUITEM_FUNCTION_W_PARAM(browse_wps, 0, | 335 | MENUITEM_FUNCTION_W_PARAM(browse_wps, 0, ID2P(LANG_WHILE_PLAYING), |
339 | ID2P(LANG_WHILE_PLAYING), | 336 | browse_folder, (void*)&wps, NULL, Icon_Wps); |
340 | browse_folder, (void*)&wps, NULL, Icon_Wps); | ||
341 | #ifdef HAVE_REMOTE_LCD | 337 | #ifdef HAVE_REMOTE_LCD |
342 | MENUITEM_FUNCTION_W_PARAM(browse_rwps, 0, | 338 | MENUITEM_FUNCTION_W_PARAM(browse_rwps, 0, ID2P(LANG_REMOTE_WHILE_PLAYING), |
343 | ID2P(LANG_REMOTE_WHILE_PLAYING), | 339 | browse_folder, (void*)&rwps, NULL, Icon_Wps); |
344 | browse_folder, (void*)&rwps, NULL, Icon_Wps); | 340 | MENUITEM_FUNCTION_W_PARAM(browse_rsbs, 0, ID2P(LANG_REMOTE_BASE_SKIN), |
345 | MENUITEM_FUNCTION_W_PARAM(browse_rsbs, 0, | 341 | browse_folder, (void*)&rsbs, NULL, Icon_Wps); |
346 | ID2P(LANG_REMOTE_BASE_SKIN), | ||
347 | browse_folder, (void*)&rsbs, NULL, Icon_Wps); | ||
348 | #if CONFIG_TUNER | 342 | #if CONFIG_TUNER |
349 | MENUITEM_FUNCTION_W_PARAM(browse_rfms, 0, | 343 | MENUITEM_FUNCTION_W_PARAM(browse_rfms, 0, ID2P(LANG_REMOTE_RADIOSCREEN), |
350 | ID2P(LANG_REMOTE_RADIOSCREEN), | 344 | browse_folder, (void*)&rfms, NULL, Icon_Wps); |
351 | browse_folder, (void*)&rfms, NULL, Icon_Wps); | ||
352 | #endif | 345 | #endif |
353 | #endif | 346 | #endif |
354 | 347 | ||
@@ -373,9 +366,8 @@ static int showicons_callback(int action, | |||
373 | } | 366 | } |
374 | 367 | ||
375 | MENUITEM_SETTING(show_icons, &global_settings.show_icons, showicons_callback); | 368 | MENUITEM_SETTING(show_icons, &global_settings.show_icons, showicons_callback); |
376 | MENUITEM_FUNCTION_W_PARAM(browse_themes, 0, | 369 | MENUITEM_FUNCTION_W_PARAM(browse_themes, 0, ID2P(LANG_CUSTOM_THEME), |
377 | ID2P(LANG_CUSTOM_THEME), | 370 | browse_folder, (void*)&themes, NULL, Icon_Config); |
378 | browse_folder, (void*)&themes, NULL, Icon_Config); | ||
379 | MENUITEM_SETTING(cursor_style, &global_settings.cursor_style, NULL); | 371 | MENUITEM_SETTING(cursor_style, &global_settings.cursor_style, NULL); |
380 | #if LCD_DEPTH > 1 | 372 | #if LCD_DEPTH > 1 |
381 | MENUITEM_SETTING(sep_menu, &global_settings.list_separator_height, NULL); | 373 | MENUITEM_SETTING(sep_menu, &global_settings.list_separator_height, NULL); |