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

#5617 Remove the plugin wizard from GUI

This commit is contained in:
Andrew Nelless 2016-09-27 13:15:44 +01:00
parent b55b8f0038
commit 5f5153f450
4 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/gui.pro
View File

@ -16,8 +16,7 @@ FORMS += res/MainWindowBase.ui \
res/HotkeyDialogBase.ui \ res/HotkeyDialogBase.ui \
res/SettingsDialogBase.ui \ res/SettingsDialogBase.ui \
res/SetupWizardBase.ui \ res/SetupWizardBase.ui \
res/AddClientDialogBase.ui \ res/AddClientDialogBase.ui
res/PluginWizardPageBase.ui
SOURCES += src/main.cpp \ SOURCES += src/main.cpp \
src/MainWindow.cpp \ src/MainWindow.cpp \
src/AboutDialog.cpp \ src/AboutDialog.cpp \
@ -54,14 +53,10 @@ SOURCES += src/main.cpp \
src/DataDownloader.cpp \ src/DataDownloader.cpp \
src/AddClientDialog.cpp \ src/AddClientDialog.cpp \
src/CommandProcess.cpp \ src/CommandProcess.cpp \
src/PluginWizardPage.cpp \
src/PluginManager.cpp \
src/CoreInterface.cpp \ src/CoreInterface.cpp \
src/Fingerprint.cpp \ src/Fingerprint.cpp \
src/SslCertificate.cpp \ src/SslCertificate.cpp \
src/Plugin.cpp \
src/WebClient.cpp \ src/WebClient.cpp \
../lib/common/PluginVersion.cpp \
src/SubscriptionManager.cpp \ src/SubscriptionManager.cpp \
src/ActivationNotifier.cpp src/ActivationNotifier.cpp
HEADERS += src/MainWindow.h \ HEADERS += src/MainWindow.h \
@ -101,15 +96,11 @@ HEADERS += src/MainWindow.h \
src/AddClientDialog.h \ src/AddClientDialog.h \
src/CommandProcess.h \ src/CommandProcess.h \
src/EditionType.h \ src/EditionType.h \
src/PluginWizardPage.h \
src/ProcessorArch.h \ src/ProcessorArch.h \
src/PluginManager.h \
src/CoreInterface.h \ src/CoreInterface.h \
src/Fingerprint.h \ src/Fingerprint.h \
src/SslCertificate.h \ src/SslCertificate.h \
src/Plugin.h \
src/WebClient.h \ src/WebClient.h \
../lib/common/PluginVersion.h \
src/SubscriptionManager.h \ src/SubscriptionManager.h \
src/ActivationNotifier.h \ src/ActivationNotifier.h \
src/ElevateMode.h src/ElevateMode.h

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

@ -63,7 +63,6 @@ class MainWindow : public QMainWindow, public Ui::MainWindowBase
friend class QSynergyApplication; friend class QSynergyApplication;
friend class SetupWizard; friend class SetupWizard;
friend class PluginWizardPage;
public: public:
enum qSynergyState enum qSynergyState

5
src/gui/src/SetupWizard.cpp
View File

@ -33,8 +33,6 @@ SetupWizard::SetupWizard(MainWindow& mainWindow, bool startMain) :
m_LoginAttemps(0) m_LoginAttemps(0)
{ {
setupUi(this); setupUi(this);
m_pPluginPage = new PluginWizardPage(mainWindow);
addPage(m_pPluginPage);
#if defined(Q_OS_MAC) #if defined(Q_OS_MAC)
@ -114,7 +112,6 @@ bool SetupWizard::validateCurrentPage()
return false; return false;
} }
else { else {
m_pPluginPage->setEdition(m_Edition);
return true; return true;
} }
} }
@ -132,8 +129,6 @@ bool SetupWizard::validateCurrentPage()
return false; return false;
} }
m_pPluginPage->setEdition(m_Edition);
return true; return true;
} }
} }

2
src/gui/src/SetupWizard.h
View File

@ -19,7 +19,6 @@
#include "ui_SetupWizardBase.h" #include "ui_SetupWizardBase.h"
#include "SynergyLocale.h" #include "SynergyLocale.h"
#include "PluginWizardPage.h"
#include <QWizard> #include <QWizard>
#include <QNetworkAccessManager> #include <QNetworkAccessManager>
@ -50,7 +49,6 @@ private:
bool m_StartMain; bool m_StartMain;
SynergyLocale m_Locale; SynergyLocale m_Locale;
int m_Edition; int m_Edition;
PluginWizardPage* m_pPluginPage;
int m_LoginAttemps; int m_LoginAttemps;
private slots: private slots: