Permalink
|
|
@@ -16,8 +16,7 @@ FORMS += res/MainWindowBase.ui \ |
|
|
res/HotkeyDialogBase.ui \
|
|
|
res/SettingsDialogBase.ui \
|
|
|
res/SetupWizardBase.ui \
|
|
|
- res/AddClientDialogBase.ui \
|
|
|
- res/PluginWizardPageBase.ui
|
|
|
+ res/AddClientDialogBase.ui
|
|
|
SOURCES += src/main.cpp \
|
|
|
src/MainWindow.cpp \
|
|
|
src/AboutDialog.cpp \
|
|
|
@@ -54,14 +53,10 @@ SOURCES += src/main.cpp \ |
|
|
src/DataDownloader.cpp \
|
|
|
src/AddClientDialog.cpp \
|
|
|
src/CommandProcess.cpp \
|
|
|
- src/PluginWizardPage.cpp \
|
|
|
- src/PluginManager.cpp \
|
|
|
src/CoreInterface.cpp \
|
|
|
src/Fingerprint.cpp \
|
|
|
src/SslCertificate.cpp \
|
|
|
- src/Plugin.cpp \
|
|
|
src/WebClient.cpp \
|
|
|
- ../lib/common/PluginVersion.cpp \
|
|
|
src/SubscriptionManager.cpp \
|
|
|
src/ActivationNotifier.cpp
|
|
|
HEADERS += src/MainWindow.h \
|
|
|
@@ -101,15 +96,11 @@ HEADERS += src/MainWindow.h \ |
|
|
src/AddClientDialog.h \
|
|
|
src/CommandProcess.h \
|
|
|
src/EditionType.h \
|
|
|
- src/PluginWizardPage.h \
|
|
|
src/ProcessorArch.h \
|
|
|
- src/PluginManager.h \
|
|
|
src/CoreInterface.h \
|
|
|
src/Fingerprint.h \
|
|
|
src/SslCertificate.h \
|
|
|
- src/Plugin.h \
|
|
|
src/WebClient.h \
|
|
|
- ../lib/common/PluginVersion.h \
|
|
|
src/SubscriptionManager.h \
|
|
|
src/ActivationNotifier.h \
|
|
|
src/ElevateMode.h
|
|
|
|
|
|
@@ -63,8 +63,7 @@ class MainWindow : public QMainWindow, public Ui::MainWindowBase |
|
|
|
|
|
friend class QSynergyApplication;
|
|
|
friend class SetupWizard;
|
|
|
- friend class PluginWizardPage;
|
|
|
-
|
|
|
+
|
|
|
public:
|
|
|
enum qSynergyState
|
|
|
{
|
|
|
|
|
|
@@ -33,8 +33,6 @@ SetupWizard::SetupWizard(MainWindow& mainWindow, bool startMain) : |
|
|
m_LoginAttemps(0)
|
|
|
{
|
|
|
setupUi(this);
|
|
|
- m_pPluginPage = new PluginWizardPage(mainWindow);
|
|
|
- addPage(m_pPluginPage);
|
|
|
|
|
|
#if defined(Q_OS_MAC)
|
|
|
|
|
|
@@ -114,7 +112,6 @@ bool SetupWizard::validateCurrentPage() |
|
|
return false;
|
|
|
}
|
|
|
else {
|
|
|
- m_pPluginPage->setEdition(m_Edition);
|
|
|
return true;
|
|
|
}
|
|
|
}
|
|
|
@@ -132,8 +129,6 @@ bool SetupWizard::validateCurrentPage() |
|
|
return false;
|
|
|
}
|
|
|
|
|
|
- m_pPluginPage->setEdition(m_Edition);
|
|
|
-
|
|
|
return true;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -19,7 +19,6 @@ |
|
|
|
|
|
#include "ui_SetupWizardBase.h"
|
|
|
#include "SynergyLocale.h"
|
|
|
-#include "PluginWizardPage.h"
|
|
|
|
|
|
#include <QWizard>
|
|
|
#include <QNetworkAccessManager>
|
|
|
@@ -50,7 +49,6 @@ class SetupWizard : public QWizard, public Ui::SetupWizardBase |
|
|
bool m_StartMain;
|
|
|
SynergyLocale m_Locale;
|
|
|
int m_Edition;
|
|
|
- PluginWizardPage* m_pPluginPage;
|
|
|
int m_LoginAttemps;
|
|
|
|
|
|
private slots:
|
|
|
|
0 comments on commit
5f5153f