Changeset 87972 in vbox

Timestamp:

Mar 5, 2021 2:55:53 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9950. Initializing medium path widgets in expert mode

Location:

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

Files:

• newvd/UIWizardNewVDPageBasic2.cpp (modified) (1 diff)
• newvd/UIWizardNewVDPageBasic2.h (modified) (1 diff)
• newvd/UIWizardNewVDPageBasic3.cpp (modified) (1 diff)
• newvd/UIWizardNewVDPageBasic3.h (modified) (1 diff)
• newvd/UIWizardNewVDPageExpert.cpp (modified) (4 diffs)
• newvd/UIWizardNewVDPageExpert.h (modified) (1 diff)
• newvm/UIWizardNewVMPageExpert.cpp (modified) (8 diffs)
• newvm/UIWizardNewVMPageExpert.h (modified) (2 diffs)

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

@@ -174 +174 @@
 }
 
+void UIWizardNewVDPage2::updateMediumVariantWidgetsAfterFormatChange(const CMediumFormat &mediumFormat)
+{
+    /* Enable/disable widgets: */
+    ULONG uCapabilities = 0;
+    QVector<KMediumFormatCapabilities> capabilities;
+    capabilities = mediumFormat.GetCapabilities();
+    for (int i = 0; i < capabilities.size(); i++)
+        uCapabilities |= capabilities[i];
+
+    bool fIsCreateDynamicPossible = uCapabilities & KMediumFormatCapabilities_CreateDynamic;
+    bool fIsCreateFixedPossible = uCapabilities & KMediumFormatCapabilities_CreateFixed;
+    bool fIsCreateSplitPossible = uCapabilities & KMediumFormatCapabilities_CreateSplit2G;
+
+    if (m_pFixedCheckBox)
+    {
+        m_pFixedCheckBox->setEnabled(fIsCreateDynamicPossible || fIsCreateFixedPossible);
+        if (!fIsCreateDynamicPossible)
+            m_pFixedCheckBox->setChecked(true);
+        if (!fIsCreateFixedPossible)
+            m_pFixedCheckBox->setChecked(false);
+    }
+    m_pSplitBox->setEnabled(fIsCreateSplitPossible);
+}
+
 UIWizardNewVDPageBasic2::UIWizardNewVDPageBasic2()
 {

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

@@ -46 +46 @@
     /** Check Medium format capability and decide if certain widgets can be shown. */
     void setWidgetVisibility(CMediumFormat &mediumFormat);
+    void updateMediumVariantWidgetsAfterFormatChange(const CMediumFormat &mediumFormat);
     /** @name Widgets
      * @{ */
-        QCheckBox    *m_pFixedCheckBox;
+        QCheckBox *m_pFixedCheckBox;
         QCheckBox *m_pSplitBox;
     /** @} */

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

@@ -231 +231 @@
 }
 
+/* static */
+QString UIWizardNewVDPage3::stripFormatExtension(const QString &strFileName, const QStringList &formatExtensions)
+{
+    QString result(strFileName);
+    foreach (const QString &strExtension, formatExtensions)
+    {
+        if (strFileName.endsWith(strExtension, Qt::CaseInsensitive))
+        {
+            /* Add the dot to extenstion: */
+            QString strExtensionWithDot(strExtension);
+            strExtensionWithDot.prepend('.');
+            int iIndex = strFileName.lastIndexOf(strExtensionWithDot, -1, Qt::CaseInsensitive);
+            result.remove(iIndex, strExtensionWithDot.length());
+        }
+    }
+    return result;
+}
+
+void UIWizardNewVDPage3::updateLocationEditorAfterFormatChange(const CMediumFormat &mediumFormat, const QStringList &formatExtensions)
+{
+    /* Compose virtual-disk extension: */
+    m_strDefaultExtension = defaultExtension(mediumFormat);
+    /* Update m_pLocationEditor's text if necessary: */
+    if (!m_pLocationEditor->text().isEmpty() && !m_strDefaultExtension.isEmpty())
+    {
+        QFileInfo fileInfo(m_pLocationEditor->text());
+        if (fileInfo.suffix() != m_strDefaultExtension)
+        {
+            QFileInfo newFileInfo(fileInfo.absolutePath(),
+                                  QString("%1.%2").
+                                  arg(stripFormatExtension(fileInfo.fileName(), formatExtensions)).
+                                  arg(m_strDefaultExtension));
+            m_pLocationEditor->setText(newFileInfo.absoluteFilePath());
+        }
+    }
+}
+
 void UIWizardNewVDPage3::retranslateWidgets()
 {

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

@@ -58 +58 @@
 
     virtual QString mediumPath() const;
+    /** A utility function thar strips the format extension from the @p strFileName.
+      * foo.dd.vdi becomes foo.dd. any extension which is not a format extension is left alone. */
+    static QString stripFormatExtension(const QString &strFileName, const QStringList &formatExtensions);
+    void updateLocationEditorAfterFormatChange(const CMediumFormat &mediumFormat, const QStringList &formatExtensions);
 
     qulonglong mediumSize() const;

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

@@ -128 +128 @@
     registerField("mediumPath", this, "mediumPath");
     registerField("mediumSize", this, "mediumSize");
-
-    /* Initialization of m_strDefaultExtension is done  here
-       since first m_formats should be populated and fields should be registered: */
-    m_strDefaultExtension = defaultExtension(mediumFormat());
-    if (m_pLocationEditor)
-        m_pLocationEditor->setText(absoluteFilePath(m_strDefaultName, m_strDefaultPath, m_strDefaultExtension));
 }
 
@@ -146 +140 @@
     }
 
-    /* Enable/disable widgets: */
-    ULONG uCapabilities = 0;
-    QVector<KMediumFormatCapabilities> capabilities;
-    capabilities = mf.GetCapabilities();
-    for (int i = 0; i < capabilities.size(); i++)
-        uCapabilities |= capabilities[i];
-
-    bool fIsCreateDynamicPossible = uCapabilities & KMediumFormatCapabilities_CreateDynamic;
-    bool fIsCreateFixedPossible = uCapabilities & KMediumFormatCapabilities_CreateFixed;
-    bool fIsCreateSplitPossible = uCapabilities & KMediumFormatCapabilities_CreateSplit2G;
-
-    if (m_pFixedCheckBox)
-    {
-        if (!fIsCreateDynamicPossible)
-        {
-            m_pFixedCheckBox->setEnabled(false);
-            m_pFixedCheckBox->setChecked(true);
-        }
-        if (!fIsCreateFixedPossible)
-        {
-            m_pFixedCheckBox->setEnabled(false);
-            m_pFixedCheckBox->setChecked(false);
-        }
-    }
-    m_pSplitBox->setEnabled(fIsCreateSplitPossible);
-
-    /* Compose virtual-disk extension: */
-    m_strDefaultExtension = defaultExtension(mf);
-    /* Update m_pLocationEditor's text if necessary: */
-    if (!m_pLocationEditor->text().isEmpty() && !m_strDefaultExtension.isEmpty())
-    {
-        QFileInfo fileInfo(m_pLocationEditor->text());
-        if (fileInfo.suffix() != m_strDefaultExtension)
-        {
-            QFileInfo newFileInfo(fileInfo.absolutePath(),
-                                  QString("%1.%2").arg(stripFormatExtension(fileInfo.fileName())).arg(m_strDefaultExtension));
-            m_pLocationEditor->setText(newFileInfo.absoluteFilePath());
-        }
-    }
+    updateMediumVariantWidgetsAfterFormatChange(mf);
+
+    updateLocationEditorAfterFormatChange(mf, m_formatExtensions);
 
     /* Broadcast complete-change: */
@@ -226 +184 @@
 void UIWizardNewVDPageExpert::initializePage()
 {
+    /* Get default extension for new virtual-disk: */
+    m_strDefaultExtension = defaultExtension(field("mediumFormat").value<CMediumFormat>());
+    /* Set default name as text for location editor: */
+    if (m_pLocationEditor)
+        m_pLocationEditor->setText(absoluteFilePath(m_strDefaultName, m_strDefaultPath, m_strDefaultExtension));
+
+
     /* Translate page: */
     retranslateUi();
@@ -274 +239 @@
     return fResult;
 }
-
-QString UIWizardNewVDPageExpert::stripFormatExtension(const QString &strFileName)
-{
-    QString result(strFileName);
-    foreach (const QString &strExtension, m_formatExtensions)
-    {
-        if (strFileName.endsWith(strExtension, Qt::CaseInsensitive))
-        {
-            /* Add the dot to extenstion: */
-            QString strExtensionWithDot(strExtension);
-            strExtensionWithDot.prepend('.');
-            int iIndex = strFileName.lastIndexOf(strExtensionWithDot, -1, Qt::CaseInsensitive);
-            result.remove(iIndex, strExtensionWithDot.length());
-        }
-    }
-    return result;
-}

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

@@ -73 +73 @@
     bool isComplete() const;
     bool validatePage();
-    /** Strips the format extension from the @p strFileName. foo.dd.vdi becomes foo.dd. any extension which is not
-      * a format extension is left alone. */
-    QString stripFormatExtension(const QString &strFileName);
 
     /* Widgets: */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp

@@ -44 +44 @@
 #include "UIWizardNewVMPageExpert.h"
 
+/* COM includes: */
+#include "CSystemProperties.h"
 
 UIWizardNewVMPageExpert::UIWizardNewVMPageExpert(const QString &strGroup)
@@ -93 +95 @@
     registerField("EFIEnabled", this, "EFIEnabled");
 
+    registerField("mediumPath", this, "mediumPath");
+    registerField("mediumFormat", this, "mediumFormat");
+
     disableEnableUnattendedRelatedWidgets(isUnattendedEnabled());
 }
@@ -102 +107 @@
 
     composeMachineFilePath();
+    updateVirtualDiskPathFromMachinePathName();
     /* Broadcast complete-change: */
     emit completeChanged();
@@ -110 +116 @@
     Q_UNUSED(strNewPath);
     composeMachineFilePath();
+    updateVirtualDiskPathFromMachinePathName();
 }
 
@@ -330 +337 @@
     setOSTypeDependedValues();
     disableEnableUnattendedRelatedWidgets(isUnattendedEnabled());
+    updateVirtualDiskPathFromMachinePathName();
 }
 
@@ -398 +406 @@
 
     /* Disk file size widgets: */
-    QLabel *pSizeEditorLabel = new QLabel("Disk Size:");
-    pSizeEditorLabel->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed);
+    m_pSizeEditorLabel = new QLabel;
+    m_pSizeEditorLabel->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed);
     m_pSizeEditor = new UIMediumSizeEditor;
-    pSizeEditorLabel->setBuddy(m_pSizeEditor);
+    m_pSizeEditorLabel->setBuddy(m_pSizeEditor);
 
     /* Disk file format widgets: */
@@ -418 +426 @@
     pDiskContainerLayout->addWidget(m_pLocationOpenButton, 0, 3, 1, 1);
 
-    pDiskContainerLayout->addWidget(pSizeEditorLabel, 1, 0, 1, 1);
+    pDiskContainerLayout->addWidget(m_pSizeEditorLabel, 1, 0, 1, 1);
     pDiskContainerLayout->addWidget(m_pSizeEditor, 1, 1, 1, 3);
 
@@ -548 +556 @@
     m_userSetWidgets << pSenderWidget;
 }
+
+void UIWizardNewVMPageExpert::updateVirtualDiskPathFromMachinePathName()
+{
+    QString strDiskFileName = machineBaseName().isEmpty() ? QString("NewVirtualDisk1") : machineBaseName();
+    QString strDiskPath = machineFolder();
+    if (strDiskPath.isEmpty())
+    {
+        if (m_pNameAndSystemEditor)
+            strDiskPath = m_pNameAndSystemEditor->path();
+        else
+            strDiskPath = uiCommon().virtualBox().GetSystemProperties().GetDefaultMachineFolder();
+    }
+    QString strExtension = defaultExtension(mediumFormat());
+    if (m_pLocationEditor)
+        m_pLocationEditor->setText(absoluteFilePath(strDiskFileName, strDiskPath, strExtension));
+}

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.h

@@ -67 +67 @@
     Q_PROPERTY(bool EFIEnabled READ EFIEnabled);
 
+
+    // Q_PROPERTY(CMedium virtualDisk READ virtualDisk WRITE setVirtualDisk);
+    // Q_PROPERTY(SelectedDiskSource selectedDiskSource READ selectedDiskSource WRITE setSelectedDiskSource);
+    Q_PROPERTY(CMediumFormat mediumFormat READ mediumFormat);
+    // Q_PROPERTY(qulonglong mediumVariant READ mediumVariant WRITE setMediumVariant);
+    Q_PROPERTY(QString mediumPath READ mediumPath);
+    // Q_PROPERTY(qulonglong mediumSize READ mediumSize WRITE setMediumSize);
+
 public:
 
@@ -128 +136 @@
     QWidget *createUnattendedWidgets();
     virtual QWidget *createNewDiskWidgets() /* override */;
+    void updateVirtualDiskPathFromMachinePathName();
 
     UIToolBox  *m_pToolBox;