Changeset 43821 in vbox for trunk

Timestamp:

Nov 7, 2012 8:09:11 AM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: VM group UI: Another group-item rework (update related, part 2).

Location:

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

Files:

• UIGChooserItemGroup.cpp (modified) (16 diffs)
• UIGChooserItemGroup.h (modified) (2 diffs)

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

@@ -55 +55 @@
 
     /* Calculate minimum header size: */
-    recacheHeaderSize();
+    updateHeaderSize();
 }
 
@@ -80 +80 @@
 
     /* Calculate minimum header size: */
-    recacheHeaderSize();
+    updateHeaderSize();
 }
 
@@ -106 +106 @@
 
     /* Calculate minimum header size: */
-    recacheHeaderSize();
+    updateHeaderSize();
 }
 
@@ -134 +134 @@
 
     /* Calculate minimum header size: */
-    recacheHeaderSize();
+    updateHeaderSize();
 }
 
@@ -199 +199 @@
 
     /* Update visible name: */
-    recacheVisibleName();
+    updateVisibleName();
     /* Update minimum header size: */
-    recacheHeaderSize();
+    updateHeaderSize();
 }
 
@@ -255 +255 @@
     /* Should we update visible name? */
     if (m_previousGeometry.width() != newGeometry.width())
-        recacheVisibleName();
+        updateVisibleName();
 
     /* Remember the new geometry: */
@@ -461 +461 @@
 {
     /* Update visible name: */
-    recacheVisibleName();
+    updateVisibleName();
     /* Update minimum header size: */
-    recacheHeaderSize();
-}
-
-void UIGChooserItemGroup::recacheVisibleName()
+    updateHeaderSize();
+}
+
+void UIGChooserItemGroup::updateVisibleName()
 {
     /* Not for main root: */
@@ -517 +517 @@
 }
 
-void UIGChooserItemGroup::recacheHeaderSize()
+void UIGChooserItemGroup::updateHeaderSize()
 {
     /* Not for main root: */
@@ -588 +588 @@
 }
 
-void UIGChooserItemGroup::retranslateUi()
-{
-    /* Update group tool-tip: */
-    updateToolTip();
-
-    /* Update button tool-tips: */
-    if (m_pEnterButton)
-        m_pEnterButton->setToolTip(tr("Enter group"));
-    if (m_pExitButton)
-        m_pExitButton->setToolTip(tr("Exit group"));
-    updateToggleButtonToolTip();
-}
-
-void UIGChooserItemGroup::show()
-{
-    /* Call to base-class: */
-    UIGChooserItem::show();
-    /* Show children: */
-    if (!isClosed())
-        foreach (UIGChooserItem *pItem, items())
-            pItem->show();
-}
-
-void UIGChooserItemGroup::hide()
-{
-    /* Call to base-class: */
-    UIGChooserItem::hide();
-    /* Hide children: */
-    foreach (UIGChooserItem *pItem, items())
-        pItem->hide();
-}
-
-void UIGChooserItemGroup::startEditing()
-{
-    /* Not for root-item: */
-    if (isRoot())
-        return;
-
-    /* Not while saving groups: */
-    if (model()->isGroupSavingInProgress())
-        return;
-
-    /* Unlock name-editor: */
-    m_pNameEditor->show();
-    m_pNameEditorWidget->setText(name());
-    m_pNameEditorWidget->setFocus();
-}
-
 void UIGChooserItemGroup::updateToolTip()
 {
@@ -689 +641 @@
 }
 
+void UIGChooserItemGroup::retranslateUi()
+{
+    /* Update group tool-tip: */
+    updateToolTip();
+
+    /* Update button tool-tips: */
+    if (m_pEnterButton)
+        m_pEnterButton->setToolTip(tr("Enter group"));
+    if (m_pExitButton)
+        m_pExitButton->setToolTip(tr("Exit group"));
+    updateToggleButtonToolTip();
+}
+
+void UIGChooserItemGroup::show()
+{
+    /* Call to base-class: */
+    UIGChooserItem::show();
+    /* Show children: */
+    if (!isClosed())
+        foreach (UIGChooserItem *pItem, items())
+            pItem->show();
+}
+
+void UIGChooserItemGroup::hide()
+{
+    /* Call to base-class: */
+    UIGChooserItem::hide();
+    /* Hide children: */
+    foreach (UIGChooserItem *pItem, items())
+        pItem->hide();
+}
+
+void UIGChooserItemGroup::startEditing()
+{
+    /* Not for root-item: */
+    if (isRoot())
+        return;
+
+    /* Not while saving groups: */
+    if (model()->isGroupSavingInProgress())
+        return;
+
+    /* Unlock name-editor: */
+    m_pNameEditor->show();
+    m_pNameEditorWidget->setText(name());
+    m_pNameEditorWidget->setFocus();
+}
+
 void UIGChooserItemGroup::addItem(UIGChooserItem *pItem, int iPosition)
 {
@@ -722 +722 @@
 
     /* Update: */
-    recacheVisibleName();
-    recacheHeaderSize();
+    updateVisibleName();
+    updateHeaderSize();
     updateToolTip();
 }
@@ -754 +754 @@
 
     /* Update: */
-    recacheVisibleName();
-    recacheHeaderSize();
+    updateVisibleName();
+    updateHeaderSize();
     updateToolTip();
 }
@@ -770 +770 @@
 
     /* Update: */
-    recacheVisibleName();
-    recacheHeaderSize();
+    updateVisibleName();
+    updateHeaderSize();
     updateToolTip();
 }
@@ -826 +826 @@
 
     /* Update: */
-    recacheVisibleName();
-    recacheHeaderSize();
+    updateVisibleName();
+    updateHeaderSize();
     updateToolTip();
 }
@@ -1383 +1383 @@
 
     /* Update visible name: */
-    recacheVisibleName();
+    updateVisibleName();
 }
 
@@ -1396 +1396 @@
 
     /* Update visible name: */
-    recacheVisibleName();
+    updateVisibleName();
 }
 

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

@@ -131 +131 @@
     static void copyContent(UIGChooserItemGroup *pFrom, UIGChooserItemGroup *pTo);
 
-    /* Helpers: Recache stuff: */
+    /* Helpers: Update stuff: */
     void handleRootStatusChange();
-    void recacheVisibleName();
-    void recacheHeaderSize();
+    void updateVisibleName();
+    void updateHeaderSize();
+    void updateToolTip();
 
     /* Helper: Translate stuff: */
@@ -143 +144 @@
     void hide();
     void startEditing();
-    void updateToolTip();
     bool isMainRoot() const { return m_fMainRoot; }