From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5680 invoked by alias); 24 Aug 2016 14:16:18 -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 5224 invoked by uid 89); 24 Aug 2016 14:16:17 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=0.3 required=5.0 tests=AWL,BAYES_05,KAM_LAZY_DOMAIN_SECURITY,RCVD_IN_DNSWL_NONE autolearn=no version=3.3.2 spammy=Hx-spam-relays-external:CriticalPath, H*RU:CriticalPath, HCc:D*uk, Hx-languages-length:2514 X-HELO: rgout03.bt.lon5.cpcloud.co.uk Received: from rgout03.bt.lon5.cpcloud.co.uk (HELO rgout03.bt.lon5.cpcloud.co.uk) (65.20.0.180) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 24 Aug 2016 14:16:07 +0000 X-OWM-Source-IP: 31.51.206.108 (GB) X-OWM-Env-Sender: jonturney@btinternet.com X-Junkmail-Premium-Raw: score=27/50,refid=2.7.2:2016.8.24.131516:17:27.888,ip=31.51.206.108,rules=__HAS_FROM, __TO_MALFORMED_2, __TO_NO_NAME, __HAS_CC_HDR, __CC_NAME, __CC_NAME_DIFF_FROM_ACC, __CP_POSSIBLE_EXPLOIT_SUBJ, __HAS_MSGID, __SANE_MSGID, __HAS_X_MAILER, __IN_REP_TO, __REFERENCES, __FROM_DOMAIN_IN_ANY_CC1, __ANY_URI, __URI_NO_MAILTO, __URI_NO_WWW, BODYTEXTP_SIZE_3000_LESS, BODY_SIZE_2000_2999, __MIME_TEXT_ONLY, RDNS_GENERIC_POOLED, SXL_IP_DYNAMIC[108.206.51.31.fur], HTML_00_01, HTML_00_10, BODY_SIZE_5000_LESS, RDNS_SUSP_GENERIC, __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 rgout03.bt.lon5.cpcloud.co.uk (8.6.122.06) (authenticated as jonturney@btinternet.com) id 57BCDABA00137EC2; Wed, 24 Aug 2016 15:16:04 +0100 From: Jon Turney To: cygwin-apps@cygwin.com Cc: Jon Turney Subject: [PATCH setup 3/4] Rename PickView::Package to PickView::PackagePending Date: Wed, 24 Aug 2016 14:16:00 -0000 Message-Id: <20160824141537.34836-4-jon.turney@dronecode.org.uk> In-Reply-To: <20160824141537.34836-1-jon.turney@dronecode.org.uk> References: <20160824141537.34836-1-jon.turney@dronecode.org.uk> X-SW-Source: 2016-08/txt/msg00085.txt.bz2 Rename PickView::Package to PickView::PackagePending, as that's what that view is --- PickView.cc | 8 ++++---- PickView.h | 2 +- choose.cc | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/PickView.cc b/PickView.cc index 588cfec..25d43a2 100644 --- a/PickView.cc +++ b/PickView.cc @@ -83,7 +83,7 @@ PickView::set_header_column_order (views vm) { if (vm == views::Unknown) return -1; - else if (vm == views::PackageFull || vm == views::Package + else if (vm == views::PackageFull || vm == views::PackagePending || vm == views::PackageKeeps || vm == views::PackageSkips || vm == views::PackageUserPicked) { @@ -181,7 +181,7 @@ PickView::setViewMode (views mode) (view_mode == PickView::views::PackageFull) // "Pending" : packages that are being added/removed/upgraded - || (view_mode == PickView::views::Package && + || (view_mode == PickView::views::PackagePending && ((!pkg.desired && pkg.installed) || // uninstall (pkg.desired && (pkg.desired.picked () || // install bin @@ -234,7 +234,7 @@ PickView::mode_caption () { case views::PackageFull: return "Full"; - case views::Package: + case views::PackagePending: return "Pending"; case views::PackageKeeps: return "Up To Date"; @@ -815,7 +815,7 @@ PickView::WindowProc (UINT message, WPARAM wParam, LPARAM lParam) lastWindowRect.width ()) != 0) { cat_headers[set_header_column_order (views::Category)].width += dx; - pkg_headers[set_header_column_order (views::Package)].width += dx; + pkg_headers[set_header_column_order (views::PackagePending)].width += dx; set_header_column_order (view_mode); set_headers (); ::MoveWindow (listheader, -scroll_ulc_x, 0, diff --git a/PickView.h b/PickView.h index 054ab4a..c07249b 100644 --- a/PickView.h +++ b/PickView.h @@ -100,7 +100,7 @@ public: { Unknown, PackageFull, - Package, + PackagePending, PackageKeeps, PackageSkips, PackageUserPicked, diff --git a/choose.cc b/choose.cc index 1c97f59..3c7f4f8 100644 --- a/choose.cc +++ b/choose.cc @@ -152,7 +152,7 @@ ChooserPage::createListview () chooser->init(PickView::views::Category); chooser->Show(SW_SHOW); chooser->setViewMode (UpgradeAlsoOption || hasManualSelections ? - PickView::views::Package : PickView::views::Category); + 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; -- 2.8.3