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

Timestamp:

Feb 16, 2012 2:56:18 PM (13 years ago)

Author:

vboxsync

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

76304

Message:

Main and FE/Qt: do not put slashes, control characters and a few others into VM file names by default.

Location:

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

Files:

• UINewVMWzd.cpp (modified) (5 diffs)
• UINewVMWzd.h (modified) (2 diffs)

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

@@ -234 +234 @@
     registerField("type*", m_pTypeSelector, "type", SIGNAL(osTypeChanged()));
     registerField("machineFolder", this, "machineFolder");
+    registerField("machineBaseName", this, "machineBaseName");
 
     connect(m_pNameEditor, SIGNAL(textChanged(const QString&)),
@@ -313 +314 @@
     /* Get machine directory: */
     QString strMachineFolder = fileInfo.absolutePath();
+    QString strMachineBaseName = fileInfo.baseName();
 
     /* Try to create this machine directory (and it's predecessors): */
@@ -323 +325 @@
 
     /* Initialize machine dir value: */
-    m_strMachineFolder = strMachineFolder;
+    m_strMachineFolder   = strMachineFolder;
+    m_strMachineBaseName = strMachineBaseName;
     return true;
 }
@@ -351 +354 @@
 }
 
+QString UINewVMWzdPage2::machineBaseName() const
+{
+    return m_strMachineBaseName;
+}
+
+void UINewVMWzdPage2::setMachineBaseName(const QString &strMachineBaseName)
+{
+    m_strMachineBaseName = strMachineBaseName;
+}
+
 UINewVMWzdPage3::UINewVMWzdPage3()
 {
@@ -592 +605 @@
 bool UINewVMWzdPage4::getWithNewHardDiskWizard()
 {
-    UINewHDWizard dlg(this, field("name").toString(), field("machineFolder").toString(), field("type").value<CGuestOSType>().GetRecommendedHDD());
+    UINewHDWizard dlg(this, field("machineBaseName").toString(), field("machineFolder").toString(), field("type").value<CGuestOSType>().GetRecommendedHDD());
 
     if (dlg.exec() == QDialog::Accepted)

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

@@ -71 +71 @@
     Q_OBJECT;
     Q_PROPERTY(QString machineFolder READ machineFolder WRITE setMachineFolder);
+    Q_PROPERTY(QString machineBaseName READ machineBaseName WRITE setMachineBaseName);
 
 public:
@@ -98 +99 @@
     void setMachineFolder(const QString &strMachineFolder);
     QString m_strMachineFolder;
+
+    QString machineBaseName() const;
+    void setMachineBaseName(const QString &strMachineBaseName);
+    QString m_strMachineBaseName;
 };