Changeset 852 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Feb 13, 2007 7:40:16 AM (18 years ago)

Author:

vboxsync

Message:

Fixed problem that you cannot do Select until you refresh the dialog after adding a VDI if this VDI was the first added to VDM.

Location:

trunk/src/VBox/Frontends/VirtualBox/ui

Files:

• VBoxDiskImageManagerDlg.ui (modified) (1 diff)
• VBoxDiskImageManagerDlg.ui.h (modified) (9 diffs)

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

@@ -629 +629 @@
     <function specifier="static" returnType="QString">composeCdToolTip( CDVDImage &amp;, VBoxMedia::Status = VBoxMedia::Ok )</function>
     <function specifier="static" returnType="QString">composeFdToolTip( CFloppyImage &amp;, VBoxMedia::Status = VBoxMedia::Ok )</function>
+    <function access="protected">clearInfoPanes()</function>
     <function access="protected">prepareToRefresh( int aTotal = 0 )</function>
 </functions>

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

@@ -1255 +1255 @@
     }
     else
-    {    
+    {
         /* insert already enumerated media */
         const VBoxMediaList &list = vboxGlobal().currentMediaList();
@@ -1288 +1288 @@
     for (it = list.begin(); it != list.end(); ++ it)
         mediaAdded (*it);
-    
+
     /* select the first item if the previous saved item is not found
      * or no current item at all */
@@ -1327 +1327 @@
     cdsView->adjustColumn (2);
     cdsView->adjustColumn (1);
-    
+
     fdsView->adjustColumn (1);
     fdsView->adjustColumn (2);
@@ -1378 +1378 @@
     if (!vboxGlobal().isMediaEnumerationStarted())
         setCurrentItem (getListView (aMedia.type), item);
+    if (item == getCurrentListView()->currentItem())
+        processCurrentChanged (item);
 }
 
@@ -1460 +1462 @@
 
 
-void VBoxDiskImageManagerDlg::prepareToRefresh (int aTotal)
-{
-    /* info panel clearing */
+void VBoxDiskImageManagerDlg::clearInfoPanes()
+{
     hdsPane1->clear();
     hdsPane2->clear(), hdsPane3->clear();
@@ -1468 +1469 @@
     cdsPane1->clear(), cdsPane2->clear();
     fdsPane1->clear(), fdsPane2->clear();
+}
+
+
+void VBoxDiskImageManagerDlg::prepareToRefresh (int aTotal)
+{
+    /* info panel clearing */
+    clearInfoPanes();
 
     /* prepare progressbar */
@@ -1481 +1489 @@
 
     /* store the current list selections */
-    
+
     QListViewItem *item;
     DiskImageItem *di;
@@ -1488 +1496 @@
     di = (item && item->rtti() == 1001) ? static_cast <DiskImageItem *> (item) : 0;
     hdSelectedId = di ? di->getUuid() : QString::null;
- 
+
     item = cdsView->currentItem();
     di = (item && item->rtti() == 1001) ? static_cast <DiskImageItem *> (item) : 0;
-    cdSelectedId = di ? di->getUuid() : QString::null; 
+    cdSelectedId = di ? di->getUuid() : QString::null;
 
     item = fdsView->currentItem();
@@ -1667 +1675 @@
         }
     }
+    else
+        clearInfoPanes();
 }