Changeset 90826 in vbox for trunk

Timestamp:

Aug 24, 2021 7:52:10 AM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9996. Adding missing connections to clone vd pages.

Location:

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

Files:

• UIWizardCloneVDPageBasic2.cpp (modified) (2 diffs)
• UIWizardCloneVDPageBasic2.h (modified) (1 diff)
• UIWizardCloneVDPageBasic3.cpp (modified) (2 diffs)
• UIWizardCloneVDPageBasic3.h (modified) (2 diffs)
• UIWizardCloneVDPageExpert.cpp (modified) (1 diff)
• UIWizardCloneVDPageExpert.h (modified) (1 diff)

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

@@ -45 +45 @@
 {
     QVBoxLayout *pMainLayout = new QVBoxLayout(this);
+
     m_pDescriptionLabel = new QIRichTextLabel(this);
     if (m_pDescriptionLabel)
         pMainLayout->addWidget(m_pDescriptionLabel);
+
     m_pDynamicLabel = new QIRichTextLabel(this);
     if (m_pDynamicLabel)
         pMainLayout->addWidget(m_pDynamicLabel);
+
     m_pFixedLabel = new QIRichTextLabel(this);
     if (m_pFixedLabel)
         pMainLayout->addWidget(m_pFixedLabel);
+
     m_pSplitLabel = new QIRichTextLabel(this);
     if (m_pSplitLabel)
         pMainLayout->addWidget(m_pSplitLabel);
+
     m_pVariantGroupBox = new UIDiskVariantGroupBox(false /* expert mode */, 0);
     if (m_pVariantGroupBox)
+    {
         pMainLayout->addWidget(m_pVariantGroupBox);
+        connect(m_pVariantGroupBox, &UIDiskVariantGroupBox::sigMediumVariantChanged,
+                this, &UIWizardCloneVDPageBasic2::sltMediumVariantChanged);
+
+    }
+
     retranslateUi();
 }
@@ -118 +129 @@
         m_pSplitLabel->setHidden(!m_pVariantGroupBox->isCreateSplitPossible());
 }
+
+void UIWizardCloneVDPageBasic2::sltMediumVariantChanged(qulonglong uVariant)
+{
+    if (cloneWizard())
+        cloneWizard()->setMediumVariant(uVariant);
+}

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

@@ -46 +46 @@
     UIWizardCloneVDPageBasic2(KDeviceType enmDeviceType);
 
+private slots:
+
+    void sltMediumVariantChanged(qulonglong uVariant);
+
 private:
 

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

@@ -45 +45 @@
     m_pMediumSizePathGroupBox = new UIMediumSizeAndPathGroupBox(false /* expert mode */, 0 /* parent */, uSourceDiskLogicaSize);
     if (m_pMediumSizePathGroupBox)
+    {
         pMainLayout->addWidget(m_pMediumSizePathGroupBox);
+        connect(m_pMediumSizePathGroupBox, &UIMediumSizeAndPathGroupBox::sigMediumLocationButtonClicked,
+                this, &UIWizardCloneVDPageBasic3::sltSelectLocationButtonClicked);
+        connect(m_pMediumSizePathGroupBox, &UIMediumSizeAndPathGroupBox::sigMediumPathChanged,
+                this, &UIWizardCloneVDPageBasic3::sltMediumPathChanged);
+        connect(m_pMediumSizePathGroupBox, &UIMediumSizeAndPathGroupBox::sigMediumSizeChanged,
+                this, &UIWizardCloneVDPageBasic3::sltMediumSizeChanged);
+    }
 
     pMainLayout->addStretch();
-
-    connect(m_pMediumSizePathGroupBox, &UIMediumSizeAndPathGroupBox::sigMediumLocationButtonClicked,
-            this, &UIWizardCloneVDPageBasic3::sltSelectLocationButtonClicked);
-    connect(m_pMediumSizePathGroupBox, &UIMediumSizeAndPathGroupBox::sigMediumPathChanged,
-            this, &UIWizardCloneVDPageBasic3::sltMediumPathChanged);
-
     retranslateUi();
 }
@@ -148 +150 @@
     emit completeChanged();
 }
+
+void UIWizardCloneVDPageBasic3::sltMediumSizeChanged(qulonglong uSize)
+{
+    UIWizardCloneVD *pWizard = cloneWizard();
+    AssertReturnVoid(pWizard);
+    m_userModifiedParameters << "MediumSize";
+    pWizard->setMediumSize(uSize);
+    emit completeChanged();
+}

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

@@ -37 +37 @@
 class UIWizardCloneVD;
 
-// /** 4th page of the Clone Virtual Disk Image wizard (base part): */
-// class UIWizardCloneVDPage3 : public UIWizardPageBase
-// {
-// protected:
-
-//     /** Constructs page basis. */
-//     UIWizardCloneVDPage3();
-
-//     /** Handles command to open target disk. */
-//     void onSelectLocationButtonClicked();
-
-//     /** Helps to compose full file name on the basis of incoming @a strName and @a strExtension. */
-//     static QString toFileName(const QString &strName, const QString &strExtension);
-//     /** Converts the @a strFileName to absolute one if necessary using @a strDefaultPath as advice. */
-//     static QString absoluteFilePath(const QString &strFileName, const QString &strDefaultPath);
-//     /** Acquires the list of @a aAllowedExtensions and @a strDefaultExtension
-//       * on the basis of incoming @a comMediumFormat and @a enmDeviceType. */
-//     static void acquireExtensions(const CMediumFormat &comMediumFormat, KDeviceType enmDeviceType,
-//                                   QStringList &aAllowedExtensions, QString &strDefaultExtension);
-
-//     /** Returns 'mediumPath' field value. */
-//     QString mediumPath() const;
-
-//     /** Returns 'mediumSize' field value. */
-//     qulonglong mediumSize();
-
-//     /** Holds the default path. */
-//     QString      m_strDefaultPath;
-//     /** Holds the default extension. */
-//     QString      m_strDefaultExtension;
-//     /** Holds the allowed extensions. */
-//     QStringList  m_aAllowedExtensions;
-
-//     /** Holds the target disk path editor instance. */
-//     QLineEdit    *m_pDestinationDiskEditor;
-//     /** Holds the open-target-disk button instance. */
-//     QIToolButton *m_pDestinationDiskOpenButton;
-// };
-
-
-// /** 4th page of the Clone Virtual Disk Image wizard (basic extension): */
+/** 4th page of the Clone Virtual Disk Image wizard (basic extension): */
 class UIWizardCloneVDPageBasic3 : public UINativeWizardPage
 {
@@ -92 +52 @@
     void sltSelectLocationButtonClicked();
     void sltMediumPathChanged(const QString &strPath);
+    void sltMediumSizeChanged(qulonglong uSize);
 
 private:

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

@@ -50 +50 @@
 
     if (m_pMediumSizePathGroupBox)
+    {
         pMainLayout->addWidget(m_pMediumSizePathGroupBox, 0, 0, 2, 2);
+        connect(m_pMediumSizePathGroupBox, &UIMediumSizeAndPathGroupBox::sigMediumLocationButtonClicked,
+                this, &UIWizardCloneVDPageExpert::sltSelectLocationButtonClicked);
+        connect(m_pMediumSizePathGroupBox, &UIMediumSizeAndPathGroupBox::sigMediumPathChanged,
+                this, &UIWizardCloneVDPageExpert::sltMediumPathChanged);
+        connect(m_pMediumSizePathGroupBox, &UIMediumSizeAndPathGroupBox::sigMediumSizeChanged,
+                this, &UIWizardCloneVDPageExpert::sltMediumSizeChanged);
+    }
 
     m_pFormatGroupBox = new UIDiskFormatsGroupBox(true /* expert mode */, enmDeviceType, 0);
     if (m_pFormatGroupBox)
+    {
         pMainLayout-> addWidget(m_pFormatGroupBox, 2, 0, 6, 1);
+        connect(m_pFormatGroupBox, &UIDiskFormatsGroupBox::sigMediumFormatChanged,
+                this, &UIWizardCloneVDPageExpert::sltMediumFormatChanged);
+    }
 
     m_pVariantGroupBox = new UIDiskVariantGroupBox(true /* expert mode */, 0);
     if (m_pVariantGroupBox)
+    {
         pMainLayout-> addWidget(m_pVariantGroupBox, 2, 1, 6, 1);
+        connect(m_pVariantGroupBox, &UIDiskVariantGroupBox::sigMediumVariantChanged,
+                this, &UIWizardCloneVDPageExpert::sltMediumVariantChanged);
+    }
 }
-
 
 void UIWizardCloneVDPageExpert::sltMediumFormatChanged()
 {
+    if (cloneWizard() && m_pFormatGroupBox)
+        cloneWizard()->setMediumFormat(m_pFormatGroupBox->mediumFormat());
+    emit completeChanged();
 }
 
 void UIWizardCloneVDPageExpert::sltSelectLocationButtonClicked()
 {
+    UIWizardCloneVD *pWizard = cloneWizard();
+    AssertReturnVoid(pWizard);
+    CMediumFormat comMediumFormat(pWizard->mediumFormat());
+    QString strSelectedPath =
+        UIDiskEditorGroupBox::openFileDialogForDiskFile(pWizard->mediumPath(), comMediumFormat, pWizard->deviceType(), pWizard);
 
+    if (strSelectedPath.isEmpty())
+        return;
+    QString strMediumPath =
+        UIDiskEditorGroupBox::appendExtension(strSelectedPath,
+                                              UIDiskFormatsGroupBox::defaultExtension(pWizard->mediumFormat(), KDeviceType_HardDisk));
+    QFileInfo mediumPath(strMediumPath);
+    m_pMediumSizePathGroupBox->setMediumPath(QDir::toNativeSeparators(mediumPath.absoluteFilePath()));
+}
+
+void UIWizardCloneVDPageExpert::sltMediumVariantChanged(qulonglong uVariant)
+{
+    if (cloneWizard())
+        cloneWizard()->setMediumVariant(uVariant);
+}
+
+void UIWizardCloneVDPageExpert::sltMediumSizeChanged(qulonglong uSize)
+{
+    UIWizardCloneVD *pWizard = cloneWizard();
+    AssertReturnVoid(pWizard);
+    pWizard->setMediumSize(uSize);
+    emit completeChanged();
+}
+
+void UIWizardCloneVDPageExpert::sltMediumPathChanged(const QString &strPath)
+{
+    UIWizardCloneVD *pWizard = cloneWizard();
+    AssertReturnVoid(pWizard);
+    QString strMediumPath =
+        UIDiskEditorGroupBox::appendExtension(strPath,
+                                              UIDiskFormatsGroupBox::defaultExtension(pWizard->mediumFormat(), pWizard->deviceType()));
+    pWizard->setMediumPath(strMediumPath);
+    emit completeChanged();
 }
 

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

@@ -51 +51 @@
     /** Handles target disk change. */
     void sltSelectLocationButtonClicked();
+    void sltMediumPathChanged(const QString &strPath);
+    void sltMediumVariantChanged(qulonglong uVariant);
+    void sltMediumSizeChanged(qulonglong uSize);
 
 private: