Changeset 74319 in vbox for trunk/src

Timestamp:

Sep 17, 2018 5:35:06 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: VirtualBox Manager todo fix: Disable machine tools for inaccessible VMs.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager

Files:

• UIVirtualBoxManagerWidget.cpp (modified) (3 diffs)
• tools/UITools.cpp (modified) (1 diff)
• tools/UITools.h (modified) (1 diff)
• tools/UIToolsModel.cpp (modified) (3 diffs)
• tools/UIToolsModel.h (modified) (2 diffs)

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

@@ -244 +244 @@
         m_pPaneToolsMachine->setCurrentItem(pItem);
 
-        /// @todo implement!
-        /* Update Machine tab-bar availability: */
-        //m_pToolbarTools->setTabBarEnabledMachine(pItem && pItem->accessible());
+        /* Update Machine Tools availability: */
+        m_pPaneTools->setToolsEnabled(UIToolsClass_Machine, pItem && pItem->accessible());
 
         /* If current item exists & accessible: */
@@ -321 +320 @@
         {
             ToolTypeGlobal enmType = ToolTypeGlobal_Invalid;
-            switch (m_pPaneTools->toolsType())
+            if (!m_pPaneTools->areToolsEnabled(UIToolsClass_Global))
+                enmType = ToolTypeGlobal_Desktop;
+            else
             {
-                case UIToolsType_Media:   enmType = ToolTypeGlobal_VirtualMedia; break;
-                case UIToolsType_Network: enmType = ToolTypeGlobal_HostNetwork; break;
-                default: break;
+                switch (m_pPaneTools->toolsType())
+                {
+                    case UIToolsType_Media:   enmType = ToolTypeGlobal_VirtualMedia; break;
+                    case UIToolsType_Network: enmType = ToolTypeGlobal_HostNetwork; break;
+                    default: break;
+                }
             }
             if (enmType != ToolTypeGlobal_Invalid)
@@ -334 +338 @@
         {
             ToolTypeMachine enmType = ToolTypeMachine_Invalid;
-            switch (m_pPaneTools->toolsType())
+            if (!m_pPaneTools->areToolsEnabled(UIToolsClass_Machine))
+                enmType = ToolTypeMachine_Desktop;
+            else
             {
-                case UIToolsType_Details:   enmType = ToolTypeMachine_Details; break;
-                case UIToolsType_Snapshots: enmType = ToolTypeMachine_Snapshots; break;
-                case UIToolsType_Logs:      enmType = ToolTypeMachine_LogViewer; break;
-                default: break;
+                switch (m_pPaneTools->toolsType())
+                {
+                    case UIToolsType_Details:   enmType = ToolTypeMachine_Details; break;
+                    case UIToolsType_Snapshots: enmType = ToolTypeMachine_Snapshots; break;
+                    case UIToolsType_Logs:      enmType = ToolTypeMachine_LogViewer; break;
+                    default: break;
+                }
             }
             if (enmType != ToolTypeMachine_Invalid)

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools.cpp

@@ -68 +68 @@
 {
     return m_pToolsModel->toolsType();
+}
+
+void UITools::setToolsEnabled(UIToolsClass enmClass, bool fEnabled)
+{
+    m_pToolsModel->setToolsEnabled(enmClass, fEnabled);
+}
+
+bool UITools::areToolsEnabled(UIToolsClass enmClass) const
+{
+    return m_pToolsModel->areToolsEnabled(enmClass);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools.h

@@ -97 +97 @@
         /** Returns current tools type. */
         UIToolsType toolsType() const;
+
+        /** Defines whether certain @a enmClass of tools is @a fEnabled.*/
+        void setToolsEnabled(UIToolsClass enmClass, bool fEnabled);
+        /** Returns whether certain class of tools is enabled.*/
+        bool areToolsEnabled(UIToolsClass enmClass) const;
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsModel.cpp

@@ -138 +138 @@
 }
 
+void UIToolsModel::setToolsEnabled(UIToolsClass enmClass, bool fEnabled)
+{
+    /* Update linked values: */
+    m_statesToolsEnabled[enmClass] = fEnabled;
+    foreach (UIToolsItem *pItem, items())
+        if (pItem->itemClass() == enmClass)
+            pItem->setEnabled(m_statesToolsEnabled.value(enmClass));
+}
+
+bool UIToolsModel::areToolsEnabled(UIToolsClass enmClass) const
+{
+    return m_statesToolsEnabled.value(enmClass);
+}
+
 void UIToolsModel::setCurrentItem(UIToolsItem *pItem)
 {
@@ -328 +342 @@
         return QObject::eventFilter(pWatched, pEvent);
 
+    /* Do not handle disabled items: */
+    if (!currentItem()->isEnabled())
+        return QObject::eventFilter(pWatched, pEvent);
+
     /* Checking event-type: */
     switch (pEvent->type())
@@ -375 +393 @@
 void UIToolsModel::prepareItems()
 {
+    /* Enable all classes of tools initially: */
+    m_statesToolsEnabled[UIToolsClass_Global] = true;
+    m_statesToolsEnabled[UIToolsClass_Machine] = true;
+
     /* Prepare classes: */
     QList<UIToolsClass> classes;

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsModel.h

@@ -103 +103 @@
         /** Returns current tools type. */
         UIToolsType toolsType() const;
+
+        /** Defines whether certain @a enmClass of tools is @a fEnabled.*/
+        void setToolsEnabled(UIToolsClass enmClass, bool fEnabled);
+        /** Returns whether certain class of tools is enabled.*/
+        bool areToolsEnabled(UIToolsClass enmClass) const;
     /** @} */
 
@@ -232 +237 @@
         /** Holds current tools class. */
         UIToolsClass  m_enmCurrentClass;
+
+        /** Holds whether tools of particular class are enabled. */
+        QMap<UIToolsClass, bool>  m_statesToolsEnabled;
     /** @} */