Changeset 37710 in vbox for trunk

Timestamp:

Jun 30, 2011 1:56:23 PM (13 years ago)

Author:

vboxsync

Message:

Frontends/VirtualBox: add config for controlling DVD eject in UIMachineSettingsStorage

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine

Files:

• UIMachineSettingsStorage.cpp (modified) (16 diffs)
• UIMachineSettingsStorage.h (modified) (7 diffs)
• UIMachineSettingsStorage.ui (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp

@@ -551 +551 @@
     , mAttIsHostDrive (false)
     , mAttIsPassthrough (false)
+    , mAttIsTempEject (false)
 {
     /* Check for proper parent type */
@@ -604 +605 @@
 }
 
+bool AttachmentItem::attIsTempEject() const
+{
+    return mAttIsTempEject;
+}
+
 void AttachmentItem::setAttSlot (const StorageSlot &aAttSlot)
 {
@@ -624 +630 @@
 {
     mAttIsPassthrough = aIsAttPassthrough;
+}
+
+void AttachmentItem::setAttIsTempEject (bool aIsAttTempEject)
+{
+    mAttIsTempEject = aIsAttTempEject;
 }
 
@@ -1078 +1089 @@
             return false;
         }
+        case R_AttIsTempEject:
+        {
+            if (AbstractItem *item = static_cast <AbstractItem*> (aIndex.internalPointer()))
+                if (item->rtti() == AbstractItem::Type_AttachmentItem)
+                    return static_cast <AttachmentItem*> (item)->attIsTempEject();
+            return false;
+        }
         case R_AttSize:
         {
@@ -1282 +1300 @@
                 {
                     static_cast <AttachmentItem*> (item)->setAttIsPassthrough (aValue.toBool());
+                    emit dataChanged (aIndex, aIndex);
+                    return true;
+                }
+            return false;
+        }
+        case R_AttIsTempEject:
+        {
+            if (AbstractItem *item = static_cast <AbstractItem*> (aIndex.internalPointer()))
+                if (item->rtti() == AbstractItem::Type_AttachmentItem)
+                {
+                    static_cast <AttachmentItem*> (item)->setAttIsTempEject (aValue.toBool());
                     emit dataChanged (aIndex, aIndex);
                     return true;
@@ -1771 +1800 @@
     connect (pOpenMediumMenu, SIGNAL (aboutToShow()), this, SLOT (sltPrepareOpenMediumMenu()));
     connect (mCbPassthrough, SIGNAL (stateChanged (int)), this, SLOT (setInformation()));
+    connect (mCbTempEject, SIGNAL (stateChanged (int)), this, SLOT (setInformation()));
 
     /* Applying language settings */
@@ -1834 +1864 @@
                     storageAttachmentData.m_iAttachmentDevice = attachment.GetDevice();
                     storageAttachmentData.m_fAttachmentPassthrough = attachment.GetPassthrough();
+                    storageAttachmentData.m_fAttachmentTempEject = attachment.GetTemporaryEject();
                     CMedium comMedium(attachment.GetMedium());
                     VBoxMedium vboxMedium;
@@ -1893 +1924 @@
             mStorageModel->setData(attachmentIndex, QVariant::fromValue(attachmentStorageSlot), StorageModel::R_AttSlot);
             mStorageModel->setData(attachmentIndex, attachmentData.m_fAttachmentPassthrough, StorageModel::R_AttIsPassthrough);
+            mStorageModel->setData(attachmentIndex, attachmentData.m_fAttachmentTempEject, StorageModel::R_AttIsTempEject);
         }
     }
@@ -1944 +1976 @@
             attachmentData.m_iAttachmentDevice = attachmentSlot.device;
             attachmentData.m_fAttachmentPassthrough = mStorageModel->data(attachmentIndex, StorageModel::R_AttIsPassthrough).toBool();
+            attachmentData.m_fAttachmentTempEject = mStorageModel->data(attachmentIndex, StorageModel::R_AttIsTempEject).toBool();
             attachmentData.m_strAttachmentMediumId = mStorageModel->data(attachmentIndex, StorageModel::R_AttMediumId).toString();
 
@@ -2380 +2413 @@
                 mCbPassthrough->setChecked (isHostDrive && mStorageModel->data (index, StorageModel::R_AttIsPassthrough).toBool());
 
+                /* Getting TempEject state */
+                mCbTempEject->setVisible (device == KDeviceType_DVD && !isHostDrive);
+                mCbTempEject->setChecked (!isHostDrive && mStorageModel->data (index, StorageModel::R_AttIsTempEject).toBool());
+
                 /* Update optional widgets visibility */
                 updateAdditionalObjects (device);
@@ -2447 +2484 @@
                 if (mStorageModel->data (index, StorageModel::R_AttIsHostDrive).toBool())
                     mStorageModel->setData (index, mCbPassthrough->isChecked(), StorageModel::R_AttIsPassthrough);
+            }
+            else if (sdr == mCbTempEject)
+            {
+                if (!mStorageModel->data (index, StorageModel::R_AttIsHostDrive).toBool())
+                    mStorageModel->setData (index, mCbTempEject->isChecked(), StorageModel::R_AttIsTempEject);
             }
             break;
@@ -3354 +3396 @@
         QString strAttachmentMediumId = attachmentData.m_strAttachmentMediumId;
         bool fAttachmentPassthrough = attachmentData.m_fAttachmentPassthrough;
+        bool fAttachmentTempEject = attachmentData.m_fAttachmentTempEject;
         /* Get GUI medium object: */
         VBoxMedium vboxMedium = vboxGlobal().findMedium(strAttachmentMediumId);
@@ -3376 +3419 @@
                     /* Check that machine is OK: */
                     fSuccess = m_machine.isOk();
+                    if (fSuccess)
+                    {
+                        m_machine.TemporaryEjectDevice(strControllerName, iAttachmentPort, iAttachmentDevice, fAttachmentTempEject);
+                        /* Check that machine is OK: */
+                        fSuccess = m_machine.isOk();
+                    }
                 }
             }
@@ -3411 +3460 @@
         QString strAttachmentMediumId = attachmentData.m_strAttachmentMediumId;
         bool fAttachmentPassthrough = attachmentData.m_fAttachmentPassthrough;
+        bool fAttachmentTempEject = attachmentData.m_fAttachmentTempEject;
         KDeviceType attachmentDeviceType = attachmentData.m_attachmentType;
 
@@ -3438 +3488 @@
                     }
                 }
+                if (fSuccess)
+                {
+                    if (attachmentDeviceType == KDeviceType_DVD)
+                    {
+                        m_machine.TemporaryEjectDevice(strControllerName, iAttachmentPort, iAttachmentDevice, fAttachmentTempEject);
+                        /* Check that machine is OK: */
+                        fSuccess = m_machine.isOk();
+                    }
+                }
             }
             else
@@ -3511 +3570 @@
     mTbOpen->setEnabled(isMachineOffline() || (isMachineOnline() && device != KDeviceType_HardDisk));
     mCbPassthrough->setEnabled(isMachineOffline());
+    mCbTempEject->setEnabled(isMachineInValidMode());
     mLsInformation->setEnabled(isMachineInValidMode());
     mLbHDFormat->setEnabled(isMachineInValidMode());

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.h

@@ -356 +356 @@
     bool attIsHostDrive() const;
     bool attIsPassthrough() const;
+    bool attIsTempEject() const;
 
     void setAttSlot (const StorageSlot &aAttSlot);
@@ -361 +362 @@
     void setAttMediumId (const QString &aAttMediumId);
     void setAttIsPassthrough (bool aPassthrough);
+    void setAttIsTempEject (bool aTempEject);
 
     QString attSize() const;
@@ -391 +393 @@
     bool mAttIsHostDrive;
     bool mAttIsPassthrough;
+    bool mAttIsTempEject;
 
     QString mAttName;
@@ -444 +447 @@
         R_AttIsHostDrive,
         R_AttIsPassthrough,
+        R_AttIsTempEject,
         R_AttSize,
         R_AttLogicalSize,
@@ -557 +561 @@
         , m_iAttachmentDevice(-1)
         , m_strAttachmentMediumId(QString())
-        , m_fAttachmentPassthrough(false) {}
+        , m_fAttachmentPassthrough(false)
+        , m_fAttachmentTempEject(false) {}
     /* Functions: */
     bool equal(const UIDataSettingsMachineStorageAttachment &other) const
@@ -565 +570 @@
                (m_iAttachmentDevice == other.m_iAttachmentDevice) &&
                (m_strAttachmentMediumId == other.m_strAttachmentMediumId) &&
-               (m_fAttachmentPassthrough == other.m_fAttachmentPassthrough);
+               (m_fAttachmentPassthrough == other.m_fAttachmentPassthrough) &&
+               (m_fAttachmentTempEject == other.m_fAttachmentTempEject);
     }
     /* Operators: */
@@ -576 +582 @@
     QString m_strAttachmentMediumId;
     bool m_fAttachmentPassthrough;
+    bool m_fAttachmentTempEject;
 };
 typedef UISettingsCache<UIDataSettingsMachineStorageAttachment> UICacheSettingsMachineStorageAttachment;

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.ui

@@ -323 +323 @@
          </widget>
         </item>
+        <item row="2" column="2" >
+         <widget class="QCheckBox" name="mCbTempEject" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="whatsThis" >
+           <string>When checked, it suppresses unmounting the medium when the guest OS ejects it.</string>
+          </property>
+          <property name="text" >
+           <string>&amp;Live CD/DVD</string>
+          </property>
+         </widget>
+        </item>
         <item row="3" column="0" colspan="3" >
          <widget class="QILabelSeparator" native="1" name="mLsInformation" >