From 6604d2874b9ba19247f66df530a883b40e1db67d Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Mon, 27 Feb 2023 17:02:57 +0100 Subject: [PATCH] Add a way to reset font family in settings. --- .../src/components/settings/SettingsModel.cpp | 14 ++++++++++++-- linphone-app/ui/views/App/Settings/SettingsUi.qml | 7 +++++++ .../views/App/Styles/Settings/SettingsUiStyle.qml | 11 +++++++++++ 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/linphone-app/src/components/settings/SettingsModel.cpp b/linphone-app/src/components/settings/SettingsModel.cpp index 3419f49a3..d9822ee9e 100644 --- a/linphone-app/src/components/settings/SettingsModel.cpp +++ b/linphone-app/src/components/settings/SettingsModel.cpp @@ -1456,7 +1456,12 @@ QFont SettingsModel::getTextMessageFont() const{ } void SettingsModel::setTextMessageFont(const QFont& font){ - mConfig->setString(UiSection, "text_message_font", Utils::appStringToCoreString(font.family())); + QString family; + if(font == QFont()) + family = Constants::DefaultFont; + else + family = font.family(); + mConfig->setString(UiSection, "text_message_font", Utils::appStringToCoreString(family)); setTextMessageFontSize(font.pointSize()); emit textMessageFontChanged(font); } @@ -1477,7 +1482,12 @@ QFont SettingsModel::getEmojiFont() const{ } void SettingsModel::setEmojiFont(const QFont& font){ - mConfig->setString(UiSection, "emoji_font", Utils::appStringToCoreString(font.family())); + QString family; + if(font == QFont()) + family = Constants::DefaultEmojiFont; + else + family = font.family(); + mConfig->setString(UiSection, "emoji_font", Utils::appStringToCoreString(family)); emit emojiFontChanged(font); } diff --git a/linphone-app/ui/views/App/Settings/SettingsUi.qml b/linphone-app/ui/views/App/Settings/SettingsUi.qml index 511a5dfa3..27b890dea 100644 --- a/linphone-app/ui/views/App/Settings/SettingsUi.qml +++ b/linphone-app/ui/views/App/Settings/SettingsUi.qml @@ -92,6 +92,13 @@ TabContainer { pointSize: FormTableStyle.entry.text.pointSize } } + ActionButton{ + isCustom: true + backgroundRadius: 90 + colorSet: SettingsUiStyle.cancel + onClicked: SettingsModel.textMessageFont = '' + Layout.preferredWidth: 25 + } } } diff --git a/linphone-app/ui/views/App/Styles/Settings/SettingsUiStyle.qml b/linphone-app/ui/views/App/Styles/Settings/SettingsUiStyle.qml index 9907f8fc9..bcfa7f19b 100644 --- a/linphone-app/ui/views/App/Styles/Settings/SettingsUiStyle.qml +++ b/linphone-app/ui/views/App/Styles/Settings/SettingsUiStyle.qml @@ -18,4 +18,15 @@ QtObject { property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } + property QtObject cancel: QtObject { + property int iconSize: 25 + property string icon : 'cancel_custom' + property string name : 'cancel' + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_fg') + } }