diff options
Diffstat (limited to 'apps/gui/select.c')
-rw-r--r-- | apps/gui/select.c | 45 |
1 files changed, 9 insertions, 36 deletions
diff --git a/apps/gui/select.c b/apps/gui/select.c index 89a047890c..12a93fcbcd 100644 --- a/apps/gui/select.c +++ b/apps/gui/select.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include "textarea.h" | 23 | #include "textarea.h" |
24 | #include "screen_access.h" | 24 | #include "screen_access.h" |
25 | #include "kernel.h" | 25 | #include "kernel.h" |
26 | #include "action.h" | ||
26 | 27 | ||
27 | 28 | ||
28 | void gui_select_init_numeric(struct gui_select * select, | 29 | void gui_select_init_numeric(struct gui_select * select, |
@@ -79,56 +80,28 @@ bool gui_syncselect_do_button(struct gui_select * select, int button) | |||
79 | { | 80 | { |
80 | switch(button) | 81 | switch(button) |
81 | { | 82 | { |
82 | case SELECT_INC | BUTTON_REPEAT : | 83 | case ACTION_SETTINGS_INCREPEAT: |
83 | #ifdef SELECT_RC_INC | ||
84 | case SELECT_RC_INC | BUTTON_REPEAT : | ||
85 | #endif | ||
86 | select->options.limit_loop = true; | 84 | select->options.limit_loop = true; |
87 | case SELECT_INC : | 85 | case ACTION_SETTINGS_INC: |
88 | #ifdef SELECT_RC_INC | ||
89 | case SELECT_RC_INC : | ||
90 | #endif | ||
91 | option_select_next(&select->options); | 86 | option_select_next(&select->options); |
92 | return(true); | 87 | return(true); |
93 | 88 | ||
94 | case SELECT_DEC | BUTTON_REPEAT : | 89 | case ACTION_SETTINGS_DECREPEAT: |
95 | #ifdef SELECT_RC_DEC | ||
96 | case SELECT_RC_DEC | BUTTON_REPEAT : | ||
97 | #endif | ||
98 | select->options.limit_loop = true; | 90 | select->options.limit_loop = true; |
99 | case SELECT_DEC : | 91 | case ACTION_SETTINGS_DEC: |
100 | #ifdef SELECT_RC_DEC | ||
101 | case SELECT_RC_DEC : | ||
102 | #endif | ||
103 | option_select_prev(&select->options); | 92 | option_select_prev(&select->options); |
104 | return(true); | 93 | return(true); |
105 | 94 | ||
106 | case SELECT_OK : | 95 | case ACTION_STD_OK: |
107 | #ifdef SELECT_RC_OK | 96 | case ACTION_STD_PREV: /*NOTE: this is in CONTEXT_SETTINGS ! */ |
108 | case SELECT_RC_OK : | ||
109 | #endif | ||
110 | #ifdef SELECT_RC_OK2 | ||
111 | case SELECT_RC_OK2 : | ||
112 | #endif | ||
113 | #ifdef SELECT_OK2 | ||
114 | case SELECT_OK2 : | ||
115 | #endif | ||
116 | select->validated=true; | 97 | select->validated=true; |
117 | return(false); | 98 | return(false); |
118 | 99 | ||
119 | case SELECT_CANCEL : | 100 | case ACTION_STD_CANCEL: |
120 | #ifdef SELECT_CANCEL2 | ||
121 | case SELECT_CANCEL2 : | ||
122 | #endif | ||
123 | #ifdef SELECT_RC_CANCEL | ||
124 | case SELECT_RC_CANCEL : | ||
125 | #endif | ||
126 | #ifdef SELECT_RC_CANCEL2 | ||
127 | case SELECT_RC_CANCEL2 : | ||
128 | #endif | ||
129 | select->canceled = true; | 101 | select->canceled = true; |
130 | gui_syncselect_draw(select); | 102 | gui_syncselect_draw(select); |
131 | sleep(HZ/2); | 103 | sleep(HZ/2); |
104 | action_signalscreenchange(); | ||
132 | return(false); | 105 | return(false); |
133 | } | 106 | } |
134 | return(false); | 107 | return(false); |