diff options
author | Dave Chapman <dave@dchapman.com> | 2005-12-10 12:59:54 +0000 |
---|---|---|
committer | Dave Chapman <dave@dchapman.com> | 2005-12-10 12:59:54 +0000 |
commit | b78838d09feb83c8d3ae4bdb24b2d771373199a6 (patch) | |
tree | fb1ec89f73e0cb8fe7f5f9322f91eefe10f22025 /apps | |
parent | 1aa26ef31fbff13c9055e5b47873ef625fa09f19 (diff) | |
download | rockbox-b78838d09feb83c8d3ae4bdb24b2d771373199a6.tar.gz rockbox-b78838d09feb83c8d3ae4bdb24b2d771373199a6.zip |
Use the abstract SETTINGS_ defines instead of the target-specific BUTTON_ defines for the time/date settings screen - in preparation for H300/iPod RTC support
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8212 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/screens.c | 20 | ||||
-rw-r--r-- | apps/settings.h | 12 |
2 files changed, 20 insertions, 12 deletions
diff --git a/apps/screens.c b/apps/screens.c index 934b2663f1..5c5d96fd44 100644 --- a/apps/screens.c +++ b/apps/screens.c | |||
@@ -879,22 +879,22 @@ bool set_time_screen(const char* string, struct tm *tm) | |||
879 | 879 | ||
880 | button = button_get_w_tmo(HZ/2); | 880 | button = button_get_w_tmo(HZ/2); |
881 | switch ( button ) { | 881 | switch ( button ) { |
882 | case BUTTON_LEFT: | 882 | case SETTINGS_PREV: |
883 | cursorpos = (cursorpos + 6 - 1) % 6; | 883 | cursorpos = (cursorpos + 6 - 1) % 6; |
884 | break; | 884 | break; |
885 | case BUTTON_RIGHT: | 885 | case SETTINGS_NEXT: |
886 | cursorpos = (cursorpos + 6 + 1) % 6; | 886 | cursorpos = (cursorpos + 6 + 1) % 6; |
887 | break; | 887 | break; |
888 | case BUTTON_UP: | 888 | case SETTINGS_INC: |
889 | case BUTTON_UP | BUTTON_REPEAT: | 889 | case SETTINGS_INC | BUTTON_REPEAT: |
890 | *valptr = (*valptr + steps - min + 1) % | 890 | *valptr = (*valptr + steps - min + 1) % |
891 | steps + min; | 891 | steps + min; |
892 | if(*valptr == 0) | 892 | if(*valptr == 0) |
893 | *valptr = min; | 893 | *valptr = min; |
894 | say_time(cursorpos, tm); | 894 | say_time(cursorpos, tm); |
895 | break; | 895 | break; |
896 | case BUTTON_DOWN: | 896 | case SETTINGS_DEC: |
897 | case BUTTON_DOWN | BUTTON_REPEAT: | 897 | case SETTINGS_DEC | BUTTON_REPEAT: |
898 | *valptr = (*valptr + steps - min - 1) % | 898 | *valptr = (*valptr + steps - min - 1) % |
899 | steps + min; | 899 | steps + min; |
900 | if(*valptr == 0) | 900 | if(*valptr == 0) |
@@ -902,15 +902,11 @@ bool set_time_screen(const char* string, struct tm *tm) | |||
902 | say_time(cursorpos, tm); | 902 | say_time(cursorpos, tm); |
903 | break; | 903 | break; |
904 | 904 | ||
905 | #ifdef BUTTON_ON | 905 | case SETTINGS_ACCEPT: |
906 | case BUTTON_ON: | ||
907 | #elif defined BUTTON_MENU | ||
908 | case BUTTON_MENU: | ||
909 | #endif | ||
910 | done = true; | 906 | done = true; |
911 | break; | 907 | break; |
912 | 908 | ||
913 | case BUTTON_OFF: | 909 | case SETTINGS_CANCEL: |
914 | done = true; | 910 | done = true; |
915 | tm->tm_year = -1; | 911 | tm->tm_year = -1; |
916 | break; | 912 | break; |
diff --git a/apps/settings.h b/apps/settings.h index b1e8c9e2e8..7f463c01fe 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -47,6 +47,9 @@ | |||
47 | #define SETTINGS_OK2 BUTTON_LEFT | 47 | #define SETTINGS_OK2 BUTTON_LEFT |
48 | #define SETTINGS_CANCEL BUTTON_OFF | 48 | #define SETTINGS_CANCEL BUTTON_OFF |
49 | #define SETTINGS_CANCEL2 BUTTON_MODE | 49 | #define SETTINGS_CANCEL2 BUTTON_MODE |
50 | #define SETTINGS_PREV BUTTON_LEFT | ||
51 | #define SETTINGS_NEXT BUTTON_RIGHT | ||
52 | #define SETTINGS_ACCEPT BUTTON_MODE | ||
50 | 53 | ||
51 | #elif CONFIG_KEYPAD == RECORDER_PAD | 54 | #elif CONFIG_KEYPAD == RECORDER_PAD |
52 | #define SETTINGS_INC BUTTON_UP | 55 | #define SETTINGS_INC BUTTON_UP |
@@ -55,6 +58,9 @@ | |||
55 | #define SETTINGS_OK2 BUTTON_LEFT | 58 | #define SETTINGS_OK2 BUTTON_LEFT |
56 | #define SETTINGS_CANCEL BUTTON_OFF | 59 | #define SETTINGS_CANCEL BUTTON_OFF |
57 | #define SETTINGS_CANCEL2 BUTTON_F1 | 60 | #define SETTINGS_CANCEL2 BUTTON_F1 |
61 | #define SETTINGS_PREV BUTTON_LEFT | ||
62 | #define SETTINGS_NEXT BUTTON_RIGHT | ||
63 | #define SETTINGS_ACCEPT BUTTON_ON | ||
58 | 64 | ||
59 | #elif CONFIG_KEYPAD == PLAYER_PAD | 65 | #elif CONFIG_KEYPAD == PLAYER_PAD |
60 | #define SETTINGS_INC BUTTON_RIGHT | 66 | #define SETTINGS_INC BUTTON_RIGHT |
@@ -78,6 +84,9 @@ | |||
78 | #define SETTINGS_OK2 BUTTON_LEFT | 84 | #define SETTINGS_OK2 BUTTON_LEFT |
79 | #define SETTINGS_CANCEL BUTTON_OFF | 85 | #define SETTINGS_CANCEL BUTTON_OFF |
80 | #define SETTINGS_CANCEL2 BUTTON_MENU | 86 | #define SETTINGS_CANCEL2 BUTTON_MENU |
87 | #define SETTINGS_PREV BUTTON_LEFT | ||
88 | #define SETTINGS_NEXT BUTTON_RIGHT | ||
89 | #define SETTINGS_ACCEPT BUTTON_MENU | ||
81 | 90 | ||
82 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 91 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
83 | (CONFIG_KEYPAD == IPOD_NANO_PAD) | 92 | (CONFIG_KEYPAD == IPOD_NANO_PAD) |
@@ -85,6 +94,9 @@ | |||
85 | #define SETTINGS_DEC BUTTON_SCROLL_BACK | 94 | #define SETTINGS_DEC BUTTON_SCROLL_BACK |
86 | #define SETTINGS_OK BUTTON_SELECT | 95 | #define SETTINGS_OK BUTTON_SELECT |
87 | #define SETTINGS_CANCEL BUTTON_MENU | 96 | #define SETTINGS_CANCEL BUTTON_MENU |
97 | #define SETTINGS_PREV BUTTON_LEFT | ||
98 | #define SETTINGS_NEXT BUTTON_RIGHT | ||
99 | #define SETTINGS_ACCEPT BUTTON_PLAY | ||
88 | 100 | ||
89 | #endif | 101 | #endif |
90 | 102 | ||