[gentoo-commits] proj/ufed:master commit in: /

["Sven Eden" <sven.eden@gmx.de>]

commit:     56dd9c3f8f8e5f003ad1fa73f7015e03c628fd01
Author:     Sven Eden <sven.eden <AT> gmx <DOT> de>
AuthorDate: Wed Jan 23 12:04:42 2013 +0000
Commit:     Sven Eden <sven.eden <AT> gmx <DOT> de>
CommitDate: Wed Jan 23 12:04:42 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/ufed.git;a=commit;h=56dd9c3f

Changed layout: Global descriptions no longer have a prefix. Others have ACS_VLINE + L/M + ' '/'*' for Local/Masked and unisntalled/installed.

---
 ufed-curses-checklist.c |   24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/ufed-curses-checklist.c b/ufed-curses-checklist.c
index 4518375..f2cfcaf 100644
--- a/ufed-curses-checklist.c
+++ b/ufed-curses-checklist.c
@@ -373,10 +373,12 @@ static int drawflag(struct item *item, bool highlight) {
 				break;
 
 			// Display flag state
-			sprintf(buf + minwidth, "[%c] ",
-				flag->item.isMasked ? flag->isInstalled[idx] ? 'M' : 'm'
-					: flag->item.isGlobal && !flag->pkgs[idx] ? 'g'
-					: flag->isInstalled[idx] ? 'L' : 'l');
+			bool hasScope = flag->item.isGlobal && !flag->pkgs[idx] ? false : true;
+			if (hasScope) {
+				sprintf(buf + minwidth, " %c%c  ",
+					flag->item.isMasked ? 'M' : 'L',
+					flag->isInstalled[idx] ? '*' : ' ');
+			}
 
 			// Assemble description line:
 			memset(desc, 0, maxDescWidth * sizeof(char));
@@ -390,8 +392,9 @@ static int drawflag(struct item *item, bool highlight) {
 				sprintf(desc, "%s", flag->descr[idx]);
 
 			// Now display the description line according to its horizontal position
-			sprintf(buf + minwidth + 4, "%-*.*s",
-				wWidth(List)-minwidth - 4, wWidth(List)-minwidth - 4,
+			sprintf(buf + minwidth + (hasScope ? 5 : 0), "%-*.*s",
+				wWidth(List)-minwidth - (hasScope ? 5 : 0),
+				wWidth(List)-minwidth - (hasScope ? 5 : 0),
 				strlen(desc) > (size_t)descriptionleft
 					? &desc[descriptionleft]
 					: "");
@@ -399,13 +402,16 @@ static int drawflag(struct item *item, bool highlight) {
 			/* Set correct color set according to highlighting and status*/
 			if(highlight)
 				wattrset(win(List), COLOR_PAIR(3) | A_BOLD | A_REVERSE);
-			else if (flag->item.isGlobal && !flag->pkgs[idx])
-				wattrset(win(List), COLOR_PAIR(5));
 			else
 				wattrset(win(List), COLOR_PAIR(3));
 
 			// Finally put the line on the screen
-			waddstr(win(List), buf);
+			mvwaddstr(win(List), line, 0, buf);
+			// waddstr(win(List), buf);
+			if (hasScope) {
+				mvwaddch(win(List), line, minwidth,     ACS_VLINE);
+				mvwaddch(win(List), line, minwidth + 3, ACS_VLINE);
+			}
 			++line;
 			++idx;
 			++usedY;