Changeset 9867 in vbox

Timestamp:

Jun 23, 2008 11:55:10 AM (17 years ago)

Author:

vboxsync

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

32258

Message:

Fe/Qt4: Make the context menu trigger for QITreeWidget more correct.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/QITreeWidget.h (modified) (1 diff)
• include/VBoxDiskImageManagerDlg.h (modified) (2 diffs)
• src/QITreeWidget.cpp (modified) (2 diffs)
• src/VBoxDiskImageManagerDlg.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox4/include/QITreeWidget.h

@@ -37 +37 @@
     void setSupportedDropActions (Qt::DropActions aAction);
 
-signals:
-
-    void itemRightClicked (const QPoint &aPos, QTreeWidgetItem *aItem, int aColumn);
-
 protected:
 
-    void mousePressEvent (QMouseEvent *aEvent);
     virtual Qt::DropActions supportedDropActions () const;
 

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxDiskImageManagerDlg.h

@@ -92 +92 @@
     void processCurrentChanged (QTreeWidgetItem *aItem, QTreeWidgetItem *aPrevItem = NULL);
     void processDoubleClick (QTreeWidgetItem *aItem, int aColumn);
-    void processRightClick (const QPoint &aPos, QTreeWidgetItem *aItem, int aColumn);
+    void showContextMenu (const QPoint &aPos);
 
 private:
@@ -129 +129 @@
 
     void makeWarningMark (DiskImageItem *aItem, VBoxMedia::Status aStatus, VBoxDefs::DiskType aType) const;
-    
+
     static QString DVDImageUsage (const QUuid &aId, QString &aSnapshotUsage);
     static QString FloppyImageUsage (const QUuid &aId, QString &aSnapshotUsage);

trunk/src/VBox/Frontends/VirtualBox4/src/QITreeWidget.cpp

@@ -27 +27 @@
 
 QITreeWidget::QITreeWidget (QWidget *aParent)
-    : QTreeWidget (aParent) 
+    : QTreeWidget (aParent)
 {
 }
@@ -36 +36 @@
 }
 
-void QITreeWidget::mousePressEvent (QMouseEvent *aEvent)
-{
-    if (aEvent->button() == Qt::RightButton)
-    {
-        emit itemRightClicked (aEvent->globalPos(), itemAt (aEvent->pos()), columnAt (aEvent->pos().x()));
-        aEvent->accept();
-    }else
-        QTreeWidget::mousePressEvent (aEvent);
-}
-
-Qt::DropActions QITreeWidget::supportedDropActions () const
+Qt::DropActions QITreeWidget::supportedDropActions() const
 {
     return mSupportedDropActions;

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxDiskImageManagerDlg.cpp

@@ -281 +281 @@
     connect (mHdsTree, SIGNAL (itemDoubleClicked (QTreeWidgetItem *, int)),
              this, SLOT (processDoubleClick (QTreeWidgetItem *, int)));
-    connect (mHdsTree, SIGNAL (itemRightClicked (const QPoint &, QTreeWidgetItem *, int)),
-             this, SLOT (processRightClick (const QPoint &, QTreeWidgetItem *, int)));
+    connect (mHdsTree, SIGNAL (customContextMenuRequested (const QPoint &)),
+             this, SLOT (showContextMenu (const QPoint &)));
 
     mCdsTree->header()->setResizeMode (0, QHeaderView::Stretch);
@@ -293 +293 @@
     connect (mCdsTree, SIGNAL (itemDoubleClicked (QTreeWidgetItem *, int)),
              this, SLOT (processDoubleClick (QTreeWidgetItem *, int)));
-    connect (mCdsTree, SIGNAL (itemRightClicked (const QPoint &, QTreeWidgetItem *, int)),
-             this, SLOT (processRightClick (const QPoint &, QTreeWidgetItem *, int)));
+    connect (mCdsTree, SIGNAL (customContextMenuRequested (const QPoint &)),
+             this, SLOT (showContextMenu (const QPoint &)));
 
     mFdsTree->header()->setResizeMode (0, QHeaderView::Stretch);
@@ -305 +305 @@
     connect (mFdsTree, SIGNAL (itemDoubleClicked (QTreeWidgetItem *, int)),
              this, SLOT (processDoubleClick (QTreeWidgetItem *, int)));
-    connect (mFdsTree, SIGNAL (itemRightClicked (const QPoint &, QTreeWidgetItem *, int)),
-             this, SLOT (processRightClick (const QPoint &, QTreeWidgetItem *, int)));
+    connect (mFdsTree, SIGNAL (customContextMenuRequested (const QPoint &)),
+             this, SLOT (showContextMenu (const QPoint &)));
 
     /* Context menu composing */
@@ -1576 +1576 @@
 }
 
-void VBoxDiskImageManagerDlg::processRightClick (const QPoint &aPos, QTreeWidgetItem *aItem, int /* aColumn */)
-{
-    if (aItem)
+void VBoxDiskImageManagerDlg::showContextMenu (const QPoint &aPos)
+{
+    QTreeWidget *curWidget = currentTreeWidget();
+    QTreeWidgetItem *curItem = curWidget->itemAt (aPos);
+    if (curItem)
     {
         /* Make sure the item is selected and current */
-        setCurrentItem (currentTreeWidget(), aItem);
-        mActionsContextMenu->exec (aPos);
+        setCurrentItem (curWidget, curItem);
+        mActionsContextMenu->exec (curWidget->viewport()->mapToGlobal (aPos));
     }
 }