Changeset 43155 in vbox

Timestamp:

Sep 3, 2012 8:54:57 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: VM selector UI: Implement refresh-VM functionality.

Location:

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

Files:

• UISelectorWindow.cpp (modified) (2 diffs)
• UISelectorWindow.h (modified) (1 diff)
• graphics/chooser/UIGChooserModel.cpp (modified) (3 diffs)
• graphics/chooser/UIGChooserModel.h (modified) (2 diffs)

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

@@ -707 +707 @@
 }
 
-void UISelectorWindow::sltPerformRefreshAction()
-{
-    /* Get selected items: */
-    QList<UIVMItem*> items = currentItems();
-    AssertMsgReturnVoid(!items.isEmpty(), ("At least one item should be selected!\n"));
-
-    // TODO: Notify selector-model to refresh selected items!
-
-    /* Refresh details: */
-    sltCurrentVMItemChanged();
-}
-
 void UISelectorWindow::sltShowLogDialog()
 {
@@ -1405 +1393 @@
     connect(m_pAction_Common_Reset, SIGNAL(triggered()), this, SLOT(sltPerformResetAction()));
     connect(m_pAction_Common_Discard, SIGNAL(triggered()), this, SLOT(sltPerformDiscardAction()));
-    connect(m_pAction_Common_Refresh, SIGNAL(triggered()), this, SLOT(sltPerformRefreshAction()));
     connect(m_pAction_Common_ShowInFileManager, SIGNAL(triggered()), this, SLOT(sltShowMachineInFileManager()));
     connect(m_pAction_Common_CreateShortcut, SIGNAL(triggered()), this, SLOT(sltPerformCreateShortcutAction()));

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

@@ -96 +96 @@
     void sltPerformACPIShutdownAction();
     void sltPerformPowerOffAction();
-    void sltPerformRefreshAction();
     void sltShowLogDialog();
     void sltShowMachineInFileManager();

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

@@ -964 +964 @@
 }
 
+void UIGChooserModel::sltPerformRefreshAction()
+{
+    /* Gather list of chosen inaccessible VMs: */
+    QList<UIGChooserItem*> inaccessibleItems;
+    enumerateInaccessibleItems(selectionList(), inaccessibleItems);
+
+    /* For each inaccessible item: */
+    UIGChooserItem *pSelectedItem = 0;
+    foreach (UIGChooserItem *pItem, inaccessibleItems)
+        if (UIGChooserItemMachine *pMachineItem = pItem->toMachineItem())
+        {
+            /* Recache: */
+            pMachineItem->recache();
+            /* Become accessible? */
+            if (pMachineItem->accessible())
+            {
+                /* Machine name: */
+                QString strMachineName = pMachineItem->name();
+                /* We should reload this machine: */
+                sltReloadMachine(pMachineItem->id());
+                /* Select first of reloaded items: */
+                if (!pSelectedItem)
+                    pSelectedItem = findMachineItem(strMachineName, mainRoot());
+            }
+        }
+    /* Some item to be selected? */
+    if (pSelectedItem)
+    {
+        pSelectedItem->makeSureItsVisible();
+        setCurrentItem(pSelectedItem);
+    }
+}
+
 void UIGChooserModel::sltSortParentGroup()
 {
@@ -1110 +1143 @@
     connect(gActionPool->action(UIActionIndexSelector_Simple_Machine_AddGroup), SIGNAL(triggered()),
             this, SLOT(sltAddGroupBasedOnChosenItems()));
+    connect(gActionPool->action(UIActionIndexSelector_Simple_Common_Refresh), SIGNAL(triggered()),
+            this, SLOT(sltPerformRefreshAction()));
     connect(gActionPool->action(UIActionIndexSelector_Simple_Machine_SortParent), SIGNAL(triggered()),
             this, SLOT(sltSortParentGroup()));
@@ -1923 +1958 @@
 }
 
+void UIGChooserModel::enumerateInaccessibleItems(const QList<UIGChooserItem*> &il, QList<UIGChooserItem*> &ol) const
+{
+    /* Enumerate all the passed items: */
+    foreach (UIGChooserItem *pItem, il)
+    {
+        /* If item is inaccessible machine: */
+        if (pItem->type() == UIGChooserItemType_Machine)
+        {
+            if (UIGChooserItemMachine *pMachineItem = pItem->toMachineItem())
+                if (!pMachineItem->accessible() && !contains(ol, pItem))
+                    ol << pMachineItem;
+        }
+        /* If item is group: */
+        else if (pItem->type() == UIGChooserItemType_Group)
+        {
+            /* Enumerate all the machine items recursively: */
+            enumerateInaccessibleItems(pItem->items(UIGChooserItemType_Machine), ol);
+            /* Enumerate all the group items recursively: */
+            enumerateInaccessibleItems(pItem->items(UIGChooserItemType_Group), ol);
+        }
+    }
+}
+
+bool UIGChooserModel::contains(const QList<UIGChooserItem*> &il, UIGChooserItem *pLookupItem) const
+{
+    /* We assume passed list contains only machine items: */
+    foreach (UIGChooserItem *pItem, il)
+        if (UIGChooserItemMachine *pMachineItem = pItem->toMachineItem())
+            if (pMachineItem->id() == pLookupItem->toMachineItem()->id())
+                return true;
+    return false;
+}
+
 void UIGChooserModel::sortItems(UIGChooserItem *pParent, bool fRecursively /* = false */)
 {

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

@@ -206 +206 @@
     void sltSlidingComplete();
 
+    /* Handler: Refresh stuff: */
+    void sltPerformRefreshAction();
+
     /* Handlers: Sorting stuff: */
     void sltSortParentGroup();
@@ -304 +307 @@
     void removeMachineItems(const QStringList &names, QList<UIGChooserItem*> &selectedItems);
     void unregisterMachines(const QStringList &ids);
+
+    /* Helper: Refresh stuff: */
+    void enumerateInaccessibleItems(const QList<UIGChooserItem*> &il, QList<UIGChooserItem*> &ol) const;
+    bool contains(const QList<UIGChooserItem*> &il, UIGChooserItem *pLookupItem) const;
 
     /* Helper: Sorting stuff: */