From 2809530793c80d182d094b6aadaf0ab6e175fe2c Mon Sep 17 00:00:00 2001
From: Andrew Nelless <andrew@symless.com>
Date: Fri, 30 Sep 2016 16:23:04 +0100
Subject: [PATCH] #5629 Remove 'Run Wizard' from file menu

---
 src/gui/res/MainWindowBase.ui | 8 --------
 src/gui/src/MainWindow.cpp    | 9 +--------
 src/gui/src/MainWindow.h      | 1 -
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/src/gui/res/MainWindowBase.ui b/src/gui/res/MainWindowBase.ui
index fa7955cc..5a852c8c 100644
--- a/src/gui/res/MainWindowBase.ui
+++ b/src/gui/res/MainWindowBase.ui
@@ -481,14 +481,6 @@
     <string notr="true"/>
    </property>
   </action>
-  <action name="m_pActionWizard">
-   <property name="text">
-    <string>Run Wizard</string>
-   </property>
-   <property name="shortcut">
-    <string notr="true"/>
-   </property>
-  </action>
   <action name="m_pActivate">
    <property name="text">
     <string>Activate</string>
diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
index f27777a1..8dca067d 100644
--- a/src/gui/src/MainWindow.cpp
+++ b/src/gui/src/MainWindow.cpp
@@ -26,7 +26,6 @@
 #include "AboutDialog.h"
 #include "ServerConfigDialog.h"
 #include "SettingsDialog.h"
-#include "SetupWizard.h"
 #include "ActivationDialog.h"
 #include "ZeroconfService.h"
 #include "DataDownloader.h"
@@ -269,8 +268,8 @@ void MainWindow::createMenuBar()
 	m_pMenuFile->addAction(m_pActionStartSynergy);
 	m_pMenuFile->addAction(m_pActionStopSynergy);
 	m_pMenuFile->addSeparator();
-	m_pMenuFile->addAction(m_pActionWizard);
 	m_pMenuFile->addAction(m_pActivate);
+	m_pMenuFile->addSeparator();
 	m_pMenuFile->addAction(m_pActionSave);
 	m_pMenuFile->addSeparator();
 	m_pMenuFile->addAction(m_pActionQuit);
@@ -1138,12 +1137,6 @@ void MainWindow::on_m_pButtonConfigureServer_clicked()
 	showConfigureServer();
 }
 
-void MainWindow::on_m_pActionWizard_triggered()
-{
-	SetupWizard wizard(*this, false);
-	wizard.exec();
-}
-
 void MainWindow::on_m_pActivate_triggered()
 {
 	ActivationDialog activationDialog (this, this->appConfig());
diff --git a/src/gui/src/MainWindow.h b/src/gui/src/MainWindow.h
index 8788e4a2..e815d53f 100644
--- a/src/gui/src/MainWindow.h
+++ b/src/gui/src/MainWindow.h
@@ -130,7 +130,6 @@ class MainWindow : public QMainWindow, public Ui::MainWindowBase
 		bool on_m_pActionSave_triggered();
 		void on_m_pActionAbout_triggered();
 		void on_m_pActionSettings_triggered();
-		void on_m_pActionWizard_triggered();
 		void on_m_pActivate_triggered();
 		void synergyFinished(int exitCode, QProcess::ExitStatus);
 		void trayActivated(QSystemTrayIcon::ActivationReason reason);