From 3545e9c765a069c314acdbde24a0e5eccf8458dd Mon Sep 17 00:00:00 2001 From: Marco Atzeri Date: Sun, 12 Jun 2016 17:45:16 +0200 Subject: [PATCH 1/2] Moved view from right to left --- choose.cc | 4 ++-- res.rc | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 11 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..d129063 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_VIEWCAP_X (0) +#define SETUP_VIEWCAP_W (40) +#define SETUP_VIEW_X (SETUP_VIEWCAP_X + SETUP_VIEWCAP_W +5) +#define SETUP_VIEW_W (26) +#define SETUP_SEARCH_X (SETUP_VIEW_X + SETUP_VIEW_W + 5) #define SETUP_SEARCH_W (32) #define SETUP_SEARCHTEXT_X (SETUP_SEARCH_X + SETUP_SEARCH_W + 2) #define SETUP_SEARCHTEXT_W (60) @@ -334,6 +334,10 @@ STYLE DS_MODALFRAME | DS_3DLOOK | WS_CHILD | WS_VISIBLE | WS_CAPTION | CAPTION "Cygwin Setup - Select Packages" FONT 8, "MS Shell Dlg" BEGIN + RTEXT "", IDC_CHOOSE_VIEWCAPTION, SETUP_VIEWCAP_X, 33, + SETUP_VIEWCAP_W, 10 + PUSHBUTTON "&View", IDC_CHOOSE_VIEW, SETUP_VIEW_X, 30, SETUP_VIEW_W, + 14, WS_EX_RIGHT RTEXT "&Search", IDC_STATIC, SETUP_SEARCH_X, 30, SETUP_SEARCH_W, 12, SS_CENTERIMAGE, WS_EX_RIGHT EDITTEXT IDC_CHOOSE_SEARCH_EDIT, SETUP_SEARCHTEXT_X, 30, @@ -346,8 +350,6 @@ BEGIN 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 -- 2.8.3