Changeset 73734 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Aug 17, 2018 12:43:50 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: Media Manager: Fix few small action related aspects.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIActionPoolSelector.cpp (modified) (3 diffs)
• medium/UIMediumManager.cpp (modified) (7 diffs)
• medium/UIMediumManager.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolSelector.cpp

@@ -1835 +1835 @@
     {
         setName(QApplication::translate("UIActionPool", "&Add..."));
-        setStatusTip(QApplication::translate("UIActionPool", "Add a Disk Image File"));
+        setStatusTip(QApplication::translate("UIActionPool", "Add a disk image file"));
         setToolTip(tr("Add a Disk Image File (%1)").arg(shortcut().toString()));
     }
@@ -2239 +2239 @@
     /* 'Remove' action: */
     fSeparator = addAction(pMenu, action(UIActionIndexST_M_Medium_S_Remove)) || fSeparator;
+    /* 'Release' action: */
+    fSeparator = addAction(pMenu, action(UIActionIndexST_M_Medium_S_Release)) || fSeparator;
 
     /* Separator? */
@@ -2247 +2249 @@
     }
 
-    /* 'Release' action: */
-    fSeparator = addAction(pMenu, action(UIActionIndexST_M_Medium_S_Release)) || fSeparator;
     /* 'Properties' action: */
     fSeparator = addAction(pMenu, action(UIActionIndexST_M_Medium_T_Details)) || fSeparator;

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp

@@ -166 +166 @@
     , m_pDetailsWidget(0)
     , m_pToolBar(0)
-    , m_pContextMenu(0)
     , m_pProgressBar(0)
 {
@@ -189 +188 @@
 void UIMediumManagerWidget::retranslateUi()
 {
-    /* Translate toolbar: */
+    /* Adjust toolbar: */
 #ifdef VBOX_WS_MAC
     // WORKAROUND:
@@ -617 +616 @@
 }
 
-void UIMediumManagerWidget::sltHandleContextMenuCall(const QPoint &position)
+void UIMediumManagerWidget::sltHandleContextMenuRequest(const QPoint &position)
 {
     /* Get current tree-widget: */
@@ -623 +622 @@
     AssertPtrReturnVoid(pTreeWidget);
 
-    /* Make sure underlaying item was found: */
+    /* If underlaying item was found => make sure that item is current one: */
     QTreeWidgetItem *pItem = pTreeWidget->itemAt(position);
-    if (!pItem)
-        return;
-
-    /* Make sure that item is current one: */
-    setCurrentItem(pTreeWidget, pItem);
-
-    /* Show item context menu: */
-    if (m_pContextMenu)
-        m_pContextMenu->exec(pTreeWidget->viewport()->mapToGlobal(position));
+    if (pItem)
+        setCurrentItem(pTreeWidget, pItem);
+
+    /* Compose temporary context-menu: */
+    QMenu menu;
+    if (pTreeWidget->itemAt(position))
+    {
+        menu.addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Copy));
+        menu.addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Move));
+        menu.addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Remove));
+        menu.addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Release));
+        menu.addSeparator();
+        menu.addAction(m_pActionPool->action(UIActionIndexST_M_Medium_T_Details));
+    }
+    else
+    {
+        menu.addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Add));
+        menu.addSeparator();
+        menu.addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Refresh));
+    }
+    /* And show it: */
+    menu.exec(pTreeWidget->viewport()->mapToGlobal(position));
 }
 
@@ -734 +746 @@
     /* Update action icons: */
     updateActionIcons();
-
-    /* Prepare context-menu: */
-    prepareContextMenu();
-}
-
-void UIMediumManagerWidget::prepareContextMenu()
-{
-    /* Create context-menu: */
-    m_pContextMenu = new QMenu(this);
-    AssertPtrReturnVoid(m_pContextMenu);
-    {
-        /* Configure contex-menu: */
-        m_pContextMenu->addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Add));
-        m_pContextMenu->addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Copy));
-        m_pContextMenu->addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Move));
-        m_pContextMenu->addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Remove));
-        m_pContextMenu->addSeparator();
-        m_pContextMenu->addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Release));
-        m_pContextMenu->addAction(m_pActionPool->action(UIActionIndexST_M_Medium_T_Details));
-    }
 }
 
@@ -795 +787 @@
         m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Move));
         m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Remove));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Release));
         m_pToolBar->addSeparator();
-        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Release));
         m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Medium_T_Details));
         m_pToolBar->addSeparator();
@@ -890 +882 @@
                 m_pActionPool->action(UIActionIndexST_M_Medium_T_Details), &QAction::setChecked);
         connect(pTreeWidget, &QITreeWidget::customContextMenuRequested,
-                this, &UIMediumManagerWidget::sltHandleContextMenuCall);
+                this, &UIMediumManagerWidget::sltHandleContextMenuRequest);
         connect(pTreeWidget, &QITreeWidget::resized,
                 this, &UIMediumManagerWidget::sltPerformTablesAdjustment, Qt::QueuedConnection);

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.h

@@ -188 +188 @@
         void sltHandleCurrentItemChanged();
         /** Handles item context-menu-call case. */
-        void sltHandleContextMenuCall(const QPoint &position);
+        void sltHandleContextMenuRequest(const QPoint &position);
     /** @} */
 
@@ -209 +209 @@
         /** Prepares actions. */
         void prepareActions();
-        /** Prepares context-menu. */
-        void prepareContextMenu();
         /** Prepares widgets. */
         void prepareWidgets();
@@ -348 +346 @@
         /** Holds the toolbar widget instance. */
         UIToolBar *m_pToolBar;
-        /** Holds the context-menu object instance. */
-        QMenu     *m_pContextMenu;
     /** @} */