Changeset 92641 in vbox for trunk/src

Timestamp:

Nov 30, 2021 9:01:57 AM (3 years ago)

Author:

vboxsync

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

148536

Message:

FE/Qt: bugref:9371. Some layout changes in file manager

Location:

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

Files:

• UIFileManager.cpp (modified) (7 diffs)
• UIFileManager.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManager.cpp ¶

@@ -118 +118 @@
     , m_pMainLayout(0)
     , m_pVerticalSplitter(0)
+    , m_pFileTableSplitter(0)
     , m_pToolBar(0)
     , m_pVerticalToolBar(0)
@@ -184 +185 @@
     if (m_fShowToolbar)
         prepareToolBar();
-    /* Two widgets are inserted into this splitter. Upper pWidget widget is a container with file tables and all the panels
-       except the log panel and lower widget is the log panel: */
     m_pVerticalSplitter = new QSplitter;
     if (!m_pVerticalSplitter)
@@ -216 +215 @@
         m_pGuestFileTable->setEnabled(false);
 
+        /* This widget hosts host file table and vertical toolbar. */
+        QWidget *pHostTableAndVerticalToolbarWidget = new QWidget;
+        QHBoxLayout *pHostTableAndVerticalToolbarLayout = new QHBoxLayout(pHostTableAndVerticalToolbarWidget);
+        pHostTableAndVerticalToolbarLayout->setSpacing(0);
+        pHostTableAndVerticalToolbarLayout->setContentsMargins(0, 0, 0, 0);
+
         m_pHostFileTable = new UIFileManagerHostTable(m_pActionPool);
         if (m_pHostFileTable)
@@ -223 +228 @@
             connect(m_pHostFileTable, &UIFileManagerHostTable::sigDeleteConfirmationOptionChanged,
                     this, &UIFileManager::sltHandleOptionsUpdated);
-            pFileTableContainerLayout->addWidget(m_pHostFileTable);
+            pHostTableAndVerticalToolbarLayout->addWidget(m_pHostFileTable);
         }
-        prepareVerticalToolBar(pFileTableContainerLayout);
+        pFileTableContainerLayout->addWidget(pHostTableAndVerticalToolbarWidget);
+        prepareVerticalToolBar(pHostTableAndVerticalToolbarLayout);
         if (m_pGuestFileTable)
         {
@@ -260 +266 @@
     m_pVerticalSplitter->addWidget(pTopWidget);
 
-    m_pOperationsPanel =
-        new UIFileManagerOperationsPanel;
+    m_pOperationsPanel = new UIFileManagerOperationsPanel;
     if (m_pOperationsPanel)
     {
@@ -338 +343 @@
                     this, &UIFileManager::sltCopyHostToGuest);
     }
-
     if (m_pGuestSessionPanel)
     {
@@ -351 +355 @@
         connect(m_pOptionsPanel, &UIFileManagerOptionsPanel::sigHidePanel,
                 this, &UIFileManager::sltHandleHidePanel);
-
     if (m_pLogPanel)
         connect(m_pLogPanel, &UIFileManagerLogPanel::sigHidePanel,

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManager.h ¶

@@ -183 +183 @@
     QVBoxLayout              *m_pMainLayout;
     QSplitter                *m_pVerticalSplitter;
+    /** Splitter hosting host and guest file system tables. */
+    QSplitter                *m_pFileTableSplitter;
     QIToolBar                *m_pToolBar;
     QIToolBar                *m_pVerticalToolBar;