Changeset 81309 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Oct 17, 2019 11:40:23 AM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

134014

Message:

FE/Qt: bugref:6143. Remembering the last selected color theme

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataDefs.cpp (modified) (1 diff)
• extradata/UIExtraDataDefs.h (modified) (1 diff)
• extradata/UIExtraDataManager.cpp (modified) (1 diff)
• extradata/UIExtraDataManager.h (modified) (1 diff)
• softkeyboard/UISoftKeyboard.cpp (modified) (9 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp

@@ -205 +205 @@
 const char *UIExtraDataDefs::GUI_SoftKeyboard_DialogGeometry = "GUI/SoftKeyboardDialogGeometry";
 const char *UIExtraDataDefs::GUI_SoftKeyboard_ColorTheme  = "GUI/SoftKeyboardColorTheme";
+const char *UIExtraDataDefs::GUI_SoftKeyboard_SelectedColorTheme  = "GUI/SoftKeyboardSelectedColorTheme";
 const char *UIExtraDataDefs::GUI_SoftKeyboard_SelectedLayout  = "GUI/SoftKeyboardSelectedLayout";
 const char *UIExtraDataDefs::GUI_SoftKeyboard_Options  = "GUI/SoftKeyboardOptions";

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h

@@ -382 +382 @@
         extern const char *GUI_SoftKeyboard_DialogGeometry;
         extern const char *GUI_SoftKeyboard_ColorTheme;
+        extern const char *GUI_SoftKeyboard_SelectedColorTheme;
         extern const char *GUI_SoftKeyboard_SelectedLayout;
         extern const char *GUI_SoftKeyboard_Options;

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -4277 +4277 @@
 }
 
+void UIExtraDataManager::setSoftKeyboardSelectedColorTheme(const QString &strColorThemeName)
+{
+    setExtraDataString(GUI_SoftKeyboard_SelectedColorTheme, strColorThemeName);
+}
+
+QString UIExtraDataManager::softKeyboardSelectedColorTheme()
+{
+    return extraDataString(GUI_SoftKeyboard_SelectedColorTheme);
+}
+
 void UIExtraDataManager::setSoftKeyboardSelectedLayout(const QUuid &uLayoutUid)
 {

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h

@@ -669 +669 @@
         void setSoftKeyboardColorTheme(const QStringList &colorStringList);
         QStringList softKeyboardColorTheme();
+        void setSoftKeyboardSelectedColorTheme(const QString &strColorThemeName);
+        QString softKeyboardSelectedColorTheme();
         void setSoftKeyboardSelectedLayout(const QUuid &uLayoutUid);
         QUuid softKeyboardSelectedLayout();

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

@@ -645 +645 @@
     void setColor(KeyboardColorType ennmColorType, const QColor &color);
 
-    QStringList colorsToStringList() const;
-    void colorsFromStringList(const QStringList &colorStringList);
+    QStringList colorsToStringList(const QString &strColorThemeName);
+    void colorsFromStringList(const QString &strColorThemeName, const QStringList &colorStringList);
 
     /** Unlike modifier and ordinary keys we update the state of the Lock keys thru event singals we receieve
@@ -655 +655 @@
     QStringList colorThemeNames() const;
     QString currentColorThemeName() const;
-    void setColorTheme(const QString &strColorThemeName);
+    void setColorThemeByName(const QString &strColorThemeName);
     void parentDialogDeactivated();
 
@@ -694 +694 @@
     /** Looks under the default keyboard layout folder and add the file names to the fileList. */
     void               lookAtDefaultLayoutFolder(QStringList &fileList);
-
+    UISoftKeyboardColorTheme *colorTheme(const QString &strColorThemeName);
     UISoftKeyboardKey *m_pKeyUnderMouse;
     UISoftKeyboardKey *m_pKeyBeingEdited;
@@ -2499 +2499 @@
 }
 
-QStringList UISoftKeyboardWidget::colorsToStringList() const
-{
-    if (!m_currentColorTheme)
-        QStringList();
-    return m_currentColorTheme->colorsToStringList();
-}
-
-void UISoftKeyboardWidget::colorsFromStringList(const QStringList &colorStringList)
-{
-    if (m_currentColorTheme)
-        m_currentColorTheme->colorsFromStringList(colorStringList);
+QStringList UISoftKeyboardWidget::colorsToStringList(const QString &strColorThemeName)
+{
+    UISoftKeyboardColorTheme *pTheme = colorTheme(strColorThemeName);
+    if (!pTheme)
+        return QStringList();
+    return pTheme->colorsToStringList();
+}
+
+void UISoftKeyboardWidget::colorsFromStringList(const QString &strColorThemeName, const QStringList &colorStringList)
+{
+    UISoftKeyboardColorTheme *pTheme = colorTheme(strColorThemeName);
+    if (!pTheme)
+        return;
+    pTheme->colorsFromStringList(colorStringList);
 }
 
@@ -2536 +2539 @@
 }
 
-void UISoftKeyboardWidget::setColorTheme(const QString &strColorThemeName)
+void UISoftKeyboardWidget::setColorThemeByName(const QString &strColorThemeName)
 {
     if (m_currentColorTheme && m_currentColorTheme->name() == strColorThemeName)
@@ -3104 +3107 @@
     foreach (const QFileInfo &fileInfo, fileInfoList)
         fileList << fileInfo.absoluteFilePath();
+}
+
+UISoftKeyboardColorTheme *UISoftKeyboardWidget::colorTheme(const QString &strColorThemeName)
+{
+    for (int i = 0; i < m_colorThemes.size(); ++i)
+    {
+        if (m_colorThemes[i].name() == strColorThemeName)
+            return &(m_colorThemes[i]);
+    }
+    return 0;
 }
 
@@ -3879 +3892 @@
 {
     if (m_pKeyboardWidget)
-        m_pKeyboardWidget->setColorTheme(strColorThemeName);
+        m_pKeyboardWidget->setColorThemeByName(strColorThemeName);
 }
 
@@ -4058 +4071 @@
     if (m_pKeyboardWidget)
     {
-        gEDataManager->setSoftKeyboardColorTheme(m_pKeyboardWidget->colorsToStringList());
-
+        /* 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(),
@@ -4092 +4108 @@
     if (m_pKeyboardWidget)
     {
-        m_pKeyboardWidget->colorsFromStringList(gEDataManager->softKeyboardColorTheme());
+        QStringList colorTheme = gEDataManager->softKeyboardColorTheme();
+        /* The fist item is the theme name and the rest are color codes: */
+        QString strThemeName = colorTheme[0];
+        colorTheme.removeFirst();
+        m_pKeyboardWidget->colorsFromStringList(strThemeName, colorTheme);
+        m_pKeyboardWidget->setColorThemeByName(gEDataManager->softKeyboardSelectedColorTheme());
         m_pKeyboardWidget->setCurrentLayout(gEDataManager->softKeyboardSelectedLayout());
         /* Load other options from exra data: */