From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2201) id 5D8163858D34; Sun, 14 Jun 2020 21:18:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5D8163858D34 To: cygwin-apps-cvs@sourceware.org Subject: [setup - the official Cygwin setup program] branch master, updated. release_2.904-7-g06eaabde X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: aa071e60504674c5750c1915e33014d3777f092f X-Git-Newrev: 06eaabde8f6df48180b8570f043d31005d5b9036 Message-Id: <20200614211826.5D8163858D34@sourceware.org> Date: Sun, 14 Jun 2020 21:18:26 +0000 (GMT) From: Jon TURNEY X-BeenThere: cygwin-apps-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin-apps git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Jun 2020 21:18:26 -0000 https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=06eaabde8f6df48180b8570f043d31005d5b9036 commit 06eaabde8f6df48180b8570f043d31005d5b9036 Author: Jon Turney Date: Fri Jun 5 15:53:03 2020 +0100 Really parse build-depends: case-insensitively https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=70df5552b91bfc4d7e1d7fb618f08024cbdf0b0d commit 70df5552b91bfc4d7e1d7fb618f08024cbdf0b0d Author: Jon Turney Date: Sun May 31 15:41:04 2020 +0100 Refine splash page text Make "you can run this again to add, remove or update packages" a separate paragraph to increase the chances of it getting read. https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=8cbcc8510b0f111bc3d8fdd7f8925f3ff474eb5b commit 8cbcc8510b0f111bc3d8fdd7f8925f3ff474eb5b Author: Jon Turney Date: Sun May 31 15:36:11 2020 +0100 Position logo relative to top when resizing splash page Diff: --- inilex.ll | 2 +- res.rc | 14 ++++++++------ splash.cc | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/inilex.ll b/inilex.ll index a4b0f64c..e25abf26 100644 --- a/inilex.ll +++ b/inilex.ll @@ -119,7 +119,7 @@ B64 [a-zA-Z0-9_-] "ldesc:" return LDESC; "message:" return MESSAGE; "Source:" return SOURCEPACKAGE; -"[bB]uild-[dD]epends:" return BUILDDEPENDS; +[bB]"uild-"[dD]"epends:" return BUILDDEPENDS; "replace-versions:" return REPLACE_VERSIONS; "category:"|"Section:" return CATEGORY; diff --git a/res.rc b/res.rc index 31eb9c49..2165545a 100644 --- a/res.rc +++ b/res.rc @@ -249,17 +249,19 @@ STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | CAPTION "Cygwin Setup" FONT 8, "MS Shell Dlg" BEGIN -// CONTROL "",IDC_STATIC,"Static",SS_WHITERECT,0,0,95,178 LTEXT "Cygwin Net Release Setup Program", IDC_STATIC_WELCOME_TITLE,115,1,195,24 LTEXT "This setup program is used for the initial installation " "of the Cygwin environment as well as all subsequent " - "updates. Make sure to remember where you saved it.\r\n\r\n" + "updates. " "The pages that follow will guide you through the " - "installation. Please note that Cygwin consists of a " - "large number of packages spanning a wide variety of " - "purposes. We only install a base set of packages by " - "default. You can always run this program at any time in " + "installation." + "\r\n\r\n" + "Please note that we only install a base set of packages by " + "default. Cygwin provides a large number of packages " + "spanning a wide variety of purposes." + "\r\n\r\n" + "You can always run this program at any time in " "the future to add, remove, or upgrade packages as " "necessary.",IDC_SPLASH_TEXT,115,25,195,90 ICON IDI_CYGWIN,IDC_SPLASH_ICON,4,6,0,0,SS_ICON | SS_REALSIZEIMAGE diff --git a/splash.cc b/splash.cc index 16a6f7b8..73cdd9c7 100644 --- a/splash.cc +++ b/splash.cc @@ -23,7 +23,7 @@ static ControlAdjuster::ControlInfo SplashControlsInfo[] = { { IDC_SPLASH_TEXT, CP_STRETCH, CP_STRETCH }, - { IDC_SPLASH_ICON, CP_LEFT, CP_BOTTOM }, + { IDC_SPLASH_ICON, CP_LEFT, CP_TOP }, { IDC_VERSION, CP_LEFT, CP_BOTTOM }, { IDC_SPLASH_COPYR, CP_LEFT, CP_BOTTOM }, { IDC_SPLASH_URL, CP_LEFT, CP_BOTTOM },