smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #7097 from symless/SYNERGY-1218-Wrong-window-title-after-open-preferences

Browse source 
SYNERGY-1218 Wrong window title after open preferences
This commit is contained in:
Andrey Batyiev 2021-10-01 11:56:19 +03:00 committed by GitHub
commit 62365c754e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

@ -12,6 +12,7 @@ Bug fixes:
- #7092 Synergy is running after quit on Linux - #7092 Synergy is running after quit on Linux
- #7095 Update account and upgrade links - #7095 Update account and upgrade links
- #7096 The system duplicates hotkeys in setup - #7096 The system duplicates hotkeys in setup
- #7097 The title "Enterprise" disappeares after clicking on "Preferences"
Enhancements: Enhancements:
- #7068 Add Synergy restart when settings changed - #7068 Add Synergy restart when settings changed

22
src/gui/src/MainWindow.cpp
View file

@ -184,12 +184,7 @@ MainWindow::MainWindow (AppConfig& appConfig,
connect (m_AppConfig, SIGNAL(zeroConfToggled()), connect (m_AppConfig, SIGNAL(zeroConfToggled()),
this, SLOT(zeroConfToggled()), Qt::QueuedConnection); this, SLOT(zeroConfToggled()), Qt::QueuedConnection);
#ifdef SYNERGY_ENTERPRISE updateWindowTitle();
setWindowTitle ("Synergy 1 Enterprise");
#else
setWindowTitle (m_LicenseManager->activeEditionName());
m_LicenseManager->refresh();
#endif
QString lastVersion = m_AppConfig->lastVersion(); QString lastVersion = m_AppConfig->lastVersion();
QString currentVersion = m_VersionChecker.getVersion(); QString currentVersion = m_VersionChecker.getVersion();
@ -620,9 +615,6 @@ void MainWindow::restartSynergy()
void MainWindow::proofreadInfo() void MainWindow::proofreadInfo()
{ {
#ifndef SYNERGY_ENTERPRISE
setEdition(m_AppConfig->edition()); // Why is this here?
#endif
int oldState = m_SynergyState; int oldState = m_SynergyState;
m_SynergyState = synergyDisconnected; m_SynergyState = synergyDisconnected;
setSynergyState((qSynergyState)oldState); setSynergyState((qSynergyState)oldState);
@ -1174,7 +1166,7 @@ void MainWindow::changeEvent(QEvent* event)
{ {
retranslateUi(this); retranslateUi(this);
retranslateMenuBar(); retranslateMenuBar();
updateWindowTitle();
proofreadInfo(); proofreadInfo();
break; break;
@ -1303,6 +1295,16 @@ void MainWindow::updateAutoConfigWidgets()
m_pComboServerList->hide(); m_pComboServerList->hide();
} }
void MainWindow::updateWindowTitle()
{
#ifdef SYNERGY_ENTERPRISE
setWindowTitle ("Synergy 1 Enterprise");
#else
setWindowTitle (m_LicenseManager->activeEditionName());
m_LicenseManager->refresh();
#endif
}
void MainWindow::on_m_pActionSettings_triggered() void MainWindow::on_m_pActionSettings_triggered()
{ {
auto result = SettingsDialog(this, appConfig()).exec(); auto result = SettingsDialog(this, appConfig()).exec();

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

@ -252,6 +252,7 @@ public slots:
ClientConnection m_clientConnection; ClientConnection m_clientConnection;
void updateAutoConfigWidgets(); void updateAutoConfigWidgets();
void updateWindowTitle();
private slots: private slots:
void on_m_pButtonApply_clicked(); void on_m_pButtonApply_clicked();