Changeset 77405 in vbox

Timestamp:

Feb 20, 2019 8:39:07 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9080. Adding context menus.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso

Files:

• UIVisoBrowserBase.cpp (modified) (1 diff)
• UIVisoBrowserBase.h (modified) (2 diffs)
• UIVisoContentBrowser.cpp (modified) (3 diffs)
• UIVisoCreator.cpp (modified) (2 diffs)
• UIVisoCreator.h (modified) (1 diff)
• UIVisoHostBrowser.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoBrowserBase.cpp

@@ -265 +265 @@
 }
 
+void UIVisoBrowserBase::sltFileTableViewContextMenu(const QPoint &point)
+{
+    QWidget *pSender = qobject_cast<QWidget*>(sender());
+    if (!pSender)
+        return;
+    emit sigCreateFileTableViewContextMenu(pSender, point);
+}
 
 void UIVisoBrowserBase::sltHandleTableViewItemDoubleClick(const QModelIndex &index)

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoBrowserBase.h

@@ -46 +46 @@
 
     void sigTreeViewVisibilityChanged(bool fVisible);
+    void sigCreateFileTableViewContextMenu(QWidget *pMenuRequester, const QPoint &point);
 
 public:
@@ -78 +79 @@
     QGridLayout        *m_pMainLayout;
 
+protected slots:
+
+    void sltFileTableViewContextMenu(const QPoint &point);
+
 private slots:
 

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoContentBrowser.cpp

@@ -393 +393 @@
     {
         m_pMainLayout->addWidget(m_pTableView, 1, 0, 6, 4);
+        m_pTableView->setContextMenuPolicy(Qt::CustomContextMenu);
         m_pTableView->setSelectionMode(QAbstractItemView::ContiguousSelection);
         m_pTableView->setShowGrid(false);
@@ -440 +441 @@
         connect(m_pTableView, &UIVisoContentTableView::sigNewItemsDropped,
                 this, &UIVisoContentBrowser::sltHandleDroppedItems);
+        connect(m_pTableView, &QTableView::customContextMenuRequested,
+                this, &UIVisoContentBrowser::sltFileTableViewContextMenu);
     }
 
@@ -448 +451 @@
         connect(m_pModel, &UICustomFileSystemModel::sigItemRenamed,
                 this, &UIVisoContentBrowser::sltHandleItemRenameAttempt);
-
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.cpp

@@ -225 +225 @@
 }
 
+void UIVisoCreator::sltHandleShowContextMenu(const QWidget *pContextMenuRequester, const QPoint &point)
+{
+    if (!pContextMenuRequester)
+        return;
+
+    QMenu menu;
+
+    if (sender() == m_pHostBrowser)
+    {
+        menu.addAction(m_pAddAction);
+    }
+    else if (sender() == m_pVisoBrowser)
+    {
+        menu.addAction(m_pRemoveAction);
+        menu.addAction(m_pNewDirectoryAction);
+        menu.addAction(m_pResetAction);
+    }
+
+    menu.exec(pContextMenuRequester->mapToGlobal(point));
+}
+
 void UIVisoCreator::prepareWidgets()
 {
@@ -325 +346 @@
         connect(m_pHostBrowser, &UIVisoHostBrowser::sigTableSelectionChanged,
                 this, &UIVisoCreator::sltHandleHostBrowserTableSelectionChanged);
+        connect(m_pHostBrowser, &UIVisoHostBrowser::sigCreateFileTableViewContextMenu,
+                this, &UIVisoCreator::sltHandleShowContextMenu);
     }
 
     if (m_pVisoBrowser)
+    {
         connect(m_pVisoBrowser, &UIVisoContentBrowser::sigTableSelectionChanged,
                 this, &UIVisoCreator::sltHandleContentBrowserTableSelectionChanged);
+        connect(m_pVisoBrowser, &UIVisoContentBrowser::sigCreateFileTableViewContextMenu,
+                this, &UIVisoCreator::sltHandleShowContextMenu);
+    }
 
     if (m_pButtonBox)

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.h

@@ -83 +83 @@
     void sltHandleHostBrowserTableSelectionChanged(bool fIsSelectionEmpty);
     void sltHandleContentBrowserTableSelectionChanged(bool fIsSelectionEmpty);
+    void sltHandleShowContextMenu(const QWidget *pContextMenuRequester, const QPoint &point);
 
 private:

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoHostBrowser.cpp

@@ -153 +153 @@
     if (m_pTableView)
     {
+        m_pTableView->setContextMenuPolicy(Qt::CustomContextMenu);
         m_pMainLayout->addWidget(m_pTableView, 1, 0, 8, 4);
         m_pTableView->setSelectionMode(QAbstractItemView::ContiguousSelection);
@@ -189 +190 @@
     UIVisoBrowserBase::prepareConnections();
     if (m_pTableView)
+    {
         connect(m_pTableView, &QTableView::doubleClicked,
                 this, &UIVisoBrowserBase::sltHandleTableViewItemDoubleClick);
+        connect(m_pTableView, &QTableView::customContextMenuRequested,
+                this, &UIVisoHostBrowser::sltFileTableViewContextMenu);
+    }
 
     if (m_pTableView->selectionModel())
@@ -216 +221 @@
     setTreeCurrentIndex(index);
     m_pTreeView->blockSignals(false);
+
+    /* Check if we still have something selected after table root index change: */
+    if (m_pTableView && m_pTableView->selectionModel())
+        emit sigTableSelectionChanged(m_pTableView->selectionModel()->hasSelection());
 }