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

Timestamp:

Dec 6, 2021 9:29:59 AM (3 years ago)

Author:

vboxsync

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

148665

Message:

FE/Qt: bugref:9371. Splitting guest table's toolbar into two.

Location:

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

Files:

• UIFileManagerGuestTable.cpp (modified) (3 diffs)
• UIFileManagerGuestTable.h (modified) (1 diff)
• UIFileManagerTable.cpp (modified) (3 diffs)
• UIFileManagerTable.h (modified) (2 diffs)

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

@@ -155 +155 @@
     , m_comMachine(comMachine)
     , m_pGuestSessionPanel(0)
+    , m_pSessionWidgetToggleToolBar(0)
 {
     if (!m_comMachine.isNull())
@@ -644 +645 @@
     if (m_pToolBar && m_pActionPool)
     {
-        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_T_GuestSession));
-        m_pToolBar->addSeparator();
         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_GoUp));
         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_GoHome));
@@ -673 +672 @@
         m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_Paste)->setVisible(false);
     }
+
     setSelectionDependentActionsEnabled(false);
     setPasteActionEnabled(false);
+
+    m_pSessionWidgetToggleToolBar = new QIToolBar;
+    if (m_pSessionWidgetToggleToolBar && toolBarLayout())
+    {
+        m_pSessionWidgetToggleToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_T_GuestSession));
+        QWidget *pSpaceWidget = new QWidget;
+        pSpaceWidget->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
+        toolBarLayout()->addWidget(pSpaceWidget);
+        toolBarLayout()->addWidget(m_pSessionWidgetToggleToolBar);
+    }
 }
 

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

@@ -142 +142 @@
     CEventListener m_comGuestListener;
     UIFileManagerGuestSessionPanel     *m_pGuestSessionPanel;
+    /** Hosts only a single action. We seperate this action since others
+      * are contained in the main toolbar which is dynamically disabled/enabled. */
+    QIToolBar               *m_pSessionWidgetToggleToolBar;
 };
 

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

@@ -711 +711 @@
     , m_pWarningLabel(0)
     , m_pathSeparator('/')
+    , m_pToolBarLayout(0)
 {
     prepareObjects();
@@ -737 +738 @@
     setLayout(m_pMainLayout);
 
-    m_pToolBar = new QIToolBar;
-    if (m_pToolBar)
-        m_pMainLayout->addWidget(m_pToolBar, 0, 0, 1, 7);
+    m_pToolBarLayout = new QHBoxLayout;
+    if (m_pToolBarLayout)
+    {
+        m_pToolBarLayout->setSpacing(0);
+        m_pToolBarLayout->setContentsMargins(0, 0, 0, 0);
+
+        m_pToolBar = new QIToolBar;
+        if (m_pToolBar)
+            m_pToolBarLayout->addWidget(m_pToolBar);
+
+        m_pMainLayout->addLayout(m_pToolBarLayout, 0, 0, 1, 7);
+    }
 
     m_pLocationLabel = new QILabel;
@@ -1446 +1456 @@
 }
 
+QHBoxLayout* UIFileManagerTable::toolBarLayout()
+{
+    return m_pToolBarLayout;
+}
+
 bool UIFileManagerTable::event(QEvent *pEvent)
 {

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

@@ -236 +236 @@
     UICustomFileSystemItem*   rootItem();
     void             setPathSeparator(const QChar &separator);
+    QHBoxLayout*     toolBarLayout();
 
     QILabel                 *m_pLocationLabel;
@@ -303 +304 @@
     QILabel         *m_pWarningLabel;
     QChar            m_pathSeparator;
+    QHBoxLayout     *m_pToolBarLayout;
     friend class     UICustomFileSystemModel;
 };