Changeset 3f3e22d

Timestamp:

01/21/10 16:39:43 (12 years ago)

Author:

fortefr <fortefr@…>

Branches:

master, qt5

Children:

76cde75

Parents:

a957cfa

Message:

Warning handling

Location:

src

Files:

• gui/mainwindow.cpp (modified) (4 diffs)
• gui/mainwindow.h (modified) (1 diff)
• mvc/delegate.cpp (modified) (4 diffs)
• mvc/delegate.h (modified) (1 diff)
• mvc/treeview.cpp (modified) (1 diff)
• mvc/treeview.h (modified) (1 diff)

src/gui/mainwindow.cpp

@@ -13 +13 @@
 
 #include <QDialog>
+#include <QMessageBox>
 #include "ui_about.h"
 #include "eventdialog.h"
@@ -18 +19 @@
 #include "importscheduledialog.h"
 #include "mapwindow.h"
+
 
 const int confId = 1;
@@ -86 +88 @@
     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()));
@@ -274 +281 @@
 }
 
+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.") );
+}

src/gui/mainwindow.h

@@ -26 +26 @@
     void itemClicked(const QModelIndex &aIndex);
     void displayMap(const QModelIndex &aIndex);
+    void displayWarning(const QModelIndex &aIndex);
     void searchClicked();
 private:

src/mvc/delegate.cpp

@@ -136 +136 @@
         //if(static_cast<Event*>(index.internalPointer())->hasTimeConflict())
         if(bkgrColor == Qt::yellow)
+        {
             painter->drawImage(mControls[WarningControlOn]->drawPoint(option.rect),*mControls[WarningControlOn]->image());
+            mControls[WarningControlOn]->hasConflict=true;
+        }
         else
+        {
             painter->drawImage(mControls[WarningControlOff]->drawPoint(option.rect),*mControls[WarningControlOff]->image());
+            mControls[WarningControlOn]->hasConflict=false;
+        }
 
         // draw texts
@@ -310 +316 @@
     {
         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;
+            }
+        }
     }
 
@@ -369 +386 @@
     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);
@@ -375 +393 @@
     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);

src/mvc/delegate.h

@@ -45 +45 @@
                     return QRect(drawPoint(aRect), drawPoint(aRect)+QPoint(mImage->size().width(),mImage->size().height()));
                 }
+                bool hasConflict;
             private:
                 ControlId mId;

src/mvc/treeview.cpp

@@ -107 +107 @@
             }
         break;
+        case Delegate::WarningControlOff:
         case Delegate::WarningControlOn:
-        case Delegate::WarningControlOff:
         {
+
+            qDebug() << "WARNING CLICKED: " << qVariantValue<QString>(aIndex.data());
             // TODO: implement
+            emit(requestForWarning(aIndex));
             handled = true;
         }

src/mvc/treeview.h

@@ -17 +17 @@
 signals:
     void requestForMap(const QModelIndex &aIndex);
+    void requestForWarning(const QModelIndex &aIndex);
 };