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

Timestamp:

Dec 2, 2021 2:31:27 PM (3 years ago)

Author:

vboxsync

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

148609

Message:

FE/Qt: bugref:9371. Moving guest session panel under guest file table.

Location:

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

Files:

• UIFileManager.cpp (modified) (4 diffs)
• UIFileManager.h (modified) (2 diffs)
• UIFileManagerGuestSessionPanel.cpp (modified) (2 diffs)
• UIFileManagerGuestTable.cpp (modified) (4 diffs)
• UIFileManagerGuestTable.h (modified) (3 diffs)
• UIFileManagerTable.cpp (modified) (2 diffs)
• UIFileManagerTable.h (modified) (4 diffs)

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

@@ -32 +32 @@
 #include "UIIconPool.h"
 #include "UIFileManager.h"
-#include "UIFileManagerGuestSessionPanel.h"
 #include "UIFileManagerOptionsPanel.h"
 #include "UIFileManagerLogPanel.h"
@@ -129 +128 @@
     , m_pOptionsPanel(0)
     , m_pLogPanel(0)
-    , m_pGuestSessionPanel(0)
     , m_pOperationsPanel(0)
     , m_fDialogBeingClosed(false)
@@ -456 +454 @@
     if (!pLayout)
         return;
-    m_pGuestSessionPanel = new UIFileManagerGuestSessionPanel;
-    if (m_pGuestSessionPanel)
-    {
-        m_pGuestSessionPanel->hide();
-        m_panelActionMap.insert(m_pGuestSessionPanel, m_pActionPool->action(UIActionIndex_M_FileManager_T_GuestSession));
-        pLayout->addWidget(m_pGuestSessionPanel);
-    }
 
     m_pOptionsPanel = new UIFileManagerOptionsPanel(0 /*parent */, UIFileManagerOptions::instance());
@@ -545 +536 @@
         }
     }
-    /* Make sure Session panel is visible: */
-    if (m_pGuestSessionPanel && !m_pGuestSessionPanel->isVisible())
-        showPanel(m_pGuestSessionPanel);
 }
 

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

@@ -44 +44 @@
 class UIFileManagerLogPanel;
 class UIFileManagerOperationsPanel;
-class UIFileManagerGuestSessionPanel;
 class UIFileManagerOptionsPanel;
 class UIFileManagerGuestTable;
@@ -172 +171 @@
     UIFileManagerOptionsPanel          *m_pOptionsPanel;
     UIFileManagerLogPanel              *m_pLogPanel;
-    UIFileManagerGuestSessionPanel     *m_pGuestSessionPanel;
     UIFileManagerOperationsPanel       *m_pOperationsPanel;
     bool                                m_fDialogBeingClosed;

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

@@ -103 +103 @@
     if (!m_pMainLayout)
         return;
+    m_pMainLayout->setSpacing(0);
+    m_pMainLayout->setContentsMargins(0, 0, 0, 0);
 
     m_pUserNameEdit = new QILineEdit;
@@ -284 +286 @@
     if (m_pSessionCreateWidget)
         mainLayout()->addWidget(m_pSessionCreateWidget);
+    mainLayout()->setSpacing(0);
+    mainLayout()->setContentsMargins(0, 0, 0, 0);
 }
 

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

@@ -19 +19 @@
 #include <QDateTime>
 #include <QFileInfo>
+#include <QHBoxLayout>
 #include <QUuid>
 
@@ -28 +29 @@
 #include "UIFileManager.h"
 #include "UIFileManagerGuestTable.h"
+#include "UIFileManagerGuestSessionPanel.h"
 #include "UIMessageCenter.h"
 #include "UIPathOperations.h"
@@ -145 +147 @@
 }
 
+#include <QPushButton>
 UIFileManagerGuestTable::UIFileManagerGuestTable(UIActionPool *pActionPool, const CMachine &comMachine, QWidget *pParent /*= 0*/)
     :UIFileManagerTable(pActionPool, pParent)
     , m_comMachine(comMachine)
+    , m_pGuestSessionPanel(0)
 {
     prepareToolbar();
+    prepareGuestSessionPanel();
     prepareActionConnections();
     retranslateUi();
@@ -731 +736 @@
 }
 
+void UIFileManagerGuestTable::prepareGuestSessionPanel()
+{
+    if (m_pMainLayout)
+    {
+        m_pGuestSessionPanel = new UIFileManagerGuestSessionPanel;
+        if (m_pGuestSessionPanel)
+            m_pMainLayout->addWidget(m_pGuestSessionPanel, m_pMainLayout->rowCount(), 0, 1, m_pMainLayout->columnCount());
+    }
+}
+
 bool UIFileManagerGuestTable::checkGuestSession()
 {

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

@@ -42 +42 @@
 class UIActionPool;
 class UICustomFileSystemItem;
+class UIFileManagerGuestSessionPanel;
 
 /** This class scans the guest file system by using the VBox Guest Control API
@@ -101 +102 @@
                          CEventListener &comEventListener,
                          CEventSource comEventSource);
-
+    void prepareGuestSessionPanel();
 
     CGuest                    m_comGuest;
@@ -112 +113 @@
     CEventListener m_comSessionListener;
     CEventListener m_comGuestListener;
+    UIFileManagerGuestSessionPanel     *m_pGuestSessionPanel;
 };
 

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

@@ -20 +20 @@
 #include <QComboBox>
 #include <QCheckBox>
+#include <QHBoxLayout>
 #include <QHeaderView>
 #include <QItemDelegate>
@@ -698 +699 @@
     , m_pActionPool(pActionPool)
     , m_pToolBar(0)
+    , m_pMainLayout(0)
     , m_pModel(0)
     , m_pView(0)
     , m_pProxyModel(0)
     , m_pNavigationWidget(0)
-    , m_pMainLayout(0)
     , m_pWarningLabel(0)
     , m_pathSeparator('/')

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

@@ -48 +48 @@
 class QStackedWidget;
 class QTextEdit;
+class QHBoxLayout;
 class QVBoxLayout;
 class UIActionPool;
@@ -241 +242 @@
     UIActionPool            *m_pActionPool;
     QIToolBar               *m_pToolBar;
-
+    QGridLayout     *m_pMainLayout;
     /** Stores the drive letters the file system has (for windows system). For non-windows
      *  systems this is empty and for windows system it should at least contain C:/ */
@@ -247 +248 @@
     /** The set of actions which need some selection to work on. Like cut, copy etc. */
     QSet<QAction*>           m_selectionDependentActions;
-    /** The absolue path list of the file objects which user has chosen to cut/copy. this
+    /** The absolute path list of the file objects which user has chosen to cut/copy. this
      *  list will be cleaned after a paste operation or overwritten by a subsequent cut/copy.
      *  Currently only used by the guest side. */
@@ -296 +297 @@
     UIFileManagerNavigationWidget *m_pNavigationWidget;
 
-    QGridLayout     *m_pMainLayout;
     QILineEdit      *m_pSearchLineEdit;
     QColor           m_searchLineUnmarkColor;