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

SYNERGY-719 Text on welcome screen on macOS is shown without spaces (#6934)

Browse source 
* SYNERGY-719 Fix for spaces for "," and language switch

* Update ChangeLog
This commit is contained in:
SerhiiGadzhilov 2021-02-05 13:39:19 +03:00 committed by GitHub
parent b3034859ff
commit ab3fb6e149
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -5,7 +5,7 @@ Bug fixes:
- #6903 Save global settings - #6903 Save global settings
- #6889 Systray Icon on Ubuntu Auto Start (take 2) - #6889 Systray Icon on Ubuntu Auto Start (take 2)
- #6907 Saving configuration on apply - #6907 Saving configuration on apply
- #6914 Fix for Qt Word Wrap on Mac - #6934 Text on welcome screen on macOS is shown without spaces
- #6920 Windows Installer checksums - #6920 Windows Installer checksums
- #6921 Handling pre-main window creation status notifications - #6921 Handling pre-main window creation status notifications
- #6922 macOS CI build - #6922 macOS CI build

9
src/gui/src/SetupWizard.cpp
View file

@ -95,6 +95,9 @@ void SetupWizard::changeEvent(QEvent* event)
m_pComboLanguage->blockSignals(true); m_pComboLanguage->blockSignals(true);
retranslateUi(this); retranslateUi(this);
m_pComboLanguage->blockSignals(false); m_pComboLanguage->blockSignals(false);
#if defined(Q_OS_MAC)
duplicateSpaces();
#endif // defined(Q_OS_MAC)
break; break;
} }
@ -149,9 +152,6 @@ void SetupWizard::on_m_pComboLanguage_currentIndexChanged(int index)
{ {
QString ietfCode = m_pComboLanguage->itemData(index).toString(); QString ietfCode = m_pComboLanguage->itemData(index).toString();
QSynergyApplication::getInstance()->switchTranslator(ietfCode); QSynergyApplication::getInstance()->switchTranslator(ietfCode);
#if defined(Q_OS_MAC)
duplicateSpaces();
#endif // defined(Q_OS_MAC)
} }
#if defined(Q_OS_MAC) #if defined(Q_OS_MAC)
@ -160,7 +160,8 @@ void SetupWizard::duplicateSpaces()
auto list = this->findChildren<QLabel *>(); auto list = this->findChildren<QLabel *>();
foreach(QLabel *l, list) { foreach(QLabel *l, list) {
if (l->wordWrap()) { if (l->wordWrap()) {
l->setText(l->text().replace(". ", ". ")); l->setText(l->text().replace(". ", ". "));
l->setText(l->text().replace(", ", ", "));
} }
} }
} }