Changeset 73597 in vbox

Timestamp:

Aug 9, 2018 5:32:32 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6596: Few fixes for r124233.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (1 diff)
• wizards/newvd/UIWizardNewVD.cpp (modified) (2 diffs)
• wizards/newvd/UIWizardNewVD.h (modified) (1 diff)
• wizards/newvd/UIWizardNewVDPageBasic3.cpp (modified) (5 diffs)
• wizards/newvd/UIWizardNewVDPageBasic3.h (modified) (1 diff)
• wizards/newvd/UIWizardNewVDPageExpert.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp

@@ -1691 +1691 @@
 {
     alert(pParent, MessageType_Info,
-          tr("Failed to create the hard disk storage <nobr><b>%1</b>.</nobr> FAT file systems have 4GB file size limit")
+          tr("Failed to create the hard disk storage <nobr><b>%1</b>.</nobr> FAT file systems have 4GB file size limit.")
           .arg(strLocation));
 }

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

@@ -38 +38 @@
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
-/* Other VBox includes: */
-#include <iprt/cdefs.h>
-#include <iprt/path.h>
 
 UIWizardNewVD::UIWizardNewVD(QWidget *pParent,
@@ -118 +115 @@
 }
 
-bool UIWizardNewVD::checkFATSizeLimitation()
-{
-    qulonglong uVariant = field("mediumVariant").toULongLong();
-    /* If the hard disk is split into 2GB parts then no need to make further checks: */
-    if (uVariant & KMediumVariant_VmdkSplit2G)
-        return true;
-
-    QString strMediumPath = field("mediumPath").toString();
-    qulonglong uSize = field("mediumSize").toULongLong();
-
-    RTFSTYPE enmType;
-    int rc = RTFsQueryType(QFileInfo(strMediumPath).absolutePath().toLatin1().constData(), &enmType);
-    if (RT_SUCCESS(rc))
-    {
-        if (enmType == RTFSTYPE_FAT)
-        {
-            /* Limit the medium size to 4GB. minus 128 MB for file overhead: */
-            qulonglong fatLimit = _4G - _128M;
-            if (uSize >= fatLimit)
-                return false;
-        }
-    }
-    return true;
-}
-
 void UIWizardNewVD::retranslateUi()
 {

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

@@ -64 +64 @@
     bool createVirtualDisk();
 
-    /* Checks if the medium file is bigger than what is allowed in FAT file systems. */
-    bool checkFATSizeLimitation();
-
     /* Who will be able to create virtual-disk: */
     friend class UIWizardNewVDPageBasic3;

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

@@ -48 +48 @@
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
+/* Other VBox includes: */
+#include <iprt/cdefs.h>
+#include <iprt/path.h>
+
+
 UIWizardNewVDPage3::UIWizardNewVDPage3(const QString &strDefaultName, const QString &strDefaultPath)
     : m_strDefaultName(strDefaultName.isEmpty() ? QString("NewVirtualDisk1") : strDefaultName)
@@ -156 +161 @@
     AssertMsgFailed(("Extension can't be NULL!\n"));
     return QString();
+}
+
+bool UIWizardNewVDPage3::checkFATSizeLimitation()
+{
+    /* Acquire medium variant: */
+    const qulonglong uVariant = fieldImp("mediumVariant").toULongLong();
+
+    /* If the hard disk is split into 2GB parts then no need to make further checks: */
+    if (uVariant & KMediumVariant_VmdkSplit2G)
+        return true;
+
+    /* Acquire medium path and size: */
+    const QString strMediumPath = fieldImp("mediumPath").toString();
+    const qulonglong uSize = fieldImp("mediumSize").toULongLong();
+
+    RTFSTYPE enmType;
+    int rc = RTFsQueryType(QFileInfo(strMediumPath).absolutePath().toLatin1().constData(), &enmType);
+    if (RT_SUCCESS(rc))
+    {
+        if (enmType == RTFSTYPE_FAT)
+        {
+            /* Limit the medium size to 4GB. minus 128 MB for file overhead: */
+            qulonglong fatLimit = _4G - _128M;
+            if (uSize >= fatLimit)
+                return false;
+        }
+    }
+
+    return true;
 }
 
@@ -254 +288 @@
     bool fResult = true;
 
-    /* Make sure such file doesn't exists already: */
-    QString strMediumPath(mediumPath());
+    /* Make sure such file doesn't exist already: */
+    const QString strMediumPath(mediumPath());
     fResult = !QFileInfo(strMediumPath).exists();
     if (!fResult)
@@ -263 +297 @@
     }
 
-    fResult = qobject_cast<UIWizardNewVD*>(wizard())->checkFATSizeLimitation();
+    /* Make sure we are passing FAT size limitation: */
+    fResult = checkFATSizeLimitation();
     if (!fResult)
     {
@@ -272 +307 @@
     /* Lock finish button: */
     startProcessing();
-
-    /* Try to create virtual hard drive file: */
+    /* Try to create virtual-disk: */
     fResult = qobject_cast<UIWizardNewVD*>(wizard())->createVirtualDisk();
     /* Unlock finish button: */

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

@@ -45 +45 @@
     static QString absoluteFilePath(const QString &strFileName, const QString &strDefaultPath);
     static QString defaultExtension(const CMediumFormat &mediumFormatRef);
+
+    /* Checks if the medium file is bigger than what is allowed in FAT file systems. */
+    bool checkFATSizeLimitation();
 
     /* Stuff for 'mediumPath' field: */

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

@@ -260 +260 @@
     bool fResult = true;
 
-    /* Make sure such virtual-disk doesn't exists: */
-    QString strMediumPath(mediumPath());
+    /* Make sure such file doesn't exist already: */
+    const QString strMediumPath(mediumPath());
     fResult = !QFileInfo(strMediumPath).exists();
     if (!fResult)
@@ -269 +269 @@
     }
 
-    fResult = qobject_cast<UIWizardNewVD*>(wizard())->checkFATSizeLimitation();
+    /* Make sure we are passing FAT size limitation: */
+    fResult = checkFATSizeLimitation();
     if (!fResult)
     {
@@ -278 +279 @@
     /* Lock finish button: */
     startProcessing();
-
     /* Try to create virtual-disk: */
     fResult = qobject_cast<UIWizardNewVD*>(wizard())->createVirtualDisk();
-
     /* Unlock finish button: */
     endProcessing();