Changeset 74320 in vbox for trunk/src

Timestamp:

Sep 17, 2018 5:45:41 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: VirtualBox Manager: Don't use actions to switch tools, do it directly; sync global <-> machine tools switch with actual tool loading, don't do these steps simultaneously.

Location:

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

Files:

• UIVirtualBoxManager.cpp (modified) (2 diffs)
• UIVirtualBoxManagerWidget.cpp (modified) (5 diffs)

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

@@ -2144 +2144 @@
     actionPool()->action(UIActionIndexST_M_Machine_T_Pause)->retranslateUi();
     actionPool()->action(UIActionIndexST_M_Machine_T_Pause)->blockSignals(false);
-
-    /* Enable/disable tools actions: */
-    actionPool()->action(UIActionIndexST_M_Tools_M_Machine)->setEnabled(isActionEnabled(UIActionIndexST_M_Tools_M_Machine, items));
-    actionPool()->action(UIActionIndexST_M_Tools_M_Machine_S_Details)->setEnabled(isActionEnabled(UIActionIndexST_M_Tools_M_Machine_S_Details, items));
-    actionPool()->action(UIActionIndexST_M_Tools_M_Machine_S_Snapshots)->setEnabled(isActionEnabled(UIActionIndexST_M_Tools_M_Machine_S_Snapshots, items));
-    actionPool()->action(UIActionIndexST_M_Tools_M_Machine_S_LogViewer)->setEnabled(isActionEnabled(UIActionIndexST_M_Tools_M_Machine_S_LogViewer, items));
 }
 
@@ -2276 +2270 @@
         {
             return isActionEnabled(UIActionIndexST_M_Machine_M_Close, items);
-        }
-        case UIActionIndexST_M_Tools_M_Machine:
-        case UIActionIndexST_M_Tools_M_Machine_S_Details:
-        case UIActionIndexST_M_Tools_M_Machine_S_Snapshots:
-        case UIActionIndexST_M_Tools_M_Machine_S_LogViewer:
-        {
-            return pItem->accessible();
         }
         default:

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

@@ -219 +219 @@
         && m_pStackedWidget->currentWidget() != m_pPaneToolsGlobal)
     {
+        /* Just start animation and return, do nothing else.. */
         m_pStackedWidget->setCurrentWidget(m_pPaneToolsGlobal); // rendering w/a
         m_pStackedWidget->setCurrentWidget(m_pSlidingAnimation);
         m_pSlidingAnimation->animate(SlidingDirection_Reverse);
+        return;
     }
 
@@ -228 +230 @@
     /* If machine or group item is selected and we are on global tools pane => switch to machine tools pane: */
     if (   (isMachineItemSelected() || isGroupItemSelected())
-        && m_pStackedWidget->currentWidget() != m_pPaneToolsMachine)
-    {
+             && m_pStackedWidget->currentWidget() != m_pPaneToolsMachine)
+    {
+        /* Just start animation and return, do nothing else.. */
         m_pStackedWidget->setCurrentWidget(m_pPaneToolsMachine); // rendering w/a
         m_pStackedWidget->setCurrentWidget(m_pSlidingAnimation);
         m_pSlidingAnimation->animate(SlidingDirection_Forward);
+        return;
     }
 
@@ -255 +259 @@
                 /* Make sure Details or Snapshot pane is chosen if opened: */
                 if (m_pPaneToolsMachine->isToolOpened(ToolTypeMachine_Details))
-                    actionPool()->action(UIActionIndexST_M_Tools_M_Machine_S_Details)->trigger();
+                    switchToTool(ToolTypeMachine_Details);
                 else
                 if (m_pPaneToolsMachine->isToolOpened(ToolTypeMachine_Snapshots))
-                    actionPool()->action(UIActionIndexST_M_Tools_M_Machine_S_Snapshots)->trigger();
+                    switchToTool(ToolTypeMachine_Snapshots);
                 else
                 if (m_pPaneToolsMachine->isToolOpened(ToolTypeMachine_LogViewer))
-                    actionPool()->action(UIActionIndexST_M_Tools_M_Machine_S_LogViewer)->trigger();
+                    switchToTool(ToolTypeMachine_LogViewer);
             }
 
@@ -296 +300 @@
 void UIVirtualBoxManagerWidget::sltHandleSlidingAnimationComplete(SlidingDirection enmDirection)
 {
+    /* First switch the panes: */
     switch (enmDirection)
     {
@@ -311 +316 @@
         }
     }
+    /* Then handle current item change (again!): */
+    sltHandleChooserPaneIndexChangeDefault();
 }