Merge pull request #6960 from spycrab/update_manually

Qt: Add option to invoke the updater manually
dolphin-emu · May 27, 2018 · 0c2538f · 0c2538f
2 parents e9ae6e2 + ec32227
commit 0c2538f
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 1 deletion.
diff --git a/Source/Core/DolphinQt2/MenuBar.cpp b/Source/Core/DolphinQt2/MenuBar.cpp
@@ -49,6 +49,7 @@
 #include "DolphinQt2/Host.h"
 #include "DolphinQt2/QtUtils/ActionHelper.h"
 #include "DolphinQt2/Settings.h"
+#include "DolphinQt2/Updater.h"
 
 #include "UICommon/GameFile.h"
 
@@ -490,9 +491,31 @@ void MenuBar::AddOptionsMenu()
   m_change_font = AddAction(options_menu, tr("&Font..."), this, &MenuBar::ChangeDebugFont);
 }
 
+#ifdef _WIN32
+void MenuBar::InstallUpdateManually()
+{
+  auto& track = SConfig::GetInstance().m_auto_update_track;
+  auto previous_value = track;
+
+  track = "dev";
+
+  auto* updater = new Updater(this);
+
+  if (!updater->CheckForUpdate())
+  {
+    QMessageBox::information(
+        this, tr("Update"),
+        tr("You are running the latest version available on this update track"));
+  }
+
+  track = previous_value;
+}
+#endif
+
 void MenuBar::AddHelpMenu()
 {
   QMenu* help_menu = addMenu(tr("&Help"));
+
   QAction* website = help_menu->addAction(tr("&Website"));
   connect(website, &QAction::triggered, this,
           []() { QDesktopServices::openUrl(QUrl(QStringLiteral("https://dolphin-emu.org/"))); });
@@ -505,6 +528,12 @@ void MenuBar::AddHelpMenu()
     QDesktopServices::openUrl(QUrl(QStringLiteral("https://github.com/dolphin-emu/dolphin")));
   });
 
+#ifdef _WIN32
+  help_menu->addSeparator();
+
+  AddAction(help_menu, tr("&Check for Updates..."), this, &MenuBar::InstallUpdateManually);
+#endif
+
   help_menu->addSeparator();
   AddAction(help_menu, tr("&About"), this, &MenuBar::ShowAboutDialog);
 }

diff --git a/Source/Core/DolphinQt2/MenuBar.h b/Source/Core/DolphinQt2/MenuBar.h
@@ -36,6 +36,10 @@ class MenuBar final : public QMenuBar
   void UpdateStateSlotMenu();
   void UpdateToolsMenu(bool emulation_started);
 
+#ifdef _WIN32
+  void InstallUpdateManually();
+#endif
+
 signals:
   // File
   void Open();

diff --git a/Source/Core/DolphinQt2/Updater.cpp b/Source/Core/DolphinQt2/Updater.cpp
@@ -8,6 +8,7 @@
 #include <QDialog>
 #include <QDialogButtonBox>
 #include <QLabel>
+#include <QMessageBox>
 #include <QPushButton>
 #include <QTextBrowser>
 #include <QVBoxLayout>
@@ -23,12 +24,21 @@ Updater::Updater(QWidget* parent) : m_parent(parent)
 
 void Updater::run()
 {
-  CheckForUpdate();
+  AutoUpdateChecker::CheckForUpdate();
+}
+
+bool Updater::CheckForUpdate()
+{
+  m_update_available = false;
+  AutoUpdateChecker::CheckForUpdate();
+
+  return m_update_available;
 }
 
 void Updater::OnUpdateAvailable(const NewVersionInformation& info)
 {
   bool later = false;
+  m_update_available = true;
 
   std::optional<int> choice = RunOnObject(m_parent, [&] {
     QDialog* dialog = new QDialog(m_parent);

diff --git a/Source/Core/DolphinQt2/Updater.h b/Source/Core/DolphinQt2/Updater.h
@@ -18,7 +18,9 @@ class Updater : public QThread, public AutoUpdateChecker
 
   void run() override;
   void OnUpdateAvailable(const NewVersionInformation& info) override;
+  bool CheckForUpdate();
 
 private:
   QWidget* m_parent;
+  bool m_update_available = false;
 };