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

Timestamp:

Jul 28, 2009 12:28:02 PM (16 years ago)

Author:

vboxsync

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

50460

Message:

FE/Qt4: 2705: Auto-convert settings files: Progress-bar for auto-conversion process implemented.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxGlobal.h (modified) (1 diff)
• include/VBoxProblemReporter.h (modified) (1 diff)
• src/VBoxGlobal.cpp (modified) (6 diffs)
• src/VBoxProblemReporter.cpp (modified) (2 diffs)
• src/VBoxSelectorWnd.cpp (modified) (1 diff)

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

@@ -610 +610 @@
 #endif
 
-    bool checkForAutoConvertedSettings (bool aAfterRefresh = false);
-
-    void checkForAutoConvertedSettingsAfterRefresh()
-    { checkForAutoConvertedSettings (true); }
+    bool checkForSettingsAutoConversion (bool aAfterRefresh = false);
+
+    bool checkForSettingsAutoConversionAfterRefresh() { return checkForSettingsAutoConversion (true); }
 
     CSession openSession (const QString &aId, bool aExisting = false);

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

@@ -324 +324 @@
     bool remindAboutPausedVMInput();
 
-    int warnAboutAutoConvertedSettings (const QString &aFormatVersion,
-                                        const QString &aFileList,
-                                        bool aAfterRefresh);
+    int warnAboutSettingsAutoConversion (const QString &aFileList, bool aAfterRefresh);
 
     bool remindAboutInaccessibleMedia();

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

@@ -38 +38 @@
 
 /* Qt includes */
+#include <QProgressDialog>
 #include <QLibraryInfo>
 #include <QFileDialog>
@@ -2106 +2107 @@
  *                      button. Used when calling after the VM refresh.
  */
-bool VBoxGlobal::checkForAutoConvertedSettings (bool aAfterRefresh /*= false*/)
-{
-    QString formatVersion = mVBox.GetSettingsFormatVersion();
-
-    bool isGlobalConverted = false;
+bool VBoxGlobal::checkForSettingsAutoConversion (bool aAfterRefresh /* = false */)
+{
+    QString currentVersion = mVBox.GetSettingsFormatVersion();
     QList <CMachine> machines;
+    bool isGlobalToBeConverted = false;
     QString fileList;
-    QString version;
-
+    int maxIndex = 0;
+
+    /* Check if VM files need to be converted */
     CMachineVector vec = mVBox.GetMachines();
-    for (CMachineVector::ConstIterator m = vec.begin();
-         m != vec.end(); ++ m)
+    for (CMachineVector::ConstIterator m = vec.begin(); m != vec.end(); ++ m)
     {
         if (!m->GetAccessible())
             continue;
 
-        version = m->GetSettingsFileVersion();
-        if (version != formatVersion)
-        {
+        QString version = m->GetSettingsFileVersion();
+        if (version != currentVersion)
+        {
+            ++ maxIndex;
             machines.append (*m);
             fileList += QString ("<tr><td><nobr>%1</nobr></td><td>&nbsp;&nbsp;</td>"
@@ -2133 +2134 @@
     }
 
+    /* Check if global file need to be converted */
     if (!aAfterRefresh)
     {
-        version = mVBox.GetSettingsFileVersion();
-        if (version != formatVersion)
-        {
-            isGlobalConverted = true;
+        QString version = mVBox.GetSettingsFileVersion();
+        if (version != currentVersion)
+        {
+            ++ maxIndex;
+            isGlobalToBeConverted = true;
             fileList += QString ("<tr><td><nobr>%1</nobr></td><td>&nbsp;&nbsp;</td>"
                                  "</td><td><nobr><i>%2</i></nobr></td></tr>")
@@ -2151 +2154 @@
                             .arg (fileList);
 
-        int rc = vboxProblem()
-            .warnAboutAutoConvertedSettings (formatVersion, fileList,
-                                             aAfterRefresh);
-
-        if (rc == QIMessageBox::Cancel)
+        /* Asking the user about he wants to convert the
+         * configuration files or leave it as already is. */
+        if (vboxProblem().warnAboutSettingsAutoConversion (
+            fileList, aAfterRefresh) == QIMessageBox::Cancel)
             return false;
 
-        Assert (rc == QIMessageBox::No || rc == QIMessageBox::Yes);
-
-        /* backup (optionally) and save all settings files
-         * (QIMessageBox::No = Backup, QIMessageBox::Yes = Save) */
-
+        /* Composing progress dialog */
+        QProgressDialog dlg (mainWindow());
+        dlg.setCancelButton (0);
+        dlg.setWindowModality (Qt::WindowModal);
+        dlg.setMinimum (0);
+        dlg.setMaximum (maxIndex);
+        dlg.setMinimumDuration (2000);
+        dlg.setAutoReset (false);
+
+        /* Converting VM configuration files */
         foreach (CMachine m, machines)
         {
+            dlg.setValue (machines.indexOf (m));
+            dlg.setLabelText (tr ("Converting file... (%1/%2)")
+                              .arg (machines.indexOf (m) + 1).arg (maxIndex));
+
             CSession session = openSession (m.GetId());
             if (!session.isNull())
             {
                 CMachine sm = session.GetMachine();
-                if (rc == QIMessageBox::No)
-                    sm.SaveSettingsWithBackup();
-                else
-                    sm.SaveSettings();
-
+                sm.SaveSettingsWithBackup();
                 if (!sm.isOk())
                     vboxProblem().cannotSaveMachineSettings (sm);
@@ -2180 +2187 @@
         }
 
-        if (isGlobalConverted)
-        {
-            if (rc == QIMessageBox::No)
-                mVBox.SaveSettingsWithBackup();
-            else
-                mVBox.SaveSettings();
-
+        /* Converting global configuration file */
+        if (isGlobalToBeConverted)
+        {
+            dlg.setValue (machines.size());
+            dlg.setLabelText (tr ("Converting file... (%1/%2)")
+                              .arg (machines.size() + 1).arg (maxIndex));
+
+            mVBox.SaveSettingsWithBackup();
             if (!mVBox.isOk())
                 vboxProblem().cannotSaveGlobalSettings (mVBox);
         }
+
+        dlg.setValue (maxIndex);
+        dlg.setLabelText (tr ("Conversion finished!"));
     }
 
@@ -4467 +4478 @@
      * that may unconditionally overwrite settings files in the new format (like
      * SetExtraData()). But after loading the proper the language. */
-    if (!checkForAutoConvertedSettings())
+    if (!checkForSettingsAutoConversion())
         return;
 

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

@@ -1751 +1751 @@
 
 /**
- * Shows a list of auto-converted files and asks the user to either Save, Backup
- * or Cancel to leave them as is and exit VirtualBox.
+ * Shows user a proposal to either convert configuration files or
+ * Exit the application leaving all as already is.
  *
- * @param aFormatVersion    Recent settings file format version.
- * @param aFileList         List of auto-converted files (may use Qt HTML).
- * @param aAfterRefresh     @true when called after the VM refresh.
+ * @param aFileList      List of files for auto-convertion (may use Qt HTML).
+ * @param aAfterRefresh  @true when called after the VM refresh.
  *
- * @return QIMessageBox::Yes (Save), QIMessageBox::No (Backup),
- *         QIMessageBox::Cancel (Exit)
+ * @return QIMessageBox::Ok (Save + Backup), QIMessageBox::Cancel (Exit)
  */
-int VBoxProblemReporter::warnAboutAutoConvertedSettings (const QString &aFormatVersion,
-                                                         const QString &aFileList,
-                                                         bool aAfterRefresh)
-{
-    /* The aAfterRefresh parameter says if an item which was inaccessible is
-       become accessible after a refresh. For the time beeing we present the
-       old message dialog. This case should be rather unlikly. */
+int VBoxProblemReporter::warnAboutSettingsAutoConversion (const QString &aFileList,
+                                                          bool aAfterRefresh)
+{
     if (!aAfterRefresh)
     {
-        int rc = message (mainWindowShown(), Info,
+        /* Common variant for all VMs */
+        return message (mainWindowShown(), Info,
             tr ("<p>Your existing VirtualBox settings files will be automatically "
                 "converted from the old format to a new format necessary for the "
@@ -1782 +1777 @@
             0,
             0,
-            tr ("E&xit", "warnAboutAutoConvertedSettings message box"));
-
-        if (rc == QIMessageBox::Cancel)
-            return QIMessageBox::Cancel;
-
-        /* We backup in any case */
-        return QIMessageBox::No;
-
-#if 0
-        int rc = message (mainWindowShown(), Info,
-            tr ("<p>Your existing VirtualBox settings files were automatically "
+            tr ("E&xit", "warnAboutSettingsAutoConversion message box"));
+    }
+    else
+    {
+        /* Particular VM variant */
+        return message (mainWindowShown(), Info,
+            tr ("<p>The following VirtualBox settings files will be automatically "
                 "converted from the old format to a new format necessary for the "
                 "new version of VirtualBox.</p>"
-                "<p>Press <b>OK</b> to start VirtualBox now or press <b>More</b> if "
-                "you want to get more information about what files were converted "
-                "and access additional actions.</p>"
-                "<p>Press <b>Exit</b> to terminate the VirtualBox "
-                "application without saving the results of the conversion to "
-                "disk.</p>"),
+                "<p>Press <b>OK</b> to start VirtualBox now or press <b>Exit</b> if "
+                "you want to terminate the VirtualBox "
+                "application without any further actions.</p>"),
+            QString ("<!--EOM-->%1").arg (aFileList),
             NULL /* aAutoConfirmId */,
             QIMessageBox::Ok | QIMessageBox::Default,
-            QIMessageBox::No,
             QIMessageBox::Cancel | QIMessageBox::Escape,
             0,
-            tr ("&More", "warnAboutAutoConvertedSettings message box"),
-            tr ("E&xit", "warnAboutAutoConvertedSettings message box"));
-
-        /* in the simplest case we backup */
-        if (rc == QIMessageBox::Ok)
-            return QIMessageBox::No;
-
-        if (rc == QIMessageBox::Cancel)
-            return QIMessageBox::Cancel;
-#endif
-    }
-
-    return message (mainWindowShown(), Info,
-        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>Backup</b> to create backup copies of the settings files in "
-            "the old format before saving them in the new format;</li>"
-            "<li><b>Overwrite</b> to save all auto-converted files without "
-            "creating backup copies (it will not be possible to use these "
-            "settings files with an older version of VirtualBox "
-            "afterwards);</li>"
-            "%2"
-            "</ul>"
-            "<p>It is recommended to always select <b>Backup</b> because in "
-            "this case it will be possible to go back to the previous "
-            "version of VirtualBox (if necessary) without losing your current "
-            "settings. See the VirtualBox Manual for more information about "
-            "downgrading.</p>")
-            .arg (aFormatVersion)
-            .arg (aAfterRefresh ? QString::null :
-                  tr ("<li><b>Exit</b> to terminate VirtualBox without saving "
-                      "the results of the conversion to disk.</li>")),
-        QString ("<!--EOM-->%1").arg (aFileList),
-        NULL /* aAutoConfirmId */,
-        QIMessageBox::Yes,
-        aAfterRefresh ? (QIMessageBox::No | QIMessageBox::Default | QIMessageBox::Escape) :
-                        (QIMessageBox::No | QIMessageBox::Default),
-        aAfterRefresh ? 0 : (QIMessageBox::Cancel | QIMessageBox::Escape),
-        tr ("O&verwrite", "warnAboutAutoConvertedSettings message box"),
-        tr ("&Backup", "warnAboutAutoConvertedSettings message box"),
-        aAfterRefresh ? QString::null :
-            tr ("E&xit", "warnAboutAutoConvertedSettings message box"));
+            0,
+            tr ("E&xit", "warnAboutSettingsAutoConversion message box"));
+    }
 }
 

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

@@ -1115 +1115 @@
                    true /* aDescription */);
 
-    if (!oldAccessible && item->accessible())
-        vboxGlobal().checkForAutoConvertedSettingsAfterRefresh();
+    if (!oldAccessible && item->accessible() &&
+        !vboxGlobal().checkForSettingsAutoConversionAfterRefresh())
+        fileExit();
 }