Changeset 5fc5d13 in confclerk_git

Timestamp:

01/21/17 23:22:39 (5 years ago)

Author:

Philipp Spitzer <philipp@…>

Branches:

master, qt5

Children:

c8257a4

Parents:

bda4629

git-author:

Philipp Spitzer <philipp@…> (01/21/17 23:20:26)

git-committer:

Philipp Spitzer <philipp@…> (01/21/17 23:22:39)

Message:

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

Location:

src/mvc

Files:

• treeview.cpp (modified) (3 diffs)
• treeview.h (modified) (1 diff)

src/mvc/treeview.cpp

@@ -45 +45 @@
 
     // 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
@@ -53 +53 @@
 
 // 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;
@@ -73 +73 @@
 
                 QList<Event> conflicts = Event::conflictEvents(event.id(),Conference::activeConference());
-                event.cycleFavourite();
+                event.cycleFavourite(button == Qt::RightButton);
                 event.update("favourite");
 

src/mvc/treeview.h

@@ -31 +31 @@
 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