This is the mail archive of the
cygwin-apps@cygwin.com
mailing list for the Cygwin project.
[Patch] Keep Button
- From: "Max Bowsher" <maxb at ukf dot net>
- To: <cygwin-apps at cygwin dot com>
- Date: Thu, 28 Nov 2002 21:04:07 -0000
- Subject: [Patch] Keep Button
Robert Collins wrote:
> Ah. Well seems to me this is the appropriate place to put it, it's more
> flexible as a category manipulator than a trust level.
But far less visible to new users.
> And less complex to code.
Really... ? :-)
#############################
Index: choose.cc
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/choose.cc,v
retrieving revision 2.109
diff -u -p -r2.109 choose.cc
--- choose.cc 2002/11/25 13:26:05 2.109
+++ choose.cc 2002/11/28 20:55:10
@@ -437,7 +437,7 @@ create_listview (HWND dlg, RECT * r)
pkg.set_requirements (chooser->deftrust);
}
/* FIXME: do we need to init the desired fields ? */
- static int ta[] = { IDC_CHOOSE_PREV, IDC_CHOOSE_CURR, IDC_CHOOSE_EXP,
0 };
+ static int ta[] = { IDC_CHOOSE_KEEP, IDC_CHOOSE_CURR, IDC_CHOOSE_EXP,
0 };
rbset (dlg, ta, IDC_CHOOSE_CURR);
}
@@ -621,15 +621,14 @@ ChooserPage::OnMessageCmd (int id, HWND
packagedb db;
switch (id)
{
- case IDC_CHOOSE_PREV:
+ case IDC_CHOOSE_KEEP:
if (IsDlgButtonChecked (GetHWND (), id))
{
- default_trust (lv, TRUST_PREV);
for (vector <packagemeta *>::iterator i = db.packages.begin ();
i != db.packages.end (); ++i)
{
packagemeta & pkg = **i;
- pkg.set_requirements (TRUST_PREV);
+ pkg.desired = pkg.installed;
}
set_view_mode (lv, chooser->get_view_mode ());
break;
Index: res.rc
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/res.rc,v
retrieving revision 2.44
diff -u -p -r2.44 res.rc
--- res.rc 2002/11/25 00:41:25 2.44
+++ res.rc 2002/11/28 20:59:04
@@ -288,8 +288,8 @@ STYLE DS_MODALFRAME | DS_3DLOOK | WS_CHI
CAPTION "Select Packages"
FONT 8, "MS Sans Serif"
BEGIN
- CONTROL "&Prev",IDC_CHOOSE_PREV,"Button",BS_AUTORADIOBUTTON |
- WS_GROUP | WS_TABSTOP,150,30,27,10
+ CONTROL "&Keep",IDC_CHOOSE_KEEP,"Button",BS_AUTORADIOBUTTON |
+ WS_GROUP | WS_TABSTOP,150,30,30,10
CONTROL
"&Curr",IDC_CHOOSE_CURR,"Button",BS_AUTORADIOBUTTON,185,
30,25,10
CONTROL
"E&xp",IDC_CHOOSE_EXP,"Button",BS_AUTORADIOBUTTON,220,30,
Index: resource.h
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/resource.h,v
retrieving revision 2.19
diff -u -p -r2.19 resource.h
--- resource.h 2002/11/25 00:41:25 2.19
+++ resource.h 2002/11/28 20:54:51
@@ -92,7 +92,7 @@
#define IDC_CHOOSE_VIEW 1035
#define IDC_CHOOSE_EXP 1036
#define IDC_CHOOSE_CURR 1037
-#define IDC_CHOOSE_PREV 1038
+#define IDC_CHOOSE_KEEP 1038
#define IDC_CHOOSE_LIST 1039
#define IDC_INS_ACTION 1040
#define IDC_ROOT_DESKTOP 1041
#############################