Changeset 43620 in vbox

Timestamp:

Oct 11, 2012 2:27:12 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: VM group feature UI: Moving some item naming stuff into corresponding place.

Location:

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

Files:

• 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) (6 diffs)
• UIGChooserModel.h (modified) (1 diff)

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

@@ -93 +93 @@
     virtual void updateToolTip() = 0;
     virtual QString name() const = 0;
+    virtual QString fullName() const = 0;
     virtual QString definition() const = 0;
     void setRoot(bool fRoot);

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

@@ -185 +185 @@
 {
     return m_strName;
+}
+
+QString UIGChooserItemGroup::fullName() const
+{
+    /* Return "/" for root-group: */
+    if (!parentItem())
+        return "/";
+    /* Get full parent name, append with '/' if not yet appended: */
+    QString strParentFullName = parentItem()->fullName();
+    if (!strParentFullName.endsWith('/'))
+        strParentFullName.append('/');
+    /* Return full item name based on parent prefix: */
+    return strParentFullName + name();
 }
 

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

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

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

@@ -134 +134 @@
 }
 
+QString UIGChooserItemMachine::fullName() const
+{
+    /* Get full parent name, append with '/' if not yet appended: */
+    QString strParentFullName = parentItem()->fullName();
+    if (!strParentFullName.endsWith('/'))
+        strParentFullName.append('/');
+    /* Return full item name based on parent prefix: */
+    return strParentFullName + name();
+}
+
 QString UIGChooserItemMachine::definition() const
 {

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

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

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

@@ -821 +821 @@
     QString strGroupName;
     if (pGroup)
-        strGroupName = fullName(pGroup);
+        strGroupName = pGroup->fullName();
 
     /* Start the new vm wizard: */
@@ -1712 +1712 @@
 {
     /* Prepare extra-data key for the parent-item: */
-    QString strExtraDataKey = UIDefs::GUI_GroupDefinitions + fullName(pParentItem);
+    QString strExtraDataKey = UIDefs::GUI_GroupDefinitions + pParentItem->fullName();
     /* Read group definitions: */
     QStringList definitions = vboxGlobal().virtualBox().GetExtraDataStringList(strExtraDataKey);
@@ -1783 +1783 @@
 {
     /* Prepare extra-data key for the parent-item: */
-    QString strExtraDataKey = UIDefs::GUI_GroupDefinitions + fullName(pParentItem);
+    QString strExtraDataKey = UIDefs::GUI_GroupDefinitions + pParentItem->fullName();
     /* Read group definitions: */
     QStringList definitions = vboxGlobal().virtualBox().GetExtraDataStringList(strExtraDataKey);
@@ -1881 +1881 @@
         if (UIGChooserItemMachine *pMachineItem = pItem->toMachineItem())
             if (pMachineItem->accessible())
-                groups[pMachineItem->id()] << fullName(pParentGroup);
+                groups[pMachineItem->id()] << pParentGroup->fullName();
     /* Iterate over all the group-items: */
     foreach (UIGChooserItem *pItem, pParentGroup->items(UIGChooserItemType_Group))
@@ -1891 +1891 @@
 {
     /* Prepare extra-data key for current group: */
-    QString strExtraDataKey = UIDefs::GUI_GroupDefinitions + fullName(pParentItem);
+    QString strExtraDataKey = UIDefs::GUI_GroupDefinitions + pParentItem->fullName();
     /* Iterate over all the group-items: */
     foreach (UIGChooserItem *pItem, pParentItem->items(UIGChooserItemType_Group))
@@ -1903 +1903 @@
         groups[strExtraDataKey] << QString("m=%1").arg(pItem->toMachineItem()->id());
 }
-
-QString UIGChooserModel::fullName(UIGChooserItem *pItem)
-{
-    /* Return '/' for root-group: */
-    if (!pItem->parentItem())
-        return QString("/");
-    /* Get full parent name, append with '/' if not yet appended: */
-    QString strParentFullName = fullName(pItem->parentItem());
-    if (!strParentFullName.endsWith("/"))
-        strParentFullName += QString("/");
-    /* Return full item name based on parent prefix: */
-    return strParentFullName + pItem->name();
-}
-
 
 void UIGChooserModel::makeSureGroupDefinitionsSaveIsFinished()

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

@@ -271 +271 @@
     void gatherGroupDefinitions(QMap<QString, QStringList> &groups, UIGChooserItem *pParentGroup);
     void gatherGroupOrders(QMap<QString, QStringList> &groups, UIGChooserItem *pParentItem);
-    QString fullName(UIGChooserItem *pItem);
     void makeSureGroupDefinitionsSaveIsFinished();
     void makeSureGroupOrdersSaveIsFinished();