Changeset 106138 in vbox for trunk

Timestamp:

Sep 24, 2024 12:36:53 PM (2 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10513: VM Settings / Storage page: Split label common for HD, CD and FD attachments into three separate labels (one per each type); Moving them into appropriate stacked widget to use horizontal space more effectively; That is the 3rd step after the r164806.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors

Files:

• UIStorageSettingsEditor.cpp (modified) (9 diffs)
• UIStorageSettingsEditor.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIStorageSettingsEditor.cpp

@@ -2872 +2872 @@
     , m_pCheckBoxIoCache(0)
     , m_pLabelSeparatorAttributes(0)
-    , m_pLabelMedium(0)
+    , m_pContainerMediumLabels(0)
+    , m_pLabelHD(0)
+    , m_pLabelCD(0)
+    , m_pLabelFD(0)
     , m_pComboSlot(0)
     , m_pToolButtonOpen(0)
@@ -3001 +3004 @@
     /* Polish attachments pane availability: */
     m_pLabelSeparatorAttributes->setEnabled(fMachineInValidMode);
-    m_pLabelMedium->setEnabled(fMachineOffline || (fMachineOnline && enmDeviceType != KDeviceType_HardDisk));
+    m_pLabelHD->setEnabled(fMachineOffline);
+    m_pLabelCD->setEnabled(fMachineOffline || fMachineOnline);
+    m_pLabelFD->setEnabled(fMachineOffline || fMachineOnline);
     m_pComboSlot->setEnabled(fMachineOffline);
     m_pToolButtonOpen->setEnabled(fMachineOffline || (fMachineOnline && enmDeviceType != KDeviceType_HardDisk));
@@ -3197 +3202 @@
     m_pCheckBoxIoCache->setText(tr("Use Host I/O Cache"));
     m_pLabelSeparatorAttributes->setText(tr("Attributes"));
+    m_pLabelHD->setText(tr("Hard &Disk:"));
+    m_pLabelCD->setText(tr("Optical &Drive:"));
+    m_pLabelFD->setText(tr("Floppy &Drive:"));
     m_pComboSlot->setToolTip(tr("Selects the slot on the storage controller used by this attachment. The available slots depend "
                                 "on the type of the controller and other attachments on it."));
@@ -3598 +3606 @@
                 {
                     case KDeviceType_HardDisk:
-                        m_pLabelMedium->setText(tr("Hard &Disk:"));
                         m_pToolButtonOpen->setIcon(iconPool()->icon(PixmapType_HDAttachmentNormal));
                         m_pToolButtonOpen->setToolTip(tr("Choose or create a virtual hard disk file. The virtual machine will "
@@ -3604 +3611 @@
                         break;
                     case KDeviceType_DVD:
-                        m_pLabelMedium->setText(tr("Optical &Drive:"));
                         m_pToolButtonOpen->setIcon(iconPool()->icon(PixmapType_CDAttachmentNormal));
                         m_pToolButtonOpen->setToolTip(tr("Choose a virtual optical disk or a physical drive to use with the "
@@ -3612 +3618 @@
                         break;
                     case KDeviceType_Floppy:
-                        m_pLabelMedium->setText(tr("Floppy &Drive:"));
                         m_pToolButtonOpen->setIcon(iconPool()->icon(PixmapType_FDAttachmentNormal));
                         m_pToolButtonOpen->setToolTip(tr("Choose a virtual floppy disk or a physical drive to use with the "
@@ -3636 +3641 @@
                                          || (   m_enmConfigurationAccessLevel == ConfigurationAccessLevel_Partial_Running
                                              && enmDeviceType == KDeviceType_HardDisk && fIsHotPluggable);
-                m_pLabelMedium->setEnabled(fIsEditable);
+                m_pLabelHD->setEnabled(fIsEditable);
+                m_pLabelCD->setEnabled(fIsEditable);
+                m_pLabelFD->setEnabled(fIsEditable);
                 m_pToolButtonOpen->setEnabled(fIsEditable);
+
+                /* Prepare medium label to show: */
+                int iIndexForMediumLabel = 0;
+                switch (enmDeviceType)
+                {
+                    case KDeviceType_HardDisk: iIndexForMediumLabel = 0; break;
+                    case KDeviceType_DVD: iIndexForMediumLabel = 1; break;
+                    case KDeviceType_Floppy: iIndexForMediumLabel = 2; break;
+                    default: break;
+                }
+                /* Trigger information to show: */
+                m_pContainerMediumLabels->setCurrentIndex(iIndexForMediumLabel);
 
                 /* Prepare setting #1 to show: */
@@ -4781 +4800 @@
                 m_pLayoutAttachment->addWidget(m_pLabelSeparatorAttributes, 0, 0, 1, 3);
 
-            /* Prepare medium label: */
-            m_pLabelMedium = new QLabel(pWidgetAttachment);
-            if (m_pLabelMedium)
+            /* Prepare medium label container: */
+            m_pContainerMediumLabels = new QStackedWidget(pWidgetAttachment);
+            if (m_pContainerMediumLabels)
             {
-                m_pLabelMedium->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-                m_pLayoutAttachment->addWidget(m_pLabelMedium, 1, 1);
+                /* Prepare HD label: */
+                m_pLabelHD = new QLabel(m_pContainerMediumLabels);
+                if (m_pLabelHD)
+                {
+                    m_pLabelHD->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+                    m_pContainerMediumLabels->addWidget(m_pLabelHD);
+                }
+
+                /* Prepare CD label: */
+                m_pLabelCD = new QLabel(m_pContainerMediumLabels);
+                if (m_pLabelCD)
+                {
+                    m_pLabelCD->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+                    m_pContainerMediumLabels->addWidget(m_pLabelCD);
+                }
+
+                /* Prepare FD label: */
+                m_pLabelFD = new QLabel(m_pContainerMediumLabels);
+                if (m_pLabelFD)
+                {
+                    m_pLabelFD->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+                    m_pContainerMediumLabels->addWidget(m_pLabelFD);
+                }
+
+                m_pLayoutAttachment->addWidget(m_pContainerMediumLabels, 1, 1);
             }
 
@@ -4808 +4850 @@
                 if (m_pToolButtonOpen)
                 {
-                    if (m_pLabelMedium)
-                        m_pLabelMedium->setBuddy(m_pToolButtonOpen);
+                    if (m_pLabelHD)
+                        m_pLabelHD->setBuddy(m_pToolButtonOpen);
+                    if (m_pLabelCD)
+                        m_pLabelCD->setBuddy(m_pToolButtonOpen);
+                    if (m_pLabelFD)
+                        m_pLabelFD->setBuddy(m_pToolButtonOpen);
 
                     /* Prepare open medium menu: */

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIStorageSettingsEditor.h

@@ -480 +480 @@
         /** Holds the right pane attachment widget separator instance. */
         QILabelSeparator *m_pLabelSeparatorAttributes;
-        /** Holds the medium label instance. */
-        QLabel           *m_pLabelMedium;
+        /** Holds the medium label container instance. */
+        QStackedWidget   *m_pContainerMediumLabels;
+        /** Holds the HD label instance. */
+        QLabel           *m_pLabelHD;
+        /** Holds the CD label instance. */
+        QLabel           *m_pLabelCD;
+        /** Holds the FD label instance. */
+        QLabel           *m_pLabelFD;
         /** Holds the slot combo instance. */
         QComboBox        *m_pComboSlot;