Changeset 87775 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Feb 17, 2021 11:42:01 AM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

142831

Message:

FE/Qt: Keeping the part of the disk file name even if it includes a dot.

Location:

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

Files:

• UIWizardNewVDPageBasic1.cpp (modified) (3 diffs)
• UIWizardNewVDPageBasic1.h (modified) (1 diff)
• UIWizardNewVDPageBasic3.h (modified) (2 diffs)
• UIWizardNewVDPageExpert.cpp (modified) (2 diffs)
• UIWizardNewVDPageExpert.h (modified) (1 diff)

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

@@ -24 +24 @@
 #include "UIConverter.h"
 #include "UIWizardNewVDPageBasic1.h"
+#include "UIWizardNewVDPageBasic3.h"
 #include "UIWizardNewVD.h"
 #include "UICommon.h"
@@ -71 +72 @@
         m_formatNames << medFormat.GetName();
         m_pFormatButtonGroup->addButton(pFormatButton, m_formatNames.size() - 1);
+        m_formatExtensions << UIWizardNewVDPage3::defaultExtension(medFormat);
     }
 }
@@ -204 +206 @@
     return UIWizardNewVD::Page3;
 }
-

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

@@ -55 +55 @@
     QList<CMediumFormat> m_formats;
     QStringList m_formatNames;
+    QStringList m_formatExtensions;
 };
 

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

@@ -36 +36 @@
 class SHARED_LIBRARY_STUFF UIWizardNewVDPage3 : public UIWizardPageBase
 {
+
+public:
+
+    static QString defaultExtension(const CMediumFormat &mediumFormatRef);
+
 protected:
 
@@ -50 +55 @@
     /* Returns the full image file path including the extension. */
     static QString absoluteFilePath(const QString &strFileName, const QString &strPath, const QString &strExtension);
-    static QString defaultExtension(const CMediumFormat &mediumFormatRef);
 
     /* Checks if the medium file is bigger than what is allowed in FAT file systems. */

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

@@ -213 +213 @@
         if (fileInfo.suffix() != m_strDefaultExtension)
         {
-            QFileInfo newFileInfo(fileInfo.absolutePath(), QString("%1.%2").arg(fileInfo.completeBaseName()).arg(m_strDefaultExtension));
+            QFileInfo newFileInfo(fileInfo.absolutePath(),
+                                  QString("%1.%2").arg(stripFormatExtension(fileInfo.fileName())).arg(m_strDefaultExtension));
             m_pLocationEditor->setText(newFileInfo.absoluteFilePath());
         }
@@ -296 +297 @@
     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: */