diff options
author | Christi Scarborough <christi@coraline.org> | 2005-11-18 15:33:05 +0000 |
---|---|---|
committer | Christi Scarborough <christi@coraline.org> | 2005-11-18 15:33:05 +0000 |
commit | 32a43e2ee688bf8b3c930685400a52910c512a1e (patch) | |
tree | 8675fddb2d926f0dabb65adb798033036a22c18d /apps | |
parent | e16ebf1a50b9692e93f44633138903418ef93526 (diff) | |
download | rockbox-32a43e2ee688bf8b3c930685400a52910c512a1e.tar.gz rockbox-32a43e2ee688bf8b3c930685400a52910c512a1e.zip |
When fixing things is it better to do it in a way that causes them to actually work. Some more bugs in wpsbuild.pl squashed. Also, themes moved to the main menu. Resetting to default themes now works properly.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7965 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/gui/gwps.c | 15 | ||||
-rw-r--r-- | apps/lang/english.lang | 4 | ||||
-rw-r--r-- | apps/main_menu.c | 10 | ||||
-rw-r--r-- | apps/settings.h | 2 | ||||
-rw-r--r-- | apps/settings_menu.c | 6 |
5 files changed, 25 insertions, 12 deletions
diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c index 2fff66e337..5877cf7c4b 100644 --- a/apps/gui/gwps.c +++ b/apps/gui/gwps.c | |||
@@ -731,11 +731,22 @@ bool wps_data_load(struct wps_data *wps_data, | |||
731 | * wants to be a virtual file. Feel free to modify dirbrowse() | 731 | * wants to be a virtual file. Feel free to modify dirbrowse() |
732 | * if you're feeling brave. | 732 | * if you're feeling brave. |
733 | */ | 733 | */ |
734 | if (! strcmp(buf, WPS_DEFAULTCFG) || !strcmp(buf, RWPS_DEFAULTCFG) ) | 734 | if (! strcmp(buf, WPS_DEFAULTCFG) ) |
735 | { | 735 | { |
736 | wps_reset(wps_data); | 736 | wps_reset(wps_data); |
737 | global_settings.wps_file[0] = 0; | ||
737 | return false; | 738 | return false; |
738 | } | 739 | } |
740 | |||
741 | #ifdef HAVE_REMOTE_LCD | ||
742 | if (! strcmp(buf, RWPS_DEFAULTCFG) ) | ||
743 | { | ||
744 | wps_reset(wps_data); | ||
745 | global_settings.rwps_file[0] = 0; | ||
746 | return false; | ||
747 | } | ||
748 | #endif | ||
749 | |||
739 | size_t bmpdirlen; | 750 | size_t bmpdirlen; |
740 | char *bmpdir = strrchr(buf, '.'); | 751 | char *bmpdir = strrchr(buf, '.'); |
741 | bmpdirlen = bmpdir - buf; | 752 | bmpdirlen = bmpdir - buf; |
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index 9ec8416ad9..f11ac9efcb 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
@@ -3451,6 +3451,6 @@ new: | |||
3451 | 3451 | ||
3452 | id: LANG_CUSTOM_THEME | 3452 | id: LANG_CUSTOM_THEME |
3453 | desc: Custom themes menu | 3453 | desc: Custom themes menu |
3454 | eng: "Browse themes" | 3454 | eng: "Browse Themes" |
3455 | voice: "Browse themes" | 3455 | voice: "Browse Themes" |
3456 | new: | 3456 | new: |
diff --git a/apps/main_menu.c b/apps/main_menu.c index f76c211f0a..262dd61a20 100644 --- a/apps/main_menu.c +++ b/apps/main_menu.c | |||
@@ -241,6 +241,11 @@ static bool plugin_browse(void) | |||
241 | return rockbox_browse(PLUGIN_DIR, SHOW_PLUGINS); | 241 | return rockbox_browse(PLUGIN_DIR, SHOW_PLUGINS); |
242 | } | 242 | } |
243 | 243 | ||
244 | static bool custom_theme_browse(void) | ||
245 | { | ||
246 | return rockbox_browse(THEME_DIR, SHOW_CFG); | ||
247 | } | ||
248 | |||
244 | #ifdef HAVE_RECORDING | 249 | #ifdef HAVE_RECORDING |
245 | 250 | ||
246 | static bool recording_settings(void) | 251 | static bool recording_settings(void) |
@@ -311,7 +316,7 @@ bool main_menu(void) | |||
311 | int i = 0; | 316 | int i = 0; |
312 | 317 | ||
313 | /* main menu */ | 318 | /* main menu */ |
314 | struct menu_item items[10]; | 319 | struct menu_item items[11]; |
315 | 320 | ||
316 | items[i].desc = ID2P(LANG_BOOKMARK_MENU_RECENT_BOOKMARKS); | 321 | items[i].desc = ID2P(LANG_BOOKMARK_MENU_RECENT_BOOKMARKS); |
317 | items[i++].function = bookmark_mrb_load; | 322 | items[i++].function = bookmark_mrb_load; |
@@ -325,6 +330,9 @@ bool main_menu(void) | |||
325 | items[i].desc = ID2P(LANG_MANAGE_MENU); | 330 | items[i].desc = ID2P(LANG_MANAGE_MENU); |
326 | items[i++].function = manage_settings_menu; | 331 | items[i++].function = manage_settings_menu; |
327 | 332 | ||
333 | items[i].desc = ID2P(LANG_CUSTOM_THEME); | ||
334 | items[i++].function = custom_theme_browse; | ||
335 | |||
328 | #ifdef CONFIG_TUNER | 336 | #ifdef CONFIG_TUNER |
329 | if(radio_hardware_present()) { | 337 | if(radio_hardware_present()) { |
330 | items[i].desc = ID2P(LANG_FM_RADIO); | 338 | items[i].desc = ID2P(LANG_FM_RADIO); |
diff --git a/apps/settings.h b/apps/settings.h index caaead6a10..04f6da667e 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -32,7 +32,7 @@ | |||
32 | #define FONT_DIR "/fonts" | 32 | #define FONT_DIR "/fonts" |
33 | #define LANG_DIR "/langs" | 33 | #define LANG_DIR "/langs" |
34 | #define WPS_DIR ROCKBOX_DIR "/wps" | 34 | #define WPS_DIR ROCKBOX_DIR "/wps" |
35 | #define THEME_DIR ROCKBOX_DIR "/theme" | 35 | #define THEME_DIR ROCKBOX_DIR "/themes" |
36 | #define PLUGIN_DIR ROCKBOX_DIR"/rocks" | 36 | #define PLUGIN_DIR ROCKBOX_DIR"/rocks" |
37 | #define REC_BASE_DIR "/recordings" | 37 | #define REC_BASE_DIR "/recordings" |
38 | 38 | ||
diff --git a/apps/settings_menu.c b/apps/settings_menu.c index 41beb4d016..27e24347a3 100644 --- a/apps/settings_menu.c +++ b/apps/settings_menu.c | |||
@@ -1003,11 +1003,6 @@ static bool custom_remote_wps_browse(void) | |||
1003 | return rockbox_browse(WPS_DIR, SHOW_RWPS); | 1003 | return rockbox_browse(WPS_DIR, SHOW_RWPS); |
1004 | } | 1004 | } |
1005 | #endif | 1005 | #endif |
1006 | |||
1007 | static bool custom_theme_browse(void) | ||
1008 | { | ||
1009 | return rockbox_browse(THEME_DIR, SHOW_CFG); | ||
1010 | } | ||
1011 | 1006 | ||
1012 | static bool custom_cfg_browse(void) | 1007 | static bool custom_cfg_browse(void) |
1013 | { | 1008 | { |
@@ -1589,7 +1584,6 @@ static bool display_settings_menu(void) | |||
1589 | #ifdef HAVE_LCD_BITMAP | 1584 | #ifdef HAVE_LCD_BITMAP |
1590 | { ID2P(LANG_CUSTOM_FONT), font_browse }, | 1585 | { ID2P(LANG_CUSTOM_FONT), font_browse }, |
1591 | #endif | 1586 | #endif |
1592 | { ID2P(LANG_CUSTOM_THEME), custom_theme_browse }, | ||
1593 | { ID2P(LANG_WHILE_PLAYING), custom_wps_browse }, | 1587 | { ID2P(LANG_WHILE_PLAYING), custom_wps_browse }, |
1594 | #ifdef HAVE_REMOTE_LCD | 1588 | #ifdef HAVE_REMOTE_LCD |
1595 | { ID2P(LANG_REMOTE_WHILE_PLAYING), custom_remote_wps_browse }, | 1589 | { ID2P(LANG_REMOTE_WHILE_PLAYING), custom_remote_wps_browse }, |