From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 129909 invoked by alias); 26 Aug 2016 14:43:30 -0000 Mailing-List: contact cygwin-apps-help@cygwin.com; run by ezmlm Precedence: bulk Sender: cygwin-apps-owner@cygwin.com List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Mail-Followup-To: cygwin-apps@cygwin.com Received: (qmail 129898 invoked by uid 89); 26 Aug 2016 14:43:30 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=1.5 required=5.0 tests=AWL,BAYES_50,KAM_LAZY_DOMAIN_SECURITY,RCVD_IN_DNSWL_NONE autolearn=no version=3.3.2 spammy=categories, HCc:D*uk, 1327, Shell X-HELO: rgout0503.bt.lon5.cpcloud.co.uk Received: from rgout0503.bt.lon5.cpcloud.co.uk (HELO rgout0503.bt.lon5.cpcloud.co.uk) (65.20.0.224) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 26 Aug 2016 14:43:20 +0000 X-OWM-Source-IP: 31.51.206.108 (GB) X-OWM-Env-Sender: jonturney@btinternet.com X-Junkmail-Premium-Raw: score=7/50,refid=2.7.2:2016.8.25.135716:17:7.944,ip=31.51.206.108,rules=__HAS_FROM, __TO_MALFORMED_2, __TO_NO_NAME, __HAS_CC_HDR, __CC_NAME, __CC_NAME_DIFF_FROM_ACC, __SUBJ_ALPHA_END, __HAS_MSGID, __SANE_MSGID, __HAS_X_MAILER, __IN_REP_TO, __REFERENCES, __FROM_DOMAIN_IN_ANY_CC1, __LINES_OF_YELLING, BODY_SIZE_4000_4999, __MIME_TEXT_ONLY, RDNS_GENERIC_POOLED, HTML_00_01, HTML_00_10, BODY_SIZE_5000_LESS, RDNS_SUSP_GENERIC, NO_URI_FOUND, NO_CTA_URI_FOUND, __FROM_DOMAIN_IN_RCPT, RDNS_SUSP, IN_REP_TO, REFERENCES, BODY_SIZE_7000_LESS, NO_URI_HTTPS, MSG_THREAD, __CC_REAL_NAMES, MULTIPLE_REAL_RCPTS, LEGITIMATE_SIGNS, LEGITIMATE_NEGATE Received: from localhost.localdomain (31.51.206.108) by rgout05.bt.lon5.cpcloud.co.uk (8.6.122.06) (authenticated as jonturney@btinternet.com) id 57BECDEE00305191; Fri, 26 Aug 2016 15:43:12 +0100 From: Jon Turney To: cygwin-apps@cygwin.com Cc: Jon Turney Subject: [PATCH setup 5/6] Simplify view mode indication Date: Fri, 26 Aug 2016 14:43:00 -0000 Message-Id: <20160826144252.23840-1-jon.turney@dronecode.org.uk> In-Reply-To: References: X-SW-Source: 2016-08/txt/msg00094.txt.bz2 We don't really need a bit of text saying what the current view mode is, when it's indicated in the pop-up menu, so remove that control. This makes PickView::mode_caption() unused, so remove that as well. --- PickView.cc | 22 ---------------------- PickView.h | 1 - choose.cc | 8 -------- res.rc | 6 +----- resource.h | 1 - 5 files changed, 1 insertion(+), 37 deletions(-) diff --git a/PickView.cc b/PickView.cc index 3702b92..b079b08 100644 --- a/PickView.cc +++ b/PickView.cc @@ -223,28 +223,6 @@ PickView::getViewMode () return view_mode; } -const char * -PickView::mode_caption () -{ - switch (view_mode) - { - case views::PackageFull: - return "Full"; - case views::PackagePending: - return "Pending"; - case views::PackageKeeps: - return "Up To Date"; - case views::PackageSkips: - return "Not Installed"; - case views::PackageUserPicked: - return "Picked"; - case views::Category: - return "Category"; - default: - return ""; - } -} - /* meant to be called on packagemeta::categories */ bool isObsolete (set &categories) diff --git a/PickView.h b/PickView.h index 332383a..fc4fbad 100644 --- a/PickView.h +++ b/PickView.h @@ -57,7 +57,6 @@ public: PickView (Category & cat); void init(views _mode); ~PickView(); - const char *mode_caption (); void setObsolete (bool doit); void insert_pkg (packagemeta &); void insert_category (Category *, bool); diff --git a/choose.cc b/choose.cc index 180c788..19c1fc9 100644 --- a/choose.cc +++ b/choose.cc @@ -85,7 +85,6 @@ static ControlAdjuster::ControlInfo ChooserControlsInfo[] = { {IDC_CHOOSE_EXP, CP_RIGHT, CP_TOP}, {IDC_CHOOSE_VIEW, CP_LEFT, CP_TOP}, {IDC_LISTVIEW_POS, 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} @@ -153,9 +152,6 @@ ChooserPage::createListview () chooser->Show(SW_SHOW); chooser->setViewMode (UpgradeAlsoOption || hasManualSelections ? PickView::views::PackagePending : PickView::views::Category); - if (!SetDlgItemText (GetHWND (), IDC_CHOOSE_VIEWCAPTION, chooser->mode_caption ())) - Log (LOG_BABBLE) << "Failed to set View button caption %ld" << - GetLastError () << endLog; /* FIXME: do we need to init the desired fields ? */ static int ta[] = { IDC_CHOOSE_KEEP, IDC_CHOOSE_CURR, IDC_CHOOSE_EXP, 0 }; @@ -534,10 +530,6 @@ ChooserPage::selectView (void) } chooser->setViewMode (view_mode); - if (!SetDlgItemText - (GetHWND (), IDC_CHOOSE_VIEWCAPTION, chooser->mode_caption ())) - Log (LOG_BABBLE) << "Failed to set View button caption " << - GetLastError () << endLog; } INT_PTR CALLBACK diff --git a/res.rc b/res.rc index 10ec375..0d124a6 100644 --- a/res.rc +++ b/res.rc @@ -319,9 +319,7 @@ END // Left-aligned controls. #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_X (SETUP_VIEW_X + SETUP_VIEW_W + 125) #define SETUP_SEARCH_W (32) #define SETUP_SEARCHTEXT_X (SETUP_SEARCH_X + SETUP_SEARCH_W + 2) #define SETUP_SEARCHTEXT_W (60) @@ -336,8 +334,6 @@ FONT 8, "MS Shell Dlg" BEGIN 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, diff --git a/resource.h b/resource.h index e2312ac..91b5b52 100644 --- a/resource.h +++ b/resource.h @@ -132,7 +132,6 @@ #define IDC_DLS_PPROGRESS_TEXT 544 #define IDC_DLS_IPROGRESS_TEXT 545 #define IDC_CHOOSE_INST_TEXT 546 -#define IDC_CHOOSE_VIEWCAPTION 547 #define IDC_CHOOSE_LISTHEADER 548 #define IDC_INS_BL_PACKAGE 549 #define IDC_INS_BL_TOTAL 550 -- 2.8.3