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

Timestamp:

Mar 28, 2007 9:53:17 AM (18 years ago)

Author:

vboxsync

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

19925

Message:

FE/Qt: Hard disk details now show Checking.../Inaccessibe when appropriate instead of dummy zero size.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxSelectorWnd.h (modified) (2 diffs)
• src/VBoxGlobal.cpp (modified) (4 diffs)
• src/VBoxSelectorWnd.cpp (modified) (4 diffs)

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

@@ -95 +95 @@
                                   bool aRefreshSnapshots = true,
                                   bool aRefreshDescription = true);
+
+    void mediaEnumStarted();
     void mediaEnumFinished (const VBoxMediaList &);
 
@@ -133 +135 @@
     QPoint normal_pos;
     QSize normal_size;
+
+    bool doneInaccessibleWarningOnce : 1;
 };
 

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

@@ -409 +409 @@
     if (!vboxGlobal_inited)
     {
-        // check that the QApplication instance is created
+        /* check that a QApplication instance is created */
         if (qApp)
         {
             vboxGlobal_inited = true;
             vboxGlobal_instance.init();
-            // add our cleanup handler to the list of Qt post routines
+            /* add our cleanup handler to the list of Qt post routines */
             qAddPostRoutine (vboxGlobalCleanup);
         }
@@ -436 +436 @@
     }
 
-    // @note
-    //  we don't assign gs to our gset member here, because VBoxCallback
-    //  will update gset as necessary when new settings are successfullly
-    //  sent to the VirtualBox server by gs.save()
+    /* We don't assign gs to our gset member here, because VBoxCallback
+     * will update gset as necessary when new settings are successfullly
+     * sent to the VirtualBox server by gs.save(). */
 
     return true;
@@ -612 +611 @@
     Assert (!aPredict || aHD.GetParent().isNull());
 
-/// @todo (r=dmik) later: we need to keep *all* media (including all hard disk
-//  children) in the current media list in order for the following to work.
-//    VBoxMedia media;
-//    if (!findMedia (CUnknown (aHD), media))
-//    {
-//        /* media may be new and not alredy in the media list, request refresh */
-//        startEnumeratingMedia();
-//        if (!findMedia (CUnknown (aHD), media))
-//            AssertFailed();
-//    }
+    VBoxMedia media;
+    if (!findMedia (CUnknown (aHD), media))
+    {
+        /* media may be new and not alredy in the media list, request refresh */
+        startEnumeratingMedia();
+        if (!findMedia (CUnknown (aHD), media))
+            AssertFailed();
+    }
 
     CHardDisk root = aHD.GetRoot();
@@ -636 +633 @@
     details += ", ";
 
-    /// @todo (r=dmik) prepend the details with the warning/error
+    /// @todo prepend the details with the warning/error
     //  icon when not accessible
 
-/// @todo (r=dmik) later: we need to keep *all* media (including all hard disk
-//  children) in the current media list in order for the following to work.
-//    switch (media.status)
-//    {
-//        case VBoxMedia::Unknown:
-//            details += tr ("<i>Checking...</i>", "hard disk");
-//            break;
-//        case VBoxMedia::Ok:
+    switch (media.status)
+    {
+        case VBoxMedia::Unknown:
+            details += tr ("<i>Checking...</i>", "hard disk");
+            break;
+        case VBoxMedia::Ok:
             details += formatSize (root.GetSize() * _1M);
-//            break;
-//        case VBoxMedia::Error:
-//        case VBoxMedia::Inaccessible:
-//            details += tr ("Inaccessible", "hard disk");
-//            break;
-//    }
+            break;
+        case VBoxMedia::Error:
+        case VBoxMedia::Inaccessible:
+            details += tr ("<i>Inaccessible</i>", "hard disk");
+            break;
+    }
 
     return details;

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

@@ -374 +374 @@
                  WFlags aFlags)
     : QMainWindow (aParent, aName, aFlags)
+    , doneInaccessibleWarningOnce (false)
 {
     if (aSelf)
@@ -580 +581 @@
             this, SLOT (vmSettings (const QString &)));
 
-    /* listen to "media enumeration finished" signals */
+    /* listen to media enumeration signals */
+    connect (&vboxGlobal(), SIGNAL (mediaEnumStarted()),
+             this, SLOT (mediaEnumStarted()));
     connect (&vboxGlobal(), SIGNAL (mediaEnumFinished (const VBoxMediaList &)),
              this, SLOT (mediaEnumFinished (const VBoxMediaList &)));
@@ -1216 +1219 @@
 }
 
-void VBoxSelectorWnd::mediaEnumFinished (const VBoxMediaList &list)
+void VBoxSelectorWnd::mediaEnumStarted()
 {
     /* refresh the current details to pick up hard disk sizes */
     vmListBoxCurrentChanged (true /* aRefreshDetails */);
+}
+
+void VBoxSelectorWnd::mediaEnumFinished (const VBoxMediaList &list)
+{
+    /* refresh the current details to pick up hard disk sizes */
+    vmListBoxCurrentChanged (true /* aRefreshDetails */);
+
+    /* we warn about inaccessible media only once (after media emumeration
+     * started from main() at startup), to avoid annoying the user */
+    if (doneInaccessibleWarningOnce)
+        return;
+
+    doneInaccessibleWarningOnce = true;
 
     do
@@ -1247 +1263 @@
     }
     while (0);
-
-    /* we react to the media enumeration event only once (after media
-     * emumeration started from main() at startup), and then disconnect
-     * to avoid annoying the user */
-    disconnect (&vboxGlobal(), SIGNAL (mediaEnumFinished (const VBoxMediaList &)),
-                this, SLOT (mediaEnumFinished (const VBoxMediaList &)));
 }