[kgraphviewer-devel] [KGraphViewer/libkgraphviz] 84f9bef: Remove context menu stuff from CanvasElement

[Kevin Funk]

commit 84f9befaf2098623f94e62b2b8899c1b1e0f53b3
branch libkgraphviz
Author: Kevin Funk <krf at electrostorm.net>
Date:   Wed Dec 15 14:38:59 2010 +0100

    Remove context menu stuff from CanvasElement
    
    Related to commit 9fa25b48e4382c578125811ffd5bc5541a9a19fa.
    All context menu events should be handled in the view itself.

diff --git a/src/kgraphviz/canvaselement.cpp b/src/kgraphviz/canvaselement.cpp
index 3271c9d..d526433 100644
--- a/src/kgraphviz/canvaselement.cpp
+++ b/src/kgraphviz/canvaselement.cpp
@@ -44,7 +44,6 @@ CanvasElementPrivate::CanvasElementPrivate() :
   m_scaleX(0), m_scaleY(0),
   m_xMargin(0), m_yMargin(0), m_gh(0), m_wdhcf(0), m_hdvcf(0),
   m_font(0),
-  m_popup(new QMenu()),
   m_hovered(false)
 {
 }
@@ -98,27 +97,18 @@ CanvasElement::CanvasElement(
   {
     d->m_brush = c->backgroundBrush();
   }
-  
-  // the message should be given (or possible to be given) by the part user
-  KAction* removeElementAction = new KAction(i18n("Remove selected element(s)"), this);
-  d->m_popup->addAction(removeElementAction);
-  connect(removeElementAction,SIGNAL(triggered(bool)),this,SLOT(slotRemoveElement()));
 
   connect(this, SIGNAL(selected(CanvasElement*, Qt::KeyboardModifiers)), v, SLOT(slotElementSelected(CanvasElement*, Qt::KeyboardModifiers)));
 
-  connect(this, SIGNAL(elementContextMenuEvent(const QString&, const QPoint&)), v, SLOT(slotContextMenuEvent(const QString&, const QPoint&)));
-
-  setAcceptHoverEvents ( true );
-
   connect(this, SIGNAL(hoverEnter(CanvasElement*)), v, SLOT(slotElementHoverEnter(CanvasElement*)));
   connect(this, SIGNAL(hoverLeave(CanvasElement*)), v, SLOT(slotElementHoverLeave(CanvasElement*)));
-  
+
+  setAcceptHoverEvents ( true );
 }
 
 CanvasElement::~CanvasElement()
 {
   Q_D(CanvasElement);
-  delete d->m_popup;
   delete d_ptr;
 }
 
@@ -562,10 +552,6 @@ void CanvasElement::mousePressEvent(QGraphicsSceneMouseEvent* event)
       emit(selected(this,event->modifiers()));
       update();
     }
-    
-//     kDebug() << "opens the contextual menu";
-//     d->m_popup->exec(event->screenPos());
-    emit(elementContextMenuEvent(d->m_element->id(), event->screenPos() ));
   }
 }
 
diff --git a/src/kgraphviz/canvaselement.h b/src/kgraphviz/canvaselement.h
index d1570be..0d2452d 100644
--- a/src/kgraphviz/canvaselement.h
+++ b/src/kgraphviz/canvaselement.h
@@ -71,7 +71,6 @@ protected:
   
 Q_SIGNALS:
   void selected(CanvasElement*, Qt::KeyboardModifiers);
-  void elementContextMenuEvent(const QString&, const QPoint&);
   void hoverEnter(CanvasElement*);
   void hoverLeave(CanvasElement*);
   
diff --git a/src/kgraphviz/canvaselement_p.h b/src/kgraphviz/canvaselement_p.h
index 09b7b8c..9fa31a8 100644
--- a/src/kgraphviz/canvaselement_p.h
+++ b/src/kgraphviz/canvaselement_p.h
@@ -42,7 +42,6 @@ public:
   QPen m_pen;
   QBrush m_brush;
   QRectF m_boundingRect;
-  QMenu* m_popup;
 
   bool m_hovered;
 };