Changeset 78121 in vbox for trunk/src/VBox/Frontends

Timestamp:

Apr 15, 2019 8:35:13 AM (6 years ago)

Author:

vboxsync

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

130016

Message:

FE/Qt: Make sure we always show the full media file location in the new medium wizard

Location:

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

Files:

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

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

@@ -128 +128 @@
 
 /* static */
-QString UIWizardNewVDPage3::absoluteFilePath(const QString &strFileName, const QString &strDefaultPath)
+QString UIWizardNewVDPage3::absoluteFilePath(const QString &strFileName, const QString &strPath)
 {
     /* Wrap file-info around received file name: */
@@ -135 +135 @@
     if (fileInfo.fileName() == strFileName || fileInfo.isRelative())
     {
-        /* Resolve path on the basis of default path we have: */
-        fileInfo = QFileInfo(strDefaultPath, strFileName);
+        /* 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 UIWizardNewVDPage3::absoluteFilePath(const QString &strFileName, const QString &strPath, const QString &strExtension)
+{
+    QString strFilePath = absoluteFilePath(strFileName, strPath);
+    if (QFileInfo(strFilePath).suffix().isEmpty())
+        strFilePath += QString(".%1").arg(strExtension);
+    return strFilePath;
 }
 
@@ -267 +276 @@
     m_strDefaultExtension = defaultExtension(field("mediumFormat").value<CMediumFormat>());
     /* Set default name as text for location editor: */
-    m_pLocationEditor->setText(m_strDefaultName);
+    m_pLocationEditor->setText(absoluteFilePath(m_strDefaultName, m_strDefaultPath, m_strDefaultExtension));
 }
 

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

@@ -46 +46 @@
     /* Location-editors stuff: */
     static QString toFileName(const QString &strName, const QString &strExtension);
-    static QString absoluteFilePath(const QString &strFileName, const QString &strDefaultPath);
+    /* Returns the full image file path except the extension. */
+    static QString absoluteFilePath(const QString &strFileName, const QString &strPath);
+    /* 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);
 

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

@@ -17 +17 @@
 
 /* Qt includes: */
+#include <QDir>
 #include <QGridLayout>
 #include <QVBoxLayout>
@@ -47 +48 @@
     : UIWizardNewVDPage3(strDefaultName, strDefaultPath)
 {
+    /* Get default extension for new virtual-disk: */
     /* Create widgets: */
     QGridLayout *pMainLayout = new QGridLayout(this);
@@ -56 +58 @@
             {
                 m_pLocationEditor = new QLineEdit(m_pLocationCnt);
-                {
-                    m_pLocationEditor->setText(m_strDefaultName);
-                }
                 m_pLocationOpenButton = new QIToolButton(m_pLocationCnt);
                 {
@@ -174 +173 @@
     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));
 }
 
@@ -202 +207 @@
     /* 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.completeSuffix() != m_strDefaultExtension)
+        {
+            QString strNewFilePath = QString("%1/%2.%3").arg(fileInfo.absoluteDir().absolutePath()).arg(fileInfo.baseName()).arg(m_strDefaultExtension);
+            m_pLocationEditor->setText(strNewFilePath);
+        }
+    }
 
     /* Broadcast complete-change: */