rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#5629 Remove 'Run Wizard' from file menu

This commit is contained in:
Andrew Nelless 2016-09-30 16:23:04 +01:00 committed by Andrew Nelless
parent bcf2d5de0d
commit 2809530793
3 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/res/MainWindowBase.ui
View File

@ -481,14 +481,6 @@
<string notr="true"/> <string notr="true"/>
</property> </property>
</action> </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"> <action name="m_pActivate">
<property name="text"> <property name="text">
<string>Activate</string> <string>Activate</string>

9
src/gui/src/MainWindow.cpp
View File

@ -26,7 +26,6 @@
#include "AboutDialog.h" #include "AboutDialog.h"
#include "ServerConfigDialog.h" #include "ServerConfigDialog.h"
#include "SettingsDialog.h" #include "SettingsDialog.h"
#include "SetupWizard.h"
#include "ActivationDialog.h" #include "ActivationDialog.h"
#include "ZeroconfService.h" #include "ZeroconfService.h"
#include "DataDownloader.h" #include "DataDownloader.h"
@ -269,8 +268,8 @@ void MainWindow::createMenuBar()
m_pMenuFile->addAction(m_pActionStartSynergy); m_pMenuFile->addAction(m_pActionStartSynergy);
m_pMenuFile->addAction(m_pActionStopSynergy); m_pMenuFile->addAction(m_pActionStopSynergy);
m_pMenuFile->addSeparator(); m_pMenuFile->addSeparator();
m_pMenuFile->addAction(m_pActionWizard);
m_pMenuFile->addAction(m_pActivate); m_pMenuFile->addAction(m_pActivate);
m_pMenuFile->addSeparator();
m_pMenuFile->addAction(m_pActionSave); m_pMenuFile->addAction(m_pActionSave);
m_pMenuFile->addSeparator(); m_pMenuFile->addSeparator();
m_pMenuFile->addAction(m_pActionQuit); m_pMenuFile->addAction(m_pActionQuit);
@ -1138,12 +1137,6 @@ void MainWindow::on_m_pButtonConfigureServer_clicked()
showConfigureServer(); showConfigureServer();
} }
void MainWindow::on_m_pActionWizard_triggered()
{
SetupWizard wizard(*this, false);
wizard.exec();
}
void MainWindow::on_m_pActivate_triggered() void MainWindow::on_m_pActivate_triggered()
{ {
ActivationDialog activationDialog (this, this->appConfig()); ActivationDialog activationDialog (this, this->appConfig());

1
src/gui/src/MainWindow.h
View File

@ -130,7 +130,6 @@ class MainWindow : public QMainWindow, public Ui::MainWindowBase
bool on_m_pActionSave_triggered(); bool on_m_pActionSave_triggered();
void on_m_pActionAbout_triggered(); void on_m_pActionAbout_triggered();
void on_m_pActionSettings_triggered(); void on_m_pActionSettings_triggered();
void on_m_pActionWizard_triggered();
void on_m_pActivate_triggered(); void on_m_pActivate_triggered();
void synergyFinished(int exitCode, QProcess::ExitStatus); void synergyFinished(int exitCode, QProcess::ExitStatus);
void trayActivated(QSystemTrayIcon::ActivationReason reason); void trayActivated(QSystemTrayIcon::ActivationReason reason);