Changeset c53a3f4

Timestamp:

01/19/10 18:34:18 (12 years ago)

Author:

pavelpa <pavelpa@…>

Branches:

master, qt5

Children:

395d6d3

Parents:

02c1e09

Message:

single-click is used to open event dialog

Location:

src

Files:

• gui/mainwindow.cpp (modified) (10 diffs)
• gui/mainwindow.h (modified) (1 diff)
• mvc/treeview.cpp (modified) (5 diffs)
• mvc/treeview.h (modified) (1 diff)

src/gui/mainwindow.cpp

@@ -17 +17 @@
 #include "daynavigatorwidget.h"
 #include "mapwindow.h"
+
+const int confId = 1;
 
 MainWindow::MainWindow(QWidget *parent)
@@ -65 +67 @@
     actTreeView->setItemDelegate(new Delegate(actTreeView));
 
-    // event double clicked
-    connect(dayTreeView, SIGNAL(doubleClicked(const QModelIndex &)), SLOT(itemDoubleClicked(const QModelIndex &)));
-    connect(favTreeView, SIGNAL(doubleClicked(const QModelIndex &)), SLOT(itemDoubleClicked(const QModelIndex &)));
-    connect(actTreeView, SIGNAL(doubleClicked(const QModelIndex &)), SLOT(itemDoubleClicked(const QModelIndex &)));
+    // event clicked
+    connect(dayTreeView, SIGNAL(clicked(const QModelIndex &)), SLOT(itemClicked(const QModelIndex &)));
+    connect(favTreeView, SIGNAL(clicked(const QModelIndex &)), SLOT(itemClicked(const QModelIndex &)));
+    connect(actTreeView, SIGNAL(clicked(const QModelIndex &)), SLOT(itemClicked(const QModelIndex &)));
     // request for map to be displayed
     connect(dayTreeView, SIGNAL(requestForMap(const QModelIndex &)), SLOT(displayMap(const QModelIndex &)));
@@ -78 +80 @@
     if(Conference::getAll().count()) // no conference(s) in the DB
     {
-        int confId = 1;
         static_cast<EventModel*>(favTreeView->model())->loadFavEvents(Conference::getById(confId).start(),confId);
         favTreeView->reset();
@@ -90 +91 @@
     else
     {
-        int confId = 1;
         QDate aStartDate = Conference::getById(confId).start();
         QDate aEndDate = Conference::getById(confId).end();
@@ -130 +130 @@
     if(Conference::getAll().count())
     {
-        int confId = 1;
         // 'dayNavigator' emits signal 'dateChanged' after setting valid START:END dates
         QDate aStartDate = Conference::getById(confId).start();
@@ -155 +154 @@
 void MainWindow::updateDayView(const QDate &aDate)
 {
-    int confId = 1;
     static_cast<EventModel*>(dayTreeView->model())->loadEvents(aDate,confId);
     dayTreeView->reset();
@@ -163 +161 @@
 void MainWindow::updateTab(const int aIndex)
 {
-    int confId = 1;
     switch(aIndex)
     {
@@ -192 +189 @@
         }
     };
-
-
 }
 
 void MainWindow::updateActivitiesDayView(const QDate &aDate)
 {
-    int confId = 1;
     static_cast<EventModel*>(actTreeView->model())->loadEventsByActivities(aDate,confId);
     actTreeView->reset();
@@ -206 +200 @@
 void MainWindow::updateFavouritesDayView(const QDate &aDate)
 {
-    int confId = 1;
     static_cast<EventModel*>(favTreeView->model())->loadFavEvents(aDate,confId);
     favTreeView->reset();
@@ -212 +205 @@
 }
 
-void MainWindow::itemDoubleClicked(const QModelIndex &aIndex)
+void MainWindow::itemClicked(const QModelIndex &aIndex)
 {
     // have to handle only events, not time-groups

src/gui/mainwindow.h

@@ -23 +23 @@
     void updateActivitiesDayView(const QDate &aDate);
     void updateFavouritesDayView(const QDate &aDate);
-    void itemDoubleClicked(const QModelIndex &aIndex);
+    void itemClicked(const QModelIndex &aIndex);
     void displayMap(const QModelIndex &aIndex);
 private:

src/mvc/treeview.cpp

@@ -22 +22 @@
     QPoint point = aEvent->pos();
 
-    testForControlClicked(index,point);
-
-    // pass the event to the Base class, so item clicks/events are handled correctly
-    QTreeView::mouseReleaseEvent(aEvent);
+    // test whether we have handled the mouse event
+    if(!testForControlClicked(index,point))
+    {
+        // pass the event to the Base class, so item clicks/events are handled correctly
+        QTreeView::mouseReleaseEvent(aEvent);
+    }
 }
 
-void TreeView::testForControlClicked(const QModelIndex &aIndex, const QPoint &aPoint) 
+// returns bool if some Control was clicked
+bool TreeView::testForControlClicked(const QModelIndex &aIndex, const QPoint &aPoint) 
 {
+    bool handled = false;
+
     if(!aIndex.isValid())
-        return;
+        return handled;
 
     QRect rect = visualRect(aIndex); // visual QRect of selected/clicked item in the list
@@ -56 +61 @@
                 // since the Favourite icon has changed, update TreeView accordingly
                 static_cast<EventModel*>(model())->emitDataChangedSignal(aIndex,aIndex);
+                handled = true;
             }
             break;
@@ -89 +95 @@
                 // since the Alarm icon has changed, update TreeView accordingly
                 static_cast<EventModel*>(model())->emitDataChangedSignal(aIndex,aIndex);
-
+                handled = true;
             }
             break;
@@ -97 +103 @@
                 qDebug() << "MAP CLICKED: " << qVariantValue<QString>(aIndex.data());
                 emit(requestForMap(aIndex));
+                handled = true;
             }
         break;
@@ -103 +110 @@
             {
                 // item was clicked, but not a control
+                handled = false;
             }
     };
+
+    return handled;
 }
 

src/mvc/treeview.h

@@ -12 +12 @@
 private:
     void mouseReleaseEvent(QMouseEvent *aEvent);
-    void testForControlClicked(const QModelIndex &aIndex, const QPoint &aPoint);
+    bool testForControlClicked(const QModelIndex &aIndex, const QPoint &aPoint);
 signals:
     void requestForMap(const QModelIndex &aIndex);