Permalink
|
|
@@ -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>
|
|
|
|
|
|
@@ -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());
|
|
|
|
|
|
@@ -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);
|
|
|
|
0 comments on commit
2809530