From 82ef15ea75b4d893a2b473e7e147ff4d485af6a7 Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Sat, 27 Nov 2021 14:56:19 -0500 Subject: [PATCH] Show language list in native language --- src/mainwindow.cpp | 9 +++++---- src/mainwindow.h | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index f000ef7..f38c359 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -235,7 +235,7 @@ void MainWindow::loadLanguage(QString& rLanguage) { qDebug() << __func__ << ": locale=" << locale; QLocale::setDefault(locale); qDebug() << __func__ << ": setDefault locale=" << locale; - QString languageName = QLocale::languageToString(locale.language()); + QString languageName = locale.nativeLanguageName(); //locale.language()); qDebug() << __func__ << ": languageName=" << languageName; switchTranslator(m_translator, QString("silentdragon_%1.qm").arg(lang)); @@ -537,8 +537,8 @@ void MainWindow::setupSettingsModal() { locale.truncate(locale.lastIndexOf('.')); // "silentdragon_de" locale.remove(0, locale.lastIndexOf('_') + 1); // "de" - QString lang = QLocale::languageToString(QLocale(locale).language()); - QIcon ico; + //QString lang = QLocale::languageToString(QLocale(locale).language()); + QString lang = QLocale(locale).nativeLanguageName(); //locale.language()); //settings.comboBoxLanguage->addItem(action); settings.comboBoxLanguage->addItem(lang + " (" + locale + ")"); @@ -1912,9 +1912,10 @@ void MainWindow::slot_change_currency(const QString& currency_name) } } -void MainWindow::slot_change_theme(const QString& theme_name) +void MainWindow::slot_change_theme(QString& theme_name) { qDebug() << __func__ << ": theme_name=" << theme_name; + Settings::getInstance()->set_theme_name(theme_name); // Include css diff --git a/src/mainwindow.h b/src/mainwindow.h index 0b75c6c..c48dd62 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -98,7 +98,7 @@ private: void setupChatTab(); void setupMarketTab(); - void slot_change_theme(const QString& themeName); + void slot_change_theme(QString& themeName); void slot_change_currency(const QString& currencyName); void setupTurnstileDialog();