Changeset 71195 in vbox for trunk/src/VBox

Timestamp:

Mar 5, 2018 10:37:56 AM (7 years ago)

Author:

vboxsync

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

121100

Message:

FE/Qt bugref:6699 Disable/enable file table widgets according to the guest session state

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/guestctrl

Files:

• UIGuestControlFileManager.cpp (modified) (7 diffs)
• UIGuestControlFileManager.h (modified) (1 diff)
• UIGuestControlInterface.cpp (modified) (2 diffs)
• UIGuestControlInterface.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/guestctrl/UIGuestControlFileManager.cpp

@@ -308 +308 @@
             containerLayout->setContentsMargins(0, 0, 0, 0);
             m_pGuestFileTable = new UIGuestFileTable;
+            m_pGuestFileTable->setEnabled(false);
             if (m_pGuestFileTable)
                 containerLayout->addWidget(m_pGuestFileTable);
@@ -315 +316 @@
             {
                 m_pToolBar->setOrientation(Qt::Vertical);
+                m_pToolBar->setEnabled(false);
 
                 /* Add to dummy QWidget to toolbar to center the action icons vertically: */
@@ -324 +326 @@
                 bottomSpacerWidget->setVisible(true);
 
-
-
                 m_pCopyGuestToHost = new QAction(this);
                 m_pCopyGuestToHost->setIcon(UIIconPool::iconSet(QString(":/arrow_right_10px_x2.png")));
@@ -384 +384 @@
     if (guestSession == m_comGuestSession && m_comGuestSession.isOk())
         m_comGuestSession.detach();
-    if (m_pSessionCreateWidget)
-        m_pSessionCreateWidget->switchSessionCreateMode();
+    postSessionClosed();
 }
 
 void UIGuestControlFileManager::sltCreateSession(QString strUserName, QString strPassword)
 {
+    if (!UIGuestControlInterface::isGuestAdditionsAvailable(m_comGuest))
+    {
+        if (m_pLogOutput)
+        {
+            m_pLogOutput->appendPlainText("Could not find Guest Additions");
+            return;
+        }
+    }
     if (strUserName.isEmpty())
     {
-        m_pLogOutput->appendPlainText("No user name is given");
+        if (m_pLogOutput)
+            m_pLogOutput->appendPlainText("No user name is given");
         return;
     }
@@ -413 +421 @@
     m_comGuestSession.Close();
     m_pLogOutput->appendPlainText("Guest session is closed");
-    if (m_pSessionCreateWidget)
-        m_pSessionCreateWidget->switchSessionCreateMode();
+    postSessionClosed();
 }
 
@@ -430 +437 @@
     {
         initFileTable();
+        postSessionCreated();
     }
     else
@@ -446 +454 @@
 }
 
+void UIGuestControlFileManager::postSessionCreated()
+{
+    if (m_pSessionCreateWidget)
+        m_pSessionCreateWidget->switchSessionCloseMode();
+    if(m_pGuestFileTable)
+        m_pGuestFileTable->setEnabled(true);
+    if(m_pToolBar)
+        m_pToolBar->setEnabled(true);
+}
+
+void UIGuestControlFileManager::postSessionClosed()
+{
+    if (m_pSessionCreateWidget)
+        m_pSessionCreateWidget->switchSessionCreateMode();
+    if(m_pGuestFileTable)
+        m_pGuestFileTable->setEnabled(false);
+    if(m_pToolBar)
+        m_pToolBar->setEnabled(false);
+
+}
 
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/guestctrl/UIGuestControlFileManager.h

@@ -82 +82 @@
 
     void initFileTable();
+    void postSessionCreated();
+    void postSessionClosed();
 
     template<typename T>
     QStringList   getFsObjInfoStringList(const T &fsObjectInfo) const;
-
-
 
     const int         m_iMaxRecursionDepth;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/guestctrl/UIGuestControlInterface.cpp

@@ -551 +551 @@
 void UIGuestControlInterface::putCommand(const QString &strCommand)
 {
-    if (!isGuestAdditionsAvaible(m_comGuest))
+    if (!isGuestAdditionsAvailable(m_comGuest))
     {
         emit sigOutputString("No guest addtions detected. Guest control needs guest additions");
@@ -664 +664 @@
 }
 
-bool UIGuestControlInterface::isGuestAdditionsAvaible(CGuest &guest)
+bool UIGuestControlInterface::isGuestAdditionsAvailable(const CGuest &guest)
 {
     if (!guest.isOk())
         return false;
-    return guest.GetAdditionsStatus(guest.GetAdditionsRunLevel());
-
+    CGuest guestNonConst = const_cast<CGuest&>(guest);
+    return guestNonConst.GetAdditionsStatus(guestNonConst.GetAdditionsRunLevel());
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/guestctrl/UIGuestControlInterface.h

@@ -54 +54 @@
         /** Pass a non-const ref since for some reason CGuest::GetAdditionsStatus
             is non-const?! */
-       static bool    isGuestAdditionsAvaible(CGuest &guest);
+       static bool    isGuestAdditionsAvailable(const CGuest &guest);
        static QString getFsObjTypeString(KFsObjType type);
     /** @} */