2002-09-22 Max Bowsher <maxb@ukf.net>

	* PickView.cc (pkg_headers): Rename column 'Category' to 'Categories'.
	* package_meta.h (packagemeta::getReadableCategoryList): Declare.
	* package_meta.cc (packagemeta::getReadableCategoryList): Implement.
	* PickPackageLine.cc (PickPackageLine::paint): Change to use
	getReadableCategoryList.
	Fix x2 argument to IntersectClipRect.

diff --git a/ChangeLog b/ChangeLog
index 38bc7efe28f599fcf7c565d4ee1cc04b2e790db6..ecf4a04f824efb8fa401566dbcad1dc721021774 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-09-22  Max Bowsher  <maxb@ukf.net>
+
+       * PickView.cc (pkg_headers): Rename column 'Category' to 'Categories'.
+       * package_meta.h (packagemeta::getReadableCategoryList): Declare.
+       * package_meta.cc (packagemeta::getReadableCategoryList): Implement.
+       * PickPackageLine.cc (PickPackageLine::paint): Change to use
+       getReadableCategoryList.
+       Fix x2 argument to IntersectClipRect.
+
 2002-11-25  Gary R. Van Sickle  <g.r.vansickle@worldnet.att.net>
 
        * window.h (Window::GetWindowRect): New method declaration.

diff --git a/PickPackageLine.cc b/PickPackageLine.cc
index 278860fb8d3dd2516bde4a5314144ae4c4bd0403..70449316e0300bc1971e710405402e6de345104d 100644 (file)
--- a/PickPackageLine.cc
+++ b/PickPackageLine.cc
@@ -136,14 +136,10 @@ PickPackageLine::paint (HDC hdc, int x, int y, int row, int show_cat)
   /* shows "first" category - do we want to show any? */
   if (pkg.categories.size () && show_cat)
     {
-      String catName;
-      if (pkg.categories.find ("All") == pkg.categories.begin () &&
-         pkg.categories.size () > 1)
-       catName = *(++pkg.categories.begin());
-      else catName = * pkg.categories.begin ();
+      String catName = pkg.getReadableCategoryList();
       IntersectClipRect (hdc, x + theView.headers[theView.cat_col].x, r,
                         x + theView.headers[theView.cat_col].x +
-                        theView.headers[theView.cat_col].x, rb);
+                        theView.headers[theView.cat_col].width - HMARGIN / 2, rb);
       TextOut (hdc, x + theView.headers[theView.cat_col].x + HMARGIN / 2, r,
               catName.cstr_oneuse(),
               catName.size());

diff --git a/PickView.cc b/PickView.cc
index 80bada6923c9ff1d45338d9337377c9a30f778a7..4861fb17ece435bfb6c086bc6b030a2964302547 100644 (file)
--- a/PickView.cc
+++ b/PickView.cc
@@ -30,7 +30,7 @@ static PickView::Header pkg_headers[] = {
   {"New", 3, 0, 0},
   {"Bin?", 4, 0, 0},
   {"Src?", 4, 0, 0},
-  {"Category", 8, 0, 0},
+  {"Categories", 10, 0, 0},
   {"Package", 7, 0, 0},
   {0, 0, 0, 0}
 };

diff --git a/package_meta.cc b/package_meta.cc
index 5e14bc72bc87d5bcb1ccfde9ea717c42ff2422ea..a6870c9e63dae0cfcb9f0ecff65774f7b62a8472 100644 (file)
--- a/package_meta.cc
+++ b/package_meta.cc
@@ -243,6 +243,22 @@ packagemeta::add_category (String const &cat)
   categories.insert (cat);
 }
 
+String const
+packagemeta::getReadableCategoryList () const
+{
+  String result;
+  for(set<String, String::caseless>::const_iterator it = categories.begin();
+      it != categories.end(); it++)
+  {
+    if (*it == "All")
+      continue;
+    if (result.size() > 0)
+      result += ", ";
+    result += *it;
+  }
+  return result;
+}
+
 static bool
 hasSDesc(packageversion const &pkg)
 {

diff --git a/package_meta.h b/package_meta.h
index d3be4bc6e2e56fd6d8a440d56c45dc1e4a02f1ae..04c59ed6556dfe88a981ea2eeb89d6e0d86ed74d 100644 (file)
--- a/package_meta.h
+++ b/package_meta.h
@@ -96,6 +96,7 @@ public:
    */
   void add_category (String const &);
   std::set <String, String::caseless> categories;
+  String const getReadableCategoryList () const;
   std::set <packageversion> versions;
 
   /* which one is installed. */