Changeset 92753 in vbox for trunk/src/VBox

Timestamp:

Dec 6, 2021 8:51:01 AM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9371. Some changes to cleanup stuff.

Location:

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

Files:

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

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

@@ -129 +129 @@
     , m_pLogPanel(0)
     , m_pOperationsPanel(0)
-    , m_fDialogBeingClosed(false)
 {
     loadOptions();
@@ -146 +145 @@
 {
     UIFileManagerOptions::destroy();
-}
-
-void UIFileManager::setDialogBeingClosed(bool fFlag)
-{
-    m_fDialogBeingClosed = fFlag;
 }
 
@@ -610 +604 @@
 void UIFileManager::savePanelVisibility()
 {
-    if (m_fDialogBeingClosed)
-        return;
     /* Save a list of currently visible panels: */
     QStringList strNameList;

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

@@ -92 +92 @@
     QMenu *menu() const;
 
-    void setDialogBeingClosed(bool fFlag);
-
 #ifdef VBOX_WS_MAC
     /** Returns the toolbar. */

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

@@ -70 +70 @@
 UIFileManagerDialog::~UIFileManagerDialog()
 {
-    UIFileManager *pWidget = qobject_cast<UIFileManager*>(widget());
-    if (pWidget)
-        pWidget->setDialogBeingClosed(true);
 }
 

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

@@ -151 +151 @@
 }
 
-#include <QPushButton>
 UIFileManagerGuestTable::UIFileManagerGuestTable(UIActionPool *pActionPool, const CMachine &comMachine, QWidget *pParent /*= 0*/)
     :UIFileManagerTable(pActionPool, pParent)
@@ -757 +756 @@
             connect(m_pGuestSessionPanel, &UIFileManagerGuestSessionPanel::sigCreateSession,
                     this, &UIFileManagerGuestTable::sltCreateGuestSession);
-            // connect(m_pGuestSessionPanel, &UIFileManagerGuestSessionPanel::sigCloseSession,
-            //         this, &UIFileManagerGuestTable::sltCloseGuestSession);
+            connect(m_pGuestSessionPanel, &UIFileManagerGuestSessionPanel::sigCloseSession,
+                    this, &UIFileManagerGuestTable::sltHandleCloseSessionRequest);
             connect(m_pGuestSessionPanel, &UIFileManagerGuestSessionPanel::sigHidePanel,
                     this, &UIFileManagerGuestTable::sltHandleGuestSessionPanelHidden);
@@ -906 +905 @@
 }
 
+void UIFileManagerGuestTable::cleanupSessionListener()
+{
+    disconnect(m_pQtSessionListener->getWrapped(), &UIMainEventListener::sigGuestSessionStatedChanged,
+            this, &UIFileManagerGuestTable::sltGuestSessionStateChanged);
+    cleanupListener(m_pQtSessionListener, m_comSessionListener, m_comGuest.GetEventSource());
+}
 
 void UIFileManagerGuestTable::postGuestSessionCreated()
@@ -1015 +1020 @@
 }
 
+bool UIFileManagerGuestTable::isGuestSessionPossible()
+{
+    if (m_comMachine.isNull())
+        return false;
+    if (m_comMachine.GetState() != KMachineState_Running)
+        return false;
+    if (!checkGuestSession())
+        return false;
+    return true;
+}
+
+void UIFileManagerGuestTable::sltHandleCloseSessionRequest()
+{
+}
+
+
 /*////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////*/
 /*////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////*/

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

@@ -90 +90 @@
     void sltHandleGuestSessionPanelHidden();
     void sltHandleGuestSessionPanelShown();
-
     void sltGuestSessionUnregistered(CGuestSession guestSession);
     void sltGuestSessionRegistered(CGuestSession guestSession);
     void sltGuestSessionStateChanged(const CGuestSessionStateChangedEvent &cEvent);
     void sltCreateGuestSession(QString strUserName, QString strPassword);
+    void sltHandleCloseSessionRequest();
 
 private:
@@ -114 +114 @@
                          CEventSource comEventSource);
     void cleanupGuestListener();
+    void cleanupSessionListener();
 
     void prepareGuestSessionPanel();
@@ -127 +128 @@
 
     void initFileTable();
+    /** Returns false if it is not possible to open a guest session on the machine.
+      * That is if machine is not running, or does not have guest additions etc. */
+    bool isGuestSessionPossible();
 
     CGuest                    m_comGuest;