UI|Client: Actions in package info popups

The package compatibility dialog should not allow performing actions on the listed packages, just show information.
skyjake · Oct 21, 2018 · 1a780aa · 1a780aa
1 parent ae484e0
commit 1a780aa
Show file tree

Hide file tree

Showing 9 changed files with 302 additions and 286 deletions.
diff --git a/doomsday/apps/client/include/ui/dialogs/packageinfodialog.h b/doomsday/apps/client/include/ui/dialogs/packageinfodialog.h
@@ -29,8 +29,11 @@ class PackageInfoDialog : public de::DialogWidget
     Q_OBJECT
 
 public:
-    PackageInfoDialog(de::String const &packageId);
-    PackageInfoDialog(de::File const *packageFile);
+    enum Mode { EnableActions, InformationOnly };
+
+public:
+    PackageInfoDialog(de::String const &packageId, Mode mode);
+    PackageInfoDialog(de::File const *packageFile, Mode mode);
 
 protected:
     void prepare() override;

diff --git a/doomsday/apps/client/include/ui/widgets/packageswidget.h b/doomsday/apps/client/include/ui/widgets/packageswidget.h
@@ -61,6 +61,7 @@ class PackagesWidget : public de::GuiWidget, public de::IPersistent
     de::ProgressWidget &progress();
 
     void setManualPackageIds(de::StringList manualPackageIds);
+    void setAllowPackageInfoActions(bool allowActions);
     void setRightClickToOpenContextMenu(bool enable);
     void setHiddenTags(de::StringList hiddenTags);
     void setDontFilterHidden(bool enable);

diff --git a/doomsday/apps/client/src/ui/dialogs/packagecompatibilitydialog.cpp b/doomsday/apps/client/src/ui/dialogs/packagecompatibilitydialog.cpp
@@ -112,7 +112,8 @@ DENG2_PIMPL(PackageCompatibilityDialog)
         {
             // The only action on the packages is to view information.
             actions << new ui::SubwidgetItem(tr("..."), ui::Up, [this]() -> PopupWidget * {
-                return new PackageInfoDialog(list->actionPackage());
+                return new PackageInfoDialog(list->actionPackage(),
+                                             PackageInfoDialog::InformationOnly);
             });
 
             self().area().add(ignoreToggle = new ToggleWidget);
@@ -191,6 +192,7 @@ DENG2_PIMPL(PackageCompatibilityDialog)
                                 [](const std::pair<String, Version> &sv) { return sv.first; });
 
             self().area().add(list = new PackagesWidget(wantedAvailable + wantedDifferent));
+            list->setAllowPackageInfoActions(false);
             list->setDontFilterHidden(true);
             list->setActionItems(actions);
             list->setActionsAlwaysShown(true);

diff --git a/doomsday/apps/client/src/ui/dialogs/packageinfodialog.cpp b/doomsday/apps/client/src/ui/dialogs/packageinfodialog.cpp
diff --git a/doomsday/apps/client/src/ui/dialogs/packagesdialog.cpp b/doomsday/apps/client/src/ui/dialogs/packagesdialog.cpp
@@ -153,7 +153,7 @@ DENG_GUI_PIMPL(PackagesDialog)
 
         PopupWidget *makeInfoPopup() const
         {
-            return new PackageInfoDialog(_item->packageFile());
+            return new PackageInfoDialog(_item->packageFile(), PackageInfoDialog::EnableActions);
         }
 
     private:
@@ -224,7 +224,7 @@ DENG_GUI_PIMPL(PackagesDialog)
         actions << new ui::SubwidgetItem(tr("..."), ui::Up, [this] () -> PopupWidget *
         {
             String const id = browser->actionPackage();
-            return new PackageInfoDialog(id);
+            return new PackageInfoDialog(id, PackageInfoDialog::EnableActions);
         });
 
         // Action for (de)selecting the package.

diff --git a/doomsday/apps/client/src/ui/dialogs/serverinfodialog.cpp b/doomsday/apps/client/src/ui/dialogs/serverinfodialog.cpp
@@ -166,10 +166,11 @@ DENG_GUI_PIMPL(ServerInfoDialog)
         bg->rule().setRect(mapOutline->rule())
                   .setInput(Rule::Bottom, gameState->rule().bottom());
 
-        serverPackageActions << new ui::SubwidgetItem(tr("..."), ui::Right, [this] () -> PopupWidget *
-        {
-             return new PackageInfoDialog(serverPackages->actionPackage());
-        });
+        serverPackageActions << new ui::SubwidgetItem(
+            tr("..."), ui::Right, [this]() -> PopupWidget * {
+                return new PackageInfoDialog(serverPackages->actionPackage(),
+                                             PackageInfoDialog::EnableActions);
+            });
 
         // Popups.
 

diff --git a/doomsday/apps/client/src/ui/home/packagescolumnwidget.cpp b/doomsday/apps/client/src/ui/home/packagescolumnwidget.cpp
@@ -54,9 +54,9 @@ DENG_GUI_PIMPL(PackagesColumnWidget)
     {
         DoomsdayApp::app().audienceForGameChange() += this;
 
-        actions << new ui::SubwidgetItem(tr("..."), ui::Left, [this] () -> PopupWidget *
-        {
-            return new PackageInfoDialog(packages->actionPackage());
+        actions << new ui::SubwidgetItem(tr("..."), ui::Left, [this]() -> PopupWidget * {
+            return new PackageInfoDialog(packages->actionPackage(),
+                                         PackageInfoDialog::EnableActions);
         });
 
         countLabel = new LabelWidget;

diff --git a/doomsday/apps/client/src/ui/widgets/packagessidebarwidget.cpp b/doomsday/apps/client/src/ui/widgets/packagessidebarwidget.cpp
@@ -39,15 +39,19 @@ DENG_GUI_PIMPL(PackagesSidebarWidget)
         browser->rule().setInput(Rule::Width, rule("sidebar.width"));
 
         // Action for showing information about the package.
-        browser->actionItems().insert(0, new ui::ActionItem(tr("..."), new CallbackAction([this] ()
-        {
-            auto *pop = new PackageInfoDialog(browser->actionPackage());
-            root().addOnTop(pop);
-            pop->setDeleteAfterDismissed(true);
-            pop->setAnchorAndOpeningDirection(browser->actionWidget()->as<HomeItemWidget>()
-                                              .buttonWidget(0).rule(), ui::Up);
-            pop->open();
-        })));
+        browser->actionItems().insert(
+            0,
+            new ui::ActionItem(
+                tr("..."), new CallbackAction([this]() {
+                    auto *pop = new PackageInfoDialog(browser->actionPackage(),
+                                                      PackageInfoDialog::EnableActions);
+                    root().addOnTop(pop);
+                    pop->setDeleteAfterDismissed(true);
+                    pop->setAnchorAndOpeningDirection(
+                        browser->actionWidget()->as<HomeItemWidget>().buttonWidget(0).rule(),
+                        ui::Up);
+                    pop->open();
+                })));
     }
 };