2002-07-17 Brian Keener * PickView.cc (PickView::views): Add two new views for Skipped packages and Installed Packages not requiring update. (PickView::set_headers () ): Ditto. (PickView::clear_view (void) ): Ditto. (PickView::views::caption () ): Add two new captions for the new views added for Skipped and Installed Packages. (PickView::scroll () ): Modify Scroll Bar property to Disable instead of disappearing when there is nothing to Scroll. * PickView.h: Add two new views for Skipped packages and Installed packages to public class view. * choose.cc (list_click () ): Modify Scroll Bar property to Disable instead of disappearing when there is nothing to Scroll. (listview_proc () ): Ditto. (set_view_mode): Add two new views for Skipped Packages and Installed Packages not requiring update. Modify Scroll Bar property to Disable instead of disappearing when there is nothing to scroll. * res.rc (IDD_CHOOSE): Reposition Radio Buttons, View Selection Button and View Button Caption to make room for longer captions. ? autom4te.cache ? bz2lib/autom4te.cache ? libgetopt++/cfgaux ? libgetopt++/aclocal.m4 ? libgetopt++/autom4te.cache ? libgetopt++/configure ? libgetopt++/Makefile.in ? libgetopt++/include/autoconf.h.in ? zlib/autom4te.cache Index: Makefile.in =================================================================== RCS file: /cvs/cygwin-apps/setup/Makefile.in,v retrieving revision 2.83 diff -u -p -r2.83 Makefile.in --- Makefile.in 9 Jul 2002 06:57:40 -0000 2.83 +++ Makefile.in 17 Jul 2002 16:33:22 -0000 @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $Id: Makefile.in,v 2.83 2002/07/09 06:57:40 rbcollins Exp $ +# $Id: Makefile.am,v 2.22 2002/07/09 06:57:40 rbcollins Exp $ # # Copyright (c) 2000, Red Hat, Inc. # Copyright (c) 2002, Robert Collins Index: PickView.cc =================================================================== RCS file: /cvs/cygwin-apps/setup/PickView.cc,v retrieving revision 2.10 diff -u -p -r2.10 PickView.cc --- PickView.cc 9 Jul 2002 06:57:40 -0000 2.10 +++ PickView.cc 17 Jul 2002 16:33:23 -0000 @@ -47,8 +47,10 @@ static PickView::Header cat_headers[] = // PickView:: views const PickView::views PickView::views::Unknown (0); const PickView::views PickView::views::PackageFull (1); -const PickView::views PickView::views::Package = PickView::views (2); -const PickView::views PickView::views::Category (3); +const PickView::views PickView::views::Package (2); +const PickView::views PickView::views::PackageKeeps (3); +const PickView::views PickView::views::PackageSkips = PickView::views (4); +const PickView::views PickView::views::Category (5); // DoInsertItem - inserts an item into a header control. // Returns the index of the new item. @@ -82,7 +84,9 @@ PickView::set_headers () if (view_mode == views::Unknown) return; if (view_mode == views::PackageFull || - view_mode == views::Package) + view_mode == views::Package || + view_mode == views::PackageKeeps || + view_mode == views::PackageSkips) { headers = pkg_headers; current_col = 0; @@ -154,6 +158,10 @@ PickView::views::caption () case 2: return "Partial"; case 3: + return "Up To Date"; + case 4: + return "Not Installed"; + case 5: return "Category"; default: return ""; @@ -210,7 +218,9 @@ PickView::clear_view (void) if (view_mode == views::Unknown) return; if (view_mode == views::PackageFull || - view_mode == views::Package) + view_mode == views::Package || + view_mode == views::PackageKeeps || + view_mode == views::PackageSkips) contents.ShowLabel (false); else if (view_mode == views::Category) contents.ShowLabel (); @@ -237,7 +247,7 @@ PickView::scroll (HWND hwnd, int which, { SCROLLINFO si; si.cbSize = sizeof (si); - si.fMask = SIF_ALL; + si.fMask = SIF_ALL | SIF_DISABLENOSCROLL; GetScrollInfo (hwnd, which, &si); switch (code) Index: PickView.h =================================================================== RCS file: /cvs/cygwin-apps/setup/PickView.h,v retrieving revision 2.4 diff -u -p -r2.4 PickView.h --- PickView.h 27 Mar 2002 12:21:19 -0000 2.4 +++ PickView.h 17 Jul 2002 16:33:23 -0000 @@ -79,6 +79,8 @@ public: static const views Unknown; static const views PackageFull; static const views Package; + static const views PackageKeeps; + static const views PackageSkips; static const views Category; static const views NView; views ():_value (0) @@ -87,7 +89,7 @@ public: views (int aInt) { _value = aInt; - if (_value < 0 || _value > 3) + if (_value < 0 || _value > 5) _value = 0; } views & operator++ (); Index: choose.cc =================================================================== RCS file: /cvs/cygwin-apps/setup/choose.cc,v retrieving revision 2.106 diff -u -p -r2.106 choose.cc --- choose.cc 9 Jul 2002 06:57:40 -0000 2.106 +++ choose.cc 17 Jul 2002 16:33:42 -0000 @@ -149,7 +149,7 @@ list_click (HWND hwnd, BOOL dblclk, int SCROLLINFO si; memset (&si, 0, sizeof (si)); si.cbSize = sizeof (si); - si.fMask = SIF_ALL; /* SIF_RANGE was giving strange behaviour */ + si.fMask = SIF_ALL | SIF_DISABLENOSCROLL; /* SIF_RANGE was giving strange behaviour */ si.nMin = 0; si.nMax = chooser->contents.itemcount () * chooser->row_height; @@ -216,7 +216,7 @@ listview_proc (HWND hwnd, UINT message, GetClientRect (hwnd, &r); SCROLLINFO si; si.cbSize = sizeof (si); - si.fMask = SIF_ALL; + si.fMask = SIF_ALL | SIF_DISABLENOSCROLL; GetScrollInfo (hwnd, SB_HORZ, &si); int oldMax = si.nMax; si.nMax = @@ -366,7 +366,28 @@ set_view_mode (HWND h, PickView::views m packagemeta & pkg = **i; if ((!pkg.desired && pkg.installed) || (pkg.desired && (pkg.desired.picked () - || pkg.desired.sourcePackage().picked()))) + || pkg.desired.sourcePackage().picked()))) + chooser->insert_pkg (pkg); + } + } + else if (chooser->get_view_mode () == PickView::views::PackageKeeps) + { + for (vector ::iterator i = db.packages.begin (); + i != db.packages.end (); ++i) + { + packagemeta & pkg = **i; + if (pkg.installed && pkg.desired && !pkg.desired.picked() + && !pkg.desired.sourcePackage().picked()) + chooser->insert_pkg (pkg); + } + } + else if (chooser->get_view_mode () == PickView::views::PackageSkips) + { + for (vector ::iterator i = db.packages.begin (); + i != db.packages.end (); ++i) + { + packagemeta & pkg = **i; + if (!pkg.desired && !pkg.installed) chooser->insert_pkg (pkg); } } @@ -390,7 +411,7 @@ set_view_mode (HWND h, PickView::views m SCROLLINFO si; memset (&si, 0, sizeof (si)); si.cbSize = sizeof (si); - si.fMask = SIF_ALL; + si.fMask = SIF_ALL | SIF_DISABLENOSCROLL; si.nMin = 0; si.nMax = chooser->headers[chooser->last_col].x + chooser->headers[chooser->last_col].width; // + HMARGIN; si.nPage = r.right; Index: res.rc =================================================================== RCS file: /cvs/cygwin-apps/setup/res.rc,v retrieving revision 2.41 diff -u -p -r2.41 res.rc --- res.rc 26 Jun 2002 21:35:16 -0000 2.41 +++ res.rc 17 Jul 2002 16:34:24 -0000 @@ -269,12 +269,12 @@ CAPTION "Cygwin Setup" FONT 8, "MS Sans Serif" BEGIN CONTROL "&Prev",IDC_CHOOSE_PREV,"Button",BS_AUTORADIOBUTTON | - WS_GROUP | WS_TABSTOP,150,30,27,10 - CONTROL "&Curr",IDC_CHOOSE_CURR,"Button",BS_AUTORADIOBUTTON,185, + WS_GROUP | WS_TABSTOP,140,30,27,10 + CONTROL "&Curr",IDC_CHOOSE_CURR,"Button",BS_AUTORADIOBUTTON,175, 30,25,10 - CONTROL "E&xp",IDC_CHOOSE_EXP,"Button",BS_AUTORADIOBUTTON,220,30, + CONTROL "E&xp",IDC_CHOOSE_EXP,"Button",BS_AUTORADIOBUTTON,210,30, 25,10 - PUSHBUTTON "&View",IDC_CHOOSE_VIEW,255,30,20,10,WS_GROUP + PUSHBUTTON "&View",IDC_CHOOSE_VIEW,245,30,20,10,WS_GROUP CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28, 317,1 CONTROL "",IDC_LISTVIEW_POS,"Static",SS_BLACKFRAME | NOT @@ -284,7 +284,7 @@ BEGIN IDC_STATIC,21,9,239,16,NOT WS_GROUP LTEXT "Select Packages",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP - LTEXT "",IDC_CHOOSE_VIEWCAPTION,280,30,30,10 + LTEXT "",IDC_CHOOSE_VIEWCAPTION,270,30,40,10 END