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

Timestamp:

May 25, 2017 3:21:01 PM (8 years ago)

Author:

vboxsync

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

115754

Message:

FE/Qt: Selector UI: Tools pane: Reworking pane to handle stack of children using QStackedLayout instead of QStackedWidget which has a glitch under macOS causing QToolBar integration failure (as a result widget became frameless cocoa window); That also required to add an early cleanup routine.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/selector

Files:

• UIToolsPane.cpp (modified) (11 diffs)
• UIToolsPane.h (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsPane.cpp

@@ -21 +21 @@
 
 /* Qt includes: */
-# include <QStackedWidget>
+# include <QStackedLayout>
 # include <QTabBar>
 
@@ -42 +42 @@
     : QIWithRetranslateUI<QWidget>(pParent)
     , m_pLayoutMain(0)
-    , m_pStackedWidget(0)
+    , m_pStackedLayout(0)
     , m_pPaneSnapshots(0)
     , m_pLayoutControls(0)
@@ -53 +53 @@
 }
 
+UIToolsPane::~UIToolsPane()
+{
+    /* Cleanup: */
+    cleanup();
+}
+
 void UIToolsPane::setMachine(const CMachine &comMachine)
 {
@@ -96 +102 @@
 {
     /* Swap stack-widget pages as well: */
-    QWidget *pWidget = m_pStackedWidget->widget(iFrom);
-    m_pStackedWidget->removeWidget(pWidget);
-    m_pStackedWidget->insertWidget(iTo, pWidget);
+    QWidget *pWidget = m_pStackedLayout->widget(iFrom);
+    m_pStackedLayout->removeWidget(pWidget);
+    m_pStackedLayout->insertWidget(iTo, pWidget);
 }
 
@@ -104 +110 @@
 {
     /* Activate corresponding indexes: */
-    m_pStackedWidget->setCurrentIndex(iIndex);
+    m_pStackedLayout->setCurrentIndex(iIndex);
 }
 
@@ -126 +132 @@
     /* Delete the tab and corresponding widget: */
     m_pTabBar->removeTab(iActualTabIndex);
-    QWidget *pWidget = m_pStackedWidget->widget(iActualTabIndex);
-    m_pStackedWidget->removeWidget(pWidget);
+    QWidget *pWidget = m_pStackedLayout->widget(iActualTabIndex);
+    m_pStackedLayout->removeWidget(pWidget);
     delete pWidget;
 }
@@ -141 +147 @@
         m_pLayoutMain->setContentsMargins(3, 4, 5, 0);
 
-        /* Prepare stacked-widget: */
-        prepareStackedWidget();
+        /* Prepare stacked-layout: */
+        prepareStackedLayout();
 
         /* Create controls layout: */
@@ -173 +179 @@
 }
 
-void UIToolsPane::prepareStackedWidget()
-{
-    /* Create stacked-widget: */
-    m_pStackedWidget = new QStackedWidget;
-    AssertPtrReturnVoid(m_pStackedWidget);
+void UIToolsPane::prepareStackedLayout()
+{
+    /* Create stacked-layout: */
+    m_pStackedLayout = new QStackedLayout;
+    AssertPtrReturnVoid(m_pStackedLayout);
     {
         /* Add into layout: */
-        m_pLayoutMain->addWidget(m_pStackedWidget);
+        m_pLayoutMain->addLayout(m_pStackedLayout);
     }
 }
@@ -268 +274 @@
 }
 
+void UIToolsPane::cleanup()
+{
+    /* Remove all tab prematurelly: */
+    while (m_pTabBar->count())
+    {
+        m_pTabBar->removeTab(0);
+        QWidget *pWidget = m_pStackedLayout->widget(0);
+        m_pStackedLayout->removeWidget(pWidget);
+        delete pWidget;
+    }
+}
+
 void UIToolsPane::activateTabBarTab(ToolsType enmType, bool fCloseable)
 {
@@ -285 +303 @@
             case ToolsType_SnapshotManager:
                 m_pPaneSnapshots = new UISnapshotPane;
-                m_pStackedWidget->addWidget(m_pPaneSnapshots);
+                m_pStackedLayout->addWidget(m_pPaneSnapshots);
                 break;
             case ToolsType_VirtualMediaManager:
-                m_pStackedWidget->addWidget(new UIMediumManagerWidget(EmbedTo_Stack));
+                m_pStackedLayout->addWidget(new UIMediumManagerWidget(EmbedTo_Stack));
                 break;
             case ToolsType_HostNetworkManager:
-                m_pStackedWidget->addWidget(new UIHostNetworkManagerWidget(EmbedTo_Stack));
+                m_pStackedLayout->addWidget(new UIHostNetworkManagerWidget(EmbedTo_Stack));
                 break;
             default:
@@ -320 +338 @@
 
     /* Activate corresponding indexes: */
-    m_pStackedWidget->setCurrentIndex(iActualTabIndex);
+    m_pStackedLayout->setCurrentIndex(iActualTabIndex);
     m_pTabBar->setCurrentIndex(iActualTabIndex);
     m_pTabBar->blockSignals(false);

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsPane.h

@@ -29 +29 @@
 class QHBoxLayout;
 class QMenu;
-class QStackedWidget;
+class QStackedLayout;
 class QTabBar;
 class QVBoxLayout;
@@ -55 +55 @@
     /** Constructs tools pane passing @a pParent to the base-class. */
     UIToolsPane(QWidget *pParent = 0);
+    /** Destructs tools pane. */
+    virtual ~UIToolsPane() /* override */;
 
     /** Defines the @a comMachine object. */
@@ -80 +82 @@
     /** Prepares all. */
     void prepare();
-    /** Prepares stacked-widget. */
-    void prepareStackedWidget();
+    /** Prepares stacked-layout. */
+    void prepareStackedLayout();
     /** Prepares tab-bar. */
     void prepareTabBar();
@@ -88 +90 @@
     /** Prepares menu. */
     void prepareMenu();
+    /** Cleanups all. */
+    void cleanup();
 
     /** Activates corresponding tab-bar tab, adds new if necessary. */
@@ -94 +98 @@
     /** Holds the main layout isntance. */
     QVBoxLayout               *m_pLayoutMain;
-    /** Holds the stacked-widget instance. */
-    QStackedWidget            *m_pStackedWidget;
+    /** Holds the stacked-layout instance. */
+    QStackedLayout            *m_pStackedLayout;
     /** Holds the snapshot pane. */
     UISnapshotPane            *m_pPaneSnapshots;