Changeset 92741 in vbox

Timestamp:

Dec 3, 2021 4:45:05 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9371. Reviving some connections.

Location:

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

Files:

• UIFileManager.cpp (modified) (1 diff)
• UIFileManagerGuestTable.cpp (modified) (4 diffs)
• UIFileManagerGuestTable.h (modified) (1 diff)

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

@@ -138 +138 @@
     UIFileManagerOptions::create();
     uiCommon().setHelpKeyword(this, "guestadd-gc-file-manager");
-    //connect(&uiCommon(), &UICommon::sigAskToDetachCOM, this, &UIFileManager::sltCleanupListenerAndGuest);
-    Q_UNUSED(comMachine);
+
+    if (!comMachine.isNull())
+        setMachines( QVector<QUuid>() << comMachine.GetId());
 }
 

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

@@ -26 +26 @@
 #include "UIActionPool.h"
 #include "UIConverter.h"
+#include "UICommon.h"
 #include "UICustomFileSystemModel.h"
 #include "UIErrorString.h"
@@ -754 +755 @@
             m_pGuestSessionPanel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
             sltHandleGuestSessionPanelShown();
-            // connect(m_pGuestSessionPanel, &UIFileManagerGuestSessionPanel::sigCreateSession,
-            //         this, &UIFileManagerGuestTable::sltCreateGuestSession);
+            connect(m_pGuestSessionPanel, &UIFileManagerGuestSessionPanel::sigCreateSession,
+                    this, &UIFileManagerGuestTable::sltCreateGuestSession);
             // connect(m_pGuestSessionPanel, &UIFileManagerGuestSessionPanel::sigCloseSession,
             //         this, &UIFileManagerGuestTable::sltCloseGuestSession);
@@ -1001 +1002 @@
 }
 
+void UIFileManagerGuestTable::sltCreateGuestSession(QString strUserName, QString strPassword)
+{
+    if (strUserName.isEmpty())
+    {
+        emit sigLogOutput("No user name is given", m_strTableName, FileManagerLogType_Error);
+        if (m_pGuestSessionPanel)
+            m_pGuestSessionPanel->markForError(true);
+        return;
+    }
+    if (m_pGuestSessionPanel)
+        m_pGuestSessionPanel->markForError(!openSession(strUserName, strPassword));
+}
+
 /*////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////*/
 /*////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////*/
@@ -1014 +1028 @@
 
 
-void UIFileManagerGuestTable::sltCreateGuestSession(QString strUserName, QString strPassword)
-{
-    if (strUserName.isEmpty())
-    {
-        emit sigLogOutput("No user name is given", m_strTableName, FileManagerLogType_Error);
-        if (m_pGuestSessionPanel)
-            m_pGuestSessionPanel->markForError(true);
-        return;
-    }
-    if (m_pGuestSessionPanel)
-        m_pGuestSessionPanel->markForError(!openSession(strUserName, strPassword));
-}
 
 void UIFileManager::sltCloseGuestSession()

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

@@ -94 +94 @@
     void sltGuestSessionRegistered(CGuestSession guestSession);
     void sltGuestSessionStateChanged(const CGuestSessionStateChangedEvent &cEvent);
-
+    void sltCreateGuestSession(QString strUserName, QString strPassword);
 
 private: