Changeset 88911 in vbox

Timestamp:

May 6, 2021 5:46:09 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8161. Saving softkeyboard color settings directly

Location:

trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard

Files:

• UISoftKeyboard.cpp (modified) (4 diffs)
• UISoftKeyboard.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.cpp

@@ -4048 +4048 @@
     if (m_pKeyboardWidget)
         m_pKeyboardWidget->setColorThemeByName(strColorThemeName);
+    saveSelectedColorThemeName();
 }
 
@@ -4129 +4130 @@
     m_pSettingsWidget->setColorSelectionButtonBackgroundAndTooltip(static_cast<KeyboardColorType>(iColorRow),
                                                                    newColor, m_pKeyboardWidget->isColorThemeEditable());
+    saveCustomColorTheme();
 }
 
@@ -4240 +4242 @@
 }
 
+void UISoftKeyboard::saveCustomColorTheme()
+{
+    if (!m_pKeyboardWidget)
+        return;
+    /* Save the changes to the 'Custom' color theme to extra data: */
+    QStringList colors = m_pKeyboardWidget->colorsToStringList("Custom");
+    colors.prepend("Custom");
+    gEDataManager->setSoftKeyboardColorTheme(colors);
+}
+
+void UISoftKeyboard::saveSelectedColorThemeName()
+{
+    if (!m_pKeyboardWidget)
+        return;
+    gEDataManager->setSoftKeyboardSelectedColorTheme(m_pKeyboardWidget->currentColorThemeName());
+}
+
 void UISoftKeyboard::sltSaveSettings()
 {
@@ -4245 +4264 @@
     if (m_pKeyboardWidget)
     {
-        /* Save the changes to the 'Custom' color theme to extra data: */
-        QStringList colors = m_pKeyboardWidget->colorsToStringList("Custom");
-        colors.prepend("Custom");
-        gEDataManager->setSoftKeyboardColorTheme(colors);
-        gEDataManager->setSoftKeyboardSelectedColorTheme(m_pKeyboardWidget->currentColorThemeName());
         gEDataManager->setSoftKeyboardOptions(m_pKeyboardWidget->hideNumPad(),
                                               m_pKeyboardWidget->hideOSMenuKeys(),

trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.h

@@ -114 +114 @@
     void prepareConnections();
     void loadSettings();
+    void saveCustomColorTheme();
+    void saveSelectedColorThemeName();
     void saveDialogGeometry();
     void configure();