Changeset 7342 in vbox

Timestamp:

Mar 6, 2008 6:35:43 PM (17 years ago)

Author:

vboxsync

Message:

FE/Qt: Added support for user notification about settings file auto-conversion (#2705).

Location:

trunk/src/VBox/Frontends

Files:

• VirtualBox/include/VBoxGlobal.h (modified) (1 diff)
• VirtualBox/include/VBoxProblemReporter.h (modified) (3 diffs)
• VirtualBox/src/VBoxGlobal.cpp (modified) (14 diffs)
• VirtualBox/src/VBoxProblemReporter.cpp (modified) (6 diffs)
• VirtualBox/src/main.cpp (modified) (1 diff)
• VirtualBox4/include/VBoxGlobal.h (modified) (1 diff)
• VirtualBox4/include/VBoxProblemReporter.h (modified) (3 diffs)
• VirtualBox4/src/VBoxGlobal.cpp (modified) (11 diffs)
• VirtualBox4/src/VBoxProblemReporter.cpp (modified) (6 diffs)
• VirtualBox4/src/main.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxGlobal.h

@@ -428 +428 @@
     bool showVirtualBoxLicense();
 #endif
+
+    void checkForAutoConvertedSettings();
 
     CSession openSession (const QUuid &aId, bool aExisting = false);

trunk/src/VBox/Frontends/VirtualBox/include/VBoxProblemReporter.h

@@ -129 +129 @@
 
     void cannotOpenURL (const QString &aURL);
+    void cannotCopyFile (const QString &aSrc, const QString &aDst, int aVRC);
 
     void cannotFindLanguage (const QString &aLangID, const QString &aNlsPath);
@@ -135 +136 @@
     void cannotInitCOM (HRESULT rc);
     void cannotCreateVirtualBox (const CVirtualBox &vbox);
+
+    void cannotSaveGlobalSettings (const CVirtualBox &vbox,
+                                   QWidget *parent = 0);
 
     void cannotLoadGlobalConfig (const CVirtualBox &vbox, const QString &error);
@@ -259 +263 @@
     bool remindAboutPausedVMInput();
 
+    int warnAboutAutoConvertedSettings (const QString &aFormatVersion,
+                                        const QString &aFileList);
+
     bool remindAboutInaccessibleMedia();
 

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

@@ -24 +24 @@
 #include "VBoxProblemReporter.h"
 #include "QIHotKeyEdit.h"
+#include "QIMessageBox.h"
 
 #ifdef VBOX_WITH_REGISTRATION
@@ -76 +77 @@
 #include <iprt/path.h>
 #include <iprt/env.h>
+#include <iprt/file.h>
 
 #if defined (Q_WS_X11)
@@ -1824 +1826 @@
 }
 #endif
+
+/**
+ * Checks if any of the settings files were auto-converted and informs the user
+ * if so.
+ */
+void VBoxGlobal::checkForAutoConvertedSettings()
+{
+    QString formatVersion = mVBox.GetSettingsFormatVersion();
+
+    bool isGlobalConverted = false;
+    QValueList <CMachine> machines;
+    QString fileList;
+    QString version;
+
+    CMachineVector vec = mVBox.GetMachines2();
+    for (CMachineVector::ConstIterator m = vec.begin();
+         m != vec.end(); ++ m)
+    {
+        if (!m->GetAccessible())
+            continue;
+
+        version = m->GetSettingsFileVersion();
+        if (version != formatVersion)
+        {
+            machines.append (*m);
+            fileList += QString ("<nobr>%1&nbsp;&nbsp;&nbsp;(<i>%2</i>)</nobr><br>")
+                .arg (m->GetSettingsFilePath())
+                .arg (version);
+        }
+    }
+
+    version = mVBox.GetSettingsFileVersion();
+    if (version != formatVersion)
+    {
+        isGlobalConverted = true;
+        fileList += QString ("<nobr>%1&nbsp;&nbsp;&nbsp;(<i>%2</i>)</nobr><br>")
+            .arg (mVBox.GetSettingsFilePath())
+            .arg (version);
+    }
+
+
+    if (!fileList.isNull())
+    {
+        int rc = vboxProblem()
+            .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 */
+            for (QValueList <CMachine>::Iterator m = machines.begin();
+                 /* machines.end() means global config => manual loop break */ ;)
+            {
+                if (m == machines.end())
+                {
+                    if (isGlobalConverted)
+                    {
+                        mVBox.SaveSettings();
+                        if (!mVBox.isOk())
+                            vboxProblem().cannotSaveGlobalSettings (mVBox);
+                    }
+                }
+                else
+                {
+                    CSession session = openSession ((*m).GetId());
+                    if (!session.isNull())
+                    {
+                        CMachine sm = session.GetMachine();
+                        sm.SaveSettings();
+                        if (!sm.isOk())
+                            vboxProblem().cannotSaveMachineSettings (sm);
+                        session.Close();
+                    }
+                }
+
+                if (m == machines.end())
+                    break;
+
+                ++ m;
+            }
+        }
+    }
+}
 
 /**
@@ -3803 +3947 @@
     }
 
-    // initialize guest OS type vector
+    /* initialize guest OS type vector */
     CGuestOSTypeCollection coll = mVBox.GetGuestOSTypes();
     int osTypeCount = coll.GetCount();
@@ -3816 +3960 @@
     }
 
-    // fill in OS type icon dictionary
+    /* fill in OS type icon dictionary */
     static const char *osTypeIcons[][2] =
     {
@@ -3843 +3987 @@
         {"l4", "os_l4.png"},
     };
-    vm_os_type_icons.setAutoDelete (true); // takes ownership of elements
+    vm_os_type_icons.setAutoDelete (true); /* takes ownership of elements */
     for (uint n = 0; n < SIZEOF_ARRAY (osTypeIcons); n ++)
     {
@@ -3850 +3994 @@
     }
 
-    // fill in VM state icon dictionary
+    /* fill in VM state icon dictionary */
     static struct
     {
@@ -3878 +4022 @@
     }
 
-    // online/offline snapshot icons
+    /* online/offline snapshot icons */
     mOfflineSnapshotIcon = QPixmap::fromMimeSource ("offline_snapshot_16px.png");
     mOnlineSnapshotIcon = QPixmap::fromMimeSource ("online_snapshot_16px.png");
 
-    // initialize state colors vector
-    // no ownership of elements, we're passing pointers to existing objects
+    /* initialize state colors vector */
+    /* no ownership of elements, we're passing pointers to existing objects */
     vm_state_color.insert (KMachineState_Null,           &Qt::red);
     vm_state_color.insert (KMachineState_PoweredOff,     &Qt::gray);
@@ -3897 +4041 @@
     vm_state_color.insert (KMachineState_Discarding,     &Qt::green);
 
+    /* Redefine default large and small icon sizes. In particular, it is
+     * necessary to consider both 32px and 22px icon sizes as Large when we
+     * explicitly define them as Large (seems to be a bug in
+     * QToolButton::sizeHint()). */
+    QIconSet::setIconSize (QIconSet::Small, QSize (16, 16));
+    QIconSet::setIconSize (QIconSet::Large, QSize (22, 22));
+
     qApp->installEventFilter (this);
 
-    // create default non-null global settings
+    /* create default non-null global settings */
     gset = VBoxGlobalSettings (false);
 
-    // try to load global settings
+    /* try to load global settings */
     gset.load (mVBox);
     if (!mVBox.isOk() || !gset)
@@ -3917 +4068 @@
     languageChange();
 
-    // process command line
+    /* process command line */
 
     vm_render_mode_str = 0;
@@ -3931 +4082 @@
     int argc = qApp->argc();
     int i = 1;
-    while ( i < argc ) {
-        const char *arg = qApp->argv()[i];
-        if (        !::strcmp( arg, "-startvm" ) ) {
-            if ( ++i < argc ) {
-                QString param = QString (qApp->argv()[i]);
+    while (i < argc)
+    {
+        const char *arg = qApp->argv() [i];
+        if (       !::strcmp (arg, "-startvm"))
+        {
+            if (++i < argc)
+            {
+                QString param = QString (qApp->argv() [i]);
                 QUuid uuid = QUuid (param);
-                if (!uuid.isNull()) {
+                if (!uuid.isNull())
+                {
                     vmUuid = uuid;
-                } else {
+                }
+                else
+                {
                     CMachine m = mVBox.FindMachine (param);
-                    if (m.isNull()) {
+                    if (m.isNull())
+                    {
                         vboxProblem().cannotFindMachineByName (mVBox, param);
                         return;
@@ -3948 +4106 @@
                 }
             }
-        } else if ( !::strcmp( arg, "-comment" ) ) {
+        }
+        else if (!::strcmp (arg, "-comment"))
+        {
             ++i;
-        } else if ( !::strcmp( arg, "-rmode" ) ) {
-            if ( ++i < argc )
-                vm_render_mode_str = qApp->argv()[i];
+        }
+        else if (!::strcmp (arg, "-rmode"))
+        {
+            if (++i < argc)
+                vm_render_mode_str = qApp->argv() [i];
         }
 #ifdef VBOX_WITH_DEBUGGER_GUI
-        else if ( !::strcmp( arg, "-dbg" ) ) {
+        else if (!::strcmp (arg, "-dbg"))
+        {
             dbg_enabled = true;
         }
 #ifdef DEBUG
-        else if ( !::strcmp( arg, "-nodebug" ) ) {
+        else if (!::strcmp (arg, "-nodebug"))
+        {
             dbg_enabled = false;
             dbg_visible_at_startup = false;
         }
 #else
-        else if ( !::strcmp( arg, "-debug" ) ) {
+        else if (!::strcmp( arg, "-debug"))
+        {
             dbg_enabled = true;
             dbg_visible_at_startup = true;
@@ -3973 +4138 @@
     }
 
-    vm_render_mode = vboxGetRenderMode( vm_render_mode_str );
-
-    // setup the callback
+    vm_render_mode = vboxGetRenderMode (vm_render_mode_str);
+
+    /* setup the callback */
     callback = CVirtualBoxCallback (new VBoxCallback (*this));
     mVBox.RegisterCallback (callback);
@@ -3981 +4146 @@
     if (!mVBox.isOk())
         return;
-
-    /*
-     *  Redefine default large and small icon sizes. In particular, it is
-     *  necessary to consider both 32px and 22px icon sizes as Large when
-     *  we explicitly define them as Large (seems to be a bug in
-     *  QToolButton::sizeHint()).
-     */
-    QIconSet::setIconSize (QIconSet::Small, QSize (16, 16));
-    QIconSet::setIconSize (QIconSet::Large, QSize (22, 22));
 
     mValid = true;

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

@@ -487 +487 @@
 }
 
+void VBoxProblemReporter::
+cannotCopyFile (const QString &aSrc, const QString &aDst, int aVRC)
+{
+    PCRTSTATUSMSG msg = RTErrGet (aVRC);
+    Assert (msg);
+
+    QString err = QString ("%1: %2").arg (msg->pszDefine, msg->pszMsgShort);
+    if (err.endsWith ("."))
+        err.truncate (err.length() - 1);
+
+    message (mainWindowShown(), VBoxProblemReporter::Error,
+        tr ("Failed to copy file <b><nobr>%1<nobr></b> to "
+             "<b><nobr>%2<nobr></b> (%3).")
+             .arg (aSrc, aDst, err));
+}
+
 void VBoxProblemReporter::cannotFindLanguage (const QString &aLangID,
                                               const QString &aNlsPath)
 {
-    message
-        (0, VBoxProblemReporter::Error,
-         tr ("<p>Could not find a language file for the language "
-             "<b>%1</b> in the directory <b><nobr>%2</nobr></b>.</p>"
-             "<p>The language will be temporarily reset to the system "
-             "default language. Please go to the <b>Preferences</b> "
-             "dialog which you can open from the <b>File</b> menu of the "
-             "main VirtualBox window, and select one of the existing "
-             "languages on the <b>Language</b> page.</p>")
-         .arg (aLangID).arg (aNlsPath));
+    message (0, VBoxProblemReporter::Error,
+        tr ("<p>Could not find a language file for the language "
+            "<b>%1</b> in the directory <b><nobr>%2</nobr></b>.</p>"
+            "<p>The language will be temporarily reset to the system "
+            "default language. Please go to the <b>Preferences</b> "
+            "dialog which you can open from the <b>File</b> menu of the "
+            "main VirtualBox window, and select one of the existing "
+            "languages on the <b>Language</b> page.</p>")
+             .arg (aLangID).arg (aNlsPath));
 }
 
 void VBoxProblemReporter::cannotLoadLanguage (const QString &aLangFile)
 {
-    message
-        (0, VBoxProblemReporter::Error,
-         tr ("<p>Could not load the language file <b><nobr>%1</nobr></b>. "
-             "<p>The language will be temporarily reset to English (built-in). "
-             "Please go to the <b>Preferences</b> "
-             "dialog which you can open from the <b>File</b> menu of the "
-             "main VirtualBox window, and select one of the existing "
-             "languages on the <b>Language</b> page.</p>")
-         .arg (aLangFile));
+    message (0, VBoxProblemReporter::Error,
+        tr ("<p>Could not load the language file <b><nobr>%1</nobr></b>. "
+            "<p>The language will be temporarily reset to English (built-in). "
+            "Please go to the <b>Preferences</b> "
+            "dialog which you can open from the <b>File</b> menu of the "
+            "main VirtualBox window, and select one of the existing "
+            "languages on the <b>Language</b> page.</p>")
+             .arg (aLangFile));
 }
 
 void VBoxProblemReporter::cannotInitCOM (HRESULT rc)
 {
-    message (
-        0,
-        Critical,
+    message (0, Critical,
         tr ("<p>Failed to initialize COM or to find the VirtualBox COM server. "
             "Most likely, the VirtualBox server is not running "
             "or failed to start.</p>"
             "<p>The application will now terminate.</p>"),
-        formatErrorInfo (COMErrorInfo(), rc)
-    );
+        formatErrorInfo (COMErrorInfo(), rc));
 }
 
 void VBoxProblemReporter::cannotCreateVirtualBox (const CVirtualBox &vbox)
 {
-    message (
-        0,
-        Critical,
+    message (0, Critical,
         tr ("<p>Failed to create the VirtualBox COM object.</p>"
             "<p>The application will now terminate.</p>"),
-        formatErrorInfo (vbox)
-    );
+        formatErrorInfo (vbox));
+}
+
+void VBoxProblemReporter::cannotSaveGlobalSettings (const CVirtualBox &vbox,
+                                                    QWidget *parent /* = 0 */)
+{
+    /* preserve the current error info before calling the object again */
+    COMResult res (vbox);
+
+    message (parent ? parent : mainWindowShown(), Error,
+             tr ("<p>Failed to save the global VirtualBox settings to "
+                 "<b><nobr>%1</nobr></b>.</p>")
+                 .arg (vbox.GetSettingsFilePath()),
+             formatErrorInfo (res));
 }
 
@@ -542 +563 @@
                                                   const QString &error)
 {
+    /* preserve the current error info before calling the object again */
+    COMResult res (vbox);
+
     message (mainWindowShown(), Critical,
-        tr ("<p>Failed to load the global GUI configuration.</p>"
-            "<p>The application will now terminate.</p>"),
-        !vbox.isOk() ? formatErrorInfo (vbox)
-                     : QString ("<p>%1</p>").arg (VBoxGlobal::highlight (error)));
+        tr ("<p>Failed to load the global GUI configuration from "
+            "<b><nobr>%1</nobr></b>.</p>"
+            "<p>The application will now terminate.</p>")
+             .arg (vbox.GetSettingsFilePath()),
+        !res.isOk() ? formatErrorInfo (res)
+                    : QString ("<p>%1</p>").arg (VBoxGlobal::highlight (error)));
 }
 
 void VBoxProblemReporter::cannotSaveGlobalConfig (const CVirtualBox &vbox)
 {
-    message (
-        mainWindowShown(),
-        Critical,
-        tr ("<p>Failed to save the global GUI configuration.<p>"),
-        formatErrorInfo (vbox)
-    );
+    /* preserve the current error info before calling the object again */
+    COMResult res (vbox);
+
+    message (mainWindowShown(), Critical,
+        tr ("<p>Failed to save the global GUI configuration to "
+            "<b><nobr>%1</nobr></b>.</p>"
+            "<p>The application will now terminate.</p>")
+             .arg (vbox.GetSettingsFilePath()),
+        formatErrorInfo (res));
 }
 
 void VBoxProblemReporter::cannotSetSystemProperties (const CSystemProperties &props)
 {
-    message (
-        mainWindowShown(),
-        Critical,
+    message (mainWindowShown(), Critical,
         tr ("Failed to set global VirtualBox properties."),
-        formatErrorInfo (props)
-    );
+        formatErrorInfo (props));
 }
 
@@ -628 +654 @@
 
     message (parent ? parent : mainWindowShown(), Error,
-             tr ("Failed to save the settings of the virtual machine <b>%1</b>.")
-                 .arg (machine.GetName()),
+             tr ("Failed to save the settings of the virtual machine "
+                 "<b>%1</b> to <b><nobr>%2</nobr></b>.")
+                 .arg (machine.GetName(), machine.GetSettingsFilePath()),
              formatErrorInfo (res));
 }
@@ -646 +673 @@
 
     message (parent ? parent : mainWindowShown(), Error,
-             tr ("Failed to load the settings of the virtual machine <b>%1</b>.")
-                 .arg (machine.GetName()),
+             tr ("Failed to load the settings of the virtual machine "
+                 "<b>%1</b> from <b><nobr>%2</nobr></b>.")
+                .arg (machine.GetName(), machine.GetSettingsFilePath()),
              formatErrorInfo (res));
 }
@@ -1116 +1144 @@
     Assert (!vbox.isOk() || progress.isOk());
 
+    QString name = machine.GetName();
+    if (name.isEmpty())
+        name = QFileInfo (machine.GetSettingsFilePath()).baseName();
+
     message (
         mainWindowShown(),
         Error,
         tr ("Failed to open a session for the virtual machine <b>%1</b>.")
-            .arg (machine.GetName()),
+            .arg (name),
         !vbox.isOk() ? formatErrorInfo (vbox) :
                        formatErrorInfo (progress.GetErrorInfo())
@@ -1602 +1634 @@
 
 /**
+ * Shows a list of auto-converted files and asks the user to either Save, Backup
+ * or Cancel to leave them as is.
+ *
+ * @param aFormatVersion    Recent settings file format version.
+ * @param aFileList         List of auto-converted files (may use Qt HTML).
+ *
+ * @return QIMessageBox::Yes (Save), QIMessageBox::No (Backup),
+ *         QIMessageBox::Cancel (Leave)
+ */
+int VBoxProblemReporter::warnAboutAutoConvertedSettings (const QString &aFormatVersion,
+                                                         const QString &aFileList)
+{
+    return message (mainWindowShown(), Warning,
+        tr ("<p>The following VirtualBox settings files have been "
+            "automatically converted to the new settings file format "
+            "version <b>%1</b>.</p>"
+            "<p>However, the results of the conversion were not saved back "
+            "to disk yet. Please press:</p>"
+            "<ul>"
+            "<li><b>Save</b> to save all auto-converted files now (it will not "
+            "be possible to use these settings files with an older version of "
+            "VirtualBox in the future);</li>"
+            "<li><b>Backup</b> to create backup copies of settings files in "
+            "the old format before saving them in the new format;</li>"
+            "<li><b>Cancel</b> to not save the settings files now.<li>"
+            "</ul>"
+            "<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>")
+            .arg (aFormatVersion),
+        aFileList,
+        NULL /* aAutoConfirmId */,
+        QIMessageBox::Yes,
+        QIMessageBox::No | QIMessageBox::Default,
+        QIMessageBox::Cancel | QIMessageBox::Escape,
+        tr ("&Save", "warnAboutAutoConvertedSettings message box"),
+        tr ("&Backup", "warnAboutAutoConvertedSettings message box"),
+        tr ("Cancel", "warnAboutAutoConvertedSettings message box"));
+}
+
+/**
  *  @param aHotKey Fullscreen hot key as defined in the menu.
  *

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

@@ -236 +236 @@
 #endif
 
+            vboxGlobal().checkForAutoConvertedSettings();
+
             VBoxGlobalSettings settings = vboxGlobal().settings();
             /* Process known keys */

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxGlobal.h

@@ -431 +431 @@
     bool showVirtualBoxLicense();
 #endif
+
+    void checkForAutoConvertedSettings();
 
     CSession openSession (const QUuid &aId, bool aExisting = false);

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxProblemReporter.h

@@ -129 +129 @@
 
     void cannotOpenURL (const QString &aURL);
+    void cannotCopyFile (const QString &aSrc, const QString &aDst, int aVRC);
 
     void cannotFindLanguage (const QString &aLangID, const QString &aNlsPath);
@@ -135 +136 @@
     void cannotInitCOM (HRESULT rc);
     void cannotCreateVirtualBox (const CVirtualBox &vbox);
+
+    void cannotSaveGlobalSettings (const CVirtualBox &vbox,
+                                   QWidget *parent = 0);
 
     void cannotLoadGlobalConfig (const CVirtualBox &vbox, const QString &error);
@@ -259 +263 @@
     bool remindAboutPausedVMInput();
 
+    int warnAboutAutoConvertedSettings (const QString &aFormatVersion,
+                                        const QString &aFileList);
+
     bool remindAboutInaccessibleMedia();
 

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

@@ -24 +24 @@
 #include "VBoxProblemReporter.h"
 #include "QIHotKeyEdit.h"
+#include "QIMessageBox.h"
+
 //Added by qt3to4:
 #include <QDesktopWidget>
@@ -63 +65 @@
 #include <q3process.h>
 
+#include <QList>
+
 #if defined (Q_WS_MAC)
 #include <Carbon/Carbon.h> // for HIToolbox/InternetConfig
@@ -87 +91 @@
 #include <iprt/path.h>
 #include <iprt/env.h>
+#include <iprt/file.h>
 
 #if defined (Q_WS_X11)
@@ -910 +915 @@
     static QStringList list;
     if (list.empty()) {
-        for (uint i = 0; i < vm_os_types.count(); i++) {
+        for (int i = 0; i < vm_os_types.count(); i++) {
             list += vm_os_types [i].GetDescription();
         }
@@ -1001 +1006 @@
     static QStringList list;
     if (list.empty())
-        for (uint i = 0; i < deviceTypes.count() - 1 /* usb=n/a */; i++)
+        for (int i = 0; i < deviceTypes.count() - 1 /* usb=n/a */; i++)
             list += deviceTypes [i];
     return list;
@@ -1804 +1809 @@
     QStringList filesList = docDir.entryList();
     double maxVersionNumber = 0;
-    for (uint index = 0; index < filesList.count(); ++ index)
+    for (int index = 0; index < filesList.count(); ++ index)
     {
         QRegExp regExp ("License-([\\d\\.]+).html");
@@ -1835 +1840 @@
 }
 #endif
+
+/**
+ * Checks if any of the settings files were auto-converted and informs the user
+ * if so.
+ */
+void VBoxGlobal::checkForAutoConvertedSettings()
+{
+    QString formatVersion = mVBox.GetSettingsFormatVersion();
+
+    bool isGlobalConverted = false;
+    QList <CMachine> machines;
+    QString fileList;
+    QString version;
+
+    CMachineVector vec = mVBox.GetMachines2();
+    for (CMachineVector::ConstIterator m = vec.begin();
+         m != vec.end(); ++ m)
+    {
+        if (!m->GetAccessible())
+            continue;
+
+        version = m->GetSettingsFileVersion();
+        if (version != formatVersion)
+        {
+            machines.append (*m);
+            fileList += QString ("<nobr>%1&nbsp;&nbsp;&nbsp;(<i>%2</i>)</nobr><br>")
+                .arg (m->GetSettingsFilePath())
+                .arg (version);
+        }
+    }
+
+    version = mVBox.GetSettingsFileVersion();
+    if (version != formatVersion)
+    {
+        isGlobalConverted = true;
+        fileList += QString ("<nobr>%1&nbsp;&nbsp;&nbsp;(<i>%2</i>)</nobr><br>")
+            .arg (mVBox.GetSettingsFilePath())
+            .arg (version);
+    }
+
+
+    if (!fileList.isNull())
+    {
+        int rc = vboxProblem()
+            .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 */
+            for (QList <CMachine>::Iterator m = machines.begin();
+                 /* machines.end() means global config => manual loop break */ ;)
+            {
+                if (m == machines.end())
+                {
+                    if (isGlobalConverted)
+                    {
+                        mVBox.SaveSettings();
+                        if (!mVBox.isOk())
+                            vboxProblem().cannotSaveGlobalSettings (mVBox);
+                    }
+                }
+                else
+                {
+                    CSession session = openSession ((*m).GetId());
+                    if (!session.isNull())
+                    {
+                        CMachine sm = session.GetMachine();
+                        sm.SaveSettings();
+                        if (!sm.isOk())
+                            vboxProblem().cannotSaveMachineSettings (sm);
+                        session.Close();
+                    }
+                }
+
+                if (m == machines.end())
+                    break;
+
+                ++ m;
+            }
+        }
+    }
+}
 
 /**
@@ -3900 +4047 @@
     vm_state_color.insert (KMachineState_Discarding,     new QColor(Qt::green));
 
+    /* Redefine default large and small icon sizes. In particular, it is
+     * necessary to consider both 32px and 22px icon sizes as Large when we
+     * explicitly define them as Large (seems to be a bug in
+     * QToolButton::sizeHint()). */
+#warning port me
+//    QIcon::setIconSize (QIcon::Small, QSize (16, 16));
+//    QIcon::setIconSize (QIcon::Large, QSize (22, 22));
+
     qApp->installEventFilter (this);
 
@@ -3934 +4089 @@
     int argc = qApp->argc();
     int i = 1;
-    while ( i < argc ) {
-        const char *arg = qApp->argv()[i];
-        if (        !::strcmp( arg, "-startvm" ) ) {
-            if ( ++i < argc ) {
-                QString param = QString (qApp->argv()[i]);
+    while (i < argc)
+    {
+        const char *arg = qApp->argv() [i];
+        if (       !::strcmp (arg, "-startvm"))
+        {
+            if (++i < argc)
+            {
+                QString param = QString (qApp->argv() [i]);
                 QUuid uuid = QUuid (param);
-                if (!uuid.isNull()) {
+                if (!uuid.isNull())
+                {
                     vmUuid = uuid;
-                } else {
+                }
+                else
+                {
                     CMachine m = mVBox.FindMachine (param);
-                    if (m.isNull()) {
+                    if (m.isNull())
+                    {
                         vboxProblem().cannotFindMachineByName (mVBox, param);
                         return;
@@ -3951 +4113 @@
                 }
             }
-        } else if ( !::strcmp( arg, "-comment" ) ) {
+        }
+        else if (!::strcmp (arg, "-comment"))
+        {
             ++i;
-        } else if ( !::strcmp( arg, "-rmode" ) ) {
-            if ( ++i < argc )
-                vm_render_mode_str = qApp->argv()[i];
+        }
+        else if (!::strcmp (arg, "-rmode"))
+        {
+            if (++i < argc)
+                vm_render_mode_str = qApp->argv() [i];
         }
 #ifdef VBOX_WITH_DEBUGGER_GUI
-        else if ( !::strcmp( arg, "-dbg" ) ) {
+        else if (!::strcmp (arg, "-dbg"))
+        {
             dbg_enabled = true;
         }
 #ifdef DEBUG
-        else if ( !::strcmp( arg, "-nodebug" ) ) {
+        else if (!::strcmp (arg, "-nodebug"))
+        {
             dbg_enabled = false;
             dbg_visible_at_startup = false;
         }
 #else
-        else if ( !::strcmp( arg, "-debug" ) ) {
+        else if (!::strcmp( arg, "-debug"))
+        {
             dbg_enabled = true;
             dbg_visible_at_startup = true;
@@ -3984 +4153 @@
     if (!mVBox.isOk())
         return;
-
-    /* Redefine default large and small icon sizes. In particular, it is
-     * necessary to consider both 32px and 22px icon sizes as Large when we
-     * explicitly define them as Large (seems to be a bug in
-     * QToolButton::sizeHint()). */
-#warning port me
-//    QIcon::setIconSize (QIcon::Small, QSize (16, 16));
-//    QIcon::setIconSize (QIcon::Large, QSize (22, 22));
 
     mValid = true;

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

@@ -493 +493 @@
 }
 
+void VBoxProblemReporter::
+cannotCopyFile (const QString &aSrc, const QString &aDst, int aVRC)
+{
+    PCRTSTATUSMSG msg = RTErrGet (aVRC);
+    Assert (msg);
+
+    QString err = QString ("%1: %2").arg (msg->pszDefine, msg->pszMsgShort);
+    if (err.endsWith ("."))
+        err.truncate (err.length() - 1);
+
+    message (mainWindowShown(), VBoxProblemReporter::Error,
+        tr ("Failed to copy file <b><nobr>%1<nobr></b> to "
+             "<b><nobr>%2<nobr></b> (%3).")
+             .arg (aSrc, aDst, err));
+}
+
 void VBoxProblemReporter::cannotFindLanguage (const QString &aLangID,
                                               const QString &aNlsPath)
 {
-    message
-        (0, VBoxProblemReporter::Error,
-         tr ("<p>Could not find a language file for the language "
-             "<b>%1</b> in the directory <b><nobr>%2</nobr></b>.</p>"
-             "<p>The language will be temporarily reset to the system "
-             "default language. Please go to the <b>Preferences</b> "
-             "dialog which you can open from the <b>File</b> menu of the "
-             "main VirtualBox window, and select one of the existing "
-             "languages on the <b>Language</b> page.</p>")
-         .arg (aLangID).arg (aNlsPath));
+    message (0, VBoxProblemReporter::Error,
+        tr ("<p>Could not find a language file for the language "
+            "<b>%1</b> in the directory <b><nobr>%2</nobr></b>.</p>"
+            "<p>The language will be temporarily reset to the system "
+            "default language. Please go to the <b>Preferences</b> "
+            "dialog which you can open from the <b>File</b> menu of the "
+            "main VirtualBox window, and select one of the existing "
+            "languages on the <b>Language</b> page.</p>")
+             .arg (aLangID).arg (aNlsPath));
 }
 
 void VBoxProblemReporter::cannotLoadLanguage (const QString &aLangFile)
 {
-    message
-        (0, VBoxProblemReporter::Error,
-         tr ("<p>Could not load the language file <b><nobr>%1</nobr></b>. "
-             "<p>The language will be temporarily reset to English (built-in). "
-             "Please go to the <b>Preferences</b> "
-             "dialog which you can open from the <b>File</b> menu of the "
-             "main VirtualBox window, and select one of the existing "
-             "languages on the <b>Language</b> page.</p>")
-         .arg (aLangFile));
+    message (0, VBoxProblemReporter::Error,
+        tr ("<p>Could not load the language file <b><nobr>%1</nobr></b>. "
+            "<p>The language will be temporarily reset to English (built-in). "
+            "Please go to the <b>Preferences</b> "
+            "dialog which you can open from the <b>File</b> menu of the "
+            "main VirtualBox window, and select one of the existing "
+            "languages on the <b>Language</b> page.</p>")
+             .arg (aLangFile));
 }
 
 void VBoxProblemReporter::cannotInitCOM (HRESULT rc)
 {
-    message (
-        0,
-        Critical,
+    message (0, Critical,
         tr ("<p>Failed to initialize COM or to find the VirtualBox COM server. "
             "Most likely, the VirtualBox server is not running "
             "or failed to start.</p>"
             "<p>The application will now terminate.</p>"),
-        formatErrorInfo (COMErrorInfo(), rc)
-    );
+        formatErrorInfo (COMErrorInfo(), rc));
 }
 
 void VBoxProblemReporter::cannotCreateVirtualBox (const CVirtualBox &vbox)
 {
-    message (
-        0,
-        Critical,
+    message (0, Critical,
         tr ("<p>Failed to create the VirtualBox COM object.</p>"
             "<p>The application will now terminate.</p>"),
-        formatErrorInfo (vbox)
-    );
+        formatErrorInfo (vbox));
+}
+
+void VBoxProblemReporter::cannotSaveGlobalSettings (const CVirtualBox &vbox,
+                                                    QWidget *parent /* = 0 */)
+{
+    /* preserve the current error info before calling the object again */
+    COMResult res (vbox);
+
+    message (parent ? parent : mainWindowShown(), Error,
+             tr ("<p>Failed to save the global VirtualBox settings to "
+                 "<b><nobr>%1</nobr></b>.</p>")
+                 .arg (vbox.GetSettingsFilePath()),
+             formatErrorInfo (res));
 }
 
@@ -548 +569 @@
                                                   const QString &error)
 {
+    /* preserve the current error info before calling the object again */
+    COMResult res (vbox);
+
     message (mainWindowShown(), Critical,
-        tr ("<p>Failed to load the global GUI configuration.</p>"
-            "<p>The application will now terminate.</p>"),
-        !vbox.isOk() ? formatErrorInfo (vbox)
-                     : QString ("<p>%1</p>").arg (VBoxGlobal::highlight (error)));
+        tr ("<p>Failed to load the global GUI configuration from "
+            "<b><nobr>%1</nobr></b>.</p>"
+            "<p>The application will now terminate.</p>")
+             .arg (vbox.GetSettingsFilePath()),
+        !res.isOk() ? formatErrorInfo (res)
+                    : QString ("<p>%1</p>").arg (VBoxGlobal::highlight (error)));
 }
 
 void VBoxProblemReporter::cannotSaveGlobalConfig (const CVirtualBox &vbox)
 {
-    message (
-        mainWindowShown(),
-        Critical,
-        tr ("<p>Failed to save the global GUI configuration.<p>"),
-        formatErrorInfo (vbox)
-    );
+    /* preserve the current error info before calling the object again */
+    COMResult res (vbox);
+
+    message (mainWindowShown(), Critical,
+        tr ("<p>Failed to save the global GUI configuration to "
+            "<b><nobr>%1</nobr></b>.</p>"
+            "<p>The application will now terminate.</p>")
+             .arg (vbox.GetSettingsFilePath()),
+        formatErrorInfo (res));
 }
 
 void VBoxProblemReporter::cannotSetSystemProperties (const CSystemProperties &props)
 {
-    message (
-        mainWindowShown(),
-        Critical,
+    message (mainWindowShown(), Critical,
         tr ("Failed to set global VirtualBox properties."),
-        formatErrorInfo (props)
-    );
+        formatErrorInfo (props));
 }
 
@@ -634 +660 @@
 
     message (parent ? parent : mainWindowShown(), Error,
-             tr ("Failed to save the settings of the virtual machine <b>%1</b>.")
-                 .arg (machine.GetName()),
+             tr ("Failed to save the settings of the virtual machine "
+                 "<b>%1</b> to <b><nobr>%2</nobr></b>.")
+                 .arg (machine.GetName(), machine.GetSettingsFilePath()),
              formatErrorInfo (res));
 }
@@ -652 +679 @@
 
     message (parent ? parent : mainWindowShown(), Error,
-             tr ("Failed to load the settings of the virtual machine <b>%1</b>.")
-                 .arg (machine.GetName()),
+             tr ("Failed to load the settings of the virtual machine "
+                 "<b>%1</b> from <b><nobr>%2</nobr></b>.")
+                .arg (machine.GetName(), machine.GetSettingsFilePath()),
              formatErrorInfo (res));
 }
@@ -1122 +1150 @@
     Assert (!vbox.isOk() || progress.isOk());
 
+    QString name = machine.GetName();
+    if (name.isEmpty())
+        name = QFileInfo (machine.GetSettingsFilePath()).baseName();
+
     message (
         mainWindowShown(),
         Error,
         tr ("Failed to open a session for the virtual machine <b>%1</b>.")
-            .arg (machine.GetName()),
+            .arg (name),
         !vbox.isOk() ? formatErrorInfo (vbox) :
                        formatErrorInfo (progress.GetErrorInfo())
@@ -1608 +1640 @@
 
 /**
+ * Shows a list of auto-converted files and asks the user to either Save, Backup
+ * or Cancel to leave them as is.
+ *
+ * @param aFormatVersion    Recent settings file format version.
+ * @param aFileList         List of auto-converted files (may use Qt HTML).
+ *
+ * @return QIMessageBox::Yes (Save), QIMessageBox::No (Backup),
+ *         QIMessageBox::Cancel (Leave)
+ */
+int VBoxProblemReporter::warnAboutAutoConvertedSettings (const QString &aFormatVersion,
+                                                         const QString &aFileList)
+{
+    return message (mainWindowShown(), Warning,
+        tr ("<p>The following VirtualBox settings files have been "
+            "automatically converted to the new settings file format "
+            "version <b>%1</b>.</p>"
+            "<p>However, the results of the conversion were not saved back "
+            "to disk yet. Please press:</p>"
+            "<ul>"
+            "<li><b>Save</b> to save all auto-converted files now (it will not "
+            "be possible to use these settings files with an older version of "
+            "VirtualBox in the future);</li>"
+            "<li><b>Backup</b> to create backup copies of settings files in "
+            "the old format before saving them in the new format;</li>"
+            "<li><b>Cancel</b> to not save the settings files now.<li>"
+            "</ul>"
+            "<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>")
+            .arg (aFormatVersion),
+        aFileList,
+        NULL /* aAutoConfirmId */,
+        QIMessageBox::Yes,
+        QIMessageBox::No | QIMessageBox::Default,
+        QIMessageBox::Cancel | QIMessageBox::Escape,
+        tr ("&Save", "warnAboutAutoConvertedSettings message box"),
+        tr ("&Backup", "warnAboutAutoConvertedSettings message box"),
+        tr ("Cancel", "warnAboutAutoConvertedSettings message box"));
+}
+
+/**
  *  @param aHotKey Fullscreen hot key as defined in the menu.
  *

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

@@ -236 +236 @@
 #endif
 
+            vboxGlobal().checkForAutoConvertedSettings();
+
             VBoxGlobalSettings settings = vboxGlobal().settings();
             /* Process known keys */