Changeset 7351 in vbox for trunk/src/VBox

Timestamp:

Mar 7, 2008 11:35:29 AM (17 years ago)

Author:

vboxsync

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

28771

Message:

FE/Qt: Use IVirtualBox/IMachine::saveSettingsWithBackup() for creating backup copies of the settings files when auto-converting.

Location:

trunk/src/VBox/Frontends

Files:

• VirtualBox/src/VBoxGlobal.cpp (modified) (3 diffs)
• VirtualBox/src/VBoxProblemReporter.cpp (modified) (1 diff)
• VirtualBox4/src/VBoxGlobal.cpp (modified) (3 diffs)
• VirtualBox4/src/VBoxProblemReporter.cpp (modified) (1 diff)

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

@@ -1872 +1872 @@
             .warnAboutAutoConvertedSettings (formatVersion, fileList);
 
-        if (rc == QIMessageBox::No)
-        {
-            /* create backup copies */
-            for (QValueList <CMachine>::Iterator m = machines.begin();
-                 /* machines.end() means global config => manual loop break */ ;)
-            {
-                QString of, nf;
-
-                if (m == machines.end())
-                {
-                    if (!isGlobalConverted)
-                        break;
-                    of = mVBox.GetSettingsFilePath();
-                    nf = QString ("%1.%2.bak").arg (of, mVBox.GetSettingsFileVersion());
-                }
-                else
-                {
-                    of = (*m).GetSettingsFilePath();
-                    nf = QString ("%1.%2.bak").arg (of, (*m).GetSettingsFileVersion());
-                }
-
-                int vrc = RTFileCopyEx (of.utf8(), nf.utf8(),
-                                        RTFILECOPY_FLAG_NO_DENY_WRITE,
-                                        NULL, NULL);
-
-                /* try progressive suffix on failure */
-                if (vrc == VERR_ALREADY_EXISTS)
-                {
-                    QString tmp = nf;
-                    for (int i = 0; i < 9 && RT_FAILURE (vrc); ++ i)
-                    {
-                        nf = QString ("%1.%2"). arg (tmp).arg (i);
-                        vrc = RTFileCopyEx (of.utf8(), nf.utf8(),
-                                            RTFILECOPY_FLAG_NO_DENY_WRITE,
-                                            NULL, NULL);
-                    }
-                }
-
-                if (RT_FAILURE (vrc))
-                {
-                    vboxProblem().cannotCopyFile (of, nf, vrc);
-                    if (m == machines.end())
-                    {
-                        /* remove from further processing */
-                        isGlobalConverted = false;
-                        break;
-                    }
-                    else
-                        /* remove from further processing */
-                        m = machines.remove (m);
-                }
-                else
-                {
-                    if (m == machines.end())
-                        break;
-                    ++ m;
-                }
-            }
-        }
-
-        if (rc == QIMessageBox::Yes || rc == QIMessageBox::No)
-        {
-            /* save all settings files */
+        if (rc == QIMessageBox::No || rc == QIMessageBox::Yes)
+        {
+            /* backup (optionally) and save all settings files
+             * (QIMessageBox::No = Backup, QIMessageBox::Yes = Save) */
+
             for (QValueList <CMachine>::Iterator m = machines.begin();
                  /* machines.end() means global config => manual loop break */ ;)
@@ -1942 +1884 @@
                     if (isGlobalConverted)
                     {
-                        mVBox.SaveSettings();
+                        if (rc == QIMessageBox::No)
+                            mVBox.SaveSettingsWithBackup();
+                        else
+                            mVBox.SaveSettings();
+
                         if (!mVBox.isOk())
                             vboxProblem().cannotSaveGlobalSettings (mVBox);
@@ -1953 +1899 @@
                     {
                         CMachine sm = session.GetMachine();
-                        sm.SaveSettings();
+                        if (rc == QIMessageBox::No)
+                            sm.SaveSettingsWithBackup();
+                        else
+                            sm.SaveSettings();
+                        ;
                         if (!sm.isOk())
                             vboxProblem().cannotSaveMachineSettings (sm);

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

@@ -1662 +1662 @@
             "<p>Note that if you select <b>Cancel</b>, the auto-converted "
             "settings files will be implicitly saved in the new format anyway "
-            "once you change a setting or start a virtual machine.</p>")
+            "once you change a setting or start a virtual machine, but "
+            "<b>no</b> backup copies will be created in this case.</p>")
             .arg (aFormatVersion),
         aFileList,

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxGlobal.cpp

@@ -1886 +1886 @@
             .warnAboutAutoConvertedSettings (formatVersion, fileList);
 
-        if (rc == QIMessageBox::No)
-        {
-            /* create backup copies */
-            for (QList <CMachine>::Iterator m = machines.begin();
-                 /* machines.end() means global config => manual loop break */ ;)
-            {
-                QString of, nf;
-
-                if (m == machines.end())
-                {
-                    if (!isGlobalConverted)
-                        break;
-                    of = mVBox.GetSettingsFilePath();
-                    nf = QString ("%1.%2.bak").arg (of, mVBox.GetSettingsFileVersion());
-                }
-                else
-                {
-                    of = (*m).GetSettingsFilePath();
-                    nf = QString ("%1.%2.bak").arg (of, (*m).GetSettingsFileVersion());
-                }
-
-                int vrc = RTFileCopyEx (of.utf8(), nf.utf8(),
-                                        RTFILECOPY_FLAG_NO_DENY_WRITE,
-                                        NULL, NULL);
-
-                /* try progressive suffix on failure */
-                if (vrc == VERR_ALREADY_EXISTS)
-                {
-                    QString tmp = nf;
-                    for (int i = 0; i < 9 && RT_FAILURE (vrc); ++ i)
-                    {
-                        nf = QString ("%1.%2"). arg (tmp).arg (i);
-                        vrc = RTFileCopyEx (of.utf8(), nf.utf8(),
-                                            RTFILECOPY_FLAG_NO_DENY_WRITE,
-                                            NULL, NULL);
-                    }
-                }
-
-                if (RT_FAILURE (vrc))
-                {
-                    vboxProblem().cannotCopyFile (of, nf, vrc);
-                    if (m == machines.end())
-                    {
-                        /* remove from further processing */
-                        isGlobalConverted = false;
-                        break;
-                    }
-                    else
-                        /* remove from further processing */
-                        m = machines.remove (m);
-                }
-                else
-                {
-                    if (m == machines.end())
-                        break;
-                    ++ m;
-                }
-            }
-        }
-
-        if (rc == QIMessageBox::Yes || rc == QIMessageBox::No)
-        {
-            /* save all settings files */
+        if (rc == QIMessageBox::No || rc == QIMessageBox::Yes)
+        {
+            /* backup (optionally) and save all settings files
+             * (QIMessageBox::No = Backup, QIMessageBox::Yes = Save) */
+
             for (QList <CMachine>::Iterator m = machines.begin();
                  /* machines.end() means global config => manual loop break */ ;)
@@ -1956 +1898 @@
                     if (isGlobalConverted)
                     {
-                        mVBox.SaveSettings();
+                        if (rc == QIMessageBox::No)
+                            mVBox.SaveSettingsWithBackup();
+                        else
+                            mVBox.SaveSettings();
+
                         if (!mVBox.isOk())
                             vboxProblem().cannotSaveGlobalSettings (mVBox);
@@ -1967 +1913 @@
                     {
                         CMachine sm = session.GetMachine();
-                        sm.SaveSettings();
+                        if (rc == QIMessageBox::No)
+                            sm.SaveSettingsWithBackup();
+                        else
+                            sm.SaveSettings();
+                        ;
                         if (!sm.isOk())
                             vboxProblem().cannotSaveMachineSettings (sm);

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxProblemReporter.cpp

@@ -1668 +1668 @@
             "<p>Note that if you select <b>Cancel</b>, the auto-converted "
             "settings files will be implicitly saved in the new format anyway "
-            "once you change a setting or start a virtual machine.</p>")
+            "once you change a setting or start a virtual machine, but "
+            "<b>no</b> backup copies will be created in this case.</p>")
             .arg (aFormatVersion),
         aFileList,