diff options
| author |   Sven Eden <sven.eden@gmx.de> | 2013-02-13 09:43:27 +0100 |
|---|---|---|
| committer | Sven Eden <sven.eden@gmx.de> | 2013-02-13 09:43:27 +0100 |
| commit | 5fd16c6089187b5241195b855b88cc7c6bad5191 (patch) | |
| tree | 91e910ce114395d18dd65ae7d0db248241907448 /ufed-curses-checklist.c | |
| parent | Fixed building of the help text. (diff) | |
| download | ufed-5fd16c6089187b5241195b855b88cc7c6bad5191.tar.gz ufed-5fd16c6089187b5241195b855b88cc7c6bad5191.tar.bz2 ufed-5fd16c6089187b5241195b855b88cc7c6bad5191.zip | |
reordered key help and changed some of the texts. It should be much clearer now.
Diffstat (limited to 'ufed-curses-checklist.c')
| -rw-r--r-- | ufed-curses-checklist.c | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/ufed-curses-checklist.c b/ufed-curses-checklist.c index 28a440c..7e0f018 100644 --- a/ufed-curses-checklist.c +++ b/ufed-curses-checklist.c @@ -23,12 +23,11 @@ static const sKey keys[] = { { '?', mkKey("Help (?)") }, { '\n', mkKey("Save (Enter)") }, { '\033', mkKey("Cancel (Esc)") }, - { -1, mkKey("Display (") }, - { KEY_F(5), mkKey("Masked/Forced (F5),") }, - { KEY_F(6), mkKey("Local/Global (F6),") }, - { KEY_F(7), mkKey("Installed (F7),") }, - { KEY_F(8), mkKey("Order (F8)") }, - { -1, mkKey(")") }, + { -1, mkKey("Toggle :") }, + { KEY_F(5), mkKey("Local/Global (F5)") }, + { KEY_F(6), mkKey("Installed (F6)") }, + { KEY_F(7), mkKey("Masked/Forced (F7)") }, + { KEY_F(9), mkKey("Pkg/Desc Order (F9)") }, { '\0', mkKey("") } }; #undef mkKey @@ -460,10 +459,11 @@ static int callback(sFlag** curr, int key) wmove(wLst, (*curr)->currline, 2); wrefresh(wLst); break; + case KEY_F(5): - if (eMask_masked == e_mask) e_mask = eMask_unmasked; - else if (eMask_unmasked == e_mask) e_mask = eMask_both; - else e_mask = eMask_masked; + if (eScope_local == e_scope) e_scope = eScope_all; + else if (eScope_global == e_scope) e_scope = eScope_local; + else e_scope = eScope_global; if ( !isFlagLegal(*curr) && !setNextItem(0, true) @@ -471,13 +471,12 @@ static int callback(sFlag** curr, int key) resetDisplay(true); else draw(true); - break; case KEY_F(6): - if (eScope_local == e_scope) e_scope = eScope_all; - else if (eScope_global == e_scope) e_scope = eScope_local; - else e_scope = eScope_global; + if (eState_installed == e_state) e_state = eState_notinstalled; + else if (eState_notinstalled == e_state) e_state = eState_all; + else e_state = eState_installed; if ( !isFlagLegal(*curr) && !setNextItem(0, true) @@ -488,9 +487,9 @@ static int callback(sFlag** curr, int key) break; case KEY_F(7): - if (eState_installed == e_state) e_state = eState_notinstalled; - else if (eState_notinstalled == e_state) e_state = eState_all; - else e_state = eState_installed; + if (eMask_masked == e_mask) e_mask = eMask_unmasked; + else if (eMask_unmasked == e_mask) e_mask = eMask_both; + else e_mask = eMask_masked; if ( !isFlagLegal(*curr) && !setNextItem(0, true) @@ -498,14 +497,17 @@ static int callback(sFlag** curr, int key) resetDisplay(true); else draw(true); + break; - case KEY_F(8): + case KEY_F(9): if (eOrder_left == e_order) e_order = eOrder_right; else e_order = eOrder_left; + drawFlags(); wmove(wInp, 0, strlen(fayt)); break; + #ifdef NCURSES_MOUSE_VERSION case KEY_MOUSE: // Masked flags can be turned off, nothing else |