Changeset 57039 in vbox

Timestamp:

Jul 21, 2015 10:18:10 AM (10 years ago)

Author:

vboxsync

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

101757

Message:

FE/Qt: 7916: Updating Hightlight of new VM only when created from GUI

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• selector/graphics/chooser/UIGChooserModel.cpp (modified) (2 diffs)
• selector/graphics/chooser/UIGChooserModel.h (modified) (1 diff)
• wizards/newvm/UIWizardNewVM.cpp (modified) (2 diffs)
• wizards/newvm/UIWizardNewVM.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp

@@ -667 +667 @@
             updateNavigation();
             updateLayout();
-            setCurrentItem(mainRoot()->searchForItem(machine.GetName(),
-                                                     UIGChooserItemSearchFlag_Machine |
-                                                     UIGChooserItemSearchFlag_ExactName));
+            /* Change current-item only if VM was created from the GUI side: */
+            if (strId == m_strLastCreatedMachineId)
+            {
+                setCurrentItem(mainRoot()->searchForItem(machine.GetName(),
+                                                         UIGChooserItemSearchFlag_Machine |
+                                                         UIGChooserItemSearchFlag_ExactName));
+            }
         }
     }
@@ -878 +882 @@
         strGroupName = pGroup->fullName();
 
-    /* Start the new vm wizard: */
-    UISafePointerWizard pWizard = new UIWizardNewVM(&vboxGlobal().selectorWnd(), strGroupName);
+    /* Prepare the new VM wizard: */
+    UISafePointerWizardNewVM pWizard = new UIWizardNewVM(&vboxGlobal().selectorWnd(), strGroupName);
     pWizard->prepare();
-    pWizard->exec();
+
+    /* Execute wizard and store created VM Id
+     * on success for current-item handling: */
+    if (pWizard->exec() == QDialog::Accepted)
+        m_strLastCreatedMachineId = pWizard->createdMachineId();
+
     if (pWizard)
         delete pWizard;

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.h

@@ -306 +306 @@
     QTimer *m_pLookupTimer;
     QString m_strLookupString;
+
+    /** Holds the Id of last VM created from the GUI side. */
+    QString m_strLastCreatedMachineId;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp

@@ -62 +62 @@
 }
 
+void UIWizardNewVM::prepare()
+{
+    /* Create corresponding pages: */
+    switch (mode())
+    {
+        case WizardMode_Basic:
+        {
+            setPage(Page1, new UIWizardNewVMPageBasic1(m_strGroup));
+            setPage(Page2, new UIWizardNewVMPageBasic2);
+            setPage(Page3, new UIWizardNewVMPageBasic3);
+            break;
+        }
+        case WizardMode_Expert:
+        {
+            setPage(PageExpert, new UIWizardNewVMPageExpert(m_strGroup));
+            break;
+        }
+        default:
+        {
+            AssertMsgFailed(("Invalid mode: %d", mode()));
+            break;
+        }
+    }
+    /* Call to base-class: */
+    UIWizard::prepare();
+}
+
 bool UIWizardNewVM::createVM()
 {
@@ -295 +322 @@
 }
 
-void UIWizardNewVM::prepare()
-{
-    /* Create corresponding pages: */
-    switch (mode())
-    {
-        case WizardMode_Basic:
-        {
-            setPage(Page1, new UIWizardNewVMPageBasic1(m_strGroup));
-            setPage(Page2, new UIWizardNewVMPageBasic2);
-            setPage(Page3, new UIWizardNewVMPageBasic3);
-            break;
-        }
-        case WizardMode_Expert:
-        {
-            setPage(PageExpert, new UIWizardNewVMPageExpert(m_strGroup));
-            break;
-        }
-        default:
-        {
-            AssertMsgFailed(("Invalid mode: %d", mode()));
-            break;
-        }
-    }
-    /* Call to base-class: */
-    UIWizard::prepare();
-}
-
 QString UIWizardNewVM::getNextControllerName(KStorageBus type)
 {

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.h

@@ -50 +50 @@
     UIWizardNewVM(QWidget *pParent, const QString &strGroup = QString());
 
+    /** Prepare routine. */
+    void prepare();
+
+    /** Returns the Id of newly created VM. */
+    QString createdMachineId() const { return m_machine.GetId(); }
+
 protected:
 
@@ -63 +69 @@
     /* Translation stuff: */
     void retranslateUi();
-
-    /* Pages related stuff: */
-    void prepare();
 
     /* Helping stuff: */
@@ -81 +84 @@
 };
 
+typedef QPointer<UIWizardNewVM> UISafePointerWizardNewVM;
+
 #endif // __UIWizardNewVM_h__