Changeset 85452 in vbox

Timestamp:

Jul 24, 2020 9:12:40 AM (5 years ago)

Author:

vboxsync

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

139498

Message:

FE/Qt: bugref:9663. Handling the virtual harddisk type change correctly in file path selector of the expert mode new disk wizard.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageExpert.cpp (modified) (2 diffs)

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

@@ -44 +44 @@
 #include "CSystemProperties.h"
 
+/* Other VBox includes: */
+#include <iprt/path.h>
 
 UIWizardNewVDPageExpert::UIWizardNewVDPageExpert(const QString &strDefaultName, const QString &strDefaultPath, qulonglong uDefaultSize)
@@ -211 +213 @@
     {
         QFileInfo fileInfo(m_pLocationEditor->text());
-        if (fileInfo.completeSuffix() != m_strDefaultExtension)
-        {
-            QString strNewFilePath = QString("%1/%2.%3").arg(fileInfo.absoluteDir().absolutePath()).arg(fileInfo.fileName()).arg(m_strDefaultExtension);
+        QString strSuffix = fileInfo.suffix();
+        if (strSuffix != m_strDefaultExtension)
+        {
+            /* QFileInfo::baseName() removes completeSuffix() from the fileName(), which is everthing coming after the 'first'
+               dot. I want to allow disk names with dots in it. So I remove the string from fileName()
+               that comes after the 'last' dot: */
+            QByteArray strFileName = fileInfo.fileName().toUtf8();
+            RTPathStripSuffix(strFileName.data());
+            QString strNewFilePath = QString("%1/%2.%3")
+                .arg(fileInfo.absoluteDir().absolutePath())
+                .arg(QString(strFileName))
+                .arg(m_strDefaultExtension);
             m_pLocationEditor->setText(strNewFilePath);
         }