Changeset 68221 in vbox for trunk/src

Timestamp:

Aug 1, 2017 4:04:00 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8900: Selector UI: Machine Tools: Keep the currently opened tool while switching between machine items; A bit of corresponding API for both Machine and Global tools.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/selector

Files:

• UISelectorWindow.cpp (modified) (1 diff)
• UIToolsPaneGlobal.cpp (modified) (1 diff)
• UIToolsPaneGlobal.h (modified) (1 diff)
• UIToolsPaneMachine.cpp (modified) (1 diff)
• UIToolsPaneMachine.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp

@@ -258 +258 @@
     if (pItem && pItem->accessible())
     {
-        /* Make sure Machine Tools-pane raised: */
-        if (m_pPaneToolsMachine->isToolOpened(ToolTypeMachine_Details))
-            m_pPaneToolsMachine->openTool(ToolTypeMachine_Details);
-        else
-        if (m_pPaneToolsMachine->isToolOpened(ToolTypeMachine_Snapshots))
-            m_pPaneToolsMachine->openTool(ToolTypeMachine_Snapshots);
+        /* If Desktop pane is chosen currently: */
+        if (m_pPaneToolsMachine->currentTool() == ToolTypeMachine_Desktop)
+        {
+            /* Make sure Details or Snapshot pane is chosen if opened: */
+            if (m_pPaneToolsMachine->isToolOpened(ToolTypeMachine_Details))
+                m_pPaneToolsMachine->openTool(ToolTypeMachine_Details);
+            else
+            if (m_pPaneToolsMachine->isToolOpened(ToolTypeMachine_Snapshots))
+                m_pPaneToolsMachine->openTool(ToolTypeMachine_Snapshots);
+        }
 
         /* Refresh Machine Tools-pane if requested: */

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsPaneGlobal.cpp

@@ -52 +52 @@
     /* Cleanup: */
     cleanup();
+}
+
+ToolTypeGlobal UIToolsPaneGlobal::currentTool() const
+{
+    return m_pLayout->currentWidget()->property("ToolType").value<ToolTypeGlobal>();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsPaneGlobal.h

@@ -59 +59 @@
     virtual ~UIToolsPaneGlobal() /* override */;
 
+    /** Returns type of tool currently opened. */
+    ToolTypeGlobal currentTool() const;
     /** Returns whether tool of particular @a enmType is opened. */
     bool isToolOpened(ToolTypeGlobal enmType) const;

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsPaneMachine.cpp

@@ -52 +52 @@
     /* Cleanup: */
     cleanup();
+}
+
+ToolTypeMachine UIToolsPaneMachine::currentTool() const
+{
+    return m_pLayout->currentWidget()->property("ToolType").value<ToolTypeMachine>();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsPaneMachine.h

@@ -70 +70 @@
     virtual ~UIToolsPaneMachine() /* override */;
 
+    /** Returns type of tool currently opened. */
+    ToolTypeMachine currentTool() const;
     /** Returns whether tool of particular @a enmType is opened. */
     bool isToolOpened(ToolTypeMachine enmType) const;