Changeset 37874 in vbox

Timestamp:

Jul 11, 2011 2:34:40 PM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: 4397: Virtual Media Manager UI: Reworking medium-type-change UI according latest requirements: Replacing medium-type-change combo-box with tool-button opening sub-dialog for this operation.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/UIMediumTypeChangeDialog.cpp (added)
• src/UIMediumTypeChangeDialog.h (added)
• src/VBoxMediaManagerDlg.cpp (modified) (7 diffs)
• src/VBoxMediaManagerDlg.h (modified) (3 diffs)
• src/VBoxMediaManagerDlg.ui (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -267 +267 @@
         src/VBoxGlobalSettings.h \
         src/VBoxMediaManagerDlg.h \
+        src/UIMediumTypeChangeDialog.h \
         src/VBoxSnapshotDetailsDlg.h \
         src/VBoxTakeSnapshotDlg.h \
@@ -431 +432 @@
         src/VBoxHelpActions.cpp \
         src/VBoxMediaManagerDlg.cpp \
+        src/UIMediumTypeChangeDialog.cpp \
         src/VBoxMedium.cpp \
         src/VBoxSnapshotDetailsDlg.cpp \

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

@@ -44 +44 @@
 #include "UIIconPool.h"
 #include "UIVirtualBoxEventHandler.h"
+#include "UIMediumTypeChangeDialog.h"
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
@@ -205 +206 @@
     , mShowDiffs (true)
     , mSetupMode (false)
-    , m_previousMediumType(KMediumType_Normal)
-    , m_fParentMediumType(true)
 {
     /* Apply UI decorations */
@@ -287 +286 @@
 
     /* Setup information pane: */
-    qRegisterMetaType<KMediumType>();
-    connect(m_pTypeCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(sltCurrentMediumTypeChanged()));
+    m_pChangeMediumTypeButton->setIcon(UIIconPool::iconSet(":/arrow_down_10px.png"));
+    connect(m_pChangeMediumTypeButton, SIGNAL(clicked()), this, SLOT(sltOpenMediumTypeChangeDialog()));
+    m_pChangeMediumTypeButton->setIconSize(QSize(10, 10));
 
     /* Context menu composing */
@@ -653 +653 @@
 #endif /* QT_MAC_USE_COCOA */
 
-    if (mDoSelect)
-        mButtonBox->button (QDialogButtonBox::Ok)->setText (tr ("&Select"));
+    mButtonBox->button(QDialogButtonBox::Ok)->setText(mDoSelect ? tr("&Select") : tr("C&lose"));
 
     if (mTwHD->model()->rowCount() || mTwCD->model()->rowCount() || mTwFD->model()->rowCount())
         refreshAll();
-
-    /* Translate medium type combo: */
-    repopulateMediumTypeCombo();
-}
-
-void VBoxMediaManagerDlg::repopulateMediumTypeCombo()
-{
-    /* Block signals: */
-    m_pTypeCombo->blockSignals(true);
-
-    /* Remember current index: */
-    int iCurrentIndex = m_pTypeCombo->currentIndex();
-
-    /* Repopulate medium types: */
-    m_pTypeCombo->clear();
-
-    /* Check parent mode: */
-    if (m_fParentMediumType)
-    {
-        /* Populate possible types for parent disks: */
-        m_pTypeCombo->insertItem(0, vboxGlobal().toString(KMediumType_Normal), QVariant::fromValue(KMediumType_Normal));
-        m_pTypeCombo->insertItem(1, vboxGlobal().toString(KMediumType_Immutable), QVariant::fromValue(KMediumType_Immutable));
-        m_pTypeCombo->insertItem(2, vboxGlobal().toString(KMediumType_Writethrough), QVariant::fromValue(KMediumType_Writethrough));
-        m_pTypeCombo->insertItem(3, vboxGlobal().toString(KMediumType_Shareable), QVariant::fromValue(KMediumType_Shareable));
-        m_pTypeCombo->insertItem(4, vboxGlobal().toString(KMediumType_MultiAttach), QVariant::fromValue(KMediumType_MultiAttach));
-    }
-    else
-    {
-        /* Just one 'differencing' type for children disks: */
-        m_pTypeCombo->insertItem(0, vboxGlobal().differencingMediumTypeName());
-    }
-
-    /* Choose current index again if still possible: */
-    if (iCurrentIndex >= 0 && iCurrentIndex < m_pTypeCombo->count())
-        m_pTypeCombo->setCurrentIndex(iCurrentIndex);
-    else
-        m_pTypeCombo->setCurrentIndex(0);
-
-    /* Unblock signals: */
-    m_pTypeCombo->blockSignals(false);
 }
 
@@ -1483 +1442 @@
         if (item->treeWidget() == mTwHD)
         {
-            /* Update parent mode: */
-            m_fParentMediumType = !item->medium().parent();
-            /* Repopulate combo: */
-            repopulateMediumTypeCombo();
-
-            /* Block signals: */
-            m_pTypeCombo->blockSignals(true);
-            /* Choose the correct one medium type: */
-            int iIndexOfType = m_pTypeCombo->findText(item->hardDiskType());
-            AssertMsg(iIndexOfType != -1, ("Incorrect medium type: %s\n", item->hardDiskType().toLatin1().constData()));
-            m_pTypeCombo->setCurrentIndex(iIndexOfType);
-            /* Remember new medium type: */
-            m_previousMediumType = m_pTypeCombo->itemData(m_pTypeCombo->currentIndex()).value<KMediumType>();
-            /* Unblock signals: */
-            m_pTypeCombo->blockSignals(false);
+            /* Check if thats parent medium: */
+            bool fIsThatParentMedium = !item->medium().parent();
+            m_pChangeMediumTypeButton->setEnabled(fIsThatParentMedium);
 
             /* Other panes: */
+            m_pTypePane->setText(item->hardDiskType());
             m_pLocationPane->setText(formatPaneText(item->location(), true, "end"));
             m_pFormatPane->setText(item->hardDiskFormat());
@@ -1598 +1546 @@
 }
 
-void VBoxMediaManagerDlg::sltCurrentMediumTypeChanged()
-{
-    /* Get new medium type: */
-    KMediumType newMediumType = m_pTypeCombo->itemData(m_pTypeCombo->currentIndex()).value<KMediumType>();
-
-    /* Check that new type exists and differs from the old one: */
-    if (newMediumType == m_previousMediumType)
-        return;
-
+void VBoxMediaManagerDlg::sltOpenMediumTypeChangeDialog()
+{
     MediaItem *pMediumItem = toMediaItem(currentTreeWidget()->currentItem());
-    CMedium medium = pMediumItem->medium().medium();
-    medium.SetType(newMediumType);
-    if (!medium.isOk())
-    {
-        /* Revert medium type: */
-        m_pTypeCombo->blockSignals(true);
-        int iPreviousIndex = m_pTypeCombo->findText(vboxGlobal().toString(m_previousMediumType));
-        m_pTypeCombo->setCurrentIndex(iPreviousIndex);
-        m_pTypeCombo->blockSignals(false);
-        /* Show warning: */
-        vboxProblem().cannotChangeMediumType(this, medium, m_previousMediumType, newMediumType);
-    }
-    else
-    {
-        /* Remember new medium type: */
-        m_previousMediumType = m_pTypeCombo->itemData(m_pTypeCombo->currentIndex()).value<KMediumType>();
-        /* Refresh related VMM item: */
+    UIMediumTypeChangeDialog dlg(this, pMediumItem->id());
+    if (dlg.exec() == QDialog::Accepted)
+    {
         pMediumItem->refreshAll();
+        m_pTypePane->setText(pMediumItem->hardDiskType());
     }
 }
@@ -1907 +1835 @@
 void VBoxMediaManagerDlg::clearInfoPanes()
 {
-    m_pTypeCombo->setCurrentIndex(-1); m_pLocationPane->clear(); m_pFormatPane->clear(); m_pDetailsPane->clear(); m_pUsagePane->clear();
+    m_pTypePane->clear(); m_pLocationPane->clear(); m_pFormatPane->clear(); m_pDetailsPane->clear(); m_pUsagePane->clear();
     mIpCD1->clear(); mIpCD2->clear();
     mIpFD1->clear(); mIpFD2->clear();

trunk/src/VBox/Frontends/VirtualBox/src/VBoxMediaManagerDlg.h

@@ -70 +70 @@
 
     void retranslateUi();
-    void repopulateMediumTypeCombo();
     virtual void closeEvent (QCloseEvent *aEvent);
     virtual bool eventFilter (QObject *aObject, QEvent *aEvent);
@@ -102 +101 @@
     void performTablesAdjustment();
 
-    void sltCurrentMediumTypeChanged();
+    void sltOpenMediumTypeChangeDialog();
 
 private:
@@ -148 +147 @@
     bool mSetupMode : 1;
 
-    /* Medium type related variables: */
-    KMediumType m_previousMediumType;
-    bool m_fParentMediumType;
-
     /* Icon definitions */
     QIcon mHardDiskIcon;

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

@@ -104 +104 @@
            </item>
            <item row="0" column="1" >
-            <widget class="QComboBox" name="m_pTypeCombo" >
-             <property name="sizePolicy" >
-              <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-            </widget>
+            <layout class="QHBoxLayout">
+             <item>
+              <widget class="QILabel" name="m_pTypePane">
+               <property name="sizePolicy">
+                <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QIToolButton" name="m_pChangeMediumTypeButton">
+               <property name="autoRaise">
+                <bool>true</bool>
+               </property>
+               <property name="toolTip">
+                <string>Change medium type...</string>
+               </property>
+              </widget>
+             </item>
+            </layout>
            </item>
            <item row="1" column="0" >
@@ -399 +413 @@
    <header>QITabWidget.h</header>
   </customwidget>
+  <customwidget>
+   <class>QIToolButton</class>
+   <extends>QToolButton</extends>
+   <header>QIToolButton.h</header>
+  </customwidget>
  </customwidgets>
  <resources/>