Changeset 43819 in vbox for trunk/src/VBox/Frontends

Timestamp:

Nov 7, 2012 7:20:34 AM (12 years ago)

Author:

vboxsync

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

81884

Message:

FE/Qt: VM group UI: Group-item cleanup.

Location:

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

Files:

• UIGChooserItemGroup.cpp (modified) (26 diffs)
• UIGChooserItemGroup.h (modified) (1 diff)

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

@@ -48 +48 @@
 
     /* Add item to the scene: */
-    if (pScene)
-        pScene->addItem(this);
+    AssertMsg(pScene, ("Incorrect scene passed!"));
+    pScene->addItem(this);
 
     /* Translate finally: */
@@ -70 +70 @@
 
     /* Add item to the scene: */
-    if (pScene)
-        pScene->addItem(this);
+    AssertMsg(pScene, ("Incorrect scene passed!"));
+    pScene->addItem(this);
 
     /* Copy content to 'this': */
@@ -177 +177 @@
         return "/";
     /* Get full parent name, append with '/' if not yet appended: */
-    QString strParentFullName = parentItem()->fullName();
-    if (!strParentFullName.endsWith('/'))
-        strParentFullName.append('/');
+    QString strFullParentName = parentItem()->fullName();
+    if (!strFullParentName.endsWith('/'))
+        strFullParentName.append('/');
     /* Return full item name based on parent prefix: */
-    return strParentFullName + name();
+    return strFullParentName + name();
 }
 
@@ -191 +191 @@
 void UIGChooserItemGroup::setName(const QString &strName)
 {
+    /* Something changed? */
+    if (m_strName == strName)
+        return;
+
+    /* Remember new name: */
     m_strName = strName;
+
+    /* Update visible name: */
+    recacheVisibleName();
+    /* Update minimum header size: */
+    recacheHeaderSize();
 }
 
@@ -207 +217 @@
 {
     AssertMsg(parentItem(), ("Can't close root-item!"));
-    m_pToggleButton->setToggled(false ,fAnimated);
+    m_pToggleButton->setToggled(false, fAnimated);
 }
 
@@ -216 +226 @@
 }
 
-bool UIGChooserItemGroup::contains(const QString &strId) const
-{
-    /* Check machine items: */
+bool UIGChooserItemGroup::isContainsMachine(const QString &strId) const
+{
+    /* Check each machine-item: */
     foreach (UIGChooserItem *pItem, m_machineItems)
         if (pItem->toMachineItem()->id() == strId)
@@ -227 +237 @@
 bool UIGChooserItemGroup::isContainsLockedMachine()
 {
-    /* For each machine-item: */
+    /* Check each machine-item: */
     foreach (UIGChooserItem *pItem, items(UIGChooserItemType_Machine))
         if (pItem->toMachineItem()->isLockedMachine())
             return true;
-    /* For each group-item: */
+    /* Check each group-item: */
     foreach (UIGChooserItem *pItem, items(UIGChooserItemType_Group))
         if (pItem->toGroupItem()->isContainsLockedMachine())
@@ -240 +250 @@
 void UIGChooserItemGroup::sltHandleGeometryChange()
 {
-    /* Which is new geometry? */
+    /* What is the new geometry? */
     QRectF newGeometry = geometry();
 
@@ -247 +257 @@
         recacheVisibleName();
 
-    /* Remember new geometry: */
+    /* Remember the new geometry: */
     m_previousGeometry = newGeometry;
 }
@@ -264 +274 @@
     foreach (UIGChooserItem *pItem, parentItem()->items(UIGChooserItemType_Group))
         groupNames << pItem->name();
-
     /* If proposed name is empty or not unique, reject it: */
     QString strNewName = m_pNameEditorWidget->text().trimmed();
@@ -274 +283 @@
     strNewName.replace(QRegExp("[\\\\/:*?\"<>]"), "_");
 
-    /* Set new name / update model: */
-    m_strName = strNewName;
-    recacheVisibleName();
-    recacheHeaderSize();
+    /* Set new name, save settings: */
+    setName(strNewName);
     model()->saveGroupSettings();
 }
@@ -298 +305 @@
     {
         /* Toggle-state and navigation will be
-         * updated on toggle finish signal! */
+         * updated on toggle-finish signal! */
     }
     /* Group opened, we are closing it: */
@@ -334 +341 @@
 void UIGChooserItemGroup::sltIndentRoot()
 {
+    /* Unhover before indenting: */
     setHovered(false);
+
+    /* Indent to this root: */
     model()->indentRoot(this);
 }
@@ -340 +350 @@
 void UIGChooserItemGroup::sltUnindentRoot()
 {
+    /* Unhover before unindenting: */
     setHovered(false);
+
+    /* Unindent to previous root: */
     model()->unindentRoot();
 }
@@ -396 +409 @@
     m_machinesPixmap = QPixmap(":/machine_16px.png");
 
-    /* Geometry change handler: */
+    /* Geometry-change handler: */
     connect(this, SIGNAL(geometryChanged()), this, SLOT(sltHandleGeometryChange()));
 
-    /* Non root item only: */
+    /* Items except roots: */
     if (!isRoot())
     {
@@ -414 +427 @@
 
         /* Setup name-editor: */
-        m_pNameEditorWidget = new UIGroupRenameEditor(m_strName, this);
+        m_pNameEditorWidget = new UIGroupRenameEditor(name(), this);
         m_pNameEditorWidget->setFont(m_nameFont);
         connect(m_pNameEditorWidget, SIGNAL(sigEditingFinished()), this, SLOT(sltNameEditingFinished()));
@@ -421 +434 @@
         m_pNameEditor->hide();
     }
-    /* Root item but non main: */
+    /* Items except main root: */
     if (!isMainRoot())
     {
@@ -437 +450 @@
 void UIGChooserItemGroup::copyContent(UIGChooserItemGroup *pFrom, UIGChooserItemGroup *pTo)
 {
-    /* Copy group items: */
+    /* Copy group-items: */
     foreach (UIGChooserItem *pGroupItem, pFrom->items(UIGChooserItemType_Group))
         new UIGChooserItemGroup(pTo, pGroupItem->toGroupItem());
-    /* Copy machine items: */
+    /* Copy machine-items: */
     foreach (UIGChooserItem *pMachineItem, pFrom->items(UIGChooserItemType_Machine))
         new UIGChooserItemMachine(pTo, pMachineItem->toMachineItem());
@@ -449 +462 @@
     /* Update visible name: */
     recacheVisibleName();
-
     /* Update minimum header size: */
     recacheHeaderSize();
@@ -456 +468 @@
 void UIGChooserItemGroup::recacheVisibleName()
 {
+    /* Not for main root: */
+    if (isMainRoot())
+        return;
+
     /* Prepare variables: */
     int iHorizontalMargin = data(GroupItemData_HorizonalMargin).toInt();
@@ -468 +484 @@
     int iMaximumWidth = geometry().width();
 
-    /* Calculate name width: */
-    iMaximumWidth -= 2 * iHorizontalMargin;
+    /* Left margin: */
+    iMaximumWidth -= iHorizontalMargin;
+    /* Button width: */
     if (isRoot())
-    {
-        iMaximumWidth -= (iExitButtonWidth + iMajorSpacing);
-    }
+        iMaximumWidth -= iExitButtonWidth;
     else
-    {
-        iMaximumWidth -= (iToggleButtonWidth + iMajorSpacing);
-        if (isHovered())
-            iMaximumWidth -= iEnterButtonWidth;
-    }
+        iMaximumWidth -= iToggleButtonWidth;
+    /* Spacing between button and name: */
+    iMaximumWidth -= iMajorSpacing;
     if (isHovered())
     {
+        /* Spacing between name and info: */
         iMaximumWidth -= iMajorSpacing;
-        if (iGroupCountTextWidth != 0)
+        /* Group info width: */
+        if (!m_groupItems.isEmpty())
             iMaximumWidth -= (iGroupPixmapWidth + iGroupCountTextWidth);
-        if (iMachineCountTextWidth != 0)
+        /* Machine info width: */
+        if (!m_machineItems.isEmpty())
             iMaximumWidth -= (iMachinePixmapWidth + iMachineCountTextWidth);
     }
-
-    /* Recache name: */
-    m_strVisibleName = compressText(m_nameFont, model()->paintDevice(), m_strName, iMaximumWidth);
+    /* Button width: */
+    if (!isRoot() && isHovered())
+        iMaximumWidth -= iEnterButtonWidth;
+    /* Right margin: */
+    iMaximumWidth -= iHorizontalMargin;
+
+    /* Recache visible name: */
+    m_strVisibleName = compressText(m_nameFont, model()->paintDevice(), name(), iMaximumWidth);
+
+    /* Repaint item: */
     update();
 }
@@ -514 +537 @@
     QFontMetrics fm(m_nameFont, pPaintDevice);
     int iMaximumNameWidth = textWidth(m_nameFont, pPaintDevice, 20);
-    QString strCompressedName = compressText(m_nameFont, pPaintDevice, m_strName, iMaximumNameWidth);
+    QString strCompressedName = compressText(m_nameFont, pPaintDevice, name(), iMaximumNameWidth);
     int iMinimumNameWidth = fm.width(strCompressedName);
     int iMinimumNameHeight = fm.height();
@@ -533 +556 @@
     /* Group info width: */
     if (!m_groupItems.isEmpty())
-        iHeaderWidth += groupPixmapSize.width() +
-                        groupCountTextSize.width();
+        iHeaderWidth += (groupPixmapSize.width() + groupCountTextSize.width());
     /* Machine info width: */
     if (!m_machineItems.isEmpty())
-        iHeaderWidth += machinePixmapSize.width() +
-                        machineCountTextSize.width();
+        iHeaderWidth += (machinePixmapSize.width() + machineCountTextSize.width());
     /* Button width: */
     if (!isRoot())
@@ -552 +573 @@
     heights /* Minimum name height: */
             << iMinimumNameHeight
-            /* Group info height: */
+            /* Group info heights: */
             << groupPixmapSize.height() << groupCountTextSize.height()
-            /* Machine info height: */
+            /* Machine info heights: */
             << machinePixmapSize.height() << machineCountTextSize.height();
     /* Button height: */
@@ -611 +632 @@
     /* Unlock name-editor: */
     m_pNameEditor->show();
-    m_pNameEditorWidget->setText(m_strName);
+    m_pNameEditorWidget->setText(name());
     m_pNameEditorWidget->setFocus();
 }
@@ -1169 +1190 @@
             {
                 /* Make sure passed item is ours or there is no other item with such id: */
-                return m_machineItems.contains(pItem) || !contains(pItem->toMachineItem()->id());
+                return m_machineItems.contains(pItem) || !isContainsMachine(pItem->toMachineItem()->id());
             }
             case Qt::CopyAction:
             {
                 /* Make sure there is no other item with such id: */
-                return !contains(pItem->toMachineItem()->id());
+                return !isContainsMachine(pItem->toMachineItem()->id());
             }
         }

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

@@ -79 +79 @@
 
     /* API: Children stuff: */
-    bool contains(const QString &strId) const;
+    bool isContainsMachine(const QString &strId) const;
     bool isContainsLockedMachine();