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

Timestamp:

Nov 29, 2021 4:25:42 PM (3 years ago)

Author:

vboxsync

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

148522

Message:

FE/Qt: bugref:9371. File manager opens it own session.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• guestctrl/UIFileManager.cpp (modified) (10 diffs)
• guestctrl/UIFileManager.h (modified) (6 diffs)
• guestctrl/UIFileManagerDialog.cpp (modified) (4 diffs)
• guestctrl/UIFileManagerDialog.h (modified) (6 diffs)
• runtime/UIMachineLogic.cpp (modified) (1 diff)

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

@@ -40 +40 @@
 
 /* COM includes: */
+#include "CConsole.h"
 #include "CFsObjInfo.h"
 #include "CGuestDirectory.h"
@@ -112 +113 @@
 
 UIFileManager::UIFileManager(EmbedTo enmEmbedding, UIActionPool *pActionPool,
-                                                     const CGuest &comGuest, QWidget *pParent, bool fShowToolbar /* = true */)
+                                                     const CMachine &comMachine, QWidget *pParent, bool fShowToolbar /* = true */)
     : QIWithRetranslateUI<QWidget>(pParent)
-    , m_comGuest(comGuest)
+    , m_comMachine(comMachine)
     , m_pMainLayout(0)
     , m_pVerticalSplitter(0)
@@ -131 +132 @@
 {
     loadOptions();
-    prepareGuestListener();
     prepareObjects();
     prepareConnections();
@@ -160 +160 @@
 void UIFileManager::retranslateUi()
 {
-}
-
-void UIFileManager::prepareGuestListener()
-{
-    if (m_comGuest.isOk())
-    {
-        QVector<KVBoxEventType> eventTypes;
-        eventTypes << KVBoxEventType_OnGuestSessionRegistered;
-
-        prepareListener(m_pQtGuestListener, m_comGuestListener,
-                        m_comGuest.GetEventSource(), eventTypes);
-    }
 }
 
@@ -329 +317 @@
 void UIFileManager::prepareConnections()
 {
-    if (m_pQtGuestListener)
-        connect(m_pQtGuestListener->getWrapped(), &UIMainEventListener::sigGuestSessionUnregistered,
-                this, &UIFileManager::sltGuestSessionUnregistered);
 
     if (m_pGuestSessionPanel)
@@ -402 +387 @@
         m_comGuestSession.detach();
         postGuestSessionClosed();
-    }
-}
+        appendLog("Guest session unregistered", FileManagerLogType_Info);
+    }
+}
+
+void UIFileManager::sltGuestSessionRegistered(CGuestSession guestSession)
+{
+    if (guestSession == m_comGuestSession && !m_comGuestSession.isNull())
+        appendLog("Guest session registered", FileManagerLogType_Info);
+}
+
 
 void UIFileManager::sltCreateGuestSession(QString strUserName, QString strPassword)
 {
-    if (!UIGuestControlInterface::isGuestAdditionsAvailable(m_comGuest))
-    {
-        appendLog("Could not find Guest Additions", FileManagerLogType_Error);
-        postGuestSessionClosed();
-        if (m_pGuestSessionPanel)
-            m_pGuestSessionPanel->markForError(true);
-        return;
-    }
     if (strUserName.isEmpty())
     {
@@ -423 +408 @@
     }
     if (m_pGuestSessionPanel)
-        m_pGuestSessionPanel->markForError(!createGuestSession(strUserName, strPassword));
+        m_pGuestSessionPanel->markForError(!openSession(strUserName, strPassword));
 }
 
@@ -460 +445 @@
             postGuestSessionCreated();
         }
-        appendLog(QString("%1: %2").arg("Session status has changed").arg(gpConverter->toString(m_comGuestSession.GetStatus())),
+        appendLog(QString("%1: %2").arg("Guest session status has changed").arg(gpConverter->toString(m_comGuestSession.GetStatus())),
                   FileManagerLogType_Info);
     }
@@ -596 +581 @@
 }
 
-bool UIFileManager::createGuestSession(const QString& strUserName, const QString& strPassword,
-                                  const QString& strDomain /* not used currently */)
-{
-    if (!m_comGuest.isOk())
+bool UIFileManager::openSession(const QString& strUserName, const QString& strPassword)
+{
+    m_comSession = uiCommon().openSession(m_comMachine.GetId(), KLockType_Shared);
+    AssertReturn(!m_comSession.isNull(), false);
+
+    CConsole comConsole = m_comSession.GetConsole();
+    AssertReturn(!comConsole.isNull(), false);
+    m_comGuest = comConsole.GetGuest();
+    AssertReturn(!m_comGuest.isNull(), false);
+
+    if (!UIGuestControlInterface::isGuestAdditionsAvailable(m_comGuest))
+    {
+        appendLog("Could not find Guest Additions", FileManagerLogType_Error);
+        postGuestSessionClosed();
+        if (m_pGuestSessionPanel)
+            m_pGuestSessionPanel->markForError(true);
         return false;
+    }
+
+    QVector<KVBoxEventType> eventTypes;
+    eventTypes << KVBoxEventType_OnGuestSessionRegistered;
+
+    prepareListener(m_pQtGuestListener, m_comGuestListener,
+                    m_comGuest.GetEventSource(), eventTypes);
+    connect(m_pQtGuestListener->getWrapped(), &UIMainEventListener::sigGuestSessionUnregistered,
+            this, &UIFileManager::sltGuestSessionUnregistered);
+
+    connect(m_pQtGuestListener->getWrapped(), &UIMainEventListener::sigGuestSessionRegistered,
+            this, &UIFileManager::sltGuestSessionRegistered);
+
     m_comGuestSession = m_comGuest.CreateSession(strUserName, strPassword,
-                                                               strDomain, "File Manager Session");
+                                                 QString() /* Domain */, "File Manager Session");
 
     if (!m_comGuestSession.isOk())
@@ -609 +619 @@
         return false;
     }
-    appendLog("Guest session has been created", FileManagerLogType_Info);
+
     if (m_pGuestSessionPanel)
         m_pGuestSessionPanel->switchSessionCloseMode();
 
-    /* Prepare session listener */
-    QVector<KVBoxEventType> eventTypes;
+    /* Prepare guest session listener */
+    eventTypes.clear();
     eventTypes << KVBoxEventType_OnGuestSessionStateChanged;
-    //<< KVBoxEventType_OnGuestProcessRegistered;
+
     prepareListener(m_pQtSessionListener, m_comSessionListener,
                     m_comGuestSession.GetEventSource(), eventTypes);
 
-    /* Connect to session listener */
     qRegisterMetaType<CGuestSessionStateChangedEvent>();
-
     connect(m_pQtSessionListener->getWrapped(), &UIMainEventListener::sigGuestSessionStatedChanged,
             this, &UIFileManager::sltGuestSessionStateChanged);
-#if 0
-    /* Wait session to start. For some reason we cannot get GuestSessionStatusChanged event
-        consistently. So we wait: */
-    appendLog("Waiting the guest session to start", FileManagerLogType_Info);
-    const ULONG waitTimeout = 2000;
-    KGuestSessionWaitResult waitResult = m_comGuestSession.WaitFor(KGuestSessionWaitForFlag_Start, waitTimeout);
-    if (waitResult != KGuestSessionWaitResult_Start)
-    {
-        appendLog("The guest session did not start", FileManagerLogType_Error);
-        sltCloseGuestSession();
-        return false;
-    }
-#endif
+
     return true;
 }
+
+
+void UIFileManager::closeSession()
+{
+}
+
 
 void UIFileManager::prepareListener(ComObjPtr<UIMainEventListenerImpl> &QtListener,

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

@@ -31 +31 @@
 #include "CEventSource.h"
 #include "CGuest.h"
+#include "CMachine.h"
 #include "CGuestSession.h"
 
@@ -92 +93 @@
 
     UIFileManager(EmbedTo enmEmbedding, UIActionPool *pActionPool,
-                              const CGuest &comGuest, QWidget *pParent, bool fShowToolbar = true);
+                              const CMachine &comMachine, QWidget *pParent, bool fShowToolbar = true);
     ~UIFileManager();
     QMenu *menu() const;
@@ -110 +111 @@
 
     void sltGuestSessionUnregistered(CGuestSession guestSession);
+    void sltGuestSessionRegistered(CGuestSession guestSession);
     void sltCreateGuestSession(QString strUserName, QString strPassword);
     void sltCloseGuestSession();
@@ -127 +129 @@
 
     void prepareObjects();
-    void prepareGuestListener();
     void prepareConnections();
     void prepareVerticalToolBar(QHBoxLayout *layout);
     void prepareToolBar();
-    bool createGuestSession(const QString& strUserName, const QString& strPassword,
-                       const QString& strDomain = QString() /* not used currently */);
+
+    /** Creates a shared machine session, opens a guest session and registers event listeners. */
+    bool openSession(const QString& strUserName, const QString& strPassword);
+    void closeSession();
 
     void prepareListener(ComObjPtr<UIMainEventListenerImpl> &Qtistener,
@@ -172 +175 @@
     CGuest                    m_comGuest;
     CGuestSession             m_comGuestSession;
+    CSession                  m_comSession;
+    CMachine                  m_comMachine;
     QVBoxLayout              *m_pMainLayout;
     QSplitter                *m_pVerticalSplitter;
@@ -177 +182 @@
     QIToolBar                *m_pVerticalToolBar;
 
-    UIFileManagerGuestTable         *m_pGuestFileTable;
+    UIFileManagerGuestTable  *m_pGuestFileTable;
     UIFileManagerHostTable   *m_pHostFileTable;
 

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

@@ -36 +36 @@
 *********************************************************************************************************************************/
 
-UIFileManagerDialogFactory::UIFileManagerDialogFactory(UIActionPool *pActionPool /* = 0 */,
-                                                         const CGuest &comGuest /* = CGuest() */,
-                                                         const QString &strMachineName /* = QString() */)
+UIFileManagerDialogFactory::UIFileManagerDialogFactory(UIActionPool *pActionPool,
+                                                       const CMachine &comMachine,
+                                                       const QString &strMachineName)
     : m_pActionPool(pActionPool)
-    , m_comGuest(comGuest)
+    , m_comMachine(comMachine)
     , m_strMachineName(strMachineName)
+{
+}
+
+
+UIFileManagerDialogFactory::UIFileManagerDialogFactory()
+    : m_pActionPool(0)
+    , m_comMachine(CMachine())
 {
 }
@@ -47 +54 @@
 void UIFileManagerDialogFactory::create(QIManagerDialog *&pDialog, QWidget *pCenterWidget)
 {
-    pDialog = new UIFileManagerDialog(pCenterWidget, m_pActionPool, m_comGuest, m_strMachineName);
+    pDialog = new UIFileManagerDialog(pCenterWidget, m_pActionPool, m_comMachine, m_strMachineName);
 }
 
@@ -57 +64 @@
 UIFileManagerDialog::UIFileManagerDialog(QWidget *pCenterWidget,
                                            UIActionPool *pActionPool,
-                                           const CGuest &comGuest,
-                                           const QString &strMachineName /* = QString() */)
+                                           const CMachine &comMachine,
+                                           const QString &strMachineName)
     : QIWithRetranslateUI<QIManagerDialog>(pCenterWidget)
     , m_pActionPool(pActionPool)
-    , m_comGuest(comGuest)
+    , m_comMachine(comMachine)
     , m_strMachineName(strMachineName)
 {
@@ -106 +113 @@
     /* Create widget: */
     UIFileManager *pWidget = new UIFileManager(EmbedTo_Dialog, m_pActionPool,
-                                                                       m_comGuest, this);
+                                                                       m_comMachine, this);
 
     if (pWidget)

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

@@ -31 +31 @@
 /* COM includes: */
 #include "COMEnums.h"
-#include "CGuest.h"
+#include "CMachine.h"
 
 /* Forward declarations: */
@@ -38 +38 @@
 class UIActionPool;
 class UIFileManagerDialog;
-class CGuest;
+class CMachine;
 
 
@@ -46 +46 @@
 public:
 
-    UIFileManagerDialogFactory(UIActionPool *pActionPool = 0, const CGuest &comGuest = CGuest(), const QString &strMachineName = QString());
+    UIFileManagerDialogFactory(UIActionPool *pActionPool, const CMachine &comMachine, const QString &strMachineName);
+    UIFileManagerDialogFactory();
 
 protected:
@@ -55 +56 @@
 
     UIActionPool *m_pActionPool;
-    CGuest        m_comGuest;
+    CMachine      m_comMachine;
     QString       m_strMachineName;
 };
@@ -69 +70 @@
       * @param  pCenterWidget  Passes the widget reference to center according to.
       * @param  pActionPool    Passes the action-pool reference.
-      * @param  comGuest       Passes the com-guest reference. */
-    UIFileManagerDialog(QWidget *pCenterWidget, UIActionPool *pActionPool, const CGuest &comGuest, const QString &strMachineName = QString());
+      * @param  comMachine     Passes the machine reference. */
+    UIFileManagerDialog(QWidget *pCenterWidget, UIActionPool *pActionPool, const CMachine &comMachine, const QString &strMachineName);
     ~UIFileManagerDialog();
 
@@ -110 +111 @@
     void manageEscapeShortCut();
     UIActionPool *m_pActionPool;
-    CGuest      m_comGuest;
+    CMachine    m_comMachine;
     QString     m_strMachineName;
 };

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -1781 +1781 @@
 
     QIManagerDialog *pFileManagerDialog;
-    UIFileManagerDialogFactory dialogFactory(actionPool(), console().GetGuest(), machine().GetName());
+    UIFileManagerDialogFactory dialogFactory(actionPool(), machine(), machine().GetName());
     dialogFactory.prepare(pFileManagerDialog, activeMachineWindow());
     if (pFileManagerDialog)