* res.rc (IDD_PREREQ): Say "Resolving Dependencies" instead of

	"Unmet Dependencies found"
	* prereq.cc (PrereqPage::OnNext): Tone down message box about
	missing dependencies.

diff --git a/ChangeLog b/ChangeLog
index bf68457b269854fbac18ee51395698a210749dc4..6fb05b9ef94a4720885da537ca5492dbad9820f2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-18  Andy Koppe  <andy.koppe@gmail.com>
+
+       * res.rc (IDD_PREREQ): Say "Resolving Dependencies" instead of 
+       "Unmet Dependencies found"
+       * prereq.cc (PrereqPage::OnNext): Tone down message box about
+       missing dependencies.
+
 2010-08-15  Andy Koppe  <andy.koppe@gmail.com>
 
        * postinstall.cc (PostInstallResultsPage::OnNext):

diff --git a/prereq.cc b/prereq.cc
index 3ad2e1051457c090e6aebe8a4874f27091d3e653..9a8cb26051ef4b1d3308d505eb75d7c9f263e72e 100644 (file)
--- a/prereq.cc
+++ b/prereq.cc
@@ -97,10 +97,10 @@ PrereqPage::OnNext ()
     {
       // 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)

diff --git a/res.rc b/res.rc
index 9adec1f286a43b82829cc209d1a149f2f8ecbee7..f193eccfa69132808ce9ea96dd1d5177f8ebf9ee 100644 (file)
--- a/res.rc
+++ b/res.rc
@@ -377,13 +377,13 @@ END
 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
     ICON            IDI_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