Re: [PATCH] setup: be less scary about missing dependencies

[Corinna Vinschen]

On Aug 17 20:02, Andy Koppe wrote:
> The "Unmet Dependencies Found" message on the "Resolve Dependencies"
> page may mislead people into thinking that there's a problem with
> setup.exe or packaging, when in fact it's a routine step now. Also,
> the message box that appears when choosing not to select required
> packages overstates its case a little bit. So this patch tweaks both.
> 
> Andy
> 
> 
> ChangeLog:
> * res.rc (IDD_PREREQ): Say "Resolving Dependencies" instead of
> "Unmet Dependencies Found"
> * prereq.cc (PrereqPage::OnNext): Tone down message box about
> missing dependencies.

SOunds good to me.  Please apply.


Thanks,
Corinna

-- 
Corinna Vinschen  Please, send mails regarding Cygwin to
Cygwin Project Co-Leader  cygwin AT cygwin DOT com
Red Hat

[PATCH] setup: be less scary about missing dependencies

[Andy Koppe]

The "Unmet Dependencies Found" message on the "Resolve Dependencies"
page may mislead people into thinking that there's a problem with
setup.exe or packaging, when in fact it's a routine step now. Also,
the message box that appears when choosing not to select required
packages overstates its case a little bit. So this patch tweaks both.

Andy


ChangeLog:
* res.rc (IDD_PREREQ): Say "Resolving Dependencies" instead of
"Unmet Dependencies Found"
* prereq.cc (PrereqPage::OnNext): Tone down message box about
missing dependencies.

Index: res.rc
===
RCS file: /cvs/cygwin-apps/setup/res.rc,v
retrieving revision 2.89
diff -u -r2.89 res.rc
--- res.rc  15 Aug 2010 16:22:00 -  2.89
+++ res.rc  17 Aug 2010 18:41:59 -
@@ -377,13 +377,13 @@
 IDD_PREREQ DIALOG DISCARDABLE  0, 0, SETUP_STANDARD_DIALOG_DIMS
 STYLE DS_MODALFRAME | DS_3DLOOK | WS_CHILD | WS_VISIBLE | WS_CAPTION |
 WS_SYSMENU
-CAPTION "Cygwin Setup - Resolve Dependencies"
+CAPTION "Cygwin Setup - Resolving Dependencies"
 FONT 8, "MS Shell Dlg"
 BEGIN
 CONTROL "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,
 0,28,SETUP_STANDARD_DIALOG_W,1
 ICONIDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
-LTEXT   "Unmet Dependencies Found",IDC_STATIC_HEADER_TITLE
+LTEXT   "Resolving Dependencies",IDC_STATIC_HEADER_TITLE
 ,7,0,258,8,NOT WS_GROUP
 LTEXT   "The following packages are required to satisfy "
 "dependencies.",IDC_STATIC,21,9,239,16,NOT WS_GROUP
Index: prereq.cc
===
RCS file: /cvs/cygwin-apps/setup/prereq.cc,v
retrieving revision 2.5
diff -u -r2.5 prereq.cc
--- prereq.cc   8 Aug 2010 15:11:43 -   2.5
+++ prereq.cc   17 Aug 2010 18:41:59 -
@@ -97,10 +97,10 @@
 {
   // breakage imminent!  danger, danger
   int res = MessageBox (h,
-  "If you continue without correcting the listed conflicts, your "
-  "Cygwin installation will not function properly.\r\n"
-  "We strongly recommend that you let Setup install the
listed packages.\r\n\r\n"
-  "Are you sure you want to proceed?",
+  "The listed packages are required for packages depending on them to "
+  "work.  We strongly recommend that you allow Setup to select them."
+  "\r\n\r\n"
+  "Are you sure you want to proceed without these packages?",
   "WARNING - Required Packages Not Selected",
   MB_YESNO | MB_ICONEXCLAMATION | MB_DEFBUTTON2);
   if (res == IDNO)