In the treeview, the right mouse button now back-cycles the favourite state of events.

diff --git a/src/mvc/treeview.cpp b/src/mvc/treeview.cpp
index dd1b47ccbaffc16d86e40e5b5c9f3fa460aea2d7..3535eb39bff709f02ae059dd804771334047e33b 100644 (file)
--- a/src/mvc/treeview.cpp
+++ b/src/mvc/treeview.cpp
@@ -44,7 +44,7 @@ void TreeView::mouseReleaseEvent(QMouseEvent *aEvent)
     QPoint point = aEvent->pos();
 
     // test whether we have handled the mouse event
     QPoint point = aEvent->pos();
 
     // test whether we have handled the mouse event

-    if(!testForControlClicked(index,point))
+    if(!testForControlClicked(index, point, aEvent->button()))

     {
         // pass the event to the Base class, so item clicks/events are handled correctly
         QTreeView::mouseReleaseEvent(aEvent);
     {
         // pass the event to the Base class, so item clicks/events are handled correctly
         QTreeView::mouseReleaseEvent(aEvent);


@@ -52,7 +52,7 @@ void TreeView::mouseReleaseEvent(QMouseEvent *aEvent)
 }
 
 // returns bool if some Control was clicked
 }
 
 // returns bool if some Control was clicked

-bool TreeView::testForControlClicked(const QModelIndex &aIndex, const QPoint &aPoint)
+bool TreeView::testForControlClicked(const QModelIndex &aIndex, const QPoint &aPoint, Qt::MouseButton button)

 {
     bool handled = false;
 
 {
     bool handled = false;
 


@@ -72,7 +72,7 @@ bool TreeView::testForControlClicked(const QModelIndex &aIndex, const QPoint &aP
                 Event event = Event::getById(aIndex.data().toInt(),confId);
 
                 QList<Event> conflicts = Event::conflictEvents(event.id(),Conference::activeConference());
                 Event event = Event::getById(aIndex.data().toInt(),confId);
 
                 QList<Event> conflicts = Event::conflictEvents(event.id(),Conference::activeConference());

-                event.cycleFavourite();
+                event.cycleFavourite(button == Qt::RightButton);

                 event.update("favourite");
 
                 // event has became 'favourite' and so 'conflicts' list may have changed
                 event.update("favourite");
 
                 // event has became 'favourite' and so 'conflicts' list may have changed

diff --git a/src/mvc/treeview.h b/src/mvc/treeview.h
index f587995bc14a634caa735f73d6eaf82f4a1a9151..6f4f463be1bbd2ccfc8c9be982389967f57dc22a 100644 (file)
--- a/src/mvc/treeview.h
+++ b/src/mvc/treeview.h
@@ -30,7 +30,7 @@ public:
     ~TreeView() {}
 private:
     void mouseReleaseEvent(QMouseEvent *aEvent);
     ~TreeView() {}
 private:
     void mouseReleaseEvent(QMouseEvent *aEvent);

-    bool testForControlClicked(const QModelIndex &aIndex, const QPoint &aPoint);
+    bool testForControlClicked(const QModelIndex &aIndex, const QPoint &aPoint, Qt::MouseButton button);

 public slots:
     void setAllExpanded(bool aExpanded); // (aExpanded==true) => expanded; (aExpanded==false) => collapsed
 private slots:
 public slots:
     void setAllExpanded(bool aExpanded); // (aExpanded==true) => expanded; (aExpanded==false) => collapsed
 private slots: