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