Changeset 76933 in vbox

Timestamp:

Jan 22, 2019 11:58:11 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9241: VirtualBox Manager UI: A bit of refactoring for Chooser pane: Merge machine item constructors contents into one function for reuse.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser

Files:

• UIChooserItemMachine.cpp (modified) (5 diffs)
• UIChooserItemMachine.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp

@@ -47 +47 @@
     : UIChooserItem(pParent, pParent->isTemporary(), 0, 100)
     , UIVirtualMachineItem(machine)
+    , m_iPosition(iPosition)
     , m_iDefaultLightnessMin(0)
     , m_iDefaultLightnessMax(0)
@@ -61 +62 @@
     /* Prepare: */
     prepare();
-
-    /* Add item to the parent: */
-    AssertMsg(parentItem(), ("No parent set for machine-item!"));
-    parentItem()->addItem(this, iPosition);
-    setZValue(parentItem()->zValue() + 1);
-
-    /* Configure connections: */
-    connect(gpManager, &UIVirtualBoxManager::sigWindowRemapped,
-            this, &UIChooserItemMachine::sltHandleWindowRemapped);
-
-    /* Init: */
-    updatePixmaps();
-    updateName();
-    updateSnapshotName();
-
-    /* Apply language settings: */
-    retranslateUi();
 }
 
@@ -85 +69 @@
     : UIChooserItem(pParent, pParent->isTemporary(), 0, 100)
     , UIVirtualMachineItem(pCopyFrom->machine())
+    , m_iPosition(iPosition)
     , m_iDefaultLightnessMin(0)
     , m_iDefaultLightnessMax(0)
@@ -99 +84 @@
     /* Prepare: */
     prepare();
-
-    /* Add item to the parent: */
-    AssertMsg(parentItem(), ("No parent set for machine-item!"));
-    parentItem()->addItem(this, iPosition);
-    setZValue(parentItem()->zValue() + 1);
-
-    /* Configure connections: */
-    connect(gpManager, &UIVirtualBoxManager::sigWindowRemapped,
-            this, &UIChooserItemMachine::sltHandleWindowRemapped);
-
-    /* Init: */
-    updatePixmaps();
-    updateName();
-    updateSnapshotName();
-
-    /* Apply language settings: */
-    retranslateUi();
 }
 
@@ -643 +611 @@
     m_iMinimumSnapshotNameWidth = 0;
     m_iMaximumSnapshotNameWidth = 0;
+
+    /* Add item to the parent: */
+    AssertMsg(parentItem(), ("No parent set for machine-item!"));
+    parentItem()->addItem(this, m_iPosition);
+    setZValue(parentItem()->zValue() + 1);
+
+    /* Configure connections: */
+    connect(gpManager, &UIVirtualBoxManager::sigWindowRemapped,
+            this, &UIChooserItemMachine::sltHandleWindowRemapped);
+
+    /* Init: */
+    updatePixmaps();
+    updateName();
+    updateSnapshotName();
+
+    /* Apply language settings: */
+    retranslateUi();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.h

@@ -276 +276 @@
     /** @name Item stuff.
       * @{ */
+        /** Holds initial item position. */
+        const int  m_iPosition;
+
         /** Holds item minimum default lightness. */
         int  m_iDefaultLightnessMin;