Changeset 1298 in vbox

Timestamp:

Mar 7, 2007 12:49:47 PM (18 years ago)

Author:

vboxsync

Message:

When there is some inaccessible media, the VDM dialog adds the exclamation mark to a tab that contains this inaccessible media (to let the user know about that).

Location:

trunk/src/VBox/Frontends/VirtualBox/ui

Files:

• VBoxDiskImageManagerDlg.ui (modified) (2 diffs)
• VBoxDiskImageManagerDlg.ui.h (modified) (6 diffs)

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxDiskImageManagerDlg.ui

@@ -538 +538 @@
     <variable access="private">QPixmap pxInaccessible;</variable>
     <variable access="private">QPixmap pxErroneous;</variable>
+    <variable access="private">QPixmap pxHD;</variable>
+    <variable access="private">QPixmap pxCD;</variable>
+    <variable access="private">QPixmap pxFD;</variable>
     <variable access="private">CMachine cmachine;</variable>
     <variable access="private">QPopupMenu *itemMenu;</variable>
@@ -631 +634 @@
     <function access="protected">clearInfoPanes()</function>
     <function access="protected">prepareToRefresh( int aTotal = 0 )</function>
+    <function access="protected">makeWarningMark( DiskImageItem*, VBoxMedia::Status, VBoxDefs::DiskType )</function>
 </functions>
 <layoutdefaults spacing="10" margin="10"/>

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxDiskImageManagerDlg.ui.h

@@ -203 +203 @@
     Assert (!pxErroneous.isNull());
 
+    pxHD = QPixmap::fromMimeSource ("diskim_16px.png");
+    pxCD = QPixmap::fromMimeSource ("cd_16px.png");
+    pxFD = QPixmap::fromMimeSource ("fd_16px.png");
 
     /* setup tab widget icons */
@@ -1096 +1099 @@
     aItem->setStatus (status);
 
-    if (aMedia.status == VBoxMedia::Inaccessible)
-        aItem->setPixmap (0, pxInaccessible);
-    else if (aMedia.status == VBoxMedia::Error)
-        aItem->setPixmap (0, pxErroneous);
+    makeWarningMark (aItem, aMedia.status, VBoxDefs::HD);
 }
 
@@ -1124 +1124 @@
     aItem->setStatus (status);
 
-    if (aMedia.status == VBoxMedia::Inaccessible)
-        aItem->setPixmap (0, pxInaccessible);
-    else if (aMedia.status == VBoxMedia::Error)
-        aItem->setPixmap (0, pxErroneous);
+    makeWarningMark (aItem, aMedia.status, VBoxDefs::CD);
 }
 
@@ -1152 +1149 @@
     aItem->setStatus (status);
 
-    if (aMedia.status == VBoxMedia::Inaccessible)
-        aItem->setPixmap (0, pxInaccessible);
-    else if (aMedia.status == VBoxMedia::Error)
-        aItem->setPixmap (0, pxErroneous);
+    makeWarningMark (aItem, aMedia.status, VBoxDefs::FD);
 }
 
@@ -1200 +1194 @@
             VBoxMedia::Error;
         createHdItem (0, aRoot, VBoxMedia (CUnknown (subHd), VBoxDefs::HD, status));
+    }
+}
+
+
+void VBoxDiskImageManagerDlg::makeWarningMark (DiskImageItem *aItem,
+                                               VBoxMedia::Status aStatus,
+                                               VBoxDefs::DiskType aType)
+{
+    const QPixmap &pm = aStatus == VBoxMedia::Inaccessible ? pxInaccessible :
+                        aStatus == VBoxMedia::Error ? pxErroneous : QPixmap();
+
+    if (!pm.isNull())
+    {
+        aItem->setPixmap (0, pm);
+        QIconSet iconSet (pm);
+        QWidget *wt = aType == VBoxDefs::HD ? twImages->page (0) :
+                      aType == VBoxDefs::CD ? twImages->page (1) :
+                      aType == VBoxDefs::FD ? twImages->page (2) : 0;
+        Assert (wt); /* aType should be correct */
+        twImages->changeTab (wt, iconSet, twImages->tabLabel (wt));
     }
 }
@@ -1293 +1307 @@
 void VBoxDiskImageManagerDlg::mediaEnumStarted()
 {
+    /* load default tab icons */
+    twImages->changeTab (twImages->page (0),
+                         QIconSet (pxHD),
+                         twImages->tabLabel (twImages->page (0)));
+    twImages->changeTab (twImages->page (1),
+                         QIconSet (pxCD),
+                         twImages->tabLabel (twImages->page (1)));
+    twImages->changeTab (twImages->page (2),
+                         QIconSet (pxFD),
+                         twImages->tabLabel (twImages->page (2)));
+
     /* load current media list */
     const VBoxMediaList &list = vboxGlobal().currentMediaList();