single-click is used to open event dialog

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index 9d58b29111e675eae3723fc3d5c25abc439a2426..b13398637f5a38c625c41d95fc29b2bac2c4f7da 100644 (file)
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -17,6 +17,8 @@
 #include "daynavigatorwidget.h"
 #include "mapwindow.h"
 
 #include "daynavigatorwidget.h"
 #include "mapwindow.h"
 

+const int confId = 1;
+

 MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent)
 {
 MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent)
 {


@@ -64,10 +66,10 @@ MainWindow::MainWindow(QWidget *parent)
     actTreeView->setModel(new EventModel());
     actTreeView->setItemDelegate(new Delegate(actTreeView));
 
     actTreeView->setModel(new EventModel());
     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 &)));
     connect(favTreeView, SIGNAL(requestForMap(const QModelIndex &)), SLOT(displayMap(const QModelIndex &)));
     // request for map to be displayed
     connect(dayTreeView, SIGNAL(requestForMap(const QModelIndex &)), SLOT(displayMap(const QModelIndex &)));
     connect(favTreeView, SIGNAL(requestForMap(const QModelIndex &)), SLOT(displayMap(const QModelIndex &)));


@@ -77,7 +79,6 @@ MainWindow::MainWindow(QWidget *parent)
     // TESTING: load some 'fav' data
     if(Conference::getAll().count()) // no conference(s) in the DB
     {
     // TESTING: load some 'fav' data
     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();
     }
         static_cast<EventModel*>(favTreeView->model())->loadFavEvents(Conference::getById(confId).start(),confId);
         favTreeView->reset();
     }


@@ -89,7 +90,6 @@ MainWindow::MainWindow(QWidget *parent)
     }
     else
     {
     }
     else
     {

-        int confId = 1;

         QDate aStartDate = Conference::getById(confId).start();
         QDate aEndDate = Conference::getById(confId).end();
         dayNavigator->setDates(aStartDate, aEndDate);
         QDate aStartDate = Conference::getById(confId).start();
         QDate aEndDate = Conference::getById(confId).end();
         dayNavigator->setDates(aStartDate, aEndDate);


@@ -129,7 +129,6 @@ void MainWindow::importSchedule()
 
     if(Conference::getAll().count())
     {
 
     if(Conference::getAll().count())
     {

-        int confId = 1;

         // 'dayNavigator' emits signal 'dateChanged' after setting valid START:END dates
         QDate aStartDate = Conference::getById(confId).start();
         QDate aEndDate = Conference::getById(confId).end();
         // 'dayNavigator' emits signal 'dateChanged' after setting valid START:END dates
         QDate aStartDate = Conference::getById(confId).start();
         QDate aEndDate = Conference::getById(confId).end();


@@ -154,7 +153,6 @@ void MainWindow::aboutApp()
 
 void MainWindow::updateDayView(const QDate &aDate)
 {
 
 void MainWindow::updateDayView(const QDate &aDate)
 {

-    int confId = 1;

     static_cast<EventModel*>(dayTreeView->model())->loadEvents(aDate,confId);
     dayTreeView->reset();
     dayNavigator->show();
     static_cast<EventModel*>(dayTreeView->model())->loadEvents(aDate,confId);
     dayTreeView->reset();
     dayNavigator->show();


@@ -162,7 +160,6 @@ void MainWindow::updateDayView(const QDate &aDate)
 
 void MainWindow::updateTab(const int aIndex)
 {
 
 void MainWindow::updateTab(const int aIndex)
 {

-    int confId = 1;

     switch(aIndex)
     {
     case 0://index 0 of tabWidget: dayViewTab
     switch(aIndex)
     {
     case 0://index 0 of tabWidget: dayViewTab


@@ -191,13 +188,10 @@ void MainWindow::updateTab(const int aIndex)
 
         }
     };
 
         }
     };

-
-

 }
 
 void MainWindow::updateActivitiesDayView(const QDate &aDate)
 {
 }
 
 void MainWindow::updateActivitiesDayView(const QDate &aDate)
 {

-    int confId = 1;

     static_cast<EventModel*>(actTreeView->model())->loadEventsByActivities(aDate,confId);
     actTreeView->reset();
     activityDayNavigator->show();
     static_cast<EventModel*>(actTreeView->model())->loadEventsByActivities(aDate,confId);
     actTreeView->reset();
     activityDayNavigator->show();


@@ -205,13 +199,12 @@ void MainWindow::updateActivitiesDayView(const QDate &aDate)
 
 void MainWindow::updateFavouritesDayView(const QDate &aDate)
 {
 
 void MainWindow::updateFavouritesDayView(const QDate &aDate)
 {

-    int confId = 1;

     static_cast<EventModel*>(favTreeView->model())->loadFavEvents(aDate,confId);
     favTreeView->reset();
     favouriteDayNavigator->show();
 }
 
     static_cast<EventModel*>(favTreeView->model())->loadFavEvents(aDate,confId);
     favTreeView->reset();
     favouriteDayNavigator->show();
 }
 

-void MainWindow::itemDoubleClicked(const QModelIndex &aIndex)
+void MainWindow::itemClicked(const QModelIndex &aIndex)

 {
     // have to handle only events, not time-groups
     if(!aIndex.parent().isValid()) // time-group
 {
     // have to handle only events, not time-groups
     if(!aIndex.parent().isValid()) // time-group

diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h
index 65719d0082341b34c8d17ed291b550c7c0556e8e..59cadf03c7ee0a6d1b095fb5aff60d40045c4be7 100644 (file)
--- a/src/gui/mainwindow.h
+++ b/src/gui/mainwindow.h
@@ -22,7 +22,7 @@ private slots:
     void updateTab(const int n);
     void updateActivitiesDayView(const QDate &aDate);
     void updateFavouritesDayView(const QDate &aDate);
     void updateTab(const int n);
     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:
     SqlEngine *mSqlEngine;
     void displayMap(const QModelIndex &aIndex);
 private:
     SqlEngine *mSqlEngine;

diff --git a/src/mvc/treeview.cpp b/src/mvc/treeview.cpp
index 20049733d023a41a4f9ebad331e67dd95ebe90f8..7abe943e0ac3562fda85b28de12fda72ce8d7526 100644 (file)
--- a/src/mvc/treeview.cpp
+++ b/src/mvc/treeview.cpp
@@ -21,16 +21,21 @@ void TreeView::mouseReleaseEvent(QMouseEvent *aEvent)
     QModelIndex index = currentIndex();
     QPoint point = aEvent->pos();
 
     QModelIndex index = currentIndex();
     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())
     if(!aIndex.isValid())

-        return;
+        return handled;

 
     QRect rect = visualRect(aIndex); // visual QRect of selected/clicked item in the list
     Delegate *delegate = static_cast<Delegate*>(itemDelegate(aIndex));
 
     QRect rect = visualRect(aIndex); // visual QRect of selected/clicked item in the list
     Delegate *delegate = static_cast<Delegate*>(itemDelegate(aIndex));


@@ -55,6 +60,7 @@ void TreeView::testForControlClicked(const QModelIndex &aIndex, const QPoint &aP
                 event.update("favourite");
                 // since the Favourite icon has changed, update TreeView accordingly
                 static_cast<EventModel*>(model())->emitDataChangedSignal(aIndex,aIndex);
                 event.update("favourite");
                 // since the Favourite icon has changed, update TreeView accordingly
                 static_cast<EventModel*>(model())->emitDataChangedSignal(aIndex,aIndex);

+                handled = true;

             }
             break;
         case Delegate::AlarmControlOn:
             }
             break;
         case Delegate::AlarmControlOn:


@@ -88,7 +94,7 @@ void TreeView::testForControlClicked(const QModelIndex &aIndex, const QPoint &aP
                 event.update("alarm");
                 // since the Alarm icon has changed, update TreeView accordingly
                 static_cast<EventModel*>(model())->emitDataChangedSignal(aIndex,aIndex);
                 event.update("alarm");
                 // since the Alarm icon has changed, update TreeView accordingly
                 static_cast<EventModel*>(model())->emitDataChangedSignal(aIndex,aIndex);

-
+                handled = true;

             }
             break;
         case Delegate::MapControl:
             }
             break;
         case Delegate::MapControl:


@@ -96,13 +102,17 @@ void TreeView::testForControlClicked(const QModelIndex &aIndex, const QPoint &aP
                 // handle Alarm Control clicked
                 qDebug() << "MAP CLICKED: " << qVariantValue<QString>(aIndex.data());
                 emit(requestForMap(aIndex));
                 // handle Alarm Control clicked
                 qDebug() << "MAP CLICKED: " << qVariantValue<QString>(aIndex.data());
                 emit(requestForMap(aIndex));

+                handled = true;

             }
         break;
         case Delegate::ControlNone:
         default:
             {
                 // item was clicked, but not a control
             }
         break;
         case Delegate::ControlNone:
         default:
             {
                 // item was clicked, but not a control

+                handled = false;

             }
     };
             }
     };

+
+    return handled;

 }
 
 }
 

diff --git a/src/mvc/treeview.h b/src/mvc/treeview.h
index 8851ca55d3648fdd3890ecf35a9c0f9738271fb1..7f2d1981bc71884a5db56f7a6e88128b7aa4b14c 100644 (file)
--- a/src/mvc/treeview.h
+++ b/src/mvc/treeview.h
@@ -11,7 +11,7 @@ public:
     ~TreeView() {}
 private:
     void mouseReleaseEvent(QMouseEvent *aEvent);
     ~TreeView() {}
 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);
 };
 signals:
     void requestForMap(const QModelIndex &aIndex);
 };