Changeset 60637 in vbox

Timestamp:

Apr 21, 2016 4:53:29 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: ​​​​​​​​​bugref:6451: Clone VD Wizard: Same as for New VD Wizard in r106773 and r106795.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards

Files:

• clonevd/UIWizardCloneVDPageBasic2.cpp (modified) (3 diffs)
• clonevd/UIWizardCloneVDPageBasic2.h (modified) (1 diff)
• clonevd/UIWizardCloneVDPageExpert.cpp (modified) (2 diffs)
• newvd/UIWizardNewVDPageBasic1.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageBasic2.cpp

@@ -41 +41 @@
 }
 
-void UIWizardCloneVDPage2::addFormatButton(QWidget *pParent, QVBoxLayout *pFormatLayout, CMediumFormat medFormat)
+void UIWizardCloneVDPage2::addFormatButton(QWidget *pParent, QVBoxLayout *pFormatLayout, CMediumFormat medFormat, bool fPreferred /* = false */)
 {
     /* Check that medium format supports creation: */
-    //ULONG uFormatCapabilities = medFormat.GetCapabilities();
     ULONG uFormatCapabilities = 0;
     QVector<KMediumFormatCapabilities> capabilities;
@@ -64 +63 @@
     /* Create/add corresponding radio-button: */
     QRadioButton *pFormatButton = new QRadioButton(pParent);
-    pFormatLayout->addWidget(pFormatButton);
-    m_formats << medFormat;
-    m_formatNames << medFormat.GetName();
-    m_pFormatButtonGroup->addButton(pFormatButton, m_formatNames.size() - 1);
+    AssertPtrReturnVoid(pFormatButton);
+    {
+        /* Make the preferred button font bold: */
+        if (fPreferred)
+        {
+            QFont font = pFormatButton->font();
+            font.setBold(true);
+            pFormatButton->setFont(font);
+        }
+        pFormatLayout->addWidget(pFormatButton);
+        m_formats << medFormat;
+        m_formatNames << medFormat.GetName();
+        m_pFormatButtonGroup->addButton(pFormatButton, m_formatNames.size() - 1);
+    }
 }
 
@@ -106 +115 @@
                 {
                     const CMediumFormat &medFormat = medFormats[i];
-                    if (medFormat.GetName() != "VDI")
+                    const QVector<KMediumFormatCapabilities> &capabilities = medFormat.GetCapabilities();
+                    if (medFormat.GetName() != "VDI" && capabilities.contains(KMediumFormatCapabilities_Preferred))
                         addFormatButton(this, pFormatLayout, medFormat);
                 }

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageBasic2.h

@@ -41 +41 @@
 
     /* Helping stuff: */
-    void addFormatButton(QWidget *pParent, QVBoxLayout *pFormatsLayout, CMediumFormat medFormat);
+    void addFormatButton(QWidget *pParent, QVBoxLayout *pFormatsLayout, CMediumFormat medFormat, bool fPreferred = false);
 
     /* Stuff for 'mediumFormat' field: */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageExpert.cpp

@@ -92 +92 @@
             QVBoxLayout *pFormatCntLayout = new QVBoxLayout(m_pFormatCnt);
             {
-                m_pFormatButtonGroup = new QButtonGroup(this);
+                m_pFormatButtonGroup = new QButtonGroup(m_pFormatCnt);
                 {
                     CSystemProperties systemProperties = vboxGlobal().virtualBox().GetSystemProperties();
@@ -100 +100 @@
                         const CMediumFormat &medFormat = medFormats[i];
                         if (medFormat.GetName() == "VDI")
-                            addFormatButton(m_pFormatCnt, pFormatCntLayout, medFormat);
+                            addFormatButton(m_pFormatCnt, pFormatCntLayout, medFormat, true);
                     }
                     for (int i = 0; i < medFormats.size(); ++i)
                     {
                         const CMediumFormat &medFormat = medFormats[i];
+                        const QVector<KMediumFormatCapabilities> &capabilities = medFormat.GetCapabilities();
                         if (medFormat.GetName() != "VDI")
-                            addFormatButton(m_pFormatCnt, pFormatCntLayout, medFormat);
+                            addFormatButton(m_pFormatCnt, pFormatCntLayout, medFormat, capabilities.contains(KMediumFormatCapabilities_Preferred));
                     }
                     if (!m_pFormatButtonGroup->buttons().isEmpty())

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic1.cpp

@@ -119 +119 @@
                         addFormatButton(this, pFormatLayout, medFormat);
                 }
-            }
-            if (!m_pFormatButtonGroup->buttons().isEmpty())
-            {
-                m_pFormatButtonGroup->button(0)->click();
-                m_pFormatButtonGroup->button(0)->setFocus();
+                if (!m_pFormatButtonGroup->buttons().isEmpty())
+                {
+                    m_pFormatButtonGroup->button(0)->click();
+                    m_pFormatButtonGroup->button(0)->setFocus();
+                }
             }
         }
@@ -132 +132 @@
 
     /* Setup connections: */
-    connect(m_pFormatButtonGroup, SIGNAL(buttonClicked(QAbstractButton*)), this, SIGNAL(completeChanged()));
+    connect(m_pFormatButtonGroup, SIGNAL(buttonClicked(QAbstractButton *)), this, SIGNAL(completeChanged()));
 
     /* Register classes: */