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

Timestamp:

Oct 19, 2010 3:41:23 PM (15 years ago)

Author:

vboxsync

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

66787

Message:

Main: new VirtualBox::ComposeMachineFilename() API; remove the 'default hard disk folder' concept and related APIs; GUI wizards need fixing

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxMediaManagerDlg.cpp (modified) (1 diff)
• settings/global/VBoxGLSettingsGeneral.cpp (modified) (2 diffs)
• wizards/newhd/UINewHDWzd.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxMediaManagerDlg.cpp

@@ -977 +977 @@
              && item->state() != KMediumState_NotCreated)
         dir = QFileInfo (item->location().trimmed()).absolutePath();
-
-    if (dir.isEmpty())
-        if (type == VBoxDefs::MediumType_HardDisk)
-            dir = mVBox.GetSystemProperties().GetDefaultHardDiskFolder();
 
     if (dir.isEmpty() || !QFileInfo (dir).exists())

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/VBoxGLSettingsGeneral.cpp

@@ -60 +60 @@
                                      const VBoxGlobalSettings &aGs)
 {
-    mPsHardDisk->setPath (aProps.GetDefaultHardDiskFolder());
     mPsMach->setPath (aProps.GetDefaultMachineFolder());
     mPsVRDP->setPath (aProps.GetRemoteDisplayAuthLibrary());
@@ -73 +72 @@
                                        VBoxGlobalSettings &aGs)
 {
-    if (mPsHardDisk->isModified())
-        aProps.SetDefaultHardDiskFolder (mPsHardDisk->path());
     if (aProps.isOk() && mPsMach->isModified())
         aProps.SetDefaultMachineFolder (mPsMach->path());

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newhd/UINewHDWzd.cpp

@@ -78 +78 @@
     CVirtualBox vbox = vboxGlobal().virtualBox();
     QString strHomeFolder = vbox.GetHomeFolder();
-    QString strDefaultFolder = vbox.GetSystemProperties().GetDefaultHardDiskFolder();
+    QString strDefaultFolder = vbox.GetHomeFolder();
 
     QFileInfo fi(strFileName);
@@ -321 +321 @@
     {
         CVirtualBox vbox = vboxGlobal().virtualBox();
-        folder = vbox.GetSystemProperties().GetDefaultHardDiskFolder();
+        folder = vbox.GetHomeFolder();          // @todo machine folder?
         if (!folder.exists())
             folder = vbox.GetHomeFolder();