From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 103605 invoked by alias); 16 Jun 2016 13:02:15 -0000 Mailing-List: contact cygwin-apps-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cygwin-apps-cvs-owner@sourceware.org Received: (qmail 103521 invoked by uid 9078); 16 Jun 2016 13:02:15 -0000 Date: Thu, 16 Jun 2016 13:02:00 -0000 Message-ID: <20160616130215.103489.qmail@sourceware.org> From: corinna@sourceware.org To: cygwin-apps-cvs@sourceware.org Subject: [setup - the official Cygwin setup program used to install Cygwin and keep it up to date] branch master, updated. release_2.874-2-gef68168 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: afa9ed98bd706cd5f6978fc35affcb2ea2921354 X-Git-Newrev: ef68168531c4623d5255b9d22b781b8fd034d9ef X-SW-Source: 2016-q2/txt/msg00027.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=ef68168531c4623d5255b9d22b781b8fd034d9ef commit ef68168531c4623d5255b9d22b781b8fd034d9ef Author: Marco Atzeri Date: Thu Jun 16 14:29:08 2016 +0200 reformatted view with alignment https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=6a36f6a6441b83491ba9af36d4f45e18bd756491 commit 6a36f6a6441b83491ba9af36d4f45e18bd756491 Author: Marco Atzeri Date: Sun Jun 12 17:45:16 2016 +0200 Moved view from right to left Diff: --- choose.cc | 4 ++-- res.rc | 27 ++++++++++++++------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/choose.cc b/choose.cc index b0e5538..42d8b74 100644 --- a/choose.cc +++ b/choose.cc @@ -83,9 +83,9 @@ static ControlAdjuster::ControlInfo ChooserControlsInfo[] = { {IDC_CHOOSE_KEEP, 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}, + {IDC_CHOOSE_VIEW, CP_LEFT, CP_TOP}, {IDC_LISTVIEW_POS, CP_RIGHT, CP_TOP}, - {IDC_CHOOSE_VIEWCAPTION, CP_RIGHT, CP_TOP}, + {IDC_CHOOSE_VIEWCAPTION, CP_LEFT, CP_TOP}, {IDC_CHOOSE_LIST, CP_STRETCH, CP_STRETCH}, {IDC_CHOOSE_HIDE, CP_LEFT, CP_BOTTOM}, {0, CP_LEFT, CP_TOP} diff --git a/res.rc b/res.rc index 472687d..f1cf406 100644 --- a/res.rc +++ b/res.rc @@ -312,16 +312,16 @@ END #define SETUP_KPCE_W (30) // Right-aligned controls. -#define SETUP_VIEWCAP_W (40) -#define SETUP_VIEWCAP_X (SETUP_STANDARD_DIALOG_W - SETUP_VIEWCAP_W - 7) -#define SETUP_VIEW_W (26) -#define SETUP_VIEW_X (SETUP_VIEWCAP_X - SETUP_VIEW_W - 5) -#define SETUP_EXP_X (SETUP_VIEW_X - SETUP_KPCE_W - 5) +#define SETUP_EXP_X (SETUP_STANDARD_DIALOG_W - SETUP_KPCE_W - 7) #define SETUP_CURR_X (SETUP_EXP_X - SETUP_KPCE_W - 5) #define SETUP_KEEP_X (SETUP_CURR_X - SETUP_KPCE_W - 5) // Left-aligned controls. -#define SETUP_SEARCH_X (0) +#define SETUP_VIEW_X (7) +#define SETUP_VIEW_W (26) +#define SETUP_VIEWCAP_X (SETUP_VIEW_X + SETUP_VIEW_W +5) +#define SETUP_VIEWCAP_W (40) +#define SETUP_SEARCH_X (SETUP_VIEWCAP_X + SETUP_VIEWCAP_W + 80) #define SETUP_SEARCH_W (32) #define SETUP_SEARCHTEXT_X (SETUP_SEARCH_X + SETUP_SEARCH_W + 2) #define SETUP_SEARCHTEXT_W (60) @@ -334,20 +334,22 @@ STYLE DS_MODALFRAME | DS_3DLOOK | WS_CHILD | WS_VISIBLE | WS_CAPTION | CAPTION "Cygwin Setup - Select Packages" FONT 8, "MS Shell Dlg" BEGIN - RTEXT "&Search", IDC_STATIC, SETUP_SEARCH_X, 30, SETUP_SEARCH_W, - 12, SS_CENTERIMAGE, WS_EX_RIGHT + PUSHBUTTON "&View", IDC_CHOOSE_VIEW, SETUP_VIEW_X, 30, SETUP_VIEW_W, + 14, WS_EX_RIGHT + LTEXT "", IDC_CHOOSE_VIEWCAPTION, SETUP_VIEWCAP_X, 33, + SETUP_VIEWCAP_W, 10 + RTEXT "&Search", IDC_STATIC, SETUP_SEARCH_X, 33, SETUP_SEARCH_W, + 10, SS_CENTERIMAGE, WS_EX_RIGHT EDITTEXT IDC_CHOOSE_SEARCH_EDIT, SETUP_SEARCHTEXT_X, 30, - SETUP_SEARCHTEXT_W, 12 + SETUP_SEARCHTEXT_W, 14 PUSHBUTTON "&Clear", IDC_CHOOSE_CLEAR_SEARCH, SETUP_CLEAR_X, 30, - SETUP_CLEAR_W, 12 + SETUP_CLEAR_W, 14 CONTROL "&Keep", IDC_CHOOSE_KEEP, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, SETUP_KEEP_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, SETUP_EXP_X, 30, SETUP_KPCE_W, 14 - PUSHBUTTON "&View", IDC_CHOOSE_VIEW, SETUP_VIEW_X, 30, SETUP_VIEW_W, - 14, WS_GROUP CONTROL "", IDC_HEADSEPARATOR, "Static", SS_BLACKFRAME | SS_SUNKEN, 0, 28, SETUP_STANDARD_DIALOG_W, 1 CONTROL "", IDC_LISTVIEW_POS, "Static", SS_BLACKFRAME | NOT @@ -359,7 +361,6 @@ BEGIN IDC_CHOOSE_INST_TEXT, 21, 9, 239, 16, NOT WS_GROUP LTEXT "Select Packages", IDC_STATIC_HEADER_TITLE, 7, 0, 258, 8, NOT WS_GROUP - LTEXT "", IDC_CHOOSE_VIEWCAPTION, SETUP_VIEWCAP_X, 33, SETUP_VIEWCAP_W, 10 END IDD_PREREQ DIALOG DISCARDABLE 0, 0, SETUP_STANDARD_DIALOG_DIMS