Changeset 72431 in vbox for trunk/src

Timestamp:

Jun 4, 2018 1:18:42 PM (7 years ago)

Author:

vboxsync

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

122903

Message:

FE/Qt bugref:9183 Some improvements to UIMediumSelector widget

Location:

trunk/src/VBox/Frontends/VirtualBox/src/medium

Files:

• UIMediumSelector.cpp (modified) (10 diffs)
• UIMediumSelector.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp

@@ -22 +22 @@
 /* Qt includes: */
 # include <QAction>
+# include <QHeaderView>
 # include <QVBoxLayout>
 # include <QPushButton>
@@ -91 +92 @@
     if (m_pActionAdd)
     {
-        m_pActionAdd->setText(QApplication::translate("UIMediumManager", "&Add from file..."));
+        m_pActionAdd->setText(QApplication::translate("UIMediumManager", "&Add"));
         m_pActionAdd->setToolTip(QApplication::translate("UIMediumManager", "Add Disk Image File"));
         m_pActionAdd->setStatusTip(QApplication::translate("UIMediumManager", "Add disk image file"));
@@ -103 +104 @@
 
     if (m_pButtonBox)
-        m_pButtonBox->button(QDialogButtonBox::Ok)->setText("Add Selected");
+        m_pButtonBox->button(QDialogButtonBox::Ok)->setText("Choose");
 
     if (m_pTreeWidget)
     {
         m_pTreeWidget->headerItem()->setText(0, QApplication::translate("UIMediumManager","Name"));
+        m_pTreeWidget->headerItem()->setText(1, QApplication::translate("UIMediumManager","Virtual Size"));
+        m_pTreeWidget->headerItem()->setText(2, QApplication::translate("UIMediumManager","Actual Size"));
     }
 }
@@ -115 +118 @@
     /* Apply window icons: */
     setWindowIcon(UIIconPool::iconSetFull(":/diskimage_32px.png", ":/diskimage_16px.png"));
-
-
     prepareActions();
     prepareWidgets();
@@ -203 +204 @@
         case UIMediumType_Invalid:
         default:
-            return createHardDiskItem(medium);
+            return createHardDiskItem(medium, pParent);
             break;
     }
 }
 
-UIMediumItem* UIMediumSelector::createHardDiskItem(const UIMedium &medium)
+UIMediumItem* UIMediumSelector::createHardDiskItem(const UIMedium &medium, QITreeWidgetItem *pParent)
 {
     if (medium.medium().isNull())
@@ -231 +232 @@
             /* Try to create parent medium-item: */
             else
-                pParentMediumItem = createHardDiskItem(parentMedium);
+                pParentMediumItem = createHardDiskItem(parentMedium, pParent);
             /* If parent medium-item was found: */
             if (pParentMediumItem)
@@ -246 +247 @@
     else
     {
-        pMediumItem = new UIMediumItemHD(medium, m_pTreeWidget);
+        pMediumItem = new UIMediumItemHD(medium, pParent);
         LogRel2(("UIMediumManager: Root hard-disk medium-item with ID={%s} created.\n", medium.id().toUtf8().constData()));
     }
@@ -308 +309 @@
         m_pMainLayout->addWidget(m_pTreeWidget);
 
+        m_pTreeWidget->setAlternatingRowColors(true);
+
     }
 
@@ -414 +417 @@
         const QRect screenGeometry = gpDesktop->screenGeometry(iHostScreen);
         if (screenGeometry.isValid())
-            proposedSize = screenGeometry.size() * 7 / 15;
+            proposedSize = screenGeometry.size() * 5 / 15;
     }
     /* Fallback to default size if we failed: */
@@ -482 +485 @@
     if (m_pNotAttachedSubTreeRoot)
         m_pTreeWidget->expandItem(m_pNotAttachedSubTreeRoot);
+
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.h

@@ -88 +88 @@
     UIMediumItem* addTreeItem(const UIMedium &medium, QITreeWidgetItem *pParent);
     void restoreSelection(const QStringList &selectedMediums, QVector<UIMediumItem*> &mediumList);
-    UIMediumItem* createHardDiskItem(const UIMedium &medium);
+    /** Recursively create the hard disk hierarchy under the tree widget */
+    UIMediumItem* createHardDiskItem(const UIMedium &medium, QITreeWidgetItem *pParent);
     UIMediumItem* searchItem(const QTreeWidgetItem *pParent, const QString &mediumId);