Index: /trunk/src/VBox/Frontends/VirtualBox/src/UIMediumTypeChangeDialog.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/UIMediumTypeChangeDialog.cpp (revision 37892) +++ /trunk/src/VBox/Frontends/VirtualBox/src/UIMediumTypeChangeDialog.cpp (revision 37893) @@ -53,5 +53,5 @@ m_pLabel = new QILabel(this); m_pLabel->setWordWrap(true); - m_pLabel->useSizeHintForWidth(400); + m_pLabel->useSizeHintForWidth(450); m_pLabel->updateGeometry(); pMainLayout->addWidget(m_pLabel); @@ -109,8 +109,9 @@ { /* Translate window title: */ - setWindowTitle(tr("Change medium type")); + setWindowTitle(tr("Modify medium attributes")); /* Translate description: */ - m_pLabel->setText(tr("

You are about to change the medium type of the virtual disk located in %1.

" + m_pLabel->setText(tr("

You are about to change the attributes of the virtual disk located in %1.

" + "

Note: For now only the 'medium type' attribute is changeable.

" "

Please choose one of the following medium types and press %2 " "to proceed or %3 otherwise.

") Index: /trunk/src/VBox/Frontends/VirtualBox/src/VBoxMediaManagerDlg.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/VBoxMediaManagerDlg.cpp (revision 37892) +++ /trunk/src/VBox/Frontends/VirtualBox/src/VBoxMediaManagerDlg.cpp (revision 37893) @@ -285,9 +285,4 @@ this, SLOT (makeRequestForAdjustTable())); - /* Setup information pane: */ - 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 */ mActionsContextMenu = new QMenu (this); @@ -296,4 +291,5 @@ mAddAction = new QAction (this); mCopyAction = new QAction (this); + mModifyAction = new QAction (this); mRemoveAction = new QAction (this); mReleaseAction = new QAction (this); @@ -303,4 +299,5 @@ connect (mAddAction, SIGNAL (triggered()), this, SLOT (doAddMedium())); connect (mCopyAction, SIGNAL (triggered()), this, SLOT (doCopyMedium())); + connect (mModifyAction, SIGNAL (triggered()), this, SLOT (doModifyMedium())); connect (mRemoveAction, SIGNAL (triggered()), this, SLOT (doRemoveMedium())); connect (mReleaseAction, SIGNAL (triggered()), this, SLOT (doReleaseMedium())); @@ -316,4 +313,8 @@ ":/hd_add_disabled_22px.png", ":/hd_add_disabled_16px.png")); mCopyAction->setIcon(UIIconPool::iconSetFull ( + QSize (22, 22), QSize (16, 16), + ":/hd_add_22px.png", ":/hd_add_16px.png", + ":/hd_add_disabled_22px.png", ":/hd_add_disabled_16px.png")); + mModifyAction->setIcon(UIIconPool::iconSetFull ( QSize (22, 22), QSize (16, 16), ":/hd_new_22px.png", ":/hd_new_16px.png", @@ -333,4 +334,5 @@ mActionsContextMenu->addAction (mCopyAction); + mActionsContextMenu->addAction (mModifyAction); mActionsContextMenu->addAction (mRemoveAction); mActionsContextMenu->addAction (mReleaseAction); @@ -362,4 +364,5 @@ // mToolBar->addAction (mAddAction); mToolBar->addAction (mCopyAction); + mToolBar->addAction (mModifyAction); // mToolBar->addSeparator(); mToolBar->addAction (mRemoveAction); @@ -373,4 +376,5 @@ // mActionsMenu->addAction (mAddAction); mActionsMenu->addAction (mCopyAction); + mActionsMenu->addAction (mModifyAction); // mActionsMenu->addSeparator(); mActionsMenu->addAction (mRemoveAction); @@ -607,4 +611,5 @@ mAddAction->setText (tr ("&Add...")); mCopyAction->setText (tr ("&Copy...")); + mModifyAction->setText (tr ("&Modify...")); mRemoveAction->setText (tr ("R&emove")); mReleaseAction->setText (tr ("Re&lease")); @@ -614,4 +619,5 @@ mAddAction->setShortcut (QKeySequence ("Ins")); mCopyAction->setShortcut (QKeySequence ("Ctrl+C")); + mModifyAction->setShortcut (QKeySequence ("Ctrl+Space")); mRemoveAction->setShortcut (QKeySequence (QKeySequence::Delete)); mReleaseAction->setShortcut (QKeySequence ("Ctrl+L")); @@ -621,4 +627,5 @@ mAddAction->setStatusTip (tr ("Add an existing medium")); mCopyAction->setStatusTip (tr ("Copy an existing medium")); + mModifyAction->setStatusTip (tr ("Modify an existing medium attributes")); mRemoveAction->setStatusTip (tr ("Remove the selected medium")); mReleaseAction->setStatusTip (tr ("Release the selected medium by detaching it from the machines")); @@ -631,4 +638,6 @@ mCopyAction->setToolTip (mCopyAction->text().remove ('&') + QString (" (%1)").arg (mCopyAction->shortcut().toString())); + mModifyAction->setToolTip (mModifyAction->text().remove ('&') + + QString (" (%1)").arg (mModifyAction->shortcut().toString())); mRemoveAction->setToolTip (mRemoveAction->text().remove ('&') + QString (" (%1)").arg (mRemoveAction->shortcut().toString())); @@ -1063,4 +1072,15 @@ } +void VBoxMediaManagerDlg::doModifyMedium() +{ + MediaItem *pMediumItem = toMediaItem(currentTreeWidget()->currentItem()); + UIMediumTypeChangeDialog dlg(this, pMediumItem->id()); + if (dlg.exec() == QDialog::Accepted) + { + pMediumItem->refreshAll(); + m_pTypePane->setText(pMediumItem->hardDiskType()); + } +} + void VBoxMediaManagerDlg::doRemoveMedium() { @@ -1419,4 +1439,6 @@ bool copyEnabled = currentTreeWidgetType() == VBoxDefs::MediumType_HardDisk && notInEnum && item && checkMediumFor (item, Action_Copy); + bool modifyEnabled = currentTreeWidgetType() == VBoxDefs::MediumType_HardDisk && + notInEnum && item && checkMediumFor (item, Action_Modify); bool removeEnabled = notInEnum && item && checkMediumFor (item, Action_Remove); bool releaseEnabled = item && checkMediumFor (item, Action_Release); @@ -1425,4 +1447,5 @@ mAddAction->setEnabled (addEnabled); mCopyAction->setEnabled (copyEnabled); + mModifyAction->setEnabled (modifyEnabled); mRemoveAction->setEnabled (removeEnabled); mReleaseAction->setEnabled (releaseEnabled); @@ -1443,9 +1466,4 @@ if (item->treeWidget() == mTwHD) { - /* 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")); @@ -1544,15 +1562,4 @@ if (widgetList [i]->header()->sectionSize (0) != size0) widgetList [i]->header()->resizeSection (0, size0); - } -} - -void VBoxMediaManagerDlg::sltOpenMediumTypeChangeDialog() -{ - MediaItem *pMediumItem = toMediaItem(currentTreeWidget()->currentItem()); - UIMediumTypeChangeDialog dlg(this, pMediumItem->id()); - if (dlg.exec() == QDialog::Accepted) - { - pMediumItem->refreshAll(); - m_pTypePane->setText(pMediumItem->hardDiskType()); } } @@ -1761,4 +1768,9 @@ } case Action_Copy: + { + /* False for children: */ + return !aItem->medium().parent(); + } + case Action_Modify: { /* False for children: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/VBoxMediaManagerDlg.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/VBoxMediaManagerDlg.h (revision 37892) +++ /trunk/src/VBox/Frontends/VirtualBox/src/VBoxMediaManagerDlg.h (revision 37893) @@ -40,5 +40,5 @@ enum TabIndex { HDTab = 0, CDTab, FDTab }; enum ItemAction { ItemAction_Added, ItemAction_Updated, ItemAction_Removed }; - enum Action { Action_Select, Action_Edit, Action_Copy, Action_Remove, Action_Release }; + enum Action { Action_Select, Action_Edit, Action_Copy, Action_Modify, Action_Remove, Action_Release }; public: @@ -86,4 +86,5 @@ void doAddMedium(); void doCopyMedium(); + void doModifyMedium(); void doRemoveMedium(); void doReleaseMedium(); @@ -100,6 +101,4 @@ void makeRequestForAdjustTable(); void performTablesAdjustment(); - - void sltOpenMediumTypeChangeDialog(); private: @@ -159,4 +158,5 @@ QAction *mAddAction; QAction *mCopyAction; + QAction *mModifyAction; QAction *mRemoveAction; QAction *mReleaseAction; Index: /trunk/src/VBox/Frontends/VirtualBox/src/VBoxMediaManagerDlg.ui =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/VBoxMediaManagerDlg.ui (revision 37892) +++ /trunk/src/VBox/Frontends/VirtualBox/src/VBoxMediaManagerDlg.ui (revision 37893) @@ -104,26 +104,12 @@ - - - - - - 0 - 0 - - - - - - - - true - - - Change medium type... - - - - + + + + 0 + 0 + + + @@ -413,9 +399,4 @@
QITabWidget.h
- - QIToolButton - QToolButton -
QIToolButton.h
-