Changeset 68282 in vbox for trunk/src

Timestamp:

Aug 3, 2017 11:59:34 AM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8900: UISelectorWindow: Make sure no Machine tools opened at startup if no machines exists.

Location:

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

Files:

• UISelectorWindow.cpp (modified) (5 diffs)
• UISelectorWindow.h (modified) (1 diff)

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

@@ -147 +147 @@
 void UISelectorWindow::sltHandlePolishEvent()
 {
-    // WORKAROUND:
-    // By some reason some of X11 DEs unable to update()
-    // tab-bars on startup.  Let's try to _create_ them instead.
-    /* Make sure 'Details' and 'Snapshots' Machine tools ares opened at startup for now: */
-    actionPool()->action(UIActionIndexST_M_Tools_M_Machine_Snapshots)->trigger();
-    actionPool()->action(UIActionIndexST_M_Tools_M_Machine_Details)->trigger();
+    /* Get current item: */
+    UIVMItem *pItem = currentItem();
+
+    /* Make sure there is accessible VM item chosen: */
+    if (pItem && pItem->accessible())
+    {
+        // WORKAROUND:
+        // By some reason some of X11 DEs unable to update()
+        // tab-bars on startup.  Let's try to _create_ them instead.
+        /* Make sure 'Details' and 'Snapshots' Machine tools ares opened at startup for now: */
+        actionPool()->action(UIActionIndexST_M_Tools_M_Machine_Snapshots)->trigger();
+        actionPool()->action(UIActionIndexST_M_Tools_M_Machine_Details)->trigger();
+    }
 }
 
@@ -255 +262 @@
 
 void UISelectorWindow::sltHandleChooserPaneIndexChange(bool fUpdateDetails /* = true */,
-                                                       bool fUpdateTools /* = true */)
+                                                       bool fUpdateSnapshots /* = true */)
 {
     /* Get current item: */
@@ -264 +271 @@
     /* Update action appearance: */
     updateActionsAppearance();
-
-    /* Update Details-pane: */
-    if (   fUpdateDetails
-        && m_pPaneToolsMachine->isToolOpened(ToolTypeMachine_Details))
-        m_pPaneToolsMachine->setItems(currentItems());
 
     /* If current item exists & accessible: */
@@ -284 +286 @@
         }
 
-        /* Refresh Machine Tools-pane if requested: */
-        if (   fUpdateTools
+        /* Update Details-pane (if requested): */
+        if (   fUpdateDetails
+            && m_pPaneToolsMachine->isToolOpened(ToolTypeMachine_Details))
+            m_pPaneToolsMachine->setItems(currentItems());
+        /* Update Snapshots-pane (if requested): */
+        if (   fUpdateSnapshots
             && m_pPaneToolsMachine->isToolOpened(ToolTypeMachine_Snapshots))
             m_pPaneToolsMachine->setMachine(pItem->machine());
@@ -321 +327 @@
         }
 
-        /* Refresh Tools-pane in any case: */
+        /* Update Details-pane (in any case): */
+        if (m_pPaneToolsMachine->isToolOpened(ToolTypeMachine_Details))
+            m_pPaneToolsMachine->setItems(currentItems());
+        /* Update Snapshots-pane (in any case): */
         if (m_pPaneToolsMachine->isToolOpened(ToolTypeMachine_Snapshots))
             m_pPaneToolsMachine->setMachine(CMachine());

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

@@ -91 +91 @@
 
     /** Handles signal about Chooser-pane index change.
-      * @param  fUpdateDetails  Brings whether details should be updated.
-      * @param  fUpdateTools    Brings whether tools should be updated. */
+      * @param  fUpdateDetails    Brings whether details should be updated.
+      * @param  fUpdateSnapshots  Brings whether tools should be updated. */
     void sltHandleChooserPaneIndexChange(bool fUpdateDetails = true,
-                                         bool fUpdateTools = true);
+                                         bool fUpdateSnapshots = true);
 
     /** Handles signal about medium-enumeration finished. */