Changeset 43540 in vbox

Timestamp:

Oct 4, 2012 12:56:22 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: VM group feature UI: Current-item handling cleanup (part 3).

Location:

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser

Files:

• UIGChooser.cpp (modified) (1 diff)
• UIGChooserItem.h (modified) (1 diff)
• UIGChooserItemGroup.cpp (modified) (1 diff)
• UIGChooserItemGroup.h (modified) (1 diff)
• UIGChooserItemMachine.cpp (modified) (1 diff)
• UIGChooserItemMachine.h (modified) (1 diff)
• UIGChooserModel.cpp (modified) (5 diffs)
• UIGChooserModel.h (modified) (4 diffs)

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

@@ -149 +149 @@
     /* Prepare model: */
     m_pChooserModel->prepare();
-
-    /* Load last selected item: */
-    m_pChooserModel->setCurrentItemDefinition(vboxGlobal().virtualBox().GetExtraData(GUI_LastItemSelected));
 }
 
 void UIGChooser::save()
 {
-    /* Save last selected item: */
-    vboxGlobal().virtualBox().SetExtraData(GUI_LastItemSelected, m_pChooserModel->currentItemDefinition());
-
     /* Cleanup model: */
     m_pChooserModel->cleanup();

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

@@ -81 +81 @@
     virtual void startEditing() = 0;
     virtual QString name() const = 0;
+    virtual QString definition() const = 0;
     void setRoot(bool fRoot);
     bool isRoot() const;

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

@@ -185 +185 @@
 {
     return m_strName;
+}
+
+QString UIGChooserItemGroup::definition() const
+{
+    return QString("g=%1").arg(name());
 }
 

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

@@ -68 +68 @@
     /* API: Basic stuff: */
     QString name() const;
+    QString definition() const;
     void setName(const QString &strName);
     bool closed() const;

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

@@ -134 +134 @@
 }
 
+QString UIGChooserItemMachine::definition() const
+{
+    return QString("m=%1").arg(name());
+}
+
 bool UIGChooserItemMachine::isLockedMachine() const
 {

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

@@ -51 +51 @@
     /* API: Basic stuff: */
     QString name() const;
+    QString definition() const;
     bool isLockedMachine() const;
 

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

@@ -192 +192 @@
 }
 
-QString UIGChooserModel::currentItemDefinition() const
-{
-    /* Determine item type: */
-    QString strItemType;
-    QString strItemName;
-
-    /* Get first selected item: */
-    UIGChooserItem *pSelectedItem = currentItem();
-    /* Item exists? */
-    if (pSelectedItem)
-    {
-        /* Update item type: */
-        if (pSelectedItem->type() == UIGChooserItemType_Group)
-            strItemType = "g";
-        else if (pSelectedItem->type() == UIGChooserItemType_Machine)
-            strItemType = "m";
-
-        /* Update item name: */
-        strItemName = pSelectedItem->name();
-    }
-
-    /* Return result: */
-    return pSelectedItem ? strItemType + "=" + strItemName : QString();
-}
-
 QList<UIVMItem*> UIGChooserModel::currentMachineItems() const
 {
@@ -260 +235 @@
 }
 
-void UIGChooserModel::setCurrentItemDefinition(const QString &strDefinition)
-{
-    /* Make sure something was passed: */
+void UIGChooserModel::setCurrentItem(const QString &strDefinition)
+{
+    /* Ignore if empty definition passed: */
     if (strDefinition.isEmpty())
-    {
-        if (mainRoot()->hasItems())
-            setCurrentItem(0);
-        else
-            unsetCurrentItem();
         return;
-    }
-
-    /* Parse definitions: */
+
+    /* Parse definition: */
+    UIGChooserItem *pItem = 0;
     QString strItemType = strDefinition.section('=', 0, 0);
-    QString strItemName = strDefinition.section('=', 1, -1);
-    UIGChooserItem *pItem = 0;
-
-    /* Its group item? */
+    QString strItemDescriptor = strDefinition.section('=', 1, -1);
+    /* Its a group-item definition? */
     if (strItemType == "g")
     {
-        /* Make sure group item with passed id exists: */
-        pItem = findGroupItem(strItemName, mainRoot());
-    }
-    /* Its machine item? */
+        /* Search for group-item with passed descriptor (name): */
+        pItem = findGroupItem(strItemDescriptor, mainRoot());
+    }
+    /* Its a machine-item definition? */
     else if (strItemType == "m")
     {
-        /* Make sure machine with passed name registered: */
-        CMachine machine = vboxGlobal().virtualBox().FindMachine(strItemName);
+        /* Check if machine-item with passed descriptor (name or id) registered: */
+        CMachine machine = vboxGlobal().virtualBox().FindMachine(strItemDescriptor);
         if (!machine.isNull())
         {
-            /* Make sure machine item with passed id exists: */
+            /* Search for machine-item with required name: */
             pItem = findMachineItem(machine.GetName(), mainRoot());
         }
     }
 
-    /* Found nothing? */
-    if (!pItem)
-    {
-        setCurrentItem(0);
-        return;
-    }
-
-    /* Select desired item: */
-    if (navigationList().contains(pItem))
+    /* Some item found? */
+    if (pItem)
+    {
+        /* This item should be in navigation list: */
+        AssertMsg(navigationList().contains(pItem),
+                  ("Passed item is NOT in navigation list!"));
+        /* Make this item current: */
         setCurrentItem(pItem);
-    else
-        setCurrentItem(0);
+    }
 }
 
@@ -345 +310 @@
     /* Notify listeners about selection change: */
     emit sigSelectionChanged();
-}
-
-void UIGChooserModel::activate()
-{
-    gActionPool->action(UIActionIndexSelector_State_Common_StartOrShow)->activate(QAction::Trigger);
 }
 
@@ -553 +513 @@
 {
     updateGroupTree(mainRoot());
+}
+
+void UIGChooserModel::activate()
+{
+    gActionPool->action(UIActionIndexSelector_State_Common_StartOrShow)->activate(QAction::Trigger);
 }
 
@@ -1235 +1200 @@
     updateNavigation();
     updateLayout();
-    if (mainRoot()->hasItems())
+
+    /* Load last selected item (choose first if unable to load): */
+    setCurrentItem(vboxGlobal().virtualBox().GetExtraData(GUI_LastItemSelected));
+    if (!currentItem() && !navigationList().isEmpty())
         setCurrentItem(0);
-    else
-        unsetCurrentItem();
 }
 
 void UIGChooserModel::cleanupGroupTree()
 {
+    /* Save last selected item: */
+    vboxGlobal().virtualBox().SetExtraData(GUI_LastItemSelected,
+                                           currentItem() ? currentItem()->definition() : QString());
+
     /* Currently we are not saving group descriptors
      * (which reflecting group toggle-state) on-the-fly

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

@@ -111 +111 @@
     /* API: Current-item stuff: */
     UIVMItem* currentMachineItem() const;
-    QString currentItemDefinition() const;
     QList<UIVMItem*> currentMachineItems() const;
     UIGChooserItem* currentItem() const;
@@ -117 +116 @@
     void setCurrentItem(int iItemIndex);
     void setCurrentItem(UIGChooserItem *pItem);
-    void setCurrentItemDefinition(const QString &strDefinition);
+    void setCurrentItem(const QString &strDefinition);
     void unsetCurrentItem();
     void addToCurrentItems(UIGChooserItem *pItem);
@@ -123 +122 @@
     void clearSelectionList();
     void notifyCurrentItemChanged();
-    void activate();
     bool isSingleGroupSelected() const;
     bool isAllItemsOfOneGroupSelected() const;
@@ -142 +140 @@
     void startEditing();
     void updateGroupTree();
+
+    /* API: Machine-item stuff: */
+    void activate();
 
     /* API: Drag&drop stuff: */