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

Timestamp:

Oct 17, 2019 8:08:23 AM (6 years ago)

Author:

vboxsync

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

134008

Message:

FE/Qt: bugref:6143. Some fixes on color themes.

Location:

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

Files:

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

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

@@ -145 +145 @@
 };
 /* 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}};
+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}};
 
 
@@ -574 +575 @@
     const QString &name() const;
     void setName(const QString &strName);
+    void print();
 
 private:
@@ -654 +656 @@
     QString currentColorThemeName() const;
     void setColorTheme(const QString &strColorThemeName);
+    void parentDialogDeactivated();
 
 protected:
@@ -821 +824 @@
     void setHideNumPad(bool fHide);
     void setHideMultimediaKeys(bool fHide);
-    void setTableItemColor(KeyboardColorType tableRow, const QColor &color);
+    void setColorSelectionButtonBackground(KeyboardColorType enmColorType, const QColor &color);
     void setColorThemeNames(const QStringList &colorThemeNames);
     void setCurrentColorThemeName(const QString &strColorThemeName);
@@ -840 +843 @@
     QCheckBox    *m_pShowOsMenuButtonsCheckBox;
     QCheckBox    *m_pHideMultimediaKeysCheckBox;
-    QGroupBox    *m_pColorTableGroupBox;
+    QGroupBox    *m_pColorThemeGroupBox;
     QComboBox    *m_pColorThemeComboBox;
     QLabel       *m_pTitleLabel;
@@ -2112 +2115 @@
 }
 
+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)));
+}
+
 
 /*********************************************************************************************************************************
@@ -2535 +2550 @@
     update();
     emit sigCurrentColorThemeChanged();
+}
+
+void UISoftKeyboardWidget::parentDialogDeactivated()
+{
+    if (!underMouse())
+        m_pKeyUnderMouse = 0;
+    else
+    {
+        printf("under %d %d\n", cursor().pos().x(), cursor().pos().y());
+
+    }
+    update();
 }
 
@@ -3506 +3533 @@
     , m_pShowOsMenuButtonsCheckBox(0)
     , m_pHideMultimediaKeysCheckBox(0)
-    , m_pColorTableGroupBox(0)
+    , m_pColorThemeGroupBox(0)
     , m_pColorThemeComboBox(0)
     , m_pTitleLabel(0)
@@ -3533 +3560 @@
 }
 
-void UISoftKeyboardSettingsWidget::setTableItemColor(KeyboardColorType tableRow, const QColor &color)
-{
-    if (m_colorSelectLabelsButtons.size() > tableRow && m_colorSelectLabelsButtons[tableRow].second)
-    {
-        UISoftKeyboardColorButton *pButton = m_colorSelectLabelsButtons[tableRow].second;
+void UISoftKeyboardSettingsWidget::setColorSelectionButtonBackground(KeyboardColorType enmColorType, const QColor &color)
+{
+    if (m_colorSelectLabelsButtons.size() > enmColorType && m_colorSelectLabelsButtons[enmColorType].second)
+    {
+        UISoftKeyboardColorButton *pButton = m_colorSelectLabelsButtons[enmColorType].second;
         QPalette pal = pButton->palette();
         pal.setColor(QPalette::Button, color);
@@ -3583 +3610 @@
     if (m_pHideMultimediaKeysCheckBox)
         m_pHideMultimediaKeysCheckBox->setText(UISoftKeyboard::tr("Hide Multimedia Keys"));
-    if (m_pColorTableGroupBox)
-        m_pColorTableGroupBox->setTitle(UISoftKeyboard::tr("Button Colors"));
+    if (m_pColorThemeGroupBox)
+        m_pColorThemeGroupBox->setTitle(UISoftKeyboard::tr("Color Themes"));
 
     if (m_colorSelectLabelsButtons.size() == KeyboardColorType_Max)
@@ -3629 +3656 @@
     connect(m_pHideMultimediaKeysCheckBox, &QCheckBox::toggled, this, &UISoftKeyboardSettingsWidget::sigHideMultimediaKeys);
 
-    /* A groupbox to host the color table widget: */
-    m_pColorTableGroupBox = new QGroupBox;
-    QVBoxLayout *pTableGroupBoxLayout = new QVBoxLayout(m_pColorTableGroupBox);
-    pSettingsLayout->addWidget(m_pColorTableGroupBox, 4, 0, 1, 1);
+    /* A groupbox to host the color selection widgets: */
+    m_pColorThemeGroupBox = new QGroupBox;
+    QVBoxLayout *pGroupBoxLayout = new QVBoxLayout(m_pColorThemeGroupBox);
+    pSettingsLayout->addWidget(m_pColorThemeGroupBox, 4, 0, 1, 1);
 
     m_pColorThemeComboBox = new QComboBox;
-    pTableGroupBoxLayout->addWidget(m_pColorThemeComboBox);
+    pGroupBoxLayout->addWidget(m_pColorThemeComboBox);
     connect(m_pColorThemeComboBox, &QComboBox::currentTextChanged, this, &UISoftKeyboardSettingsWidget::sigColorThemeSelectionChanged);
 
@@ -3641 +3668 @@
     QGridLayout *pColorSelectionLayout = new QGridLayout;
     pColorSelectionLayout->setSpacing(1);
-    pTableGroupBoxLayout->addLayout(pColorSelectionLayout);
+    pGroupBoxLayout->addLayout(pColorSelectionLayout);
     for (int i = KeyboardColorType_Background; i < KeyboardColorType_Max; ++i)
     {
@@ -3720 +3747 @@
 }
 
+bool UISoftKeyboard::event(QEvent *pEvent)
+{
+    if (pEvent->type() == QEvent::WindowDeactivate)
+    {
+        if (m_pKeyboardWidget)
+            m_pKeyboardWidget->parentDialogDeactivated();
+    }
+    else if (pEvent->type() == QEvent::WindowDeactivate)
+    {
+        if (m_pKeyboardWidget)
+            m_pKeyboardWidget->parentDialogDeactivated();
+    }
+
+    return QMainWindowWithRestorableGeometryAndRetranslateUi::event(pEvent);
+}
+
 void UISoftKeyboard::sltKeyboardLedsChange()
 {
@@ -3845 +3888 @@
     {
         KeyboardColorType enmType = (KeyboardColorType)i;
-        m_pSettingsWidget->setTableItemColor(enmType, m_pKeyboardWidget->color(enmType));
+        m_pSettingsWidget->setColorSelectionButtonBackground(enmType, m_pKeyboardWidget->color(enmType));
     }
 }
@@ -3908 +3951 @@
         return;
     m_pKeyboardWidget->setColor(static_cast<KeyboardColorType>(iColorRow), newColor);
-    m_pSettingsWidget->setTableItemColor(static_cast<KeyboardColorType>(iColorRow), newColor);
+    m_pSettingsWidget->setColorSelectionButtonBackground(static_cast<KeyboardColorType>(iColorRow), newColor);
 }
 
@@ -4078 +4121 @@
         {
             KeyboardColorType enmType = (KeyboardColorType)i;
-            m_pSettingsWidget->setTableItemColor(enmType, m_pKeyboardWidget->color(enmType));
+            m_pSettingsWidget->setColorSelectionButtonBackground(enmType, m_pKeyboardWidget->color(enmType));
         }
     }

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

@@ -63 +63 @@
 
     virtual void retranslateUi() /* override */;
-
     virtual bool shouldBeMaximized() const /* override */;
+    bool event(QEvent *pEvent) /* override */;
 
 private slots: