Changeset 37893 in vbox

Timestamp:

Jul 12, 2011 12:31:43 PM (14 years ago)

Author:

vboxsync

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

72794

Message:

FE/Qt: Virtual Media Manager: 'Modify' action added, medium-type-change functionality moved into 'modify' action handler.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• UIMediumTypeChangeDialog.cpp (modified) (2 diffs)
• VBoxMediaManagerDlg.cpp (modified) (17 diffs)
• VBoxMediaManagerDlg.h (modified) (4 diffs)
• VBoxMediaManagerDlg.ui (modified) (2 diffs)

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

@@ -53 +53 @@
     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 +109 @@
 {
     /* Translate window title: */
-    setWindowTitle(tr("Change medium type"));
+    setWindowTitle(tr("Modify medium attributes"));
 
     /* Translate description: */
-    m_pLabel->setText(tr("<p>You are about to change the medium type of the virtual disk located in %1.</p>"
+    m_pLabel->setText(tr("<p>You are about to change the attributes of the virtual disk located in <b>%1</b>.</p>"
+                         "<p><i>Note: For now only the 'medium type' attribute is changeable.</i></p>"
                          "<p>Please choose one of the following medium types and press <b>%2</b> "
                          "to proceed or <b>%3</b> otherwise.</p>")

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

@@ -285 +285 @@
              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 +291 @@
     mAddAction     = new QAction (this);
     mCopyAction    = new QAction (this);
+    mModifyAction  = new QAction (this);
     mRemoveAction  = new QAction (this);
     mReleaseAction = new QAction (this);
@@ -303 +299 @@
     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 +313 @@
         ":/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 +334 @@
 
     mActionsContextMenu->addAction (mCopyAction);
+    mActionsContextMenu->addAction (mModifyAction);
     mActionsContextMenu->addAction (mRemoveAction);
     mActionsContextMenu->addAction (mReleaseAction);
@@ -362 +364 @@
 //    mToolBar->addAction (mAddAction);
     mToolBar->addAction (mCopyAction);
+    mToolBar->addAction (mModifyAction);
 //    mToolBar->addSeparator();
     mToolBar->addAction (mRemoveAction);
@@ -373 +376 @@
 //    mActionsMenu->addAction (mAddAction);
     mActionsMenu->addAction (mCopyAction);
+    mActionsMenu->addAction (mModifyAction);
 //    mActionsMenu->addSeparator();
     mActionsMenu->addAction (mRemoveAction);
@@ -607 +611 @@
     mAddAction->setText (tr ("&Add..."));
     mCopyAction->setText (tr ("&Copy..."));
+    mModifyAction->setText (tr ("&Modify..."));
     mRemoveAction->setText (tr ("R&emove"));
     mReleaseAction->setText (tr ("Re&lease"));
@@ -614 +619 @@
     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 +627 @@
     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 +638 @@
     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 +1072 @@
 }
 
+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 +1439 @@
     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 +1447 @@
     mAddAction->setEnabled (addEnabled);
     mCopyAction->setEnabled (copyEnabled);
+    mModifyAction->setEnabled (modifyEnabled);
     mRemoveAction->setEnabled (removeEnabled);
     mReleaseAction->setEnabled (releaseEnabled);
@@ -1443 +1466 @@
         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 +1562 @@
         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 +1768 @@
         }
         case Action_Copy:
+        {
+            /* False for children: */
+            return !aItem->medium().parent();
+        }
+        case Action_Modify:
         {
             /* False for children: */

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

@@ -40 +40 @@
     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 +86 @@
     void doAddMedium();
     void doCopyMedium();
+    void doModifyMedium();
     void doRemoveMedium();
     void doReleaseMedium();
@@ -100 +101 @@
     void makeRequestForAdjustTable();
     void performTablesAdjustment();
-
-    void sltOpenMediumTypeChangeDialog();
 
 private:
@@ -159 +158 @@
     QAction     *mAddAction;
     QAction     *mCopyAction;
+    QAction     *mModifyAction;
     QAction     *mRemoveAction;
     QAction     *mReleaseAction;

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

@@ -104 +104 @@
            </item>
            <item row="0" column="1" >
-            <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>
+            <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 row="1" column="0" >
@@ -413 +399 @@
    <header>QITabWidget.h</header>
   </customwidget>
-  <customwidget>
-   <class>QIToolButton</class>
-   <extends>QToolButton</extends>
-   <header>QIToolButton.h</header>
-  </customwidget>
  </customwidgets>
  <resources/>