Main Window receives screen name change (#6916)
* corresponding slot and signal * changelog updated Co-authored-by: SerhiiGadzhilov <71632867+SerhiiGadzhilov@users.noreply.github.com>
This commit is contained in:
parent
ec79083753
commit
519b4af730
5 changed files with 13 additions and 0 deletions
|
|
@ -3,6 +3,9 @@ v1.13.1-snapshot
|
||||||
Bug fixes:
|
Bug fixes:
|
||||||
- #6900 Remaining SonarCloud reported bug items (test fixed)
|
- #6900 Remaining SonarCloud reported bug items (test fixed)
|
||||||
- #6889 Systray Icon on Ubuntu Auto Start (take 2)
|
- #6889 Systray Icon on Ubuntu Auto Start (take 2)
|
||||||
|
|
||||||
|
Enhancements:
|
||||||
|
- #6916 Main Window receives screen name change
|
||||||
- #6910 Don't use the word “Version” for release names because it can lead to errors during update checking.
|
- #6910 Don't use the word “Version” for release names because it can lead to errors during update checking.
|
||||||
- #6918 Removing positional union initialisation
|
- #6918 Removing positional union initialisation
|
||||||
===========
|
===========
|
||||||
|
|
|
||||||
|
|
@ -335,6 +335,7 @@ void AppConfig::setLastVersion(const QString& version) {
|
||||||
|
|
||||||
void AppConfig::setScreenName(const QString &s) {
|
void AppConfig::setScreenName(const QString &s) {
|
||||||
setSettingModified(m_ScreenName, s);
|
setSettingModified(m_ScreenName, s);
|
||||||
|
emit screenNameChanged();
|
||||||
}
|
}
|
||||||
|
|
||||||
void AppConfig::setPort(int i) {
|
void AppConfig::setPort(int i) {
|
||||||
|
|
|
||||||
|
|
@ -293,6 +293,7 @@ protected:
|
||||||
signals:
|
signals:
|
||||||
void sslToggled() const;
|
void sslToggled() const;
|
||||||
void zeroConfToggled();
|
void zeroConfToggled();
|
||||||
|
void screenNameChanged() const;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -135,7 +135,9 @@ MainWindow::MainWindow (AppConfig& appConfig,
|
||||||
|
|
||||||
m_pWidgetUpdate->hide();
|
m_pWidgetUpdate->hide();
|
||||||
m_VersionChecker.setApp(appPath(appConfig.synergycName()));
|
m_VersionChecker.setApp(appPath(appConfig.synergycName()));
|
||||||
|
|
||||||
m_pLabelScreenName->setText(getScreenName());
|
m_pLabelScreenName->setText(getScreenName());
|
||||||
|
connect(m_AppConfig, SIGNAL(screenNameChanged()), this, SLOT(updateScreenName()));
|
||||||
m_pLabelIpAddresses->setText(getIPAddresses());
|
m_pLabelIpAddresses->setText(getIPAddresses());
|
||||||
|
|
||||||
#if defined(Q_OS_WIN)
|
#if defined(Q_OS_WIN)
|
||||||
|
|
@ -1403,3 +1405,8 @@ void MainWindow::windowStateChanged()
|
||||||
if (windowState() == Qt::WindowMinimized && appConfig().getMinimizeToTray())
|
if (windowState() == Qt::WindowMinimized && appConfig().getMinimizeToTray())
|
||||||
hide();
|
hide();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void MainWindow::updateScreenName()
|
||||||
|
{
|
||||||
|
m_pLabelScreenName->setText(getScreenName());
|
||||||
|
}
|
||||||
|
|
@ -143,6 +143,7 @@ public slots:
|
||||||
|
|
||||||
protected slots:
|
protected slots:
|
||||||
void updateLocalFingerprint();
|
void updateLocalFingerprint();
|
||||||
|
void updateScreenName();
|
||||||
void on_m_pGroupClient_toggled(bool on);
|
void on_m_pGroupClient_toggled(bool on);
|
||||||
void on_m_pGroupServer_toggled(bool on);
|
void on_m_pGroupServer_toggled(bool on);
|
||||||
bool on_m_pButtonBrowseConfigFile_clicked();
|
bool on_m_pButtonBrowseConfigFile_clicked();
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue