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

#5629 Show the main window behind the activation dialog

This commit is contained in:
Andrew Nelless 2016-10-04 11:48:47 +01:00
parent 16ef224ba8
commit 15f2e27d18
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,15 +145,8 @@ MainWindow::MainWindow(QSettings& settings, AppConfig& appConfig) :
}
updateLocalFingerprint();
}
void
MainWindow::showEvent(QShowEvent* event) {
QMainWindow::showEvent (event);
if (!m_AppConfig.activationHasRun() && (m_AppConfig.edition() == Unregistered)) {
ActivationDialog activationDialog (this, m_AppConfig);
activationDialog.exec();
}
connect (this, SIGNAL(windowShown()), this, SLOT(on_windowShown()), Qt::QueuedConnection);
}
MainWindow::~MainWindow()
@ -518,6 +511,12 @@ void MainWindow::proofreadInfo()
setSynergyState((qSynergyState)oldState);
}
void MainWindow::showEvent(QShowEvent* event)
{
QMainWindow::showEvent(event);
emit windowShown();
}
void MainWindow::clearLog()
{
m_pLogOutput->clear();
@ -1367,6 +1366,14 @@ void MainWindow::bonjourInstallFinished()
m_pCheckBoxAutoConfig->setChecked(true);
}
void MainWindow::on_windowShown()
{
if (!m_AppConfig.activationHasRun() && (m_AppConfig.edition() == Unregistered)) {
ActivationDialog activationDialog (this, m_AppConfig);
activationDialog.exec();
}
}
QString MainWindow::getProfileRootForArg()
{
CoreInterface coreInterface;

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

@ -117,6 +117,7 @@ class MainWindow : public QMainWindow, public Ui::MainWindowBase
void serverDetected(const QString name);
void setEdition(int edition);
void updateLocalFingerprint();
public slots:
void appendLogRaw(const QString& text);
void appendLogInfo(const QString& text);
@ -182,7 +183,8 @@ class MainWindow : public QMainWindow, public Ui::MainWindowBase
void restartSynergy();
void proofreadInfo();
void showEvent(QShowEvent *event);
void showEvent (QShowEvent*);
private:
QSettings& m_Settings;
AppConfig& m_AppConfig;
@ -217,6 +219,10 @@ private slots:
void on_m_pComboServerList_currentIndexChanged(QString );
void on_m_pButtonApply_clicked();
void installBonjour();
void on_windowShown();
signals:
void windowShown();
};
#endif