Changeset 73118 in vbox

Timestamp:

Jul 13, 2018 12:07:42 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9206: Reworking VBoxOSTypeSelectorButton widget, renaming it to UIGuestOSTypeSelectionButton and doing proper makeup.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/precomp.h (modified) (1 diff)
• src/widgets/UIApplianceEditorWidget.cpp (modified) (5 diffs)
• src/widgets/UIGuestOSTypeSelectionButton.cpp (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorButton.cpp ) (2 diffs)
• src/widgets/UIGuestOSTypeSelectionButton.h (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorButton.h ) (2 diffs)

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

@@ -700 +700 @@
         src/widgets/UIApplianceImportEditorWidget.h \
         src/widgets/UIEmptyFilePathSelector.h \
+        src/widgets/UIGuestOSTypeSelectionButton.h \
         src/widgets/UILineTextEdit.h \
         src/widgets/UISlidingWidget.h \
         src/widgets/UITabBar.h \
         src/widgets/UIMenuToolBar.h \
-        src/widgets/VBoxOSTypeSelectorButton.h \
         src/widgets/graphics/UIGraphicsButton.h \
         src/widgets/graphics/UIGraphicsRotatorButton.h \
@@ -1345 +1345 @@
         src/widgets/UIApplianceImportEditorWidget.cpp \
         src/widgets/UIEmptyFilePathSelector.cpp \
+        src/widgets/UIGuestOSTypeSelectionButton.cpp \
         src/widgets/UILineTextEdit.cpp \
         src/widgets/UISlidingWidget.cpp \
         src/widgets/UITabBar.cpp \
         src/widgets/UIMenuToolBar.cpp \
-        src/widgets/VBoxOSTypeSelectorButton.cpp \
         src/widgets/graphics/UIGraphicsButton.cpp \
         src/widgets/graphics/UIGraphicsRotatorButton.cpp \

trunk/src/VBox/Frontends/VirtualBox/src/precomp.h

@@ -643 +643 @@
 #include "VBoxLicenseViewer.h"
 #include "UIMediaComboBox.h"
-#include "VBoxOSTypeSelectorButton.h"
+#include "UIGuestOSTypeSelectionButton.h"
 #include "UISettingsSelector.h"
 #include "UISnapshotDetailsWidget.h"

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.cpp

@@ -34 +34 @@
 # include "QITreeView.h"
 # include "VBoxGlobal.h"
-# include "VBoxOSTypeSelectorButton.h"
+# include "UIGuestOSTypeSelectionButton.h"
 # include "UIApplianceEditorWidget.h"
 # include "UIConverter.h"
@@ -591 +591 @@
             case KVirtualSystemDescriptionType_OS:
             {
-                VBoxOSTypeSelectorButton *pButton = new VBoxOSTypeSelectorButton(pParent);
+                UIGuestOSTypeSelectionButton *pButton = new UIGuestOSTypeSelectionButton(pParent);
                 /* Fill the background with the highlight color in the case
                  * the button hasn't a rectangle shape. This prevents the
@@ -722 +722 @@
         case KVirtualSystemDescriptionType_OS:
         {
-            if (VBoxOSTypeSelectorButton *pButton = qobject_cast<VBoxOSTypeSelectorButton*>(pEditor))
+            if (UIGuestOSTypeSelectionButton *pButton = qobject_cast<UIGuestOSTypeSelectionButton*>(pEditor))
             {
                 pButton->setOSTypeId(m_strConfigValue);
@@ -818 +818 @@
         case KVirtualSystemDescriptionType_OS:
         {
-            if (VBoxOSTypeSelectorButton *pButton = qobject_cast<VBoxOSTypeSelectorButton*>(pEditor))
+            if (UIGuestOSTypeSelectionButton *pButton = qobject_cast<UIGuestOSTypeSelectionButton*>(pEditor))
             {
                 m_strConfigValue = pButton->osTypeId();
@@ -1284 +1284 @@
          * the popup menu is shown. Prevent this here, cause otherwise the new
          * selected OS will not be updated. */
-        VBoxOSTypeSelectorButton *pButton = qobject_cast<VBoxOSTypeSelectorButton*>(pObject);
+        UIGuestOSTypeSelectionButton *pButton = qobject_cast<UIGuestOSTypeSelectionButton*>(pObject);
         if (pButton && pButton->isMenuShown())
             return false;

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIGuestOSTypeSelectionButton.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - VBoxOSTypeSelectorButton class implementation.
+ * VBox Qt GUI - UIGuestOSTypeSelectionButton class implementation.
  */
 
 /*
- * Copyright (C) 2009-2017 Oracle Corporation
+ * Copyright (C) 2009-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -26 +26 @@
 
 /* GUI includes */
-# include "VBoxOSTypeSelectorButton.h"
 # include "VBoxGlobal.h"
+# include "UIGuestOSTypeSelectionButton.h"
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
 
-VBoxOSTypeSelectorButton::VBoxOSTypeSelectorButton (QWidget *aParent)
-  : QIWithRetranslateUI <QPushButton> (aParent)
+UIGuestOSTypeSelectionButton::UIGuestOSTypeSelectionButton(QWidget *pParent)
+    : QIWithRetranslateUI<QPushButton>(pParent)
 {
     /* Determine icon metric: */
-    const QStyle *pStyle = QApplication::style();
-    const int iIconMetric = pStyle->pixelMetric(QStyle::PM_SmallIconSize);
-    /* We have to make sure that the button has strong focus, otherwise the
-     * editing is ended when the menu is shown */
-    setFocusPolicy (Qt::StrongFocus);
-    setIconSize (QSize (iIconMetric, iIconMetric));
-    /* Create a signal mapper so that we not have to react to every single
-     * menu activation ourself. */
-    mSignalMapper = new QSignalMapper (this);
-    connect (mSignalMapper, SIGNAL (mapped (const QString &)),
-             this, SLOT (setOSTypeId (const QString &)));
-    mMainMenu = new QMenu (aParent);
-    setMenu (mMainMenu);
+    const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
+    setIconSize(QSize(iIconMetric, iIconMetric));
 
+    /* We have to make sure that the button has strong focus, otherwise
+     * the editing is ended when the menu is shown: */
+    setFocusPolicy(Qt::StrongFocus);
+
+    /* Create a signal mapper so that we not have to react to
+     * every single menu activation ourself: */
+    m_pSignalMapper = new QSignalMapper(this);
+    if (m_pSignalMapper)
+        connect(m_pSignalMapper, static_cast<void(QSignalMapper::*)(const QString &)>(&QSignalMapper::mapped),
+                this, &UIGuestOSTypeSelectionButton::setOSTypeId);
+
+    /* Create main menu: */
+    m_pMainMenu = new QMenu(pParent);
+    if (m_pMainMenu)
+        setMenu(m_pMainMenu);
+
+    /* Apply language settings: */
     retranslateUi();
 }
 
-void VBoxOSTypeSelectorButton::setOSTypeId (const QString& aOSTypeId)
+bool UIGuestOSTypeSelectionButton::isMenuShown() const
 {
-    mOSTypeId = aOSTypeId;
-    CGuestOSType type = vboxGlobal().vmGuestOSType (aOSTypeId);
-    /* Looks ugly on the Mac */
-#ifndef VBOX_WS_MAC
-    setIcon (vboxGlobal().vmGuestOSTypePixmapDefault (type.GetId()));
-#endif /* VBOX_WS_MAC */
-    setText (type.GetDescription());
+    return m_pMainMenu->isVisible();
 }
 
-bool VBoxOSTypeSelectorButton::isMenuShown() const
+void UIGuestOSTypeSelectionButton::setOSTypeId(const QString &strOSTypeId)
 {
-    return mMainMenu->isVisible();
+    m_strOSTypeId = strOSTypeId;
+    CGuestOSType enmType = vboxGlobal().vmGuestOSType(strOSTypeId);
+
+#ifndef VBOX_WS_MAC
+    /* Looks ugly on the Mac: */
+    setIcon(vboxGlobal().vmGuestOSTypePixmapDefault(enmType.GetId()));
+#endif
+
+    setText(enmType.GetDescription());
 }
 
-void VBoxOSTypeSelectorButton::retranslateUi()
+void UIGuestOSTypeSelectionButton::retranslateUi()
 {
     populateMenu();
 }
 
-void VBoxOSTypeSelectorButton::populateMenu()
+void UIGuestOSTypeSelectionButton::populateMenu()
 {
-    mMainMenu->clear();
+    m_pMainMenu->clear();
+
     /* Create a list of all possible OS types */
-    QList <CGuestOSType> families = vboxGlobal().vmGuestOSFamilyList();
-    foreach (const CGuestOSType& family, families)
+    QList<CGuestOSType> families = vboxGlobal().vmGuestOSFamilyList();
+    foreach(const CGuestOSType &comFamily, families)
     {
-        QMenu *subMenu = mMainMenu->addMenu (family.GetFamilyDescription());
-        QList <CGuestOSType> types = vboxGlobal().vmGuestOSTypeList (family.GetFamilyId());
-        foreach (const CGuestOSType& type, types)
+        QMenu *pSubMenu = m_pMainMenu->addMenu(comFamily.GetFamilyDescription());
+        QList<CGuestOSType> types = vboxGlobal().vmGuestOSTypeList(comFamily.GetFamilyId());
+        foreach (const CGuestOSType &comType, types)
         {
-            QAction *a = subMenu->addAction (vboxGlobal().vmGuestOSTypePixmapDefault (type.GetId()), type.GetDescription());
-            connect(a, SIGNAL (triggered()),
-                    mSignalMapper, SLOT(map()));
-            mSignalMapper->setMapping (a, type.GetId());
+            QAction *pAction = pSubMenu->addAction(vboxGlobal().vmGuestOSTypePixmapDefault(comType.GetId()),
+                                                   comType.GetDescription());
+            connect(pAction, &QAction::triggered,
+                    m_pSignalMapper, static_cast<void(QSignalMapper::*)(void)>(&QSignalMapper::map));
+            m_pSignalMapper->setMapping(pAction, comType.GetId());
         }
     }
 }
-

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIGuestOSTypeSelectionButton.h

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - VBoxOSTypeSelectorButton class declaration.
+ * VBox Qt GUI - UIGuestOSTypeSelectionButton class declaration.
  */
 
 /*
- * Copyright (C) 2009-2017 Oracle Corporation
+ * Copyright (C) 2009-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -16 +16 @@
  */
 
-#ifndef __VBoxOSTypeSelectorButton_h__
-#define __VBoxOSTypeSelectorButton_h__
+#ifndef ___UIGuestOSTypeSelectionButton_h___
+#define ___UIGuestOSTypeSelectionButton_h___
 
-/* VBox includes */
+/* Qt includes: */
+#include <QPushButton>
+
+/* GUI includes: */
 #include "QIWithRetranslateUI.h"
 
-/* Qt includes */
-#include <QPushButton>
-
+/* Forward declarations: */
+class QMenu;
 class QSignalMapper;
 
-class VBoxOSTypeSelectorButton: public QIWithRetranslateUI<QPushButton>
+/** QPushButton sub-class for choosing guest OS family/type inside appliance editor widget. */
+class UIGuestOSTypeSelectionButton : public QIWithRetranslateUI<QPushButton>
 {
     Q_OBJECT;
 
 public:
-    VBoxOSTypeSelectorButton (QWidget *aParent);
-    QString osTypeId() const { return mOSTypeId; }
 
+    /** Constructs a button passing @a pParent to the base-class. */
+    UIGuestOSTypeSelectionButton(QWidget *pParent);
+
+    /** Returns whether the menu is shown. */
     bool isMenuShown() const;
 
-    void retranslateUi();
+    /** Returns current guest OS type ID. */
+    QString osTypeId() const { return m_strOSTypeId; }
 
 public slots:
-    void setOSTypeId (const QString& aOSTypeId);
+
+    /** Defines current guest @a strOSTypeId. */
+    void setOSTypeId(const QString &strOSTypeId);
+
+protected:
+
+    /** Handles translation event. */
+    virtual void retranslateUi() /* override */;
 
 private:
+
+    /** Populates menu. */
     void populateMenu();
 
-    /* Private member vars */
-    QString mOSTypeId;
-    QMenu *mMainMenu;
-    QSignalMapper *mSignalMapper;
+    /** Holds the current guest OS type ID. */
+    QString  m_strOSTypeId;
+
+    /** Holds the menu instance. */
+    QMenu         *m_pMainMenu;
+    /** Holds the signal mapper instance. */
+    QSignalMapper *m_pSignalMapper;
 };
 
-#endif /* __VBoxOSTypeSelectorButton_h__ */
-
+#endif /* !___UIGuestOSTypeSelectionButton_h___ */