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

Timestamp:

Nov 7, 2012 11:19:49 AM (12 years ago)

Author:

vboxsync

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

81898

Message:

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

Location:

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

Files:

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

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

@@ -46 +46 @@
     : UIGChooserItem(pParent, pParent->isTemporary())
     , UIVMItem(machine)
-    , m_pToolBar(0)
-    , m_pSettingsButton(0)
-    , m_pStartButton(0)
-    , m_pPauseButton(0)
-    , m_pCloseButton(0)
-    , m_iCornerRadius(0)
-#ifdef Q_WS_MAC
-    , m_iHighlightLightness(115)
-    , m_iHoverLightness(110)
-    , m_iHoverHighlightLightness(120)
-#else /* Q_WS_MAC */
-    , m_iHighlightLightness(130)
-    , m_iHoverLightness(155)
-    , m_iHoverHighlightLightness(175)
-#endif /* !Q_WS_MAC */
-{
-//    /* Prepare: */
-//    prepare();
+{
+    /* Prepare: */
+    prepare();
 
     /* Add item to the parent: */
@@ -79 +64 @@
     : UIGChooserItem(pParent, pParent->isTemporary())
     , UIVMItem(pCopyFrom->machine())
-    , m_pToolBar(0)
-    , m_pSettingsButton(0)
-    , m_pStartButton(0)
-    , m_pPauseButton(0)
-    , m_pCloseButton(0)
-    , m_iCornerRadius(0)
-#ifdef Q_WS_MAC
-    , m_iHighlightLightness(115)
-    , m_iHoverLightness(110)
-    , m_iHoverHighlightLightness(120)
-#else /* Q_WS_MAC */
-    , m_iHighlightLightness(130)
-    , m_iHoverLightness(155)
-    , m_iHoverHighlightLightness(175)
-#endif /* !Q_WS_MAC */
-{
-//    /* Prepare: */
-//    prepare();
+{
+    /* Prepare: */
+    prepare();
 
     /* Add item to the parent: */
@@ -115 +85 @@
         model()->setFocusItem(0);
     }
-    /* If that item is selected: */
+    /* If that item is in selection list: */
     if (model()->currentItems().contains(this))
     {
@@ -121 +91 @@
         model()->removeFromCurrentItems(this);
     }
-    /* Remove item from the navigation list: */
-    model()->removeFromNavigationList(this);
+    /* If that item is in navigation list: */
+    if (model()->navigationList().contains(this))
+    {
+        /* Remove item from the navigation list: */
+        model()->removeFromNavigationList(this);
+    }
 
     /* Remove item from the parent: */
@@ -933 +907 @@
 void UIGChooserItemMachine::prepare()
 {
+    /* Tool-bar/buttons: */
+    m_pToolBar = 0;
+    m_pSettingsButton = 0;
+    m_pStartButton = 0;
+    m_pPauseButton = 0;
+    m_pCloseButton = 0;
+    /* Corner radius: */
+    m_iCornerRadius = 0;
+    /* Colors: */
+#ifdef Q_WS_MAC
+    m_iHighlightLightness = 115;
+    m_iHoverLightness = 110;
+    m_iHoverHighlightLightness = 120;
+#else /* Q_WS_MAC */
+    m_iHighlightLightness = 130;
+    m_iHoverLightness = 155;
+    m_iHoverHighlightLightness = 175;
+#endif /* !Q_WS_MAC */
+
+    /* Other things disabled for now: */
+    return;
+
     /* Create tool-bar: */
     m_pToolBar = new UIGraphicsToolBar(this, 2, 2);

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

@@ -51 +51 @@
     int type() const { return Type; }
 
-    /* Constructor/destructor: */
+    /* Constructor (new item): */
     UIGChooserItemMachine(UIGChooserItem *pParent, const CMachine &machine, int iPosition = -1);
+    /* Constructor (new item copy): */
     UIGChooserItemMachine(UIGChooserItem *pParent, UIGChooserItemMachine *pCopyFrom, int iPosition = -1);
+    /* Destructor: */
     ~UIGChooserItemMachine();