Warning handling

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index 7f2da94faaf904b3e28c0d6d6bfdbaa7bb1e9540..97f1716115771233cf9fefea594a31dd494a50ec 100644 (file)
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -12,12 +12,14 @@
 #include <conference.h>
 
 #include <QDialog>
 #include <conference.h>
 
 #include <QDialog>

+#include <QMessageBox>

 #include "ui_about.h"
 #include "eventdialog.h"
 #include "daynavigatorwidget.h"
 #include "importscheduledialog.h"
 #include "mapwindow.h"
 
 #include "ui_about.h"
 #include "eventdialog.h"
 #include "daynavigatorwidget.h"
 #include "importscheduledialog.h"
 #include "mapwindow.h"
 

+

 const int confId = 1;
 
 MainWindow::MainWindow(int aEventId, QWidget *aParent)
 const int confId = 1;
 
 MainWindow::MainWindow(int aEventId, QWidget *aParent)


@@ -85,6 +87,11 @@ MainWindow::MainWindow(int aEventId, QWidget *aParent)
     connect(favTreeView, SIGNAL(requestForMap(const QModelIndex &)), SLOT(displayMap(const QModelIndex &)));
     connect(trackTreeView, SIGNAL(requestForMap(const QModelIndex &)), SLOT(displayMap(const QModelIndex &)));
     connect(searchTreeView, SIGNAL(requestForMap(const QModelIndex &)), SLOT(displayMap(const QModelIndex &)));
     connect(favTreeView, SIGNAL(requestForMap(const QModelIndex &)), SLOT(displayMap(const QModelIndex &)));
     connect(trackTreeView, SIGNAL(requestForMap(const QModelIndex &)), SLOT(displayMap(const QModelIndex &)));
     connect(searchTreeView, SIGNAL(requestForMap(const QModelIndex &)), SLOT(displayMap(const QModelIndex &)));

+    // request for warning to be displayed
+    connect(dayTreeView, SIGNAL(requestForWarning(const QModelIndex &)), SLOT(displayWarning(const QModelIndex &)));
+    connect(favTreeView, SIGNAL(requestForWarning(const QModelIndex &)), SLOT(displayWarning(const QModelIndex &)));
+    connect(trackTreeView, SIGNAL(requestForWarning(const QModelIndex &)), SLOT(displayWarning(const QModelIndex &)));
+    connect(searchTreeView, SIGNAL(requestForWarning(const QModelIndex &)), SLOT(displayWarning(const QModelIndex &)));

     // event search button clicked
     connect(searchButton, SIGNAL(clicked()), SLOT(searchClicked()));
 
     // event search button clicked
     connect(searchButton, SIGNAL(clicked()), SLOT(searchClicked()));
 


@@ -273,3 +280,10 @@ void MainWindow::searchClicked()
     updateSearchView( Conference::getById(confId).start() );
 }
 
     updateSearchView( Conference::getById(confId).start() );
 }
 

+void MainWindow::displayWarning(const QModelIndex &aIndex)
+{
+    QMessageBox::warning(
+    this,
+    tr("Time Conflict Warning"),
+    tr("This event happens at the same time than another one of your favourites.") );
+}

diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h
index dd9e24e6aea2e8a8a72a1ef3827a5eed3299ecd1..3ee01f8e1bd4705632bf101a94ceed4e0b100f13 100644 (file)
--- a/src/gui/mainwindow.h
+++ b/src/gui/mainwindow.h
@@ -25,6 +25,7 @@ private slots:
     void updateSearchView(const QDate &aDate);
     void itemClicked(const QModelIndex &aIndex);
     void displayMap(const QModelIndex &aIndex);
     void updateSearchView(const QDate &aDate);
     void itemClicked(const QModelIndex &aIndex);
     void displayMap(const QModelIndex &aIndex);

+    void displayWarning(const QModelIndex &aIndex);

     void searchClicked();
 private:
     SqlEngine *mSqlEngine;
     void searchClicked();
 private:
     SqlEngine *mSqlEngine;

diff --git a/src/mvc/delegate.cpp b/src/mvc/delegate.cpp
index a566e595858ff2317a6132fd4cd3f1ce9f9ce917..4edde0e029b8b6aac5e6c30d646ae39fade7e14c 100644 (file)
--- a/src/mvc/delegate.cpp
+++ b/src/mvc/delegate.cpp
@@ -135,9 +135,15 @@ void Delegate::paint(QPainter *painter, const QStyleOptionViewItem &option, cons
         // Time conflict
         //if(static_cast<Event*>(index.internalPointer())->hasTimeConflict())
         if(bkgrColor == Qt::yellow)
         // Time conflict
         //if(static_cast<Event*>(index.internalPointer())->hasTimeConflict())
         if(bkgrColor == Qt::yellow)

+        {

             painter->drawImage(mControls[WarningControlOn]->drawPoint(option.rect),*mControls[WarningControlOn]->image());
             painter->drawImage(mControls[WarningControlOn]->drawPoint(option.rect),*mControls[WarningControlOn]->image());

+            mControls[WarningControlOn]->hasConflict=true;
+        }

         else
         else

+        {

             painter->drawImage(mControls[WarningControlOff]->drawPoint(option.rect),*mControls[WarningControlOff]->image());
             painter->drawImage(mControls[WarningControlOff]->drawPoint(option.rect),*mControls[WarningControlOff]->image());

+            mControls[WarningControlOn]->hasConflict=false;
+        }

 
         // draw texts
         Event *event = static_cast<Event*>(index.internalPointer());
 
         // draw texts
         Event *event = static_cast<Event*>(index.internalPointer());


@@ -309,8 +315,19 @@ Delegate::ControlId Delegate::whichControlClicked(const QModelIndex &aIndex, con
     while (i.hasNext())
     {
         ControlId id = i.next();
     while (i.hasNext())
     {
         ControlId id = i.next();

-        if(mControls[id]->drawRect(static_cast<QTreeView*>(parent())->visualRect(aIndex)).contains(aPoint))
+        if((mControls[id]->drawRect(static_cast<QTreeView*>(parent())->visualRect(aIndex)).contains(aPoint))
+            && (id != WarningControlOn) && (id != WarningControlOff))
+        {
+            return id;
+        }
+        else
+        {
+            if ((mControls[id]->drawRect(static_cast<QTreeView*>(parent())->visualRect(aIndex)).contains(aPoint))
+            && (mControls[id]->hasConflict))
+            {

             return id;
             return id;

+            }
+        }

     }
 
     return ControlNone;
     }
 
     return ControlNone;


@@ -368,12 +385,14 @@ void Delegate::defineControls()
     // on
     control = new Control(WarningControlOn,QString(":icons/exclamation-iconOn.png"));
     p = mControls[MapControl]->drawPoint();
     // on
     control = new Control(WarningControlOn,QString(":icons/exclamation-iconOn.png"));
     p = mControls[MapControl]->drawPoint();

+    control->hasConflict = false;

     p.setX(p.x()-control->image()->width()-SPACER);
     control->setDrawPoint(p);
     mControls.insert(WarningControlOn,control);
     // off
     control = new Control(WarningControlOff,QString(":icons/exclamation-iconOff.png"));
     p = mControls[MapControl]->drawPoint();
     p.setX(p.x()-control->image()->width()-SPACER);
     control->setDrawPoint(p);
     mControls.insert(WarningControlOn,control);
     // off
     control = new Control(WarningControlOff,QString(":icons/exclamation-iconOff.png"));
     p = mControls[MapControl]->drawPoint();

+    control->hasConflict = false;

     p.setX(p.x()-control->image()->width()-SPACER);
     control->setDrawPoint(p);
     mControls.insert(WarningControlOff,control);
     p.setX(p.x()-control->image()->width()-SPACER);
     control->setDrawPoint(p);
     mControls.insert(WarningControlOff,control);

diff --git a/src/mvc/delegate.h b/src/mvc/delegate.h
index 98bef422711466300b172132b24acbe7814b8379..d8cc1a4422100a00da274af93493288fa03a4d81 100644 (file)
--- a/src/mvc/delegate.h
+++ b/src/mvc/delegate.h
@@ -44,6 +44,7 @@ class Delegate : public QItemDelegate
                 {
                     return QRect(drawPoint(aRect), drawPoint(aRect)+QPoint(mImage->size().width(),mImage->size().height()));
                 }
                 {
                     return QRect(drawPoint(aRect), drawPoint(aRect)+QPoint(mImage->size().width(),mImage->size().height()));
                 }

+                bool hasConflict;

             private:
                 ControlId mId;
                 QImage *mImage;
             private:
                 ControlId mId;
                 QImage *mImage;

diff --git a/src/mvc/treeview.cpp b/src/mvc/treeview.cpp
index ac1e5d789d07f2a39da96edda32f8c12f70af151..4a7a98676d4cd612ab43f813c06f0fbcc6e2b9de 100644 (file)
--- a/src/mvc/treeview.cpp
+++ b/src/mvc/treeview.cpp
@@ -106,10 +106,13 @@ bool TreeView::testForControlClicked(const QModelIndex &aIndex, const QPoint &aP
                 handled = true;
             }
         break;
                 handled = true;
             }
         break;

-        case Delegate::WarningControlOn:

         case Delegate::WarningControlOff:
         case Delegate::WarningControlOff:

+        case Delegate::WarningControlOn:

         {
         {

+
+            qDebug() << "WARNING CLICKED: " << qVariantValue<QString>(aIndex.data());

             // TODO: implement
             // TODO: implement

+            emit(requestForWarning(aIndex));

             handled = true;
         }
         break;
             handled = true;
         }
         break;

diff --git a/src/mvc/treeview.h b/src/mvc/treeview.h
index cf21e066742d644c6f4afbe9d4dcfb7720b921fc..e608ff12525d40111c386b73e4f0dae1241ba1ba 100644 (file)
--- a/src/mvc/treeview.h
+++ b/src/mvc/treeview.h
@@ -16,6 +16,7 @@ private slots:
     void handleItemClicked(const QModelIndex &index);
 signals:
     void requestForMap(const QModelIndex &aIndex);
     void handleItemClicked(const QModelIndex &index);
 signals:
     void requestForMap(const QModelIndex &aIndex);

+    void requestForWarning(const QModelIndex &aIndex);

 };
 
 #endif /* TREEVIEW_H */
 };
 
 #endif /* TREEVIEW_H */