Changeset 81399 in vbox for trunk/src/VBox/Frontends

Timestamp:

Oct 21, 2019 11:24:19 AM (6 years ago)

Author:

vboxsync

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

134113

Message:

FE/Qt: bugref:6699. Marking color themes not-editable.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.cpp (modified) (19 diffs)

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

@@ -70 +70 @@
 const QString strSubDirectorName("keyboardLayouts");
 
+/** Name, background color, normal font color, hover color, edited button background color, pressed button font color. */
+const char* predefinedColorThemes[][6] = {{"Clear Night","#000000", "#ffffff", "#859900", "#9b6767", "#000000"},
+    {"Gobi Dark","#002b36", "#fdf6e3", "#859900", "#cb4b16", "#002b36"},
+    {"Gobi Light","#fdf6e3", "#002b36", "#2aa198", "#cb4b16", "#bf4040"},
+    {0, 0, 0, 0, 0, 0}};
+
 typedef QPair<QLabel*, UISoftKeyboardColorButton*> ColorSelectLabelButton;
 
@@ -144 +150 @@
     bool fRelease;
 };
-/* Name, background color, normal font color, hover color, edited button background color, pressed button font color. */
-const char* predefinedColorThemes[][6] = {{"Clear Night","#000000", "#ffffff", "#859900", "#9b6767", "#000000"},
-    {"Gobi Dark","#002b36", "#fdf6e3", "#859900", "#cb4b16", "#002b36"},
-    {"Gobi Light","#fdf6e3", "#002b36", "#2aa198", "#cb4b16", "#bf4040"},
-    {0, 0, 0, 0, 0, 0}};
 
 
@@ -575 +576 @@
     const QString &name() const;
     void setName(const QString &strName);
-    void print();
+
+    bool isEditable() const;
+    void setIsEditable(bool fIsEditable);
 
 private:
@@ -581 +584 @@
     QVector<QColor> m_colors;
     QString m_strName;
+    bool    m_fIsEditable;
 };
 
@@ -657 +661 @@
     void setColorThemeByName(const QString &strColorThemeName);
     void parentDialogDeactivated();
+    bool isColorThemeEditable() const;
 
 protected:
@@ -829 +834 @@
     void setHideNumPad(bool fHide);
     void setHideMultimediaKeys(bool fHide);
-    void setColorSelectionButtonBackground(KeyboardColorType enmColorType, const QColor &color);
+    void setColorSelectionButtonBackgroundAndTooltip(KeyboardColorType enmColorType, const QColor &color, bool fIsColorEditable);
     void setColorThemeNames(const QStringList &colorThemeNames);
     void setCurrentColorThemeName(const QString &strColorThemeName);
@@ -2053 +2058 @@
 UISoftKeyboardColorTheme::UISoftKeyboardColorTheme()
     : m_colors(QVector<QColor>(KeyboardColorType_Max))
+    , m_fIsEditable(false)
 {
     m_colors[KeyboardColorType_Background].setNamedColor("#ff878787");
@@ -2069 +2075 @@
     :m_colors(QVector<QColor>(KeyboardColorType_Max))
     ,m_strName(strName)
+    , m_fIsEditable(false)
 {
     m_colors[KeyboardColorType_Background].setNamedColor(strBackgroundColor);
@@ -2120 +2127 @@
 }
 
-void UISoftKeyboardColorTheme::print()
-{
-    printf("=====================\n");
-    printf("name: %s\n backround %s\n font %s\n hover %s\n edit %s\n pressed %s\n",
-           qPrintable(m_strName),
-           qPrintable(m_colors[KeyboardColorType_Background].name(QColor::HexRgb)),
-           qPrintable(m_colors[KeyboardColorType_Font].name(QColor::HexRgb)),
-           qPrintable(m_colors[KeyboardColorType_Hover].name(QColor::HexRgb)),
-           qPrintable(m_colors[KeyboardColorType_Edit].name(QColor::HexRgb)),
-           qPrintable(m_colors[KeyboardColorType_Pressed].name(QColor::HexRgb)));
-}
-
+bool UISoftKeyboardColorTheme::isEditable() const
+{
+    return m_fIsEditable;
+}
+
+void UISoftKeyboardColorTheme::setIsEditable(bool fIsEditable)
+{
+    m_fIsEditable = fIsEditable;
+}
 
 /*********************************************************************************************************************************
@@ -2575 +2579 @@
 }
 
+bool UISoftKeyboardWidget::isColorThemeEditable() const
+{
+    if (!m_currentColorTheme)
+        return false;
+    return m_currentColorTheme->isEditable();
+}
+
 void UISoftKeyboardWidget::deleteCurrentLayout()
 {
@@ -3070 +3081 @@
     UISoftKeyboardColorTheme customTheme;
     customTheme.setName("Custom");
+    customTheme.setIsEditable(true);
     m_colorThemes.append(customTheme);
     m_currentColorTheme = &(m_colorThemes.back());
@@ -3610 +3622 @@
 }
 
-void UISoftKeyboardSettingsWidget::setColorSelectionButtonBackground(KeyboardColorType enmColorType, const QColor &color)
+void UISoftKeyboardSettingsWidget::setColorSelectionButtonBackgroundAndTooltip(KeyboardColorType enmColorType,
+                                                                               const QColor &color, bool fIsColorEditable)
 {
     if (m_colorSelectLabelsButtons.size() > enmColorType && m_colorSelectLabelsButtons[enmColorType].second)
@@ -3619 +3632 @@
         pButton->setAutoFillBackground(true);
         pButton->setPalette(pal);
+        pButton->setToolTip(fIsColorEditable ? UISoftKeyboard::tr("Click to change the color.") : UISoftKeyboard::tr("This color theme is not editable."));
         pButton->update();
     }
@@ -3628 +3642 @@
         return;
     m_pColorThemeComboBox->blockSignals(true);
+    m_pColorThemeComboBox->clear();
     foreach (const QString &strName, colorThemeNames)
         m_pColorThemeComboBox->addItem(strName);
@@ -3723 +3738 @@
         QLabel *pLabel = new QLabel;
         UISoftKeyboardColorButton *pButton = new UISoftKeyboardColorButton((KeyboardColorType)i);
+        pButton->setFlat(true);
+        pButton->setMaximumWidth(3 * qApp->style()->pixelMetric(QStyle::PM_LargeIconSize));
         pColorSelectionLayout->addWidget(pLabel, i, 0, 1, 1);
         pColorSelectionLayout->addWidget(pButton, i, 1, 1, 1);
@@ -3938 +3955 @@
     {
         KeyboardColorType enmType = (KeyboardColorType)i;
-        m_pSettingsWidget->setColorSelectionButtonBackground(enmType, m_pKeyboardWidget->color(enmType));
+        m_pSettingsWidget->setColorSelectionButtonBackgroundAndTooltip(enmType,
+                                                                       m_pKeyboardWidget->color(enmType),
+                                                                       m_pKeyboardWidget->isColorThemeEditable());
     }
 }
@@ -3992 +4011 @@
     if (!m_pKeyboardWidget || iColorRow >= static_cast<int>(KeyboardColorType_Max))
         return;
+
+    if (!m_pKeyboardWidget->isColorThemeEditable())
+        return;
     const QColor &currentColor = m_pKeyboardWidget->color(static_cast<KeyboardColorType>(iColorRow));
     QColorDialog colorDialog(currentColor, this);
@@ -4001 +4023 @@
         return;
     m_pKeyboardWidget->setColor(static_cast<KeyboardColorType>(iColorRow), newColor);
-    m_pSettingsWidget->setColorSelectionButtonBackground(static_cast<KeyboardColorType>(iColorRow), newColor);
+    m_pSettingsWidget->setColorSelectionButtonBackgroundAndTooltip(static_cast<KeyboardColorType>(iColorRow),
+                                                                   newColor, m_pKeyboardWidget->isColorThemeEditable());
 }
 
@@ -4173 +4196 @@
         {
             KeyboardColorType enmType = (KeyboardColorType)i;
-            m_pSettingsWidget->setColorSelectionButtonBackground(enmType, m_pKeyboardWidget->color(enmType));
+            m_pSettingsWidget->setColorSelectionButtonBackgroundAndTooltip(enmType,
+                                                                           m_pKeyboardWidget->color(enmType),
+                                                                           m_pKeyboardWidget->isColorThemeEditable());
         }
     }