Duplicating text spaces after dot only for Mac (#6914)
* duplicating text spaces after dot * updated changelog * implemented suggestion Co-authored-by: SerhiiGadzhilov <71632867+SerhiiGadzhilov@users.noreply.github.com>
This commit is contained in:
parent
577bb9f492
commit
9f5f0276d8
4 changed files with 26 additions and 3 deletions
|
|
@ -4,6 +4,7 @@ Bug fixes:
|
||||||
- #6900 Remaining SonarCloud reported bug items
|
- #6900 Remaining SonarCloud reported bug items
|
||||||
- #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)
|
||||||
|
- #6914 Fix for Qt Word Wrap on Mac
|
||||||
|
|
||||||
Enhancements:
|
Enhancements:
|
||||||
- #6912 Removes UI for Screen Saver Sync and Files Drag and Drop
|
- #6912 Removes UI for Screen Saver Sync and Files Drag and Drop
|
||||||
|
|
|
||||||
|
|
@ -37,6 +37,9 @@ SetupWizard::SetupWizard(MainWindow& mainWindow, bool startMain) :
|
||||||
resize(600, 500);
|
resize(600, 500);
|
||||||
setMinimumSize(size());
|
setMinimumSize(size());
|
||||||
|
|
||||||
|
// additionally, we identified an issue with presenting dots, see SYNERGY-719
|
||||||
|
duplicateSpaces();
|
||||||
|
|
||||||
#elif defined(Q_OS_WIN)
|
#elif defined(Q_OS_WIN)
|
||||||
|
|
||||||
// when areo is disabled on windows, the next/back buttons
|
// when areo is disabled on windows, the next/back buttons
|
||||||
|
|
@ -146,4 +149,19 @@ 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)
|
||||||
|
void SetupWizard::duplicateSpaces()
|
||||||
|
{
|
||||||
|
auto list = this->findChildren<QLabel *>();
|
||||||
|
foreach(QLabel *l, list) {
|
||||||
|
if (l->wordWrap()) {
|
||||||
|
l->setText(l->text().replace(". ", ". "));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif // defined(Q_OS_MAC)
|
||||||
|
|
|
||||||
|
|
@ -48,6 +48,10 @@ private:
|
||||||
bool m_StartMain;
|
bool m_StartMain;
|
||||||
SynergyLocale m_Locale;
|
SynergyLocale m_Locale;
|
||||||
|
|
||||||
|
#if defined(Q_OS_MAC)
|
||||||
|
void duplicateSpaces();
|
||||||
|
#endif // defined(Q_OS_MAC)
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void on_m_pComboLanguage_currentIndexChanged(int index);
|
void on_m_pComboLanguage_currentIndexChanged(int index);
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -97,11 +97,11 @@ int main(int argc, char* argv[])
|
||||||
QObject::connect(dynamic_cast<QObject*>(&app), SIGNAL(aboutToQuit()),
|
QObject::connect(dynamic_cast<QObject*>(&app), SIGNAL(aboutToQuit()),
|
||||||
&mainWindow, SLOT(saveSettings()));
|
&mainWindow, SLOT(saveSettings()));
|
||||||
|
|
||||||
SetupWizard setupWizard(mainWindow, true);
|
std::unique_ptr<SetupWizard> setupWizard;
|
||||||
|
|
||||||
if (appConfig.wizardShouldRun())
|
if (appConfig.wizardShouldRun())
|
||||||
{
|
{
|
||||||
setupWizard.show();
|
setupWizard.reset(new SetupWizard(mainWindow, true));
|
||||||
|
setupWizard->show();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue