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

Timestamp:

Oct 30, 2012 1:13:59 PM (13 years ago)

Author:

vboxsync

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

81714

Message:

FE/Qt: VM group UI: Group-item code cleanup (part 3).

Location:

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

Files:

• UIGChooserHandlerKeyboard.cpp (modified) (1 diff)
• UIGChooserHandlerMouse.cpp (modified) (1 diff)
• UIGChooserItem.cpp (modified) (1 diff)
• UIGChooserItemGroup.cpp (modified) (12 diffs)
• UIGChooserItemGroup.h (modified) (1 diff)
• UIGChooserModel.cpp (modified) (3 diffs)

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

@@ -333 +333 @@
                     /* Toggle that group: */
                     UIGChooserItemGroup *pGroupItem = pFocusItem->toGroupItem();
-                    if (pGroupItem->closed())
+                    if (pGroupItem->isClosed())
                         pGroupItem->open();
-                    else
+                    else if (pGroupItem->isOpened())
                         pGroupItem->close();
                     /* Filter that event out: */

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

@@ -186 +186 @@
                         {
                             /* Toggle it: */
-                            if (pGroupItem->opened())
+                            if (pGroupItem->isClosed())
+                                pGroupItem->open();
+                            else if (pGroupItem->isOpened())
                                 pGroupItem->close();
-                            else if (pGroupItem->closed())
-                                pGroupItem->open();
                         }
                         /* If click was at right part: */

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

@@ -171 +171 @@
             pParentItem->makeSureItsVisible();
             /* And make sure its opened: */
-            if (pParentItem->closed())
+            if (pParentItem->isClosed())
                 pParentItem->open(false);
         }

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

@@ -60 +60 @@
     : UIGChooserItem(0, true /* temporary? */)
     , m_strName(pCopyFrom->name())
-    , m_fClosed(pCopyFrom->closed())
+    , m_fClosed(pCopyFrom->isClosed())
     , m_fMainRoot(fMainRoot)
 {
@@ -105 +105 @@
     : UIGChooserItem(pParent, pParent->isTemporary())
     , m_strName(pCopyFrom->name())
-    , m_fClosed(pCopyFrom->closed())
+    , m_fClosed(pCopyFrom->isClosed())
     , m_fMainRoot(false)
 {
@@ -182 +182 @@
 }
 
-bool UIGChooserItemGroup::closed() const
+bool UIGChooserItemGroup::isClosed() const
 {
     return m_fClosed && !isRoot();
 }
 
-bool UIGChooserItemGroup::opened() const
+bool UIGChooserItemGroup::isOpened() const
 {
     return !m_fClosed || isRoot();
@@ -503 +503 @@
     {
         /* Setup toggle-button: */
-        m_pToggleButton = new UIGraphicsRotatorButton(this, "additionalHeight", opened());
+        m_pToggleButton = new UIGraphicsRotatorButton(this, "additionalHeight", isOpened());
         connect(m_pToggleButton, SIGNAL(sigRotationStart()), this, SLOT(sltGroupToggleStart()));
         connect(m_pToggleButton, SIGNAL(sigRotationFinish(bool)), this, SLOT(sltGroupToggleFinish(bool)));
@@ -563 +563 @@
     UIGChooserItem::show();
     /* Show children: */
-    if (!closed())
+    if (!isClosed())
         foreach (UIGChooserItem *pItem, items())
             pItem->show();
@@ -946 +946 @@
 
     /* No body for closed group: */
-    if (closed())
+    if (isClosed())
     {
         /* Hide all the items: */
@@ -1053 +1053 @@
 int UIGChooserItemGroup::minimumWidthHint() const
 {
-    return minimumWidthHint(closed());
+    return minimumWidthHint(isClosed());
 }
 
 int UIGChooserItemGroup::minimumHeightHint() const
 {
-    return minimumHeightHint(closed());
+    return minimumHeightHint(isClosed());
 }
 
@@ -1070 +1070 @@
     /* If Qt::MinimumSize requested: */
     if (which == Qt::MinimumSize)
-        return minimumSizeHint(closed());
+        return minimumSizeHint(isClosed());
     /* Else call to base-class: */
     return UIGChooserItem::sizeHint(which, constraint);
@@ -1082 +1082 @@
 
     /* Update toggle-button tool-tip: */
-    m_pToggleButton->setToolTip(opened() ? tr("Collapse group") : tr("Expand group"));
+    m_pToggleButton->setToolTip(isOpened() ? tr("Collapse group") : tr("Expand group"));
 }
 
@@ -1196 +1196 @@
                 /* Copy passed item into this group: */
                 UIGChooserItem *pNewGroupItem = new UIGChooserItemGroup(this, pItem->toGroupItem(), iPosition);
-                if (closed())
+                if (isClosed())
                     open(false);
 
@@ -1249 +1249 @@
                 /* Copy passed machine-item into this group: */
                 UIGChooserItem *pNewMachineItem = new UIGChooserItemMachine(this, pItem->toMachineItem(), iPosition);
-                if (closed())
+                if (isClosed())
                     open(false);
 
@@ -1308 +1308 @@
 void UIGChooserItemGroup::paint(QPainter *pPainter, const QStyleOptionGraphicsItem *pOption, QWidget* /* pWidget = 0 */)
 {
-    paint(pPainter, pOption, closed());
+    paint(pPainter, pOption, isClosed());
 }
 

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

@@ -72 +72 @@
     QString definition() const;
     void setName(const QString &strName);
-    bool closed() const;
-    bool opened() const;
+    bool isClosed() const;
+    bool isOpened() const;
     void close(bool fAnimated = true);
     void open(bool fAnimated = true);

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

@@ -1348 +1348 @@
     {
         navigationItems << pGroupItem;
-        if (pGroupItem->toGroupItem()->opened())
+        if (pGroupItem->toGroupItem()->isOpened())
             navigationItems << createNavigationList(pGroupItem);
     }
@@ -1691 +1691 @@
                 UIGChooserItem *pFoundItem = getGroupItem(strFirstSuffix, pGroupItem, fAllGroupsOpened);
                 if (UIGChooserItemGroup *pFoundGroupItem = pFoundItem->toGroupItem())
-                    if (fAllGroupsOpened && pFoundGroupItem->closed())
+                    if (fAllGroupsOpened && pFoundGroupItem->isClosed())
                         pFoundGroupItem->open(false);
                 return pFoundItem;
@@ -1895 +1895 @@
     foreach (UIGChooserItem *pItem, pParentItem->items(UIGChooserItemType_Group))
     {
-        QString strGroupDescriptor(pItem->toGroupItem()->opened() ? "go" : "gc");
+        QString strGroupDescriptor(pItem->toGroupItem()->isOpened() ? "go" : "gc");
         groups[strExtraDataKey] << QString("%1=%2").arg(strGroupDescriptor, pItem->name());
         gatherGroupOrders(groups, pItem);