Changeset 81293 in vbox

Timestamp:

Oct 16, 2019 6:46:56 AM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6143. Adding a color theme list widget.

Location:

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

Files:

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

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

@@ -141 +141 @@
     bool fRelease;
 };
-
-
+/* Name, background color, normal font color, hover color, edited button background color, pressed button font color. */
+const char* predefinedColorThemes[][6] = {{"Solarized-Dark","#073642", "#586e75", "#dc322f", "#6c71c4", "#859900"},
+                                          {"Solarized-Light","#b58900", "#586e75", "#dc322f", "#6c71c4", "#859900"},
+                                          {0, 0, 0, 0, 0, 0}};
 /*********************************************************************************************************************************
 *   UISoftKeyboardPhysicalLayout definition.                                                                                     *
@@ -534 +536 @@
 
     UISoftKeyboardColorTheme();
+    UISoftKeyboardColorTheme(const QString &strName,
+                             const QString &strBackgroundColor,
+                             const QString &strNormalFontColor,
+                             const QString &strHoverColor,
+                             const QString &strEditedButtonBackgroundColor,
+                             const QString &strPressedButtonFontColor);
+
     void setColor(KeyboardColorType enmColorType, const QColor &color);
     QColor color(KeyboardColorType enmColorType) const;
@@ -539 +548 @@
     void colorsFromStringList(const QStringList &colorStringList);
 
+    const QString &name() const;
+    void setName(const QString &strName);
+
 private:
 
     QVector<QColor> m_colors;
+    QString m_strName;
 };
 
@@ -565 +578 @@
     void sigStatusBarMessage(const QString &strMessage);
     void sigPutKeyboardSequence(QVector<LONG> sequence);
-
     void sigPutUsageCodesPress(QVector<QPair<LONG, LONG> > sequence);
     void sigPutUsageCodesRelease(QVector<QPair<LONG, LONG> > sequence);
-
-
     void sigCurrentLayoutChange();
     void sigKeyToEdit(UISoftKeyboardKey* pKey);
+    void sigCurrentColorThemeChanged();
 
 public:
@@ -605 +616 @@
     void setHideMultimediaKeys(bool fHide);
 
-    const QColor color(KeyboardColorType enmColorType) const;
+    QColor color(KeyboardColorType enmColorType) const;
     void setColor(KeyboardColorType ennmColorType, const QColor &color);
 
@@ -615 +626 @@
     void updateLockKeyStates(bool fCapsLockState, bool fNumLockState, bool fScrollLockState);
     void reset();
+
+    QStringList colorThemeNames() const;
+    QString currentColorThemeName() const;
+    void setColorTheme(const QString &strColorThemeName);
 
 protected:
@@ -657 +672 @@
 
     UISoftKeyboardKey *m_pKeyPressed;
-    UISoftKeyboardColorTheme m_colorTheme;
+    UISoftKeyboardColorTheme *m_currentColorTheme;
+    QVector<UISoftKeyboardColorTheme> m_colorThemes;
     QVector<UISoftKeyboardKey*> m_pressedModifiers;
     QVector<UISoftKeyboardPhysicalLayout> m_physicalLayouts;
@@ -773 +789 @@
     void sigColorCellClicked(int iColorRow);
     void sigCloseSettingsWidget();
+    void sigColorThemeSelectionChanged(const QString &strColorThemeName);
 
 public:
@@ -781 +798 @@
     void setHideMultimediaKeys(bool fHide);
     void setTableItemColor(KeyboardColorType tableRow, const QColor &color);
+    void setColorThemeNames(const QStringList &colorThemeNames);
+    void setCurrentColorThemeName(const QString &strColorThemeName);
 
 protected:
@@ -798 +817 @@
     QCheckBox    *m_pHideMultimediaKeysCheckBox;
     QGroupBox    *m_pColorTableGroupBox;
+    QListWidget  *m_pColorThemeList;
     QTableWidget *m_pColorSelectionTable;
     QLabel       *m_pTitleLabel;
@@ -1994 +2014 @@
 }
 
+UISoftKeyboardColorTheme::UISoftKeyboardColorTheme(const QString &strName,
+                                                   const QString &strBackgroundColor,
+                                                   const QString &strNormalFontColor,
+                                                   const QString &strHoverColor,
+                                                   const QString &strEditedButtonBackgroundColor,
+                                                   const QString &strPressedButtonFontColor)
+    :m_colors(QVector<QColor>(KeyboardColorType_Max))
+    ,m_strName(strName)
+{
+    m_colors[KeyboardColorType_Background].setNamedColor(strBackgroundColor);
+    m_colors[KeyboardColorType_Font].setNamedColor(strNormalFontColor);
+    m_colors[KeyboardColorType_Hover].setNamedColor(strHoverColor);
+    m_colors[KeyboardColorType_Edit].setNamedColor(strEditedButtonBackgroundColor);
+    m_colors[KeyboardColorType_Pressed].setNamedColor(strPressedButtonFontColor);
+}
+
+
 void UISoftKeyboardColorTheme::setColor(KeyboardColorType enmColorType, const QColor &color)
 {
@@ -2025 +2062 @@
     }
 }
+
+const QString &UISoftKeyboardColorTheme::name() const
+{
+    return m_strName;
+}
+
+void UISoftKeyboardColorTheme::setName(const QString &strName)
+{
+    m_strName = strName;
+}
+
 
 /*********************************************************************************************************************************
@@ -2035 +2083 @@
     , m_pKeyBeingEdited(0)
     , m_pKeyPressed(0)
+    , m_currentColorTheme(0)
     , m_pCurrentKeyboardLayout(0)
     , m_iInitialHeight(0)
@@ -2051 +2100 @@
 {
     prepareObjects();
+
+    int iIndex = 0;
+    while (predefinedColorThemes[iIndex][0])
+    {
+        m_colorThemes << UISoftKeyboardColorTheme(predefinedColorThemes[iIndex][0],
+                                                  predefinedColorThemes[iIndex][1],
+                                                  predefinedColorThemes[iIndex][2],
+                                                  predefinedColorThemes[iIndex][3],
+                                                  predefinedColorThemes[iIndex][4],
+                                                  predefinedColorThemes[iIndex][5]);
+        ++iIndex;
+    }
+
+    UISoftKeyboardColorTheme customTheme;
+    customTheme.setName("Custom");
+    m_colorThemes.append(customTheme);
+    m_currentColorTheme = &(m_colorThemes.back());
 }
 
@@ -2365 +2431 @@
 }
 
-const QColor UISoftKeyboardWidget::color(KeyboardColorType enmColorType) const
-{
-    return m_colorTheme.color(enmColorType);
+QColor UISoftKeyboardWidget::color(KeyboardColorType enmColorType) const
+{
+    if (!m_currentColorTheme)
+        return QColor();
+    return m_currentColorTheme->color(enmColorType);
 }
 
 void UISoftKeyboardWidget::setColor(KeyboardColorType enmColorType, const QColor &color)
 {
-    m_colorTheme.setColor(enmColorType, color);
+    if (m_currentColorTheme)
+        m_currentColorTheme->setColor(enmColorType, color);
+    update();
 }
 
 QStringList UISoftKeyboardWidget::colorsToStringList() const
 {
-    return m_colorTheme.colorsToStringList();
+    if (!m_currentColorTheme)
+        QStringList();
+    return m_currentColorTheme->colorsToStringList();
 }
 
 void UISoftKeyboardWidget::colorsFromStringList(const QStringList &colorStringList)
 {
-    m_colorTheme.colorsFromStringList(colorStringList);
+    if (m_currentColorTheme)
+        m_currentColorTheme->colorsFromStringList(colorStringList);
 }
 
@@ -2390 +2463 @@
         m_physicalLayouts[i].updateLockKeyStates(fCapsLockState, fNumLockState, fScrollLockState);
     update();
+}
+
+QStringList UISoftKeyboardWidget::colorThemeNames() const
+{
+    QStringList nameList;
+    foreach (const UISoftKeyboardColorTheme &theme, m_colorThemes)
+    {
+        nameList << theme.name();
+    }
+    return nameList;
+}
+
+QString UISoftKeyboardWidget::currentColorThemeName() const
+{
+    if (!m_currentColorTheme)
+        return QString();
+    return m_currentColorTheme->name();
+}
+
+void UISoftKeyboardWidget::setColorTheme(const QString &strColorThemeName)
+{
+    if (m_currentColorTheme && m_currentColorTheme->name() == strColorThemeName)
+        return;
+    for (int i = 0; i < m_colorThemes.size(); ++i)
+    {
+        if (m_colorThemes[i].name() == strColorThemeName)
+        {
+            m_currentColorTheme = &(m_colorThemes[i]);
+            break;
+        }
+    }
+    update();
+    emit sigCurrentColorThemeChanged();
 }
 
@@ -3362 +3468 @@
     , m_pHideMultimediaKeysCheckBox(0)
     , m_pColorTableGroupBox(0)
+    , m_pColorThemeList(0)
     , m_pColorSelectionTable(0)
     , m_pTitleLabel(0)
@@ -3397 +3504 @@
     pItem->setBackground(color);
     m_pColorSelectionTable->update();
+}
+
+void UISoftKeyboardSettingsWidget::setColorThemeNames(const QStringList &colorThemeNames)
+{
+    if (!m_pColorThemeList)
+        return;
+    foreach (const QString &strName, colorThemeNames)
+        m_pColorThemeList->addItem(strName);
+}
+
+void UISoftKeyboardSettingsWidget::setCurrentColorThemeName(const QString &strColorThemeName)
+{
+    if (!m_pColorThemeList)
+        return;
+    QList<QListWidgetItem*> items = m_pColorThemeList->findItems(strColorThemeName, Qt::MatchFixedString);
+    if (items.isEmpty())
+        return;
+    m_pColorThemeList->blockSignals(true);
+    m_pColorThemeList->setCurrentItem(items[0]);
+    m_pColorThemeList->blockSignals(false);
 }
 
@@ -3432 +3559 @@
         pItem = m_pColorSelectionTable->item(KeyboardColorType_Pressed, 0);
         if (pItem)
-            pItem->setText(UISoftKeyboard::tr("Pressed Button Color"));
+            pItem->setText(UISoftKeyboard::tr("Pressed Button Font Color"));
         m_pColorSelectionTable->setToolTip(UISoftKeyboard::tr("Click on the corresponding table cells to modify colors"));
     }
@@ -3469 +3596 @@
     QVBoxLayout *pTableGroupBoxLayout = new QVBoxLayout(m_pColorTableGroupBox);
     pSettingsLayout->addWidget(m_pColorTableGroupBox, 4, 0, 2, 1);
+
+    m_pColorThemeList = new QListWidget;
+    pTableGroupBoxLayout->addWidget(m_pColorThemeList);
+    connect(m_pColorThemeList, &QListWidget::currentTextChanged, this, &UISoftKeyboardSettingsWidget::sigColorThemeSelectionChanged);
 
     /* Creating and configuring the color table widget: */
@@ -3678 +3809 @@
 }
 
+void UISoftKeyboard::sltHandleColorThemeListSelection(const QString &strColorThemeName)
+{
+    if (m_pKeyboardWidget)
+        m_pKeyboardWidget->setColorTheme(strColorThemeName);
+}
+
+void UISoftKeyboard::sltHandleKeyboardWidgetColorThemeChange()
+{
+    for (int i = (int)KeyboardColorType_Background;
+         i < (int)KeyboardColorType_Max; ++i)
+    {
+        KeyboardColorType enmType = (KeyboardColorType)i;
+        m_pSettingsWidget->setTableItemColor(enmType, m_pKeyboardWidget->color(enmType));
+    }
+}
 
 void UISoftKeyboard::sltCopyLayout()
@@ -3808 +3954 @@
     connect(m_pKeyboardWidget, &UISoftKeyboardWidget::sigKeyToEdit, this, &UISoftKeyboard::sltKeyToEditChanged);
     connect(m_pKeyboardWidget, &UISoftKeyboardWidget::sigStatusBarMessage, this, &UISoftKeyboard::sltStatusBarMessage);
+    connect(m_pKeyboardWidget, &UISoftKeyboardWidget::sigStatusBarMessage, this, &UISoftKeyboard::sltStatusBarMessage);
+    connect(m_pKeyboardWidget, &UISoftKeyboardWidget::sigCurrentColorThemeChanged, this, &UISoftKeyboard::sltHandleKeyboardWidgetColorThemeChange);
 
     connect(m_pLayoutSelector, &UILayoutSelector::sigLayoutSelectionChanged, this, &UISoftKeyboard::sltLayoutSelectionChanged);
@@ -3828 +3976 @@
     connect(m_pSettingsWidget, &UISoftKeyboardSettingsWidget::sigColorCellClicked, this, &UISoftKeyboard::sltHandleColorCellClick);
     connect(m_pSettingsWidget, &UISoftKeyboardSettingsWidget::sigCloseSettingsWidget, this, &UISoftKeyboard::sltShowHideSettingsWidget);
+    connect(m_pSettingsWidget, &UISoftKeyboardSettingsWidget::sigColorThemeSelectionChanged, this, &UISoftKeyboard::sltHandleColorThemeListSelection);
+
 }
 
@@ -3897 +4047 @@
         m_pSettingsWidget->setHideMultimediaKeys(m_pKeyboardWidget->hideMultimediaKeys());
 
+        m_pSettingsWidget->setColorThemeNames(m_pKeyboardWidget->colorThemeNames());
+        m_pSettingsWidget->setCurrentColorThemeName(m_pKeyboardWidget->currentColorThemeName());
+
         for (int i = (int)KeyboardColorType_Background;
              i < (int)KeyboardColorType_Max; ++i)

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

@@ -86 +86 @@
     void sltShowHideSidePanel();
     void sltShowHideSettingsWidget();
+    void sltHandleColorThemeListSelection(const QString &strColorThemeName);
+    void sltHandleKeyboardWidgetColorThemeChange();
     void sltCopyLayout();
     void sltSaveLayout();