From: Jon Turney <jon.turney@dronecode.org.uk>
To: cygwin-apps@cygwin.com
Cc: Jon Turney <jon.turney@dronecode.org.uk>
Subject: [PATCH setup 3/4] Rename PickView::Package to PickView::PackagePending
Date: Wed, 24 Aug 2016 14:16:00 -0000 [thread overview]
Message-ID: <20160824141537.34836-4-jon.turney@dronecode.org.uk> (raw)
In-Reply-To: <20160824141537.34836-1-jon.turney@dronecode.org.uk>
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
next prev parent reply other threads:[~2016-08-24 14:16 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-24 14:16 [PATCH setup 0/4] Use a pop-up menu to select chooser view filter Jon Turney
2016-08-24 14:16 ` Jon Turney [this message]
2016-08-24 14:16 ` [PATCH setup 1/4] Build C++ code with -std=gnu++11 Jon Turney
2016-08-24 14:16 ` [PATCH setup 2/4] Change PickView::view into an enum Jon Turney
2016-08-24 14:16 ` [PATCH setup 4/4] Use a pop-up menu to directly select chooser view filter Jon Turney
2016-08-24 16:50 ` [PATCH setup 0/4] Use a pop-up menu to " Corinna Vinschen
2016-08-25 19:11 ` Jon Turney
2016-08-25 20:34 ` Yaakov Selkowitz
2016-08-26 8:07 ` Corinna Vinschen
2016-08-26 14:41 ` Jon Turney
2016-08-26 14:43 ` [PATCH setup 5/6] Simplify view mode indication Jon Turney
2016-08-26 14:43 ` [PATCH setup 6/6] Use a splitbutton to show the view choosing popup menu Jon Turney
2016-08-26 15:25 ` [PATCH setup 0/4] Use a pop-up menu to select chooser view filter Corinna Vinschen
2016-08-29 10:03 ` Jon Turney
2016-08-29 10:04 ` [PATCH setup 4/4] Use a drop-down list to directly " Jon Turney
2016-08-30 13:01 ` Corinna Vinschen
2016-08-30 23:29 ` Jon Turney
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160824141537.34836-4-jon.turney@dronecode.org.uk \
--to=jon.turney@dronecode.org.uk \
--cc=cygwin-apps@cygwin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).