#5629 Add rudimentary activation dialog
This commit is contained in:
parent
45da1dfc7c
commit
663e3f5854
|
@ -16,7 +16,8 @@ FORMS += res/MainWindowBase.ui \
|
|||
res/HotkeyDialogBase.ui \
|
||||
res/SettingsDialogBase.ui \
|
||||
res/SetupWizardBase.ui \
|
||||
res/AddClientDialogBase.ui
|
||||
res/AddClientDialogBase.ui \
|
||||
res/ActivationDialog.ui
|
||||
SOURCES += src/main.cpp \
|
||||
src/MainWindow.cpp \
|
||||
src/AboutDialog.cpp \
|
||||
|
@ -58,7 +59,8 @@ SOURCES += src/main.cpp \
|
|||
src/SslCertificate.cpp \
|
||||
src/WebClient.cpp \
|
||||
src/SubscriptionManager.cpp \
|
||||
src/ActivationNotifier.cpp
|
||||
src/ActivationNotifier.cpp \
|
||||
src/ActivationDialog.cpp
|
||||
HEADERS += src/MainWindow.h \
|
||||
src/AboutDialog.h \
|
||||
src/ServerConfig.h \
|
||||
|
@ -103,7 +105,8 @@ HEADERS += src/MainWindow.h \
|
|||
src/WebClient.h \
|
||||
src/SubscriptionManager.h \
|
||||
src/ActivationNotifier.h \
|
||||
src/ElevateMode.h
|
||||
src/ElevateMode.h \
|
||||
src/ActivationDialog.h
|
||||
RESOURCES += res/Synergy.qrc
|
||||
RC_FILE = res/win/Synergy.rc
|
||||
macx {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>MainWindowBase</class>
|
||||
<widget class="QMainWindow" name="MainWindowBase">
|
||||
|
@ -489,6 +489,14 @@
|
|||
<string notr="true"/>
|
||||
</property>
|
||||
</action>
|
||||
<action name="m_pActivate">
|
||||
<property name="text">
|
||||
<string>Activate</string>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Activate</string>
|
||||
</property>
|
||||
</action>
|
||||
</widget>
|
||||
<resources>
|
||||
<include location="Synergy.qrc"/>
|
||||
|
|
|
@ -27,6 +27,7 @@
|
|||
#include "ServerConfigDialog.h"
|
||||
#include "SettingsDialog.h"
|
||||
#include "SetupWizard.h"
|
||||
#include "ActivationDialog.h"
|
||||
#include "ZeroconfService.h"
|
||||
#include "DataDownloader.h"
|
||||
#include "CommandProcess.h"
|
||||
|
@ -263,6 +264,7 @@ void MainWindow::createMenuBar()
|
|||
m_pMenuFile->addAction(m_pActionStopSynergy);
|
||||
m_pMenuFile->addSeparator();
|
||||
m_pMenuFile->addAction(m_pActionWizard);
|
||||
m_pMenuFile->addAction(m_pActivate);
|
||||
m_pMenuFile->addAction(m_pActionSave);
|
||||
m_pMenuFile->addSeparator();
|
||||
m_pMenuFile->addAction(m_pActionQuit);
|
||||
|
@ -1150,6 +1152,12 @@ void MainWindow::on_m_pActionWizard_triggered()
|
|||
wizard.exec();
|
||||
}
|
||||
|
||||
void MainWindow::on_m_pActivate_triggered()
|
||||
{
|
||||
ActivationDialog activationDialog;
|
||||
activationDialog.exec();
|
||||
}
|
||||
|
||||
void MainWindow::on_m_pButtonApply_clicked()
|
||||
{
|
||||
restartSynergy();
|
||||
|
|
|
@ -113,7 +113,6 @@ class MainWindow : public QMainWindow, public Ui::MainWindowBase
|
|||
void serverDetected(const QString name);
|
||||
void setEdition(int type);
|
||||
void updateLocalFingerprint();
|
||||
|
||||
public slots:
|
||||
void appendLogRaw(const QString& text);
|
||||
void appendLogInfo(const QString& text);
|
||||
|
@ -130,6 +129,7 @@ class MainWindow : public QMainWindow, public Ui::MainWindowBase
|
|||
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);
|
||||
void stopSynergy();
|
||||
|
|
Loading…
Reference in New Issue