Changeset 82548 in vbox

Timestamp:

Dec 11, 2019 1:54:35 PM (5 years ago)

Author:

vboxsync

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

135417

Message:

FE/Qt: bugref:9390: UIWizardCloneVMPageBasic2: Get rid of hardcoded clone option types, instead acquire these types through CSystemProperties interface (clone options related to linked clone functionality).

Location:

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

Files:

• UIWizardCloneVMPageBasic2.cpp (modified) (2 diffs)
• UIWizardCloneVMPageBasic2.h (modified) (2 diffs)
• UIWizardCloneVMPageExpert.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageBasic2.cpp

@@ -22 +22 @@
 
 /* GUI includes: */
+#include "UICommon.h"
 #include "UIWizardCloneVMPageBasic2.h"
 #include "UIWizardCloneVM.h"
 #include "QIRichTextLabel.h"
 
+/* COM includes: */
+#include "CSystemProperties.h"
+
 
 UIWizardCloneVMPage2::UIWizardCloneVMPage2(bool fAdditionalInfo)
     : m_fAdditionalInfo(fAdditionalInfo)
+    , m_pButtonGroup(0)
+    , m_pFullCloneRadio(0)
+    , m_pLinkedCloneRadio(0)
 {
 }
 
-bool UIWizardCloneVMPage2::isLinkedClone() const
+bool UIWizardCloneVMPage2::linkedClone() const
 {
-    return m_pLinkedCloneRadio->isChecked();
+    return m_pLinkedCloneRadio ? m_pLinkedCloneRadio->isChecked() : false;
 }
 
 UIWizardCloneVMPageBasic2::UIWizardCloneVMPageBasic2(bool fAdditionalInfo)
     : UIWizardCloneVMPage2(fAdditionalInfo)
+    , m_pLabel(0)
 {
-    /* Create widgets: */
+    /* Prepare main layout: */
     QVBoxLayout *pMainLayout = new QVBoxLayout(this);
+    if (pMainLayout)
     {
+        /* Prepare description label: */
         m_pLabel = new QIRichTextLabel(this);
+        if (m_pLabel)
+            pMainLayout->addWidget(m_pLabel);
+
+        /* Prepare clone-type options layout: */
         QVBoxLayout *pCloneTypeCntLayout = new QVBoxLayout;
+        if (pCloneTypeCntLayout)
         {
+            /* Prepare clone-type options button-group: */
             m_pButtonGroup = new QButtonGroup(this);
+            if (m_pButtonGroup)
             {
+                /* Prepare full clone option radio-button: */
                 m_pFullCloneRadio = new QRadioButton(this);
+                if (m_pFullCloneRadio)
                 {
                     m_pFullCloneRadio->setChecked(true);
+                    m_pButtonGroup->addButton(m_pFullCloneRadio);
+                    pCloneTypeCntLayout->addWidget(m_pFullCloneRadio);
                 }
-                m_pLinkedCloneRadio = new QRadioButton(this);
-                m_pButtonGroup->addButton(m_pFullCloneRadio);
-                m_pButtonGroup->addButton(m_pLinkedCloneRadio);
+
+                /* Load currently supported clone options: */
+                CSystemProperties comProperties = uiCommon().virtualBox().GetSystemProperties();
+                const QVector<KCloneOptions> supportedOptions = comProperties.GetSupportedCloneOptions();
+                /* Check whether we support linked clone option at all: */
+                const bool fSupportedLinkedClone = supportedOptions.contains(KCloneOptions_Link);
+
+                /* Prepare linked clone option radio-button: */
+                if (fSupportedLinkedClone)
+                {
+                    m_pLinkedCloneRadio = new QRadioButton(this);
+                    if (m_pLinkedCloneRadio)
+                    {
+                        m_pButtonGroup->addButton(m_pLinkedCloneRadio);
+                        pCloneTypeCntLayout->addWidget(m_pLinkedCloneRadio);
+                    }
+                }
             }
-            pCloneTypeCntLayout->addWidget(m_pFullCloneRadio);
-            pCloneTypeCntLayout->addWidget(m_pLinkedCloneRadio);
+
+            pMainLayout->addLayout(pCloneTypeCntLayout);
         }
-        pMainLayout->addWidget(m_pLabel);
-        pMainLayout->addLayout(pCloneTypeCntLayout);
+
+        /* Stretch under buttons: */
         pMainLayout->addStretch();
     }
@@ -98 +133 @@
 
     m_pFullCloneRadio->setText(UIWizardCloneVM::tr("&Full clone"));
-    m_pLinkedCloneRadio->setText(UIWizardCloneVM::tr("&Linked clone"));
+    if (m_pLinkedCloneRadio)
+        m_pLinkedCloneRadio->setText(UIWizardCloneVM::tr("&Linked clone"));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageBasic2.h

@@ -39 +39 @@
 
     /* Stuff for 'linkedClone' field: */
-    bool isLinkedClone() const;
+    bool linkedClone() const;
 
     /* Variables: */
@@ -54 +54 @@
 {
     Q_OBJECT;
-    Q_PROPERTY(bool linkedClone READ isLinkedClone);
+    Q_PROPERTY(bool linkedClone READ linkedClone);
 
 public:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageExpert.h

@@ -39 +39 @@
     Q_PROPERTY(QString cloneName READ cloneName WRITE setCloneName);
     Q_PROPERTY(QString cloneFilePath READ cloneFilePath WRITE setCloneFilePath);
-    Q_PROPERTY(bool linkedClone READ isLinkedClone);
+    Q_PROPERTY(bool linkedClone READ linkedClone);
     Q_PROPERTY(KCloneMode cloneMode READ cloneMode WRITE setCloneMode);
     Q_PROPERTY(MACAddressClonePolicy macAddressClonePolicy READ macAddressClonePolicy WRITE setMACAddressClonePolicy);