Changeset 43829 in vbox for trunk/src

Timestamp:

Nov 7, 2012 11:51:00 AM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: VM group UI: Some machine-item cleanup (part 2).

Location:

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

Files:

• UIGChooserItemGroup.cpp (modified) (1 diff)
• UIGChooserItemMachine.cpp (modified) (16 diffs)
• UIGChooserItemMachine.h (modified) (1 diff)

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

@@ -1173 +1173 @@
 QPixmap UIGChooserItemGroup::toPixmap()
 {
+    /* Ask item to paint itself into pixmap: */
     QSize minimumSize = minimumSizeHint(false).toSize();
     QPixmap pixmap(minimumSize);

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

@@ -51 +51 @@
 
     /* Add item to the parent: */
-    AssertMsg(parentItem(), ("No parent set for machine item!"));
+    AssertMsg(parentItem(), ("No parent set for machine-item!"));
     parentItem()->addItem(this, iPosition);
     setZValue(parentItem()->zValue() + 1);
@@ -69 +69 @@
 
     /* Add item to the parent: */
-    AssertMsg(parentItem(), ("No parent set for machine item!"));
+    AssertMsg(parentItem(), ("No parent set for machine-item!"));
     parentItem()->addItem(this, iPosition);
     setZValue(parentItem()->zValue() + 1);
@@ -99 +99 @@
 
     /* Remove item from the parent: */
-    AssertMsg(parentItem(), ("No parent set for machine item!"));
+    AssertMsg(parentItem(), ("No parent set for machine-item!"));
     parentItem()->removeItem(this);
 }
@@ -111 +111 @@
 {
     /* Get full parent name, append with '/' if not yet appended: */
-    QString strParentFullName = parentItem()->fullName();
-    if (!strParentFullName.endsWith('/'))
-        strParentFullName.append('/');
+    AssertMsg(parentItem(), ("Incorrect parent set!"));
+    QString strFullParentName = parentItem()->fullName();
+    if (!strFullParentName.endsWith('/'))
+        strFullParentName.append('/');
     /* Return full item name based on parent prefix: */
-    return strParentFullName + name();
+    return strFullParentName + name();
 }
 
@@ -299 +300 @@
 void UIGChooserItemMachine::retranslateUi()
 {
+    /* Update machine tool-tip: */
     updateToolTip();
 }
@@ -346 +348 @@
 void UIGChooserItemMachine::updateAll(const QString &strId)
 {
-    /* Skip wrong id: */
+    /* Skip other ids: */
     if (id() != strId)
         return;
@@ -410 +412 @@
     updateGeometry();
 
+    /* Update tool-bar: */
     if (m_pToolBar)
     {
@@ -438 +441 @@
 int UIGChooserItemMachine::minimumWidthHint() const
 {
-    /* First of all, we have to prepare few variables: */
+    /* Prepare variables: */
     int iMachineItemMargin = data(MachineItemData_Margin).toInt();
     int iMachineItemMajorSpacing = data(MachineItemData_MajorSpacing).toInt();
@@ -454 +457 @@
     /* Two margins: */
     iProposedWidth += 2 * iMachineItemMargin;
-    /* And machine item content to take into account: */
+    /* And machine-item content to take into account: */
     int iTopLineWidth = iMinimumNameWidth +
                         iMachineItemMinorSpacing +
@@ -475 +478 @@
 int UIGChooserItemMachine::minimumHeightHint() const
 {
-    /* First of all, we have to prepare few variables: */
+    /* Prepare variables: */
     int iMachineItemMargin = data(MachineItemData_Margin).toInt();
     int iMachineItemTextSpacing = data(MachineItemData_TextSpacing).toInt();
@@ -490 +493 @@
     /* Two margins: */
     iProposedHeight += 2 * iMachineItemMargin;
-    /* And machine item content to take into account: */
+    /* And machine-item content to take into account: */
     int iTopLineHeight = qMax(iMachineNameHeight, iSnapshotNameHeight);
     int iBottomLineHeight = qMax(iMachineStatePixmapHeight, iMachineStateTextHeight);
@@ -511 +514 @@
     /* If Qt::MinimumSize requested: */
     if (which == Qt::MinimumSize)
-    {
-        /* Return wrappers: */
         return QSizeF(minimumWidthHint(), minimumHeightHint());
-    }
-
-    /* Call to base-class: */
+    /* Else call to base-class: */
     return UIGChooserItem::sizeHint(which, constraint);
 }
@@ -642 +641 @@
 }
 
-void UIGChooserItemMachine::paint(QPainter *pPainter, const QStyleOptionGraphicsItem *pOption, QWidget * /* pWidget = 0 */)
+void UIGChooserItemMachine::paint(QPainter *pPainter, const QStyleOptionGraphicsItem *pOption, QWidget* /* pWidget = 0 */)
 {
     /* Setup: */
     pPainter->setRenderHint(QPainter::Antialiasing);
-
-    /* Configure painter shape: */
-    configurePainterShape(pPainter, pOption, m_iCornerRadius);
 
     /* Paint decorations: */
@@ -736 +732 @@
         return;
 
-    /* Simple white frame: */
+    /* Simple frame: */
     pPainter->save();
     QPalette pal = palette();
@@ -913 +909 @@
     m_pPauseButton = 0;
     m_pCloseButton = 0;
-    /* Corner radius: */
-    m_iCornerRadius = 0;
     /* Colors: */
 #ifdef Q_WS_MAC
@@ -978 +972 @@
         if (pIteratedItem->id() == pItem->id())
             return true;
+    /* Found nothing? */
     return false;
 }

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

@@ -167 +167 @@
     UIGraphicsZoomButton *m_pPauseButton;
     UIGraphicsZoomButton *m_pCloseButton;
-    int m_iCornerRadius;
     int m_iHighlightLightness;
     int m_iHoverLightness;