Changeset 50272 in vbox

Timestamp:

Jan 29, 2014 2:52:52 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: 6863: Machine settings: Storage page: SATA hot-plug support (step 1): Adding hot-pluggable check-box.

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

@@ -607 +607 @@
     , mAttIsTempEject (false)
     , mAttIsNonRotational (false)
+    , m_fIsHotPluggable(false)
 {
     /* Check for proper parent type */
@@ -670 +671 @@
 }
 
+bool AttachmentItem::attIsHotPluggable() const
+{
+    return m_fIsHotPluggable;
+}
+
 void AttachmentItem::setAttSlot (const StorageSlot &aAttSlot)
 {
@@ -700 +706 @@
 {
     mAttIsNonRotational = aIsAttNonRotational;
+}
+
+void AttachmentItem::setAttIsHotPluggable(bool fIsHotPluggable)
+{
+    m_fIsHotPluggable = fIsHotPluggable;
 }
 
@@ -1188 +1199 @@
             return false;
         }
+        case R_AttIsHotPluggable:
+        {
+            if (AbstractItem *item = static_cast<AbstractItem*>(aIndex.internalPointer()))
+                if (item->rtti() == AbstractItem::Type_AttachmentItem)
+                    return static_cast<AttachmentItem*>(item)->attIsHotPluggable();
+            return false;
+        }
         case R_AttSize:
         {
@@ -1426 +1444 @@
                     static_cast <AttachmentItem*> (item)->setAttIsNonRotational (aValue.toBool());
                     emit dataChanged (aIndex, aIndex);
+                    return true;
+                }
+            return false;
+        }
+        case R_AttIsHotPluggable:
+        {
+            if (AbstractItem *item = static_cast<AbstractItem*>(aIndex.internalPointer()))
+                if (item->rtti() == AbstractItem::Type_AttachmentItem)
+                {
+                    static_cast<AttachmentItem*>(item)->setAttIsHotPluggable(aValue.toBool());
+                    emit dataChanged(aIndex, aIndex);
                     return true;
                 }
@@ -1922 +1951 @@
     connect (mCbTempEject, SIGNAL (stateChanged (int)), this, SLOT (setInformation()));
     connect (mCbNonRotational, SIGNAL (stateChanged (int)), this, SLOT (setInformation()));
+    connect(m_pCheckBoxHotPluggable, SIGNAL(stateChanged(int)), this, SLOT(setInformation()));
 
     /* Applying language settings */
@@ -2007 +2037 @@
                     storageAttachmentData.m_fAttachmentTempEject = attachment.GetTemporaryEject();
                     storageAttachmentData.m_fAttachmentNonRotational = attachment.GetNonRotational();
+                    storageAttachmentData.m_fAttachmentHotPluggable = attachment.GetHotPluggable();
                     const CMedium cmedium = attachment.GetMedium();
                     storageAttachmentData.m_strAttachmentMediumId = cmedium.isNull() ? UIMedium::nullID() : cmedium.GetId();
@@ -2067 +2098 @@
             mStorageModel->setData(attachmentIndex, attachmentData.m_fAttachmentTempEject, StorageModel::R_AttIsTempEject);
             mStorageModel->setData(attachmentIndex, attachmentData.m_fAttachmentNonRotational, StorageModel::R_AttIsNonRotational);
+            mStorageModel->setData(attachmentIndex, attachmentData.m_fAttachmentHotPluggable, StorageModel::R_AttIsHotPluggable);
         }
     }
@@ -2120 +2152 @@
             attachmentData.m_fAttachmentTempEject = mStorageModel->data(attachmentIndex, StorageModel::R_AttIsTempEject).toBool();
             attachmentData.m_fAttachmentNonRotational = mStorageModel->data(attachmentIndex, StorageModel::R_AttIsNonRotational).toBool();
+            attachmentData.m_fAttachmentHotPluggable = mStorageModel->data(attachmentIndex, StorageModel::R_AttIsHotPluggable).toBool();
             attachmentData.m_strAttachmentMediumId = mStorageModel->data(attachmentIndex, StorageModel::R_AttMediumId).toString();
 
@@ -2599 +2632 @@
                 mCbNonRotational->setChecked (mStorageModel->data (index, StorageModel::R_AttIsNonRotational).toBool());
 
+                /* Getting hot-pluggable state: */
+                m_pCheckBoxHotPluggable->setVisible(slt.bus == KStorageBus_SATA);
+                m_pCheckBoxHotPluggable->setChecked(mStorageModel->data(index, StorageModel::R_AttIsHotPluggable).toBool());
+
                 /* Update optional widgets visibility */
                 updateAdditionalObjects (device);
@@ -2678 +2715 @@
             {
                 mStorageModel->setData (index, mCbNonRotational->isChecked(), StorageModel::R_AttIsNonRotational);
+            }
+            else if (sdr == m_pCheckBoxHotPluggable)
+            {
+                mStorageModel->setData(index, m_pCheckBoxHotPluggable->isChecked(), StorageModel::R_AttIsHotPluggable);
             }
             break;
@@ -3553 +3594 @@
         bool fAttachmentTempEject = attachmentData.m_fAttachmentTempEject;
         bool fAttachmentNonRotational = attachmentData.m_fAttachmentNonRotational;
+        bool fAttachmentHotPluggable = attachmentData.m_fAttachmentHotPluggable;
         /* Get GUI medium object: */
         UIMedium vboxMedium = vboxGlobal().medium(strAttachmentMediumId);
@@ -3592 +3634 @@
                     fSuccess = m_machine.isOk();
                 }
+                m_machine.SetHotPluggableForDevice(strControllerName, iAttachmentPort, iAttachmentDevice, fAttachmentHotPluggable);
+                /* Check that machine is OK: */
+                fSuccess = m_machine.isOk();
             }
             else
@@ -3628 +3673 @@
         bool fAttachmentTempEject = attachmentData.m_fAttachmentTempEject;
         bool fAttachmentNonRotational = attachmentData.m_fAttachmentNonRotational;
+        bool fAttachmentHotPluggable = attachmentData.m_fAttachmentHotPluggable;
         KDeviceType attachmentDeviceType = attachmentData.m_attachmentType;
 
@@ -3671 +3717 @@
                     }
                 }
+                m_machine.SetHotPluggableForDevice(strControllerName, iAttachmentPort, iAttachmentDevice, fAttachmentHotPluggable);
+                /* Check that machine is OK: */
+                fSuccess = m_machine.isOk();
             }
             else
@@ -3754 +3803 @@
     mCbTempEject->setEnabled(isMachineInValidMode());
     mCbNonRotational->setEnabled(isMachineOffline());
+    m_pCheckBoxHotPluggable->setEnabled(isMachineOffline());
     mLsInformation->setEnabled(isMachineInValidMode());
     mLbHDFormat->setEnabled(isMachineInValidMode());

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

@@ -374 +374 @@
     bool attIsTempEject() const;
     bool attIsNonRotational() const;
+    bool attIsHotPluggable() const;
 
     void setAttSlot (const StorageSlot &aAttSlot);
@@ -381 +382 @@
     void setAttIsTempEject (bool aTempEject);
     void setAttIsNonRotational (bool aNonRotational);
+    void setAttIsHotPluggable(bool fIsHotPluggable);
 
     QString attSize() const;
@@ -413 +415 @@
     bool mAttIsTempEject;
     bool mAttIsNonRotational;
+    bool m_fIsHotPluggable;
 
     QString mAttName;
@@ -471 +474 @@
         R_AttIsTempEject,
         R_AttIsNonRotational,
+        R_AttIsHotPluggable,
         R_AttSize,
         R_AttLogicalSize,
@@ -586 +590 @@
         , m_fAttachmentPassthrough(false)
         , m_fAttachmentTempEject(false)
-        , m_fAttachmentNonRotational(false) {}
+        , m_fAttachmentNonRotational(false)
+        , m_fAttachmentHotPluggable(false)
+    {}
     /* Functions: */
     bool equal(const UIDataSettingsMachineStorageAttachment &other) const
@@ -596 +602 @@
                (m_fAttachmentPassthrough == other.m_fAttachmentPassthrough) &&
                (m_fAttachmentTempEject == other.m_fAttachmentTempEject) &&
-               (m_fAttachmentNonRotational == other.m_fAttachmentNonRotational);
+               (m_fAttachmentNonRotational == other.m_fAttachmentNonRotational) &&
+               (m_fAttachmentHotPluggable == other.m_fAttachmentHotPluggable);
     }
     /* Operators: */
@@ -609 +616 @@
     bool m_fAttachmentTempEject;
     bool m_fAttachmentNonRotational;
+    bool m_fAttachmentHotPluggable;
 };
 typedef UISettingsCache<UIDataSettingsMachineStorageAttachment> UICacheSettingsMachineStorageAttachment;

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

@@ -389 +389 @@
            </widget>
           </item>
+          <item>
+           <widget class="QCheckBox" name="m_pCheckBoxHotPluggable">
+            <property name="sizePolicy">
+             <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="whatsThis">
+             <string>When checked the guest system will see the virtual disk as a hot-pluggable device.</string>
+            </property>
+            <property name="text">
+             <string>&amp;Hot-pluggable</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </item>