Changeset 9404 in vbox for trunk

Timestamp:

Jun 5, 2008 8:55:54 AM (17 years ago)

Author:

vboxsync

Message:

FE/Qt4: Added some space between the info panels of the VDM.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxDiskImageManagerDlg.h (modified) (1 diff)
• src/VBoxDiskImageManagerDlg.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxDiskImageManagerDlg.h

@@ -126 +126 @@
     void clearInfoPanes();
     void prepareToRefresh (int aTotal = 0);
-    void createInfoString (InfoPaneLabel *&aInfo, QWidget* aRoot, int aRow, int aCol, int aRowSpan = 1, int aColSpan = 1) const;
+    void createInfoString (InfoPaneLabel *&aInfo, QWidget* aRoot, bool aLeftRigthMargin, int aRow, int aCol, int aRowSpan = 1, int aColSpan = 1) const;
 
     void makeWarningMark (DiskImageItem *aItem, VBoxMedia::Status aStatus, VBoxDefs::DiskType aType) const;

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxDiskImageManagerDlg.cpp

@@ -412 +412 @@
     fdsContainerLayout->setSpacing (0);
     /* Create info-pane for hd list-view */
-    createInfoString (mHdsPane1, mHdsContainer, 0, 0, 1, 3);
-    createInfoString (mHdsPane2, mHdsContainer, 1, 0);
-    createInfoString (mHdsPane3, mHdsContainer, 1, 2);
-    createInfoString (mHdsPane4, mHdsContainer, 2, 0);
-    createInfoString (mHdsPane5, mHdsContainer, 2, 2);
+    createInfoString (mHdsPane1, mHdsContainer, false, 0, 0, 1, 3);
+    createInfoString (mHdsPane2, mHdsContainer,  true, 1, 0);
+    createInfoString (mHdsPane3, mHdsContainer, false, 1, 2);
+    createInfoString (mHdsPane4, mHdsContainer,  true, 2, 0);
+    createInfoString (mHdsPane5, mHdsContainer, false, 2, 2);
     /* Create info-pane for cd list-view */
-    createInfoString (mCdsPane1, mCdsContainer, 0, 0);
-    createInfoString (mCdsPane2, mCdsContainer, 1, 0);
+    createInfoString (mCdsPane1, mCdsContainer, false, 0, 0);
+    createInfoString (mCdsPane2, mCdsContainer, false, 1, 0);
     /* Create info-pane for fd list-view */
-    createInfoString (mFdsPane1, mFdsContainer, 0, 0);
-    createInfoString (mFdsPane2, mFdsContainer, 1, 0);
+    createInfoString (mFdsPane1, mFdsContainer, false, 0, 0);
+    createInfoString (mFdsPane2, mFdsContainer, false, 1, 0);
 
     /* Enumeration progressbar creation */
@@ -1997 +1997 @@
 void VBoxDiskImageManagerDlg::createInfoString (InfoPaneLabel *&aInfo,
                                                 QWidget *aRoot,
+                                                bool aLeftRigthMargin,
                                                 int aRow, int aCol,
                                                 int aRowSpan /* = 1 */, int aColSpan /* = 1 */) const
@@ -2015 +2016 @@
     /* Add the two widgets */
     rootLayout->addWidget (nameLabel, aRow, aCol, 1, 1);
+    int margin = aInfo->style()->pixelMetric (QStyle::PM_LayoutHorizontalSpacing);
+#if QT_VERSION >= 0x040300
+    if (margin == -1)
+        margin = aInfo->style()->layoutSpacing (QSizePolicy::Label, QSizePolicy::Label, Qt::Horizontal);
+#endif /* QT_VERSION >= 0x040300 */
+    if (aLeftRigthMargin)
+        aInfo->setContentsMargins (margin, NULL, margin, NULL);
+    else 
+        aInfo->setContentsMargins (margin, NULL, NULL, NULL);
     rootLayout->addWidget (aInfo, aRow, aCol + 1, aRowSpan, aColSpan);
 }