Skip to content
Snippets Groups Projects
Commit 29207d73 authored by Aline Gondim Santos's avatar Aline Gondim Santos
Browse files

language: reload theme and layout options

Change-Id: Id33ae495260ff1e9ea58624a440a80aab23ad6a1
GitLab: #886
parent f3334fed
No related branches found
No related tags found
No related merge requests found
......@@ -90,6 +90,7 @@ ColumnLayout {
tipText: JamiStrings.layout
fontPointSize: JamiTheme.settingsFontSize
comboModel: ListModel {
id: layoutModel
Component.onCompleted: {
append({ textDisplay: JamiStrings.horizontalViewOpt })
append({ textDisplay: JamiStrings.verticalViewOpt })
......@@ -106,5 +107,17 @@ ColumnLayout {
comboModel.get(modelIndex).textDisplay === JamiStrings.verticalViewOpt
)
}
Connections {
target: UtilsAdapter
function onChangeLanguage() {
var idx = outputComboBoxSetting.modelIndex
layoutModel.clear()
layoutModel.append({ textDisplay: JamiStrings.horizontalViewOpt })
layoutModel.append({ textDisplay: JamiStrings.verticalViewOpt })
outputComboBoxSetting.modelIndex = idx
}
}
}
}
......@@ -76,6 +76,7 @@ ColumnLayout {
fontPointSize: JamiTheme.settingsFontSize
comboModel: ListModel {
id: themeModel
Component.onCompleted: {
append({ textDisplay: JamiStrings.dark })
append({ textDisplay: JamiStrings.light })
......@@ -223,13 +224,22 @@ ColumnLayout {
}
}
Connections {
target: UtilsAdapter
function onChangeFontSize() {
zoomSpinBox.valueField = Math.round(UtilsAdapter.getAppValue(Settings.BaseZoom) * 100.0)
}
function onChangeLanguage() {
var idx = themeComboBoxSettings.modelIndex
themeModel.clear()
themeModel.append({ textDisplay: JamiStrings.dark })
themeModel.append({ textDisplay: JamiStrings.light })
if (UtilsAdapter.hasNativeDarkTheme())
themeModel.append({ textDisplay: JamiStrings.system })
themeComboBoxSettings.modelIndex = idx
}
}
SettingSpinBox {
......
......@@ -367,9 +367,10 @@ UtilsAdapter::setAppValue(const Settings::Key key, const QVariant& value)
}
settingsManager_->setValue(key, value);
// If we change the lang preference, reload the translations
if (key == Settings::Key::LANG)
if (key == Settings::Key::LANG) {
settingsManager_->loadTranslations();
else if (key == Settings::Key::BaseZoom)
Q_EMIT changeLanguage();
} else if (key == Settings::Key::BaseZoom)
Q_EMIT changeFontSize();
else if (key == Settings::Key::EnableExperimentalSwarm)
Q_EMIT showExperimentalCallSwarm();
......
......@@ -127,6 +127,7 @@ Q_SIGNALS:
void chatviewPositionChanged();
void appThemeChanged();
void showExperimentalCallSwarm();
void changeLanguage();
private:
QClipboard* clipboard_;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment