* [PATCH] Remove Prev button from setup.exe's chooser page
@ 2011-07-17 19:26 Andy Koppe
2011-07-19 12:32 ` Corinna Vinschen
2011-08-13 7:52 ` Corinna Vinschen
0 siblings, 2 replies; 6+ messages in thread
From: Andy Koppe @ 2011-07-17 19:26 UTC (permalink / raw)
To: cygwin-apps
[-- Attachment #1: Type: text/plain, Size: 848 bytes --]
Attached is a patch for removing the Prev radio button from
setup.exe's chooser page. As previously discussed at [1], that button
doesn't really serve any useful purpose. It might mislead people into
thinking that it delivers a somewhat outdated but proven Cygwin, when
in fact it delivers a rather random mix of packages of widely varying
age that is unlikely to actually work together.
Also attached is a documentation change to go with this.
Andy
[1] http://cygwin.com/ml/cygwin/2010-08/msg00890.html
cygwin-apps/setup/ChangeLog:
* res.rc: Remove Prev button from chooser page.
* resource.h: Reflect removal of Prev button.
* package_meta.h (trustp): Ditto.
* choose.cc: Ditto.
winsup/doc/ChangeLog:
* setup-net.sgml (setup-packages): Reflect removal of Prev button.
Also document Keep button and improve description of Exp button.
[-- Attachment #2: no_prev.patch --]
[-- Type: application/octet-stream, Size: 5229 bytes --]
Index: choose.cc
===================================================================
RCS file: /cvs/cygwin-apps/setup/choose.cc,v
retrieving revision 2.158
diff -p -u -r2.158 choose.cc
--- choose.cc 26 Nov 2010 14:21:42 -0000 2.158
+++ choose.cc 17 Jul 2011 19:16:24 -0000
@@ -74,7 +74,6 @@ static ControlAdjuster::ControlInfo Choo
{IDC_CHOOSE_SEARCH_LABEL, CP_LEFT, CP_TOP},
{IDC_CHOOSE_SEARCH_EDIT, CP_LEFT, CP_TOP},
{IDC_CHOOSE_KEEP, CP_RIGHT, CP_TOP},
- {IDC_CHOOSE_PREV, CP_RIGHT, CP_TOP},
{IDC_CHOOSE_CURR, CP_RIGHT, CP_TOP},
{IDC_CHOOSE_EXP, CP_RIGHT, CP_TOP},
{IDC_CHOOSE_VIEW, CP_RIGHT, CP_TOP},
@@ -157,7 +156,7 @@ ChooserPage::createListview ()
}
/* FIXME: do we need to init the desired fields ? */
- static int ta[] = { IDC_CHOOSE_KEEP, IDC_CHOOSE_PREV, IDC_CHOOSE_CURR, IDC_CHOOSE_EXP, 0 };
+ static int ta[] = { IDC_CHOOSE_KEEP, IDC_CHOOSE_CURR, IDC_CHOOSE_EXP, 0 };
rbset (GetHWND (), ta, IDC_CHOOSE_CURR);
ClearBusy ();
}
@@ -256,7 +255,6 @@ ChooserPage::OnInit ()
createListview ();
AddTooltip (IDC_CHOOSE_KEEP, IDS_TRUSTKEEP_TOOLTIP);
- AddTooltip (IDC_CHOOSE_PREV, IDS_TRUSTPREV_TOOLTIP);
AddTooltip (IDC_CHOOSE_CURR, IDS_TRUSTCURR_TOOLTIP);
AddTooltip (IDC_CHOOSE_EXP, IDS_TRUSTEXP_TOOLTIP);
AddTooltip (IDC_CHOOSE_VIEW, IDS_VIEWBUTTON_TOOLTIP);
@@ -381,11 +379,6 @@ ChooserPage::OnMessageCmd (int id, HWND
keepClicked();
break;
- case IDC_CHOOSE_PREV:
- if (IsButtonChecked (id))
- changeTrust (TRUST_PREV);
- break;
-
case IDC_CHOOSE_CURR:
if (IsButtonChecked (id))
changeTrust (TRUST_CURR);
Index: package_meta.h
===================================================================
RCS file: /cvs/cygwin-apps/setup/package_meta.h,v
retrieving revision 2.40
diff -p -u -r2.40 package_meta.h
--- package_meta.h 22 Nov 2010 12:53:06 -0000 2.40
+++ package_meta.h 17 Jul 2011 19:16:24 -0000
@@ -92,9 +92,12 @@ public:
std::string action_caption () const;
packageversion trustp (trusts const t) const
{
- return (t == TRUST_PREV && prev) ? prev
- : (t == TRUST_TEST && exp) ? exp
- : curr ? curr : installed;
+ if (t == TRUST_TEST && exp)
+ return exp;
+ else if (curr)
+ return curr;
+ else
+ return installed;
}
std::string name; /* package name, like "cygwin" */
Index: res.rc
===================================================================
RCS file: /cvs/cygwin-apps/setup/res.rc,v
retrieving revision 2.91
diff -p -u -r2.91 res.rc
--- res.rc 10 Nov 2010 20:20:33 -0000 2.91
+++ res.rc 17 Jul 2011 19:16:24 -0000
@@ -327,8 +327,7 @@ END
#define SETUP_VIEW_X (SETUP_VIEWCAP_X - SETUP_VIEW_W - 5)
#define SETUP_EXP_X (SETUP_VIEW_X - SETUP_KPCE_W - 5)
#define SETUP_CURR_X (SETUP_EXP_X - SETUP_KPCE_W - 5)
-#define SETUP_PREV_X (SETUP_CURR_X - SETUP_KPCE_W - 5)
-#define SETUP_KEEP_X (SETUP_PREV_X - SETUP_KPCE_W - 5)
+#define SETUP_KEEP_X (SETUP_CURR_X - SETUP_KPCE_W - 5)
// Left-aligned controls.
#define SETUP_SEARCH_X (0)
@@ -352,8 +351,6 @@ BEGIN
SETUP_CLEAR_W, 12
CONTROL "&Keep", IDC_CHOOSE_KEEP, "Button", BS_AUTORADIOBUTTON
| WS_GROUP | WS_TABSTOP, SETUP_KEEP_X, 30, SETUP_KPCE_W, 14
- CONTROL "&Prev", IDC_CHOOSE_PREV, "Button", BS_AUTORADIOBUTTON,
- SETUP_PREV_X, 30, SETUP_KPCE_W, 14
CONTROL "&Curr", IDC_CHOOSE_CURR, "Button", BS_AUTORADIOBUTTON,
SETUP_CURR_X, 30, SETUP_KPCE_W, 14
CONTROL "E&xp", IDC_CHOOSE_EXP, "Button", BS_AUTORADIOBUTTON,
@@ -513,9 +510,6 @@ BEGIN
IDS_TRUSTKEEP_TOOLTIP "Sets all packages to their currently installed "
"version. This is equivalent to telling setup not to make any "
"changes to any package."
- IDS_TRUSTPREV_TOOLTIP "Globally select the version marked as 'Prev', "
- "which generally means the version that was last considered stable "
- "prior to the current stable version."
IDS_TRUSTCURR_TOOLTIP "Globally select the version that is currently "
"considered the most stable. (RECOMMENDED)"
IDS_TRUSTEXP_TOOLTIP "Globally select the most recent version, even if "
Index: resource.h
===================================================================
RCS file: /cvs/cygwin-apps/setup/resource.h,v
retrieving revision 2.41
diff -p -u -r2.41 resource.h
--- resource.h 29 Jul 2010 13:06:03 -0000 2.41
+++ resource.h 17 Jul 2011 19:16:24 -0000
@@ -26,7 +26,6 @@
#define IDS_UNCAUGHT_EXCEPTION_WITH_ERRNO 123
#define IDS_SKIP_PACKAGE 124
#define IDS_TRUSTKEEP_TOOLTIP 125
-#define IDS_TRUSTPREV_TOOLTIP 126
#define IDS_TRUSTCURR_TOOLTIP 127
#define IDS_TRUSTEXP_TOOLTIP 128
#define IDS_VIEWBUTTON_TOOLTIP 129
@@ -117,7 +116,6 @@
#define IDC_CHOOSE_VIEW 531
#define IDC_CHOOSE_EXP 532
#define IDC_CHOOSE_CURR 533
-#define IDC_CHOOSE_PREV 534
#define IDC_CHOOSE_LIST 535
#define IDC_INS_ACTION 536
#define IDC_ROOT_DESKTOP 537
[-- Attachment #3: no_prev_doc.patch --]
[-- Type: application/octet-stream, Size: 2187 bytes --]
Index: setup-net.sgml
===================================================================
RCS file: /cvs/src/src/winsup/doc/setup-net.sgml,v
retrieving revision 1.26
diff -p -u -r1.26 setup-net.sgml
--- setup-net.sgml 26 Jul 2010 22:56:24 -0000 1.26
+++ setup-net.sgml 17 Jul 2011 19:20:05 -0000
@@ -192,18 +192,23 @@ to close all Cygwin windows and stop all
To avoid unintentionally upgrading, use the <literal>Pending</literal>
view to see which packages have been marked for upgrading. If you
don't want to upgrade a package, click on the new version number to
-toggle it until it says <literal>Keep</literal>.
+toggle it until it says <literal>Keep</literal>. All packages can be
+set to stay at the installed version by pressing the <literal>Keep</literal>
+button in the top right part of the chooser window.
</para>
<para>
-The final feature of the <command>setup.exe</command> chooser is for
-<literal>Previous</literal> and <literal>Experimental</literal> packages.
-By default the chooser shows only the current version of each package,
-though mirrors have at least one previous version and occasionally there
-is a testing or beta version of a package available. To see these package,
-click on the <literal>Prev</literal> or <literal>Exp</literal> radio button.
-Be warned, however, that the next time you run <command>setup.exe</command>
-it will try to replace old or experimental versions with the current
-stable version.
+A previous version of each package is usually available, in case downgrading
+is required to avoid a serious bug in the current version of the package.
+Packages also occasionally have testing (or "experimental") versions available.
+Previous and experimental versions can be chosen by clicking on the package's
+<literal>New</literal> column until the required version appears.
+</para>
+<para>
+All available experimental packages can be selected by pressing the
+<literal>Exp</literal> in the top right part of the chooser window.
+Be warned, however, that the next time you run <command>setup.exe</command>
+it will try to replace all old or experimental versions with the current
+version, unless told otherwise.
</para>
</sect2>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Remove Prev button from setup.exe's chooser page
2011-07-17 19:26 [PATCH] Remove Prev button from setup.exe's chooser page Andy Koppe
@ 2011-07-19 12:32 ` Corinna Vinschen
2011-07-19 17:41 ` Christopher Faylor
2011-08-13 7:52 ` Corinna Vinschen
1 sibling, 1 reply; 6+ messages in thread
From: Corinna Vinschen @ 2011-07-19 12:32 UTC (permalink / raw)
To: cygwin-apps
On Jul 17 20:26, Andy Koppe wrote:
> Attached is a patch for removing the Prev radio button from
> setup.exe's chooser page. As previously discussed at [1], that button
> doesn't really serve any useful purpose. It might mislead people into
> thinking that it delivers a somewhat outdated but proven Cygwin, when
> in fact it delivers a rather random mix of packages of widely varying
> age that is unlikely to actually work together.
>
> Also attached is a documentation change to go with this.
>
> Andy
>
>
> [1] http://cygwin.com/ml/cygwin/2010-08/msg00890.html
>
>
> cygwin-apps/setup/ChangeLog:
> * res.rc: Remove Prev button from chooser page.
> * resource.h: Reflect removal of Prev button.
> * package_meta.h (trustp): Ditto.
> * choose.cc: Ditto.
>
> winsup/doc/ChangeLog:
> * setup-net.sgml (setup-packages): Reflect removal of Prev button.
> Also document Keep button and improve description of Exp button.
I guess that patch is ok. I never use the Prev button since it turned
out to be quite dangerous and never did what I wanted. I'd say, go for
it.
Thanks,
Corinna
--
Corinna Vinschen Please, send mails regarding Cygwin to
Cygwin Project Co-Leader cygwin AT cygwin DOT com
Red Hat
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Remove Prev button from setup.exe's chooser page
2011-07-19 12:32 ` Corinna Vinschen
@ 2011-07-19 17:41 ` Christopher Faylor
0 siblings, 0 replies; 6+ messages in thread
From: Christopher Faylor @ 2011-07-19 17:41 UTC (permalink / raw)
To: cygwin-apps
On Tue, Jul 19, 2011 at 02:32:01PM +0200, Corinna Vinschen wrote:
>On Jul 17 20:26, Andy Koppe wrote:
>> Attached is a patch for removing the Prev radio button from
>> setup.exe's chooser page. As previously discussed at [1], that button
>> doesn't really serve any useful purpose. It might mislead people into
>> thinking that it delivers a somewhat outdated but proven Cygwin, when
>> in fact it delivers a rather random mix of packages of widely varying
>> age that is unlikely to actually work together.
>>
>> Also attached is a documentation change to go with this.
>>
>> Andy
>>
>>
>> [1] http://cygwin.com/ml/cygwin/2010-08/msg00890.html
>>
>>
>> cygwin-apps/setup/ChangeLog:
>> * res.rc: Remove Prev button from chooser page.
>> * resource.h: Reflect removal of Prev button.
>> * package_meta.h (trustp): Ditto.
>> * choose.cc: Ditto.
>>
>> winsup/doc/ChangeLog:
>> * setup-net.sgml (setup-packages): Reflect removal of Prev button.
>> Also document Keep button and improve description of Exp button.
>
>I guess that patch is ok. I never use the Prev button since it turned
>out to be quite dangerous and never did what I wanted. I'd say, go for
>it.
Ditto.
cgf
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Remove Prev button from setup.exe's chooser page
2011-07-17 19:26 [PATCH] Remove Prev button from setup.exe's chooser page Andy Koppe
2011-07-19 12:32 ` Corinna Vinschen
@ 2011-08-13 7:52 ` Corinna Vinschen
2011-08-13 20:38 ` Andy Koppe
1 sibling, 1 reply; 6+ messages in thread
From: Corinna Vinschen @ 2011-08-13 7:52 UTC (permalink / raw)
To: cygwin-apps
Andy,
On Jul 17 20:26, Andy Koppe wrote:
> Attached is a patch for removing the Prev radio button from
> setup.exe's chooser page. As previously discussed at [1], that button
> doesn't really serve any useful purpose. It might mislead people into
> thinking that it delivers a somewhat outdated but proven Cygwin, when
> in fact it delivers a rather random mix of packages of widely varying
> age that is unlikely to actually work together.
>
> Also attached is a documentation change to go with this.
>
> Andy
>
>
> [1] http://cygwin.com/ml/cygwin/2010-08/msg00890.html
>
>
> cygwin-apps/setup/ChangeLog:
> * res.rc: Remove Prev button from chooser page.
> * resource.h: Reflect removal of Prev button.
> * package_meta.h (trustp): Ditto.
> * choose.cc: Ditto.
>
> winsup/doc/ChangeLog:
> * setup-net.sgml (setup-packages): Reflect removal of Prev button.
> Also document Keep button and improve description of Exp button.
please apply.
Corinna
--
Corinna Vinschen Please, send mails regarding Cygwin to
Cygwin Project Co-Leader cygwin AT cygwin DOT com
Red Hat
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Remove Prev button from setup.exe's chooser page
2011-08-13 7:52 ` Corinna Vinschen
@ 2011-08-13 20:38 ` Andy Koppe
2011-08-14 10:41 ` Corinna Vinschen
0 siblings, 1 reply; 6+ messages in thread
From: Andy Koppe @ 2011-08-13 20:38 UTC (permalink / raw)
To: cygwin-apps
On 13 August 2011 08:52, Corinna Vinschen wrote:
> Andy,
>
> On Jul 17 20:26, Andy Koppe wrote:
>> Attached is a patch for removing the Prev radio button from
>> setup.exe's chooser page. As previously discussed at [1], that button
>> doesn't really serve any useful purpose. It might mislead people into
>> thinking that it delivers a somewhat outdated but proven Cygwin, when
>> in fact it delivers a rather random mix of packages of widely varying
>> age that is unlikely to actually work together.
>>
>> Also attached is a documentation change to go with this.
>>
>> Andy
>>
>>
>> [1] http://cygwin.com/ml/cygwin/2010-08/msg00890.html
>>
>>
>> cygwin-apps/setup/ChangeLog:
>> * res.rc: Remove Prev button from chooser page.
>> * resource.h: Reflect removal of Prev button.
>> * package_meta.h (trustp): Ditto.
>> * choose.cc: Ditto.
>>
>> winsup/doc/ChangeLog:
>> * setup-net.sgml (setup-packages): Reflect removal of Prev button.
>> Also document Keep button and improve description of Exp button.
>
> please apply.
I checked that in at the time, but forgot to confirm here, sorry.
(Also, I notice I put 2010 instead of 2011 in the ChangeLog entry ...)
Andy
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Remove Prev button from setup.exe's chooser page
2011-08-13 20:38 ` Andy Koppe
@ 2011-08-14 10:41 ` Corinna Vinschen
0 siblings, 0 replies; 6+ messages in thread
From: Corinna Vinschen @ 2011-08-14 10:41 UTC (permalink / raw)
To: cygwin-apps
On Aug 13 21:38, Andy Koppe wrote:
> On 13 August 2011 08:52, Corinna Vinschen wrote:
> > Andy,
> >
> > On Jul 17 20:26, Andy Koppe wrote:
> >> Attached is a patch for removing the Prev radio button from
> >> setup.exe's chooser page. As previously discussed at [1], that button
> >> doesn't really serve any useful purpose. It might mislead people into
> >> thinking that it delivers a somewhat outdated but proven Cygwin, when
> >> in fact it delivers a rather random mix of packages of widely varying
> >> age that is unlikely to actually work together.
> >>
> >> Also attached is a documentation change to go with this.
> >>
> >> Andy
> >>
> >>
> >> [1] http://cygwin.com/ml/cygwin/2010-08/msg00890.html
> >>
> >>
> >> cygwin-apps/setup/ChangeLog:
> >> Â Â Â * res.rc: Remove Prev button from chooser page.
> >> Â Â Â * resource.h: Reflect removal of Prev button.
> >> Â Â Â * package_meta.h (trustp): Ditto.
> >> Â Â Â * choose.cc: Ditto.
> >>
> >> winsup/doc/ChangeLog:
> >> Â Â Â * setup-net.sgml (setup-packages): Reflect removal of Prev button.
> >> Â Â Â Also document Keep button and improve description of Exp button.
> >
> > please apply.
>
> I checked that in at the time, but forgot to confirm here, sorry.
Oh, I missed that check in.
> (Also, I notice I put 2010 instead of 2011 in the ChangeLog entry ...)
Fixed.
Thanks,
Corinna
--
Corinna Vinschen Please, send mails regarding Cygwin to
Cygwin Project Co-Leader cygwin AT cygwin DOT com
Red Hat
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-08-14 10:41 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-07-17 19:26 [PATCH] Remove Prev button from setup.exe's chooser page Andy Koppe
2011-07-19 12:32 ` Corinna Vinschen
2011-07-19 17:41 ` Christopher Faylor
2011-08-13 7:52 ` Corinna Vinschen
2011-08-13 20:38 ` Andy Koppe
2011-08-14 10:41 ` Corinna Vinschen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).