Changeset 90400 in vbox for trunk

Timestamp:

Jul 29, 2021 9:40:13 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9996. Fixing medium size and location page.

Location:

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

Files:

• editors/UIWizardDiskEditors.cpp (modified) (1 diff)
• editors/UIWizardDiskEditors.h (modified) (1 diff)
• newvd/UIWizardNewVDPageSizeLocation.cpp (modified) (6 diffs)
• newvd/UIWizardNewVDPageSizeLocation.h (modified) (3 diffs)
• newvd/UIWizardNewVDPageVariant.cpp (modified) (1 diff)
• newvm/UIWizardNewVMDiskPageBasic.cpp (modified) (4 diffs)
• newvm/UIWizardNewVMDiskPageBasic.h (modified) (1 diff)
• newvm/UIWizardNewVMPageExpert.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIWizardDiskEditors.cpp

@@ -57 +57 @@
 }
 
+/* static */
+QString UIDiskEditorGroupBox::appendExtension(const QString &strName, const QString &strExtension)
+{
+    /* Convert passed name to native separators: */
+    QString strFileName = QDir::toNativeSeparators(strName);
+
+    /* Remove all trailing dots to avoid multiple dots before extension: */
+    int iLen;
+    while (iLen = strFileName.length(), iLen > 0 && strFileName[iLen - 1] == '.')
+        strFileName.truncate(iLen - 1);
+
+    /* Add passed extension if its not done yet: */
+    if (QFileInfo(strFileName).suffix().toLower() != strExtension)
+        strFileName += QString(".%1").arg(strExtension);
+
+    /* Return result: */
+    return strFileName;
+}
+
+/* static */
+QString UIDiskEditorGroupBox::constructMediumFilePath(const QString &strFileName, const QString &strPath)
+{
+    /* Wrap file-info around received file name: */
+    QFileInfo fileInfo(strFileName);
+    /* If path-info is relative or there is no path-info at all: */
+    if (fileInfo.fileName() == strFileName || fileInfo.isRelative())
+    {
+        /* Resolve path on the basis of  path we have: */
+        fileInfo = QFileInfo(strPath, strFileName);
+    }
+    /* Return full absolute hard disk file path: */
+    return QDir::toNativeSeparators(fileInfo.absoluteFilePath());
+}
+
+/* static */
+QString UIDiskEditorGroupBox::defaultExtensionForMediumFormat(const CMediumFormat &mediumFormatRef)
+{
+    if (!mediumFormatRef.isNull())
+    {
+        /* Load extension / device list: */
+        QVector<QString> fileExtensions;
+        QVector<KDeviceType> deviceTypes;
+        CMediumFormat mediumFormat(mediumFormatRef);
+        mediumFormat.DescribeFileExtensions(fileExtensions, deviceTypes);
+        for (int i = 0; i < fileExtensions.size(); ++i)
+            if (deviceTypes[i] == KDeviceType_HardDisk)
+                return fileExtensions[i].toLower();
+    }
+    AssertMsgFailed(("Extension can't be NULL!\n"));
+    return QString();
+}
+
+
 /*********************************************************************************************************************************
 *   UIDiskFormatsGroupBox implementation.                                                                                   *

trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIWizardDiskEditors.h

@@ -57 +57 @@
 
     UIDiskEditorGroupBox(bool fExpertMode, QWidget *pParent = 0);
+
+    static QString appendExtension(const QString &strName, const QString &strExtension);
+    static QString constructMediumFilePath(const QString &strFileName, const QString &strPath);
+    static QString defaultExtensionForMediumFormat(const CMediumFormat &mediumFormatRef);
 
 protected:

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

@@ -279 +279 @@
 // }
 
-UIWizardNewVDPageSizeLocation::UIWizardNewVDPageSizeLocation(const QString &/*strDefaultName*/, const QString &/*strDefaultPath*/, qulonglong /*uDefaultSize*/)
+UIWizardNewVDPageSizeLocation::UIWizardNewVDPageSizeLocation(const QString &strDefaultName,
+                                                             const QString &strDefaultPath, qulonglong uDefaultSize)
     : m_pMediumSizePathGroup(0)
+    , m_uMediumSizeMin(_4M)
+    , m_uMediumSizeMax(uiCommon().virtualBox().GetSystemProperties().GetInfoVDSize())
+    , m_strDefaultName(strDefaultName.isEmpty() ? QString("NewVirtualDisk1") : strDefaultName)
+    , m_strDefaultPath(strDefaultPath)
+    , m_uDefaultSize(uDefaultSize)
 {
 
@@ -300 +306 @@
     QVBoxLayout *pMainLayout = new QVBoxLayout(this);
     AssertReturnVoid(pMainLayout);
-    m_pMediumSizePathGroup = new UIMediumSizeAndPathGroupBox(false, 0);
+    m_pMediumSizePathGroup = new UIMediumSizeAndPathGroupBox(false /* fExpertMode */, 0);
 //     {
 //         m_pLocationLabel = new QIRichTextLabel(this);
@@ -320 +326 @@
 //         pMainLayout->addLayout(pLocationLayout);
 //         pMainLayout->addWidget(m_pSizeLabel);
+    connect(m_pMediumSizePathGroup, &UIMediumSizeAndPathGroupBox::sigMediumSizeChanged,
+            this, &UIWizardNewVDPageSizeLocation::sltMediumSizeChanged);
+    connect(m_pMediumSizePathGroup, &UIMediumSizeAndPathGroupBox::sigMediumPathChanged,
+            this, &UIWizardNewVDPageSizeLocation::sltMediumPathChanged);
+    connect(m_pMediumSizePathGroup, &UIMediumSizeAndPathGroupBox::sigMediumLocationButtonClicked,
+            this, &UIWizardNewVDPageSizeLocation::sltSelectLocationButtonClicked);
     pMainLayout->addWidget(m_pMediumSizePathGroup);
     pMainLayout->addStretch();
@@ -332 +344 @@
 }
 
+void UIWizardNewVDPageSizeLocation::sltMediumSizeChanged(qulonglong /*uSize*/)
+{
+
+}
+
+void UIWizardNewVDPageSizeLocation::sltMediumPathChanged(const QString &/*strPath*/)
+{
+
+}
+
 void UIWizardNewVDPageSizeLocation::retranslateUi()
 {
@@ -340 +362 @@
 {
     // /* Translate page: */
-    // retranslateUi();
+
 
     // /* Get default extension for new virtual-disk: */
@@ -347 +369 @@
     // if (m_pLocationEditor)
     //     m_pLocationEditor->setText(absoluteFilePath(m_strDefaultName, m_strDefaultPath, m_strDefaultExtension));
+
+    UIWizardNewVD *pWizard = qobject_cast<UIWizardNewVD*>(wizard());
+    AssertReturnVoid(pWizard && m_pMediumSizePathGroup);
+    const CMediumFormat comMediumFormat = pWizard->mediumFormat();
+    AssertReturnVoid(!comMediumFormat.isNull());
+
+    QString strExtension = UIDiskEditorGroupBox::defaultExtensionForMediumFormat(comMediumFormat);
+    QString strMediumFilePath =
+        UIDiskEditorGroupBox::constructMediumFilePath(UIDiskVariantGroupBox::appendExtension(m_strDefaultName,
+                                                                                             strExtension), m_strDefaultPath);
+    m_pMediumSizePathGroup->setMediumPath(strMediumFilePath);
+    m_pMediumSizePathGroup->setMediumSize(m_uDefaultSize > m_uMediumSizeMin && m_uDefaultSize < m_uMediumSizeMax ? m_uDefaultSize : m_uMediumSizeMin);
+    retranslateUi();
 }
 

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

@@ -72 +72 @@
 //        QString m_strDefaultPath;
 //        QString m_strDefaultExtension;
-//        qulonglong m_uMediumSizeMin;
-//        qulonglong m_uMediumSizeMax;
+
 //     /** @} */
 
@@ -101 +100 @@
 private slots:
 
-    /** Location editors stuff: */
     void sltSelectLocationButtonClicked();
+    void sltMediumSizeChanged(qulonglong uSize);
+    void sltMediumPathChanged(const QString &strPath);
 
 private:
@@ -113 +113 @@
 
     UIMediumSizeAndPathGroupBox *m_pMediumSizePathGroup;
+    qulonglong m_uMediumSizeMin;
+    qulonglong m_uMediumSizeMax;
+    QString m_strDefaultName;
+    QString m_strDefaultPath;
+    qulonglong m_uDefaultSize;
+    QSet<QString> m_userModifiedParameters;
 };
 

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

@@ -190 +190 @@
 void UIWizardNewVDPageVariant::initializePage()
 {
-    retranslateUi();
     UIWizardNewVD *pWizard = qobject_cast<UIWizardNewVD*>(wizard());
     AssertReturnVoid(pWizard && m_pVariantGroupBox);
     setWidgetVisibility(pWizard->mediumFormat());
     newVDWizardPropertySet(MediumVariant, m_pVariantGroupBox->mediumVariant());
+    retranslateUi();
 }
 

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

@@ -37 +37 @@
 #include "UIMessageCenter.h"
 #include "UIWizardNewVMDiskPageBasic.h"
+#include "UIWizardDiskEditors.h"
 
 /* COM includes: */
@@ -45 +46 @@
 #include <iprt/path.h>
 
-
-QString UIWizardNewVMDiskPage::defaultExtension(const CMediumFormat &mediumFormatRef)
-{
-    if (!mediumFormatRef.isNull())
-    {
-        /* Load extension / device list: */
-        QVector<QString> fileExtensions;
-        QVector<KDeviceType> deviceTypes;
-        CMediumFormat mediumFormat(mediumFormatRef);
-        mediumFormat.DescribeFileExtensions(fileExtensions, deviceTypes);
-        for (int i = 0; i < fileExtensions.size(); ++i)
-            if (deviceTypes[i] == KDeviceType_HardDisk)
-                return fileExtensions[i].toLower();
-    }
-    AssertMsgFailed(("Extension can't be NULL!\n"));
-    return QString();
-}
-
-QString UIWizardNewVMDiskPage::toFileName(const QString &strName, const QString &strExtension)
-{
-    /* Convert passed name to native separators (it can be full, actually): */
-    QString strFileName = QDir::toNativeSeparators(strName);
-
-    /* Remove all trailing dots to avoid multiple dots before extension: */
-    int iLen;
-    while (iLen = strFileName.length(), iLen > 0 && strFileName[iLen - 1] == '.')
-        strFileName.truncate(iLen - 1);
-
-    /* Add passed extension if its not done yet: */
-    if (QFileInfo(strFileName).suffix().toLower() != strExtension)
-        strFileName += QString(".%1").arg(strExtension);
-
-    /* Return result: */
-    return strFileName;
-}
-
-QString UIWizardNewVMDiskPage::absoluteFilePath(const QString &strFileName, const QString &strPath)
-{
-    /* Wrap file-info around received file name: */
-    QFileInfo fileInfo(strFileName);
-    /* If path-info is relative or there is no path-info at all: */
-    if (fileInfo.fileName() == strFileName || fileInfo.isRelative())
-    {
-        /* Resolve path on the basis of  path we have: */
-        fileInfo = QFileInfo(strPath, strFileName);
-    }
-    /* Return full absolute hard disk file path: */
-    return QDir::toNativeSeparators(fileInfo.absoluteFilePath());
-}
 
 QUuid UIWizardNewVMDiskPage::getWithFileOpenDialog(const QString &strOSTypeID,
@@ -425 +377 @@
         setWidgetVisibility(pWizard->mediumFormat());
     }
-    QString strDefaultExtension =  UIWizardNewVMDiskPage::defaultExtension(pWizard->mediumFormat());
+    QString strDefaultExtension =  UIDiskEditorGroupBox::defaultExtensionForMediumFormat(pWizard->mediumFormat());
 
     /* We set the medium name and path according to machine name/path and do not allow user change these in the guided mode: */
@@ -431 +383 @@
     const QString &strMachineFolder = pWizard->machineFolder();
     QString strMediumPath =
-        UIWizardNewVMDiskPage::absoluteFilePath(UIWizardNewVMDiskPage::toFileName(strDefaultName,
+        UIDiskEditorGroupBox::constructMediumFilePath(UIDiskEditorGroupBox::appendExtension(strDefaultName,
                                                                                   strDefaultExtension), strMachineFolder);
     newVMWizardPropertySet(MediumPath, strMediumPath);

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

@@ -55 +55 @@
 namespace UIWizardNewVMDiskPage
 {
-    QString defaultExtension(const CMediumFormat &mediumFormatRef);
-    QString toFileName(const QString &strName, const QString &strExtension);
     QUuid getWithFileOpenDialog(const QString &strOSTypeID,
                                 const QString &strMachineFolder,
                                 const QString &strMachineBaseName,
                                 QWidget *pCaller);
-    QString absoluteFilePath(const QString &strFileName, const QString &strPath);
     bool checkFATSizeLimitation(const qulonglong uVariant, const QString &strMediumPath, const qulonglong uSize);
     QString selectNewMediumLocation(UIWizardNewVM *pWizard);

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

@@ -707 +707 @@
         return;
     QString strMediumPath =
-        UIWizardNewVMDiskPage::toFileName(strSelectedPath,
-                                          UIWizardNewVMDiskPage::defaultExtension(pWizard->mediumFormat()));
+        UIDiskEditorGroupBox::appendExtension(strSelectedPath,
+                                              UIDiskEditorGroupBox::defaultExtensionForMediumFormat(pWizard->mediumFormat()));
     QFileInfo mediumPath(strMediumPath);
     m_pSizeAndLocationGroup->setMediumPath(QDir::toNativeSeparators(mediumPath.absoluteFilePath()));
@@ -812 +812 @@
             strMediumPath = uiCommon().virtualBox().GetSystemProperties().GetDefaultMachineFolder();
     }
-    QString strExtension = UIWizardNewVMDiskPage::defaultExtension(pWizard->mediumFormat());
+    QString strExtension = UIDiskEditorGroupBox::defaultExtensionForMediumFormat(pWizard->mediumFormat());
     if (m_pSizeAndLocationGroup)
     {
         QString strMediumFilePath =
-            UIWizardNewVMDiskPage::absoluteFilePath(UIWizardNewVMDiskPage::toFileName(strDiskFileName,
+            UIDiskEditorGroupBox::constructMediumFilePath(UIDiskEditorGroupBox::appendExtension(strDiskFileName,
                                                                                       strExtension), strMediumPath);
         m_pSizeAndLocationGroup->blockSignals(true);