| 1 |
commit: e4bd16c64a35ed62e23388201c9e03edbcd4e1df |
| 2 |
Author: Sven Eden <sven.eden <AT> gmx <DOT> de> |
| 3 |
AuthorDate: Fri Feb 1 10:39:48 2013 +0000 |
| 4 |
Commit: Sven Eden <sven.eden <AT> gmx <DOT> de> |
| 5 |
CommitDate: Fri Feb 1 10:39:48 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/ufed.git;a=commit;h=e4bd16c6 |
| 7 |
|
| 8 |
Reorganized filter toggling finally enabling local/global and installed/not-installed filter. The toggle no longer leads to a list reset, the display stays where it is. |
| 9 |
|
| 10 |
--- |
| 11 |
ufed-curses-checklist.c | 6 ++-- |
| 12 |
ufed-curses.c | 48 +++++++++++++++++++++++++++++++++------------- |
| 13 |
2 files changed, 37 insertions(+), 17 deletions(-) |
| 14 |
|
| 15 |
diff --git a/ufed-curses-checklist.c b/ufed-curses-checklist.c |
| 16 |
index 5950796..d9f3067 100644 |
| 17 |
--- a/ufed-curses-checklist.c |
| 18 |
+++ b/ufed-curses-checklist.c |
| 19 |
@@ -26,9 +26,9 @@ static const sKey keys[] = { |
| 20 |
{ '\033', mkKey("Cancel (Esc)") }, |
| 21 |
{ -1, mkKey("Display (") }, |
| 22 |
{ KEY_F(5), mkKey("Mask (F5)") }, |
| 23 |
- { KEY_F(6), mkKey("Order (F6)") }, |
| 24 |
-// { KEY_F(7), mkKey("Local/Global (F7)") }, |
| 25 |
-// { KEY_F(8), mkKey("Installed (F8)") }, |
| 26 |
+ { KEY_F(6), mkKey("Local/Global (F7)") }, |
| 27 |
+ { KEY_F(7), mkKey("Installed (F8)") }, |
| 28 |
+ { KEY_F(8), mkKey("Order (F6)") }, |
| 29 |
{ -1, mkKey(")") }, |
| 30 |
{ '\0', mkKey("") } |
| 31 |
}; |
| 32 |
|
| 33 |
diff --git a/ufed-curses.c b/ufed-curses.c |
| 34 |
index 2808055..d14cd38 100644 |
| 35 |
--- a/ufed-curses.c |
| 36 |
+++ b/ufed-curses.c |
| 37 |
@@ -703,28 +703,48 @@ int maineventloop( |
| 38 |
if (eMask_masked == e_mask) e_mask = eMask_unmasked; |
| 39 |
else if (eMask_unmasked == e_mask) e_mask = eMask_both; |
| 40 |
else e_mask = eMask_masked; |
| 41 |
- resetDisplay(withSep); |
| 42 |
+ |
| 43 |
+ if ( !isFlagLegal(currentflag) |
| 44 |
+ && !setNextItem(1, true) |
| 45 |
+ && !setPrevItem(1, true) ) |
| 46 |
+ resetDisplay(withSep); |
| 47 |
+ else |
| 48 |
+ draw(withSep); |
| 49 |
+ |
| 50 |
break; |
| 51 |
|
| 52 |
case KEY_F(6): |
| 53 |
+ if (eScope_local == e_scope) e_scope = eScope_all; |
| 54 |
+ else if (eScope_global == e_scope) e_scope = eScope_local; |
| 55 |
+ else e_scope = eScope_global; |
| 56 |
+ |
| 57 |
+ if ( !isFlagLegal(currentflag) |
| 58 |
+ && !setNextItem(1, true) |
| 59 |
+ && !setPrevItem(1, true) ) |
| 60 |
+ resetDisplay(withSep); |
| 61 |
+ else |
| 62 |
+ draw(withSep); |
| 63 |
+ break; |
| 64 |
+ |
| 65 |
+ case KEY_F(7): |
| 66 |
+ if (eState_installed == e_state) e_state = eState_notinstalled; |
| 67 |
+ else if (eState_notinstalled == e_state) e_state = eState_all; |
| 68 |
+ else e_state = eState_installed; |
| 69 |
+ |
| 70 |
+ if ( !isFlagLegal(currentflag) |
| 71 |
+ && !setNextItem(1, true) |
| 72 |
+ && !setPrevItem(1, true) ) |
| 73 |
+ resetDisplay(withSep); |
| 74 |
+ else |
| 75 |
+ draw(withSep); |
| 76 |
+ break; |
| 77 |
+ |
| 78 |
+ case KEY_F(8): |
| 79 |
if (eOrder_left == e_order) e_order = eOrder_right; |
| 80 |
else e_order = eOrder_left; |
| 81 |
drawFlags(); |
| 82 |
break; |
| 83 |
|
| 84 |
-// case KEY_F(7): |
| 85 |
-// if (eScope_local == e_scope) e_scope = eScope_all; |
| 86 |
-// else if (eScope_global == e_scope) e_scope = eScope_local; |
| 87 |
-// else if (eScope_all == e_scope) e_scope = eScope_global; |
| 88 |
-// resetDisplay(); |
| 89 |
-// break; |
| 90 |
-// |
| 91 |
-// case KEY_F(8): |
| 92 |
-// if (eState_installed == e_state) e_state = eState_notinstalled; |
| 93 |
-// else if (eState_notinstalled == e_state) e_state = eState_all; |
| 94 |
-// else if (eState_all == e_state) e_state = eState_installed; |
| 95 |
-// resetDisplay(); |
| 96 |
-// break; |
| 97 |
|
| 98 |
#ifdef KEY_RESIZE |
| 99 |
case KEY_RESIZE: |
Archives