Changeset 88912 in vbox for trunk/src/VBox

Timestamp:

May 6, 2021 6:06:41 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8161. Saving softkeyboard selected keyboard layout to the extra data as soon as it changes

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

@@ -3141 +3141 @@
     for (QMap<QUuid, UISoftKeyboardLayout>::iterator iterator = m_layouts.begin(); iterator != m_layouts.end(); ++iterator)
         iterator.value().setEditedBuNotSaved(false);
+    /* Block sigCurrentLayoutChange since it causes saving set layout to exra data: */
+    blockSignals(true);
     setCurrentLayout(m_layouts.firstKey());
+    blockSignals(false);
 }
 
@@ -3976 +3979 @@
         return;
     updateStatusBarMessage(pCurrentLayout->nameString());
+    saveCurrentLayout();
 }
 
@@ -4259 +4263 @@
 }
 
+void UISoftKeyboard::saveCurrentLayout()
+{
+    if (m_pKeyboardWidget && m_pKeyboardWidget->currentLayout())
+        gEDataManager->setSoftKeyboardSelectedLayout(m_pKeyboardWidget->currentLayout()->uid());
+}
+
 void UISoftKeyboard::sltSaveSettings()
 {
@@ -4267 +4277 @@
                                               m_pKeyboardWidget->hideOSMenuKeys(),
                                               m_pKeyboardWidget->hideMultimediaKeys());
-        if (m_pKeyboardWidget->currentLayout())
-            gEDataManager->setSoftKeyboardSelectedLayout(m_pKeyboardWidget->currentLayout()->uid());
     }
 }

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

@@ -116 +116 @@
     void saveCustomColorTheme();
     void saveSelectedColorThemeName();
+    void saveCurrentLayout();
     void saveDialogGeometry();
     void configure();