[patch] Categories column

["Max Bowsher" <maxb at ukf dot net>]

You've seen this before - take a look on the date on the ChangeLog.
It's unchanged since then except rediffing to pick up changed line numbers.
I assume I update the ChangeLog date to the current date before checkin?

Max.

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

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

Index: PickPackageLine.cc
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/PickPackageLine.cc,v
retrieving revision 2.9
diff -u -p -r2.9 PickPackageLine.cc
--- PickPackageLine.cc 2002/07/13 14:00:37 2.9
+++ PickPackageLine.cc 2002/11/10 09:49:13
@@ -136,14 +136,10 @@ PickPackageLine::paint (HDC hdc, int x,
   /* 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());
Index: PickView.cc
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/PickView.cc,v
retrieving revision 2.11
diff -u -p -r2.11 PickView.cc
--- PickView.cc 2002/11/09 13:44:52 2.11
+++ PickView.cc 2002/11/10 09:49:12
@@ -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}
 };
Index: package_meta.cc
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/package_meta.cc,v
retrieving revision 2.32
diff -u -p -r2.32 package_meta.cc
--- package_meta.cc 2002/11/10 03:40:36 2.32
+++ package_meta.cc 2002/11/10 09:49:12
@@ -243,6 +243,22 @@ packagemeta::add_category (String const
   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)
 {
Index: package_meta.h
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/package_meta.h,v
retrieving revision 2.20
diff -u -p -r2.20 package_meta.h
--- package_meta.h 2002/11/10 03:40:36 2.20
+++ package_meta.h 2002/11/10 09:49:12
@@ -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. */
############################################################################
#