Changeset 105542 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jul 30, 2024 12:43:20 PM (6 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10736. Integrating KDeviceType member to New VD wizard. It will be needed in VD cloning case since we clone floppy disks over the wizard as well.

Location:

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

Files:

• UIWizardNewVD.cpp (modified) (3 diffs)
• UIWizardNewVD.h (modified) (1 diff)
• UIWizardNewVDExpertPage.cpp (modified) (2 diffs)
• UIWizardNewVDExpertPage.h (modified) (3 diffs)
• UIWizardNewVDFileTypePage.cpp (modified) (1 diff)
• UIWizardNewVDFileTypePage.h (modified) (3 diffs)

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

@@ -51 +51 @@
     , m_uDefaultSize(uDefaultSize)
     , m_iMediumVariantPageIndex(-1)
+    , m_enmDeviceType(KDeviceType_HardDisk)
 {
 #ifndef VBOX_WS_MAC
@@ -129 +130 @@
         case WizardMode_Basic:
         {
-            addPage(new UIWizardNewVDFileTypePage);
+            addPage(new UIWizardNewVDFileTypePage(m_enmDeviceType));
             m_iMediumVariantPageIndex = addPage(new UIWizardNewVDVariantPage);
             addPage(new UIWizardNewVDSizeLocationPage(diskMinimumSize()));
@@ -136 +137 @@
         case WizardMode_Expert:
         {
-            addPage(new UIWizardNewVDExpertPage(diskMinimumSize()));
+            addPage(new UIWizardNewVDExpertPage(diskMinimumSize(), m_enmDeviceType));
             break;
         }

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVD.h

@@ -110 +110 @@
     /** Holds the source virtual disk wrapper. */
     CMedium m_comSourceVirtualDisk;
+    KDeviceType m_enmDeviceType;
 };
 

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

@@ -42 +42 @@
 #include "CSystemProperties.h"
 
-UIWizardNewVDExpertPage::UIWizardNewVDExpertPage(qulonglong uDiskMinimumSize)
+UIWizardNewVDExpertPage::UIWizardNewVDExpertPage(qulonglong uDiskMinimumSize, KDeviceType enmDeviceType)
     : UINativeWizardPage()
     , m_pSizeAndPathGroup(0)
@@ -51 +51 @@
     , m_uMediumSizeMax(gpGlobalSession->virtualBox().GetSystemProperties().GetInfoVDSize())
 {
-    prepare(uDiskMinimumSize);
-}
-
-void UIWizardNewVDExpertPage::prepare(qulonglong uDiskMinimumSize)
+    prepare(uDiskMinimumSize, enmDeviceType);
+}
+
+void UIWizardNewVDExpertPage::prepare(qulonglong uDiskMinimumSize, KDeviceType enmDeviceType)
 {
     QVBoxLayout *pMainLayout = new QVBoxLayout(this);

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDExpertPage.h

@@ -35 +35 @@
 #include "UINativeWizardPage.h"
 
+/* COM includes:*/
+#include "KDeviceType.h"
+
 /* Forward declarations: */
 class QGroupBox;
@@ -48 +51 @@
 public:
 
-    UIWizardNewVDExpertPage(qulonglong uDiskMinimumSize);
+    UIWizardNewVDExpertPage(qulonglong uDiskMinimumSize, KDeviceType enmDeviceType);
 
 private slots:
@@ -63 +66 @@
 
     /** Prepare stuff. */
-    void prepare(qulonglong uDiskMinimumSize);
+    void prepare(qulonglong uDiskMinimumSize, KDeviceType enmDeviceType);
     virtual void initializePage() RT_OVERRIDE RT_FINAL;
 

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

@@ -35 +35 @@
 #include "QIRichTextLabel.h"
 
-UIWizardNewVDFileTypePage::UIWizardNewVDFileTypePage()
+UIWizardNewVDFileTypePage::UIWizardNewVDFileTypePage(KDeviceType enmDeviceType)
     : m_pLabel(0)
     , m_pFormatButtonGroup(0)
 {
-    prepare();
+    prepare(enmDeviceType);
 }
 
-void UIWizardNewVDFileTypePage::prepare()
+void UIWizardNewVDFileTypePage::prepare(KDeviceType enmDeviceType)
 {
     QVBoxLayout *pMainLayout = new QVBoxLayout(this);
     m_pLabel = new QIRichTextLabel(this);
     pMainLayout->addWidget(m_pLabel);
-    m_pFormatButtonGroup = new UIDiskFormatsGroupBox(false, KDeviceType_HardDisk, 0);
+    m_pFormatButtonGroup = new UIDiskFormatsGroupBox(false, enmDeviceType, 0);
     pMainLayout->addWidget(m_pFormatButtonGroup, false);
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDFileTypePage.h

@@ -35 +35 @@
 #include "UINativeWizardPage.h"
 
+/* COM includes:*/
+#include "KDeviceType.h"
+
 /* Forward declarations: */
 class QIRichTextLabel;
@@ -47 +50 @@
 
     /** Constructor. */
-    UIWizardNewVDFileTypePage();
+    UIWizardNewVDFileTypePage(KDeviceType enmDeviceType);
 
 private slots:
@@ -56 +59 @@
 private:
 
-    void prepare();
+    void prepare(KDeviceType enmDeviceType);
     void initializePage() RT_OVERRIDE RT_FINAL;