Decouple dependency check from updating mods

launcher/ui/dialogs/ChooseProviderDialog.h

@@ -13,7 +13,6 @@ enum class ResourceProvider;
 
 class Mod;
 class NetJob;
-class ModUpdateDialog;
 
 class ChooseProviderDialog : public QDialog {
     Q_OBJECT

launcher/ui/dialogs/ModUpdateDialog.cpp

@@ -39,14 +39,16 @@ static std::optional<ModPlatform::ModLoaderTypes> mcLoaders(BaseInstance* inst)
 ModUpdateDialog::ModUpdateDialog(QWidget* parent,
                                  BaseInstance* instance,
                                  const std::shared_ptr<ModFolderModel> mods,
-                                 QList<Mod*>& search_for)
+                                 QList<Mod*>& search_for,
+                                 bool includeDeps)
     : ReviewMessageBox(parent, tr("Confirm mods to update"), "")
     , m_parent(parent)
     , m_mod_model(mods)
     , m_candidates(search_for)
     , m_second_try_metadata(
           new ConcurrentTask(nullptr, "Second Metadata Search", APPLICATION->settings()->get("NumberOfConcurrentTasks").toInt()))
     , m_instance(instance)
+    , m_include_deps(includeDeps)
 {
     ReviewMessageBox::setGeometry(0, 0, 800, 600);
 
@@ -186,7 +188,7 @@ void ModUpdateDialog::checkCandidates()
         }
     }
 
-    if (!APPLICATION->settings()->get("ModDependenciesDisabled").toBool()) {  // dependencies
+    if (m_include_deps && !APPLICATION->settings()->get("ModDependenciesDisabled").toBool()) {  // dependencies
         auto depTask = makeShared<GetModDependenciesTask>(this, m_instance, m_mod_model.get(), selectedVers);
 
         connect(depTask.get(), &Task::failed, this,

launcher/ui/dialogs/ModUpdateDialog.h

@@ -19,7 +19,8 @@ class ModUpdateDialog final : public ReviewMessageBox {
     explicit ModUpdateDialog(QWidget* parent,
                              BaseInstance* instance,
                              const std::shared_ptr<ModFolderModel> mod_model,
-                             QList<Mod*>& search_for);
+                             QList<Mod*>& search_for,
+                             bool includeDeps);
 
     void checkCandidates();
 
@@ -61,4 +62,5 @@ class ModUpdateDialog final : public ReviewMessageBox {
 
     bool m_no_updates = false;
     bool m_aborted = false;
+    bool m_include_deps = false;
 };

launcher/ui/pages/instance/ExternalResourcesPage.ui

@@ -70,6 +70,9 @@
    </layout>
   </widget>
   <widget class="WideBar" name="actionsToolbar">
+   <property name="useDefaultAction" stdset="0">
+    <bool>true</bool>
+   </property>
    <property name="windowTitle">
     <string>Actions</string>
    </property>
@@ -146,17 +149,6 @@
     <string>Download a new resource</string>
    </property>
   </action>
-  <action name="actionUpdateItem">
-   <property name="enabled">
-    <bool>false</bool>
-   </property>
-   <property name="text">
-    <string>Check for &amp;Updates</string>
-   </property>
-   <property name="toolTip">
-    <string>Try to check or update all selected resources (all resources if none are selected)</string>
-   </property>
-  </action>
   <action name="actionVisitItemPage">
    <property name="enabled">
     <bool>false</bool>
@@ -168,15 +160,15 @@
     <string>Go to mods home page</string>
    </property>
   </action>
-  <action name="actionRemoveItemMetadata">
+  <action name="actionUpdateItem">
    <property name="enabled">
-    <bool>false</bool>
+    <bool>true</bool>
    </property>
    <property name="text">
-    <string>Remove metadata</string>
+    <string>Check for &amp;Updates</string>
    </property>
    <property name="toolTip">
-    <string>Remove mod's metadata</string>
+    <string>Try to check or update all selected resources (all resources if none are selected)</string>
    </property>
   </action>
  </widget>

launcher/ui/pages/instance/ModFolderPage.cpp

@@ -84,50 +84,71 @@ ModFolderPage::ModFolderPage(BaseInstance* inst, std::shared_ptr<ModFolderModel>
 
         connect(ui->actionDownloadItem, &QAction::triggered, this, &ModFolderPage::installMods);
 
+        // update menu
+        auto updateMenu = ui->actionUpdateItem->menu();
+        if (updateMenu) {
+            updateMenu->clear();
+        } else {
+            updateMenu = new QMenu(this);
+        }
+
+        auto update = updateMenu->addAction(tr("Check for Updates"));
+        update->setToolTip(tr("Try to check or update all selected mods (all mods if none are selected)"));
+        connect(update, &QAction::triggered, this, &ModFolderPage::updateMods);
+
+        auto updateWithDeps = updateMenu->addAction(tr("Verify Dependencies"));
+        updateWithDeps->setToolTip(
+            tr("Try to update and check for missing dependencies all selected mods (all mods if none are selected)"));
+        connect(updateWithDeps, &QAction::triggered, this, [this] { updateMods(true); });
+
+        auto depsDisabled = APPLICATION->settings()->getSetting("ModDependenciesDisabled");
+        updateWithDeps->setVisible(!depsDisabled->get().toBool());
+        connect(depsDisabled.get(), &Setting::SettingChanged, this,
+                [updateWithDeps](const Setting& setting, QVariant value) { updateWithDeps->setVisible(!value.toBool()); });
+
+        auto actionRemoveItemMetadata = updateMenu->addAction(tr("Reset update metadata"));
+        actionRemoveItemMetadata->setToolTip(tr("Remove mod's metadata"));
+        connect(actionRemoveItemMetadata, &QAction::triggered, this, &ModFolderPage::deleteModMetadata);
+        actionRemoveItemMetadata->setEnabled(false);
+
+        ui->actionUpdateItem->setMenu(updateMenu);
+
         ui->actionUpdateItem->setToolTip(tr("Try to check or update all selected mods (all mods if none are selected)"));
-        ui->actionsToolbar->insertActionAfter(ui->actionAddItem, ui->actionUpdateItem);
         connect(ui->actionUpdateItem, &QAction::triggered, this, &ModFolderPage::updateMods);
+        ui->actionsToolbar->insertActionBefore(ui->actionAddItem, ui->actionUpdateItem);
 
         ui->actionVisitItemPage->setToolTip(tr("Go to mod's home page"));
         ui->actionsToolbar->addAction(ui->actionVisitItemPage);
         connect(ui->actionVisitItemPage, &QAction::triggered, this, &ModFolderPage::visitModPages);
 
-        ui->actionRemoveItemMetadata->setToolTip(tr("Remove mod's metadata"));
-        ui->actionsToolbar->insertActionAfter(ui->actionRemoveItem, ui->actionRemoveItemMetadata);
-        connect(ui->actionRemoveItemMetadata, &QAction::triggered, this, &ModFolderPage::deleteModMetadata);
-
         auto check_allow_update = [this] { return ui->treeView->selectionModel()->hasSelection() || !m_model->empty(); };
 
-        connect(ui->treeView->selectionModel(), &QItemSelectionModel::selectionChanged, this, [this, check_allow_update] {
-            ui->actionUpdateItem->setEnabled(check_allow_update());
-
-            auto selection = m_filterModel->mapSelectionToSource(ui->treeView->selectionModel()->selection()).indexes();
-            auto mods_list = m_model->selectedMods(selection);
-            auto selected = std::count_if(mods_list.cbegin(), mods_list.cend(),
-                                          [](Mod* v) { return v->metadata() != nullptr || v->homeurl().size() != 0; });
-            if (selected <= 1) {
-                ui->actionVisitItemPage->setText(tr("Visit mod's page"));
-                ui->actionVisitItemPage->setToolTip(tr("Go to mod's home page"));
+        connect(ui->treeView->selectionModel(), &QItemSelectionModel::selectionChanged, this,
+                [this, check_allow_update, actionRemoveItemMetadata] {
+                    ui->actionUpdateItem->setEnabled(check_allow_update());
 
-                ui->actionRemoveItemMetadata->setToolTip(tr("Remove mod's metadata"));
-            } else {
-                ui->actionVisitItemPage->setText(tr("Visit mods' pages"));
-                ui->actionVisitItemPage->setToolTip(tr("Go to the pages of the selected mods"));
+                    auto selection = m_filterModel->mapSelectionToSource(ui->treeView->selectionModel()->selection()).indexes();
+                    auto mods_list = m_model->selectedMods(selection);
+                    auto selected = std::count_if(mods_list.cbegin(), mods_list.cend(),
+                                                  [](Mod* v) { return v->metadata() != nullptr || v->homeurl().size() != 0; });
+                    if (selected <= 1) {
+                        ui->actionVisitItemPage->setText(tr("Visit mod's page"));
+                        ui->actionVisitItemPage->setToolTip(tr("Go to mod's home page"));
 
-                ui->actionRemoveItemMetadata->setToolTip(tr("Remove mods' metadata"));
-            }
-            ui->actionVisitItemPage->setEnabled(selected != 0);
-            ui->actionRemoveItemMetadata->setEnabled(selected != 0);
-        });
+                    } else {
+                        ui->actionVisitItemPage->setText(tr("Visit mods' pages"));
+                        ui->actionVisitItemPage->setToolTip(tr("Go to the pages of the selected mods"));
+                    }
+                    ui->actionVisitItemPage->setEnabled(selected != 0);
+                    actionRemoveItemMetadata->setEnabled(selected != 0);
+                });
 
-        connect(mods.get(), &ModFolderModel::rowsInserted, this,
-                [this, check_allow_update] { ui->actionUpdateItem->setEnabled(check_allow_update()); });
+        auto updateButtons = [this, check_allow_update] { ui->actionUpdateItem->setEnabled(check_allow_update()); };
+        connect(mods.get(), &ModFolderModel::rowsInserted, this, updateButtons);
 
-        connect(mods.get(), &ModFolderModel::rowsRemoved, this,
-                [this, check_allow_update] { ui->actionUpdateItem->setEnabled(check_allow_update()); });
+        connect(mods.get(), &ModFolderModel::rowsRemoved, this, updateButtons);
 
-        connect(mods.get(), &ModFolderModel::updateFinished, this,
-                [this, check_allow_update] { ui->actionUpdateItem->setEnabled(check_allow_update()); });
+        connect(mods.get(), &ModFolderModel::updateFinished, this, updateButtons);
     }
 }
 
@@ -204,7 +225,7 @@ void ModFolderPage::installMods()
     }
 }
 
-void ModFolderPage::updateMods()
+void ModFolderPage::updateMods(bool includeDeps)
 {
     if (m_instance->typeName() != "Minecraft")
         return;  // this is a null instance or a legacy instance
@@ -225,7 +246,7 @@ void ModFolderPage::updateMods()
     if (use_all)
         mods_list = m_model->allMods();
 
-    ModUpdateDialog update_dialog(this, m_instance, m_model, mods_list);
+    ModUpdateDialog update_dialog(this, m_instance, m_model, mods_list, includeDeps);
     update_dialog.checkCandidates();
 
     if (update_dialog.aborted()) {

launcher/ui/pages/instance/ModFolderPage.h

@@ -64,7 +64,7 @@ class ModFolderPage : public ExternalResourcesPage {
     void deleteModMetadata();
 
     void installMods();
-    void updateMods();
+    void updateMods(bool includeDeps = false);
     void visitModPages();
 
    protected: