Changeset 77935 in vbox for trunk

Timestamp:

Mar 28, 2019 12:54:19 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6699. Using stack widget for navigation widgets.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl

Files:

• UIFileManagerTable.cpp (modified) (4 diffs)
• UIFileManagerTable.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerTable.cpp

@@ -23 +23 @@
 #include <QItemDelegate>
 #include <QGridLayout>
+#include <QStackedWidget>
 #include <QTextEdit>
 
@@ -475 +476 @@
     , m_pLocationComboBox(0)
     , m_pWarningLabel(0)
+    , m_pNavigationWidgetWidget(0)
     , m_pBreadCrumbsWidget(0)
 {
@@ -525 +527 @@
     }
 
-    m_pLocationComboBox = new QComboBox;
-    if (m_pLocationComboBox)
-    {
-        m_pMainLayout->addWidget(m_pLocationComboBox, 1, 1, 1, 4);
-        m_pLocationComboBox->setEditable(false);
-        connect(m_pLocationComboBox, static_cast<void(QComboBox::*)(const QString&)>(&QComboBox::currentIndexChanged),
-                this, &UIFileManagerTable::sltLocationComboCurrentChange);
-    }
-
-    m_pBreadCrumbsWidget = new UIFileManagerBreadCrumbs;
-    if (m_pBreadCrumbsWidget)
-    {
-        m_pMainLayout->addWidget(m_pBreadCrumbsWidget, 1, 1, 1, 4);
-        m_pBreadCrumbsWidget->setReadOnly(true);
-        QSizePolicy sizePolicy;
-        sizePolicy.setControlType(QSizePolicy::ComboBox);
-        m_pBreadCrumbsWidget->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
-        connect(m_pBreadCrumbsWidget, &UIFileManagerBreadCrumbs::sigNavitatePath,
-                this, &UIFileManagerTable::sltHandleBreadCrumbsClick);
-    }
-
+    m_pNavigationWidgetWidget = new QStackedWidget;
+    if (m_pNavigationWidgetWidget)
+    {
+        m_pNavigationWidgetWidget->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
+
+        m_pLocationComboBox = new QComboBox;
+        if (m_pLocationComboBox)
+        {
+            m_pNavigationWidgetWidget->addWidget(m_pLocationComboBox);
+            m_pLocationComboBox->setEditable(false);
+            connect(m_pLocationComboBox, static_cast<void(QComboBox::*)(const QString&)>(&QComboBox::currentIndexChanged),
+                    this, &UIFileManagerTable::sltLocationComboCurrentChange);
+        }
+
+        m_pBreadCrumbsWidget = new UIFileManagerBreadCrumbs;
+        if (m_pBreadCrumbsWidget)
+        {
+            m_pNavigationWidgetWidget->addWidget(m_pBreadCrumbsWidget);
+            m_pBreadCrumbsWidget->setReadOnly(true);
+            connect(m_pBreadCrumbsWidget, &UIFileManagerBreadCrumbs::sigNavitatePath,
+                    this, &UIFileManagerTable::sltHandleBreadCrumbsClick);
+        }
+        m_pMainLayout->addWidget(m_pNavigationWidgetWidget, 1, 1, 1, 4);
+    }
     UIFileManagerOptions *pOptions = UIFileManagerOptions::instance();
     if (pOptions)
@@ -1382 +1387 @@
 void UIFileManagerTable::showHideBreadCrumbs(bool fShow)
 {
-    if (m_pLocationComboBox)
-        m_pLocationComboBox->setVisible(!fShow);
-    if (m_pBreadCrumbsWidget)
-        m_pBreadCrumbsWidget->setVisible(fShow);
+    if (!m_pNavigationWidgetWidget)
+        return;
+    if (fShow)
+        m_pNavigationWidgetWidget->setCurrentIndex(0);
+    else
+        m_pNavigationWidgetWidget->setCurrentIndex(1);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerTable.h

@@ -46 +46 @@
 class QGridLayout;
 class QSortFilterProxyModel;
+class QStackedWidget;
 class QTextEdit;
 class QVBoxLayout;
@@ -295 +296 @@
     QILabel         *m_pWarningLabel;
 
+    /** Contains m_pBreadCrumbsWidget and m_pLocationComboBox. */
+    QStackedWidget           *m_pNavigationWidgetWidget;
     UIFileManagerBreadCrumbs *m_pBreadCrumbsWidget;