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

Timestamp:

Aug 3, 2012 2:27:38 AM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: 6234: Support for VM groups: Machine mini-tool-bar disabled as non-stable.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemMachine.cpp (modified) (6 diffs)

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

@@ -53 +53 @@
     , m_iCornerRadius(6)
 {
-    /* Prepare: */
-    prepare();
+//    /* Prepare: */
+//    prepare();
 
     /* Add item to the parent: */
@@ -74 +74 @@
     , m_iCornerRadius(6)
 {
-    /* Prepare: */
-    prepare();
+//    /* Prepare: */
+//    prepare();
 
     /* Add item to the parent: */
@@ -204 +204 @@
             int iPixmapWidth = data(MachineItemData_PixmapSize).toSize().width();
             int iMachineItemMajorSpacing = data(MachineItemData_MajorSpacing).toInt();
+            int iMachineItemMinorSpacing = data(MachineItemData_MinorSpacing).toInt();
             int iToolBarWidth = data(MachineItemData_ToolBarSize).toSize().width();
             int iMaximumWidth = (int)geometry().width() - iMargin -
-                                                          iPixmapWidth - iMachineItemMajorSpacing -
-                                                          iToolBarWidth - iMachineItemMajorSpacing;
+                                                          iPixmapWidth -
+                                                          iMachineItemMajorSpacing -
+                                                          iMachineItemMinorSpacing -
+                                                          iMachineItemMajorSpacing -
+                                                          iMargin;
+            if (m_pToolBar)
+                iMaximumWidth -= iToolBarWidth;
             return iMaximumWidth;
         }
@@ -215 +221 @@
             return QSize(fm.width(data(MachineItemData_StateText).toString()), fm.height());
         }
-        case MachineItemData_ToolBarSize: return m_pToolBar->minimumSizeHint().toSize();
+        case MachineItemData_ToolBarSize:
+        {
+            return m_pToolBar ? m_pToolBar->minimumSizeHint().toSize() : QSize(0, 0);
+        }
         /* Default: */
         default: break;
@@ -266 +275 @@
 void UIGChooserItemMachine::updateLayout()
 {
-    /* Prepare variables: */
-    QSize size = geometry().size().toSize();
-
-    /* Prepare variables: */
-    int iMachineItemWidth = size.width();
-    int iMachineItemHeight = size.height();
-    int iToolBarHeight = data(MachineItemData_ToolBarSize).toSize().height();
-
-    /* Configure tool-bar: */
-    QSize toolBarSize = m_pToolBar->minimumSizeHint().toSize();
-    int iToolBarX = iMachineItemWidth - 1 - toolBarSize.width();
-    int iToolBarY = (iMachineItemHeight - iToolBarHeight) / 2;
-    m_pToolBar->setPos(iToolBarX, iToolBarY);
-    m_pToolBar->resize(toolBarSize);
-    m_pToolBar->updateLayout();
-
-    /* Configure buttons: */
-    m_pStartButton->updateAnimation();
-    m_pSettingsButton->updateAnimation();
-    m_pCloseButton->updateAnimation();
-    m_pPauseButton->updateAnimation();
+    if (m_pToolBar)
+    {
+        /* Prepare variables: */
+        QSize size = geometry().size().toSize();
+
+        /* Prepare variables: */
+        int iMachineItemWidth = size.width();
+        int iMachineItemHeight = size.height();
+        int iToolBarHeight = data(MachineItemData_ToolBarSize).toSize().height();
+
+        /* Configure tool-bar: */
+        QSize toolBarSize = m_pToolBar->minimumSizeHint().toSize();
+        int iToolBarX = iMachineItemWidth - 1 - toolBarSize.width();
+        int iToolBarY = (iMachineItemHeight - iToolBarHeight) / 2;
+        m_pToolBar->setPos(iToolBarX, iToolBarY);
+        m_pToolBar->resize(toolBarSize);
+        m_pToolBar->updateLayout();
+
+        /* Configure buttons: */
+        m_pStartButton->updateAnimation();
+        m_pSettingsButton->updateAnimation();
+        m_pCloseButton->updateAnimation();
+        m_pPauseButton->updateAnimation();
+    }
 }
 
@@ -671 +683 @@
     }
 
-    /* Show/hide start-button: */
-    if (isHovered())
-    {
-        if (!m_pToolBar->isVisible())
-            m_pToolBar->show();
-    }
-    else
-    {
-        if (m_pToolBar->isVisible())
-            m_pToolBar->hide();
+    if (m_pToolBar)
+    {
+        /* Show/hide tool-bar: */
+        if (isHovered())
+        {
+            if (!m_pToolBar->isVisible())
+                m_pToolBar->show();
+        }
+        else
+        {
+            if (m_pToolBar->isVisible())
+                m_pToolBar->hide();
+        }
     }
 }