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

Timestamp:

Oct 29, 2009 2:25:53 PM (16 years ago)

Author:

vboxsync

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

54100

Message:

FE/Qt4: VM Settings / Storage Page: Fixed bug - loading "empty" attachments (during opening VM Settings) was performed in verbose mode (warning dialog appears); Added too-tip to Storage Slot combo.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxVMSettingsHD.h (modified) (1 diff)
• src/VBoxVMSettingsHD.cpp (modified) (4 diffs)

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

@@ -329 +329 @@
 public:
 
-    AttachmentItem (AbstractItem *aParent, KDeviceType aDeviceType);
+    AttachmentItem (AbstractItem *aParent, KDeviceType aDeviceType, bool aVerbose);
 
     StorageSlot attSlot() const;

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

@@ -602 +602 @@
 
 /* Attachment Item */
-AttachmentItem::AttachmentItem (AbstractItem *aParent, KDeviceType aDeviceType)
+AttachmentItem::AttachmentItem (AbstractItem *aParent, KDeviceType aDeviceType, bool aVerbose)
     : AbstractItem (aParent)
     , mAttDeviceType (aDeviceType)
@@ -628 +628 @@
             if (freeMediumIds.size() > 1)
                 setAttMediumId (freeMediumIds [1]);
-            else if (freeMediumIds.size() > 0)
+            else if (!aVerbose && freeMediumIds.size() > 0)
                 setAttMediumId (freeMediumIds [0]);
             break;
@@ -1402 +1402 @@
         QModelIndex parentIndex = index (parentPosition, 0, root());
         beginInsertRows (parentIndex, parent->childCount(), parent->childCount());
-        new AttachmentItem (parent, aDeviceType);
+        new AttachmentItem (parent, aDeviceType, qobject_cast <QWidget*> (QObject::parent())->isVisible());
         endInsertRows();
         return index (parent->childCount() - 1, 0, parentIndex);
@@ -2088 +2088 @@
                 int attSlotPos = mCbSlot->findText (vboxGlobal().toString (slt));
                 mCbSlot->setCurrentIndex (attSlotPos == -1 ? 0 : attSlotPos);
+                mCbSlot->setToolTip (mCbSlot->itemText (mCbSlot->currentIndex()));
                 mLbSlot->setEnabled (!mDisableStaticControls);
                 mCbSlot->setEnabled (!mDisableStaticControls);