r3240 - in software/ui: data src

[Miriam Ruiz]

Author: baby-guest
Date: 2007-07-04 19:31:54 +0000 (Wed, 04 Jul 2007)
New Revision: 3240

Added:
   software/ui/data/people.png
   software/ui/data/people_off.png
   software/ui/data/people_on.png
Modified:
   software/ui/src/common.h
   software/ui/src/pkgbrowser.cpp
Log:
Replaced stars with people in popcon



Added: software/ui/data/people.png
===================================================================
(Binary files differ)


Property changes on: software/ui/data/people.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: software/ui/data/people_off.png
===================================================================
(Binary files differ)


Property changes on: software/ui/data/people_off.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: software/ui/data/people_on.png
===================================================================
(Binary files differ)


Property changes on: software/ui/data/people_on.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: software/ui/src/common.h
===================================================================
--- software/ui/src/common.h	2007-07-04 18:10:12 UTC (rev 3239)
+++ software/ui/src/common.h	2007-07-04 19:31:54 UTC (rev 3240)
@@ -38,11 +38,11 @@
 #endif
 
 #ifndef FILE_STARS_ON
-#define FILE_STARS_ON DATADIR "/stars_on.png"
+#define FILE_STARS_ON DATADIR "/people_on.png"
 #endif
 
 #ifndef FILE_STARS_OFF
-#define FILE_STARS_OFF DATADIR "/stars_off.png"
+#define FILE_STARS_OFF DATADIR "/people_off.png"
 #endif
 
 #ifndef THUMBNAILSDIR

Modified: software/ui/src/pkgbrowser.cpp
===================================================================
--- software/ui/src/pkgbrowser.cpp	2007-07-04 18:10:12 UTC (rev 3239)
+++ software/ui/src/pkgbrowser.cpp	2007-07-04 19:31:54 UTC (rev 3240)
@@ -300,26 +300,34 @@
 		}
 
 	BREAK:
+		fl_font(font, tsize);
+		if (item_selected(p))
+			lcol = fl_contrast(lcol, selection_color());
+		if (!active_r()) lcol = fl_inactive(lcol);
+		fl_color(lcol);
+
 		if (*str=='%' && '0'<*str+1<'9')
 		{
 			int percent = atoi(str+1);
-			if (percent < 0) percent = 0;
-			if (percent > 100) percent = 100;
-			int active = stars_on->w()*percent/100;
-			active = active/12 * 12;
+			int permil = percent * 10;
+			permil = (permil) / 125 * 125;
+			if (permil < 0) percent = 0;
+			if (permil > 1000) permil = 1000;
+			int active = stars_on->w()*permil/1000;
+
 			if (stars_off)
 				stars_off->draw(x + active + 3, y, min(stars_off->w() - active, w1 - active - 6), h, active, 0);
 			if (stars_on)
 				stars_on->draw(x + 3, y, min(active, w1 - 6), h, 0, 0);
+
+			char tmp[32];
+			snprintf(tmp, sizeof(tmp), "%u%%", percent);
+			//fl_draw(tmp, x + 3, y, min(stars_off->w(), w1) - 6, h, Fl_Align(FL_ALIGN_CENTER|FL_ALIGN_CLIP), 0, 0);
+			//fl_draw(tmp, x + stars_on->w() + 3, y, w1 - 6, h, Fl_Align(FL_ALIGN_LEFT|FL_ALIGN_CLIP), 0, 0);
 		}
 		else
 		{
-			fl_font(font, tsize);
-			if (item_selected(p))
-				lcol = fl_contrast(lcol, selection_color());
-			if (!active_r()) lcol = fl_inactive(lcol);
-			fl_color(lcol);
-			fl_draw(str, x + 3, y, w1-6, h, e ? Fl_Align(talign|FL_ALIGN_CLIP) : talign, 0, 0);
+			fl_draw(str, x + 3, y, w1 - 6, h, e ? Fl_Align(talign|FL_ALIGN_CLIP) : talign, 0, 0);
 		}
 
 		if (!e) break; // no more fields...