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

Timestamp:

May 26, 2021 3:43:54 PM (4 years ago)

Author:

vboxsync

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

144645

Message:

FE/Qt: bugref:10003: Introducing new UIColorThemeEditor class allowing to choose corresponding parameter; That stuff isn't yet used anywhere.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (3 diffs)
• src/settings/editors/UIColorThemeEditor.cpp (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVisualStateEditor.cpp ) (7 diffs)
• src/settings/editors/UIColorThemeEditor.h (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVisualStateEditor.h ) (7 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -5 +5 @@
 
 #
-# Copyright (C) 2006-2020 Oracle Corporation
+# Copyright (C) 2006-2021 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -848 +848 @@
         src/settings/editors/UIBaseMemoryEditor.h \
         src/settings/editors/UIBootOrderEditor.h \
+        src/settings/editors/UIColorThemeEditor.h \
         src/settings/editors/UIDefaultMachineFolderEditor.h \
         src/settings/editors/UIGraphicsControllerEditor.h \
@@ -1388 +1389 @@
         src/settings/editors/UIBaseMemoryEditor.cpp \
         src/settings/editors/UIBootOrderEditor.cpp \
+        src/settings/editors/UIColorThemeEditor.cpp \
         src/settings/editors/UIDefaultMachineFolderEditor.cpp \
         src/settings/editors/UIGraphicsControllerEditor.cpp \

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIColorThemeEditor.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIVisualStateEditor class implementation.
+ * VBox Qt GUI - UIColorThemeEditor class implementation.
  */
 
 /*
- * Copyright (C) 2019-2020 Oracle Corporation
+ * Copyright (C) 2019-2021 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -23 +23 @@
 /* GUI includes: */
 #include "QIComboBox.h"
-#include "UICommon.h"
+#include "UIColorThemeEditor.h"
 #include "UIConverter.h"
-#include "UIExtraDataManager.h"
-#include "UIVisualStateEditor.h"
 
 
-UIVisualStateEditor::UIVisualStateEditor(QWidget *pParent /* = 0 */, bool fWithLabel /* = false */)
+UIColorThemeEditor::UIColorThemeEditor(QWidget *pParent /* = 0 */, bool fWithLabel /* = false */)
     : QIWithRetranslateUI<QWidget>(pParent)
     , m_fWithLabel(fWithLabel)
-    , m_enmValue(UIVisualStateType_Invalid)
+    , m_enmValue(UIColorThemeType_Auto)
     , m_pLabel(0)
     , m_pCombo(0)
@@ -39 +37 @@
 }
 
-void UIVisualStateEditor::setMachineId(const QUuid &uMachineId)
-{
-    m_uMachineId = uMachineId;
-}
-
-void UIVisualStateEditor::setValue(UIVisualStateType enmValue)
+void UIColorThemeEditor::setValue(UIColorThemeType enmValue)
 {
     if (m_pCombo)
@@ -63 +56 @@
 }
 
-UIVisualStateType UIVisualStateEditor::value() const
+UIColorThemeType UIColorThemeEditor::value() const
 {
-    return m_pCombo ? m_pCombo->currentData().value<UIVisualStateType>() : m_enmValue;
+    return m_pCombo ? m_pCombo->currentData().value<UIColorThemeType>() : m_enmValue;
 }
 
-void UIVisualStateEditor::retranslateUi()
+void UIColorThemeEditor::retranslateUi()
 {
     if (m_pLabel)
-        m_pLabel->setText(tr("Visual &State:"));
+        m_pLabel->setText(tr("Color &Theme:"));
     if (m_pCombo)
     {
         for (int i = 0; i < m_pCombo->count(); ++i)
         {
-            const UIVisualStateType enmType = m_pCombo->itemData(i).value<UIVisualStateType>();
+            const UIColorThemeType enmType = m_pCombo->itemData(i).value<UIColorThemeType>();
             m_pCombo->setItemText(i, gpConverter->toString(enmType));
         }
@@ -82 +75 @@
 }
 
-void UIVisualStateEditor::sltHandleCurrentIndexChanged()
+void UIColorThemeEditor::sltHandleCurrentIndexChanged()
 {
     if (m_pCombo)
-        emit sigValueChanged(m_pCombo->itemData(m_pCombo->currentIndex()).value<UIVisualStateType>());
+        emit sigValueChanged(m_pCombo->itemData(m_pCombo->currentIndex()).value<UIColorThemeType>());
 }
 
-void UIVisualStateEditor::prepare()
+void UIColorThemeEditor::prepare()
 {
     /* Create main layout: */
@@ -117 +110 @@
                     m_pLabel->setBuddy(m_pCombo->focusProxy());
                 connect(m_pCombo, static_cast<void(QIComboBox::*)(int)>(&QIComboBox::currentIndexChanged),
-                        this, &UIVisualStateEditor::sltHandleCurrentIndexChanged);
+                        this, &UIColorThemeEditor::sltHandleCurrentIndexChanged);
                 pComboLayout->addWidget(m_pCombo);
             }
@@ -136 +129 @@
 }
 
-void UIVisualStateEditor::populateCombo()
+void UIColorThemeEditor::populateCombo()
 {
     if (m_pCombo)
     {
         /* Clear combo first of all: */
-        m_supportedValues.clear();
         m_pCombo->clear();
 
         /* Get possible values: */
-        QList<UIVisualStateType> possibleValues;
-        possibleValues << UIVisualStateType_Normal
-                       << UIVisualStateType_Fullscreen
-                       << UIVisualStateType_Seamless
-                       << UIVisualStateType_Scale;
+        QList<UIColorThemeType> possibleValues;
+        possibleValues << UIColorThemeType_Auto
+                       << UIColorThemeType_Light
+                       << UIColorThemeType_Dark;
 
-        /* Load currently supported visual state types: */
-        const UIVisualStateType enmRestrictedTypes = m_uMachineId.isNull()
-                                                   ? UIVisualStateType_Invalid
-                                                   : gEDataManager->restrictedVisualStates(m_uMachineId);
-        foreach (const UIVisualStateType &enmPossibleValue, possibleValues)
-            if (!(enmPossibleValue & enmRestrictedTypes))
-                m_supportedValues << enmPossibleValue;
-
-        /* Make sure requested value if sane is present as well: */
-        if (   possibleValues.contains(m_enmValue)
-            && !m_supportedValues.contains(m_enmValue))
-            m_supportedValues.prepend(m_enmValue);
-
-        /* Update combo with all the supported values: */
-        foreach (const UIVisualStateType &enmType, m_supportedValues)
+        /* Update combo with all the possible values: */
+        foreach (const UIColorThemeType &enmType, possibleValues)
             m_pCombo->addItem(QString(), QVariant::fromValue(enmType));
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIColorThemeEditor.h

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIVisualStateEditor class declaration.
+ * VBox Qt GUI - UIColorThemeEditor class declaration.
  */
 
 /*
- * Copyright (C) 2019-2020 Oracle Corporation
+ * Copyright (C) 2019-2021 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -16 +16 @@
  */
 
-#ifndef FEQT_INCLUDED_SRC_settings_editors_UIVisualStateEditor_h
-#define FEQT_INCLUDED_SRC_settings_editors_UIVisualStateEditor_h
+#ifndef FEQT_INCLUDED_SRC_settings_editors_UIColorThemeEditor_h
+#define FEQT_INCLUDED_SRC_settings_editors_UIColorThemeEditor_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
@@ -23 +23 @@
 
 /* Qt includes: */
-#include <QUuid>
 #include <QWidget>
 
@@ -35 +34 @@
 class QIComboBox;
 
-/** QWidget subclass used as a visual state editor. */
-class SHARED_LIBRARY_STUFF UIVisualStateEditor : public QIWithRetranslateUI<QWidget>
+/** QWidget subclass used as a color theme editor. */
+class SHARED_LIBRARY_STUFF UIColorThemeEditor : public QIWithRetranslateUI<QWidget>
 {
     Q_OBJECT;
@@ -43 +42 @@
 
     /** Notifies listeners about @a enmValue change. */
-    void sigValueChanged(UIVisualStateType enmValue);
+    void sigValueChanged(UIColorThemeType enmValue);
 
 public:
 
-    /** Constructs visual state editor passing @a pParent to the base-class.
+    /** Constructs color theme editor passing @a pParent to the base-class.
       * @param  fWithLabel  Brings whether we should add label ourselves. */
-    UIVisualStateEditor(QWidget *pParent = 0, bool fWithLabel = false);
-
-    /** Defines editor @a uMachineId. */
-    void setMachineId(const QUuid &uMachineId);
+    UIColorThemeEditor(QWidget *pParent = 0, bool fWithLabel = false);
 
     /** Defines editor @a enmValue. */
-    void setValue(UIVisualStateType enmValue);
+    void setValue(UIColorThemeType enmValue);
     /** Returns editor value. */
-    UIVisualStateType value() const;
-
-    /** Returns the vector of supported values. */
-    QVector<UIVisualStateType> supportedValues() const { return m_supportedValues; }
+    UIColorThemeType value() const;
 
 protected:
@@ -79 +72 @@
     void populateCombo();
 
-    /** Holds the machine id. */
-    QUuid  m_uMachineId;
-
     /** Holds whether descriptive label should be created. */
     bool  m_fWithLabel;
 
     /** Holds the value to be selected. */
-    UIVisualStateType  m_enmValue;
-
-    /** Holds the vector of supported values. */
-    QVector<UIVisualStateType>  m_supportedValues;
+    UIColorThemeType  m_enmValue;
 
     /** Holds the label instance. */
@@ -97 +84 @@
 };
 
-#endif /* !FEQT_INCLUDED_SRC_settings_editors_UIVisualStateEditor_h */
+#endif /* !FEQT_INCLUDED_SRC_settings_editors_UIColorThemeEditor_h */