Changeset 92640 in vbox for trunk/src/VBox

Timestamp:

Nov 30, 2021 8:40:16 AM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9371. Appending file manager toolbar to manager UI's toolbar.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• guestctrl/UIFileManager.cpp (modified) (6 diffs)
• guestctrl/UIFileManager.h (modified) (1 diff)
• manager/UIToolPaneMachine.cpp (modified) (1 diff)
• manager/UIVirtualBoxManagerWidget.cpp (modified) (1 diff)

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

@@ -144 +144 @@
 {
     UIFileManagerOptions::destroy();
+}
+
+void UIFileManager::setMachine(const QUuid &machineId)
+{
+    m_comMachine = uiCommon().virtualBox().FindMachine(machineId.toString());
 }
 
@@ -288 +293 @@
 {
     m_pVerticalToolBar = new QIToolBar;
-    if (!m_pVerticalToolBar)
+    if (!m_pVerticalToolBar && !m_pActionPool)
         return;
 
@@ -307 +312 @@
     m_pVerticalToolBar->addWidget(bottomSpacerWidget);
 
-    connect(m_pActionPool->action(UIActionIndex_M_FileManager_S_CopyToHost), &QAction::triggered,
-            this, &UIFileManager::sltCopyGuestToHost);
-    connect(m_pActionPool->action(UIActionIndex_M_FileManager_S_CopyToGuest), &QAction::triggered,
-             this, &UIFileManager::sltCopyHostToGuest);
-
     layout ->addWidget(m_pVerticalToolBar);
 }
@@ -317 +317 @@
 void UIFileManager::prepareConnections()
 {
+    if (m_pActionPool)
+    {
+        if (m_pActionPool->action(UIActionIndex_M_FileManager_T_Options))
+            connect(m_pActionPool->action(UIActionIndex_M_FileManager_T_Options), &QAction::toggled,
+                    this, &UIFileManager::sltPanelActionToggled);
+        if (m_pActionPool->action(UIActionIndex_M_FileManager_T_Log))
+            connect(m_pActionPool->action(UIActionIndex_M_FileManager_T_Log), &QAction::toggled,
+                    this, &UIFileManager::sltPanelActionToggled);
+        if (m_pActionPool->action(UIActionIndex_M_FileManager_T_GuestSession))
+            connect(m_pActionPool->action(UIActionIndex_M_FileManager_T_GuestSession), &QAction::toggled,
+                    this, &UIFileManager::sltPanelActionToggled);
+        if (m_pActionPool->action(UIActionIndex_M_FileManager_T_Operations))
+            connect(m_pActionPool->action(UIActionIndex_M_FileManager_T_Operations), &QAction::toggled,
+                    this, &UIFileManager::sltPanelActionToggled);
+        if (m_pActionPool->action(UIActionIndex_M_FileManager_S_CopyToHost))
+            connect(m_pActionPool->action(UIActionIndex_M_FileManager_S_CopyToHost), &QAction::triggered,
+                    this, &UIFileManager::sltCopyGuestToHost);
+        if (m_pActionPool->action(UIActionIndex_M_FileManager_S_CopyToGuest))
+            connect(m_pActionPool->action(UIActionIndex_M_FileManager_S_CopyToGuest), &QAction::triggered,
+                    this, &UIFileManager::sltCopyHostToGuest);
+    }
 
     if (m_pGuestSessionPanel)
@@ -355 +376 @@
         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_T_Operations));
         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_T_Log));
-
-        connect(m_pActionPool->action(UIActionIndex_M_FileManager_T_Options), &QAction::toggled,
-                this, &UIFileManager::sltPanelActionToggled);
-        connect(m_pActionPool->action(UIActionIndex_M_FileManager_T_Log), &QAction::toggled,
-                this, &UIFileManager::sltPanelActionToggled);
-        connect(m_pActionPool->action(UIActionIndex_M_FileManager_T_GuestSession), &QAction::toggled,
-                this, &UIFileManager::sltPanelActionToggled);
-        connect(m_pActionPool->action(UIActionIndex_M_FileManager_T_Operations), &QAction::toggled,
-                this, &UIFileManager::sltPanelActionToggled);
 
 #ifdef VBOX_WS_MAC
@@ -583 +595 @@
 bool UIFileManager::openSession(const QString& strUserName, const QString& strPassword)
 {
-    AssertReturn(!m_comMachine.isNull(), false);
+    if (m_comMachine.isNull())
+    {
+        appendLog("Invalid machine reference", FileManagerLogType_Error);
+        return false;
+    }
     m_comSession = uiCommon().openSession(m_comMachine.GetId(), KLockType_Shared);
-    AssertReturn(!m_comSession.isNull(), false);
+    if (!m_comSession.isNull())
+    {
+        appendLog("Could not open machine session", FileManagerLogType_Error);
+        return false;
+    }
 
     CConsole comConsole = m_comSession.GetConsole();

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

@@ -104 +104 @@
     QIToolBar *toolbar() const { return m_pToolBar; }
 #endif
+
+    void setMachine(const QUuid &machineId);
 
 protected:

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneMachine.cpp

@@ -316 +316 @@
         m_pPaneVMActivityMonitor->setSelectedVMListItems(m_items);
     }
+    if (isToolOpened(UIToolType_FileManager))
+    {
+        AssertPtrReturnVoid(m_pPaneFileManager);
+        if (!m_items.isEmpty() && m_items[0])
+            m_pPaneFileManager->setMachine(m_items[0]->id());
+    }
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp

@@ -966 +966 @@
                     break;
                 }
+                case UIToolType_FileManager:
+                {
+                    m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_T_GuestSession));
+                    m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_T_Options));
+                    m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_T_Operations));
+                    m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_T_Log));
+                    m_pToolBar->addSeparator();
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Settings));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Discard));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Machine_M_StartOrShow));
+                    break;
+                }
                 case UIToolType_Error:
                 {