Warning icon (uncompleted)

diff --git a/src/icons.qrc b/src/icons.qrc
index 8bdaf13b074936665504974f828eee334cf198fe..110cf5de25a13fc93d8816c81257c29753217359 100644 (file)
--- a/src/icons.qrc
+++ b/src/icons.qrc
@@ -8,5 +8,7 @@
         <file>icons/compassBig.png</file>
         <file>icons/favourite-offBig.png</file>
         <file>icons/favourite-onBig.png</file>
         <file>icons/compassBig.png</file>
         <file>icons/favourite-offBig.png</file>
         <file>icons/favourite-onBig.png</file>

+        <file>icons/exclamation-iconOn.png</file>
+        <file>icons/exclamation-iconOff.png</file>

     </qresource>
 </RCC>
     </qresource>
 </RCC>

diff --git a/src/icons/exclamation-iconOff.png b/src/icons/exclamation-iconOff.png
new file mode 100644 (file)
index 0000000..dc56ba8
Binary files /dev/null and b/src/icons/exclamation-iconOff.png differ

diff --git a/src/icons/exclamation-iconOn.png b/src/icons/exclamation-iconOn.png
new file mode 100644 (file)
index 0000000..91065fb
Binary files /dev/null and b/src/icons/exclamation-iconOn.png differ

diff --git a/src/mvc/delegate.cpp b/src/mvc/delegate.cpp
index 80dcb7b55ac4cdc95579bad3ee51be3bf3fcad6e..47bda7c12cb894f3e55740f826717287ac65d0e6 100644 (file)
--- a/src/mvc/delegate.cpp
+++ b/src/mvc/delegate.cpp
@@ -123,6 +123,11 @@ void Delegate::paint(QPainter *painter, const QStyleOptionViewItem &option, cons
             painter->drawImage(mControls[AlarmControlOff]->drawPoint(option.rect),*mControls[AlarmControlOff]->image());
         // map
         painter->drawImage(mControls[MapControl]->drawPoint(option.rect),*mControls[MapControl]->image());
             painter->drawImage(mControls[AlarmControlOff]->drawPoint(option.rect),*mControls[AlarmControlOff]->image());
         // map
         painter->drawImage(mControls[MapControl]->drawPoint(option.rect),*mControls[MapControl]->image());

+        // Time conflict
+        if(static_cast<Event*>(index.internalPointer())->hasTimeConflict())
+            painter->drawImage(mControls[WarningControlOn]->drawPoint(option.rect),*mControls[WarningControlOn]->image());
+        else
+            painter->drawImage(mControls[WarningControlOff]->drawPoint(option.rect),*mControls[WarningControlOff]->image());

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


@@ -337,6 +342,20 @@ void Delegate::defineControls()
     p.setX(p.x()-control->image()->width()-SPACER);
     control->setDrawPoint(p);
     mControls.insert(MapControl,control);
     p.setX(p.x()-control->image()->width()-SPACER);
     control->setDrawPoint(p);
     mControls.insert(MapControl,control);

+
+    // WARNING ICONs
+    // on
+    control = new Control(WarningControlOn,QString(":icons/exclamation-iconOn.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();
+    p.setX(p.x()-control->image()->width()-SPACER);
+    control->setDrawPoint(p);
+    mControls.insert(WarningControlOff,control);

 }
 
 bool Delegate::isPointFromRect(const QPoint &aPoint, const QRect &aRect) const
 }
 
 bool Delegate::isPointFromRect(const QPoint &aPoint, const QRect &aRect) const

diff --git a/src/mvc/delegate.h b/src/mvc/delegate.h
index 64fc40618992ee2de8bcbd8890b3b63e728ca2e7..269e35eb58ef2e84f6fc4d1124d8367abac0b25e 100644 (file)
--- a/src/mvc/delegate.h
+++ b/src/mvc/delegate.h
@@ -18,7 +18,9 @@ class Delegate : public QItemDelegate
             FavouriteControlOff,
             AlarmControlOn,
             AlarmControlOff,
             FavouriteControlOff,
             AlarmControlOn,
             AlarmControlOff,

-            MapControl
+            MapControl,
+            WarningControlOn,
+            WarningControlOff

         };
 
         class Control
         };
 
         class Control

diff --git a/src/mvc/event.h b/src/mvc/event.h
index 97d97a773fb89853300d54f6ce3818377bd57919..8c99f4fbbae858a611598c0458e2c9ee3effcd37 100644 (file)
--- a/src/mvc/event.h
+++ b/src/mvc/event.h
@@ -40,6 +40,7 @@ public:
     QString language() const { return value("language").toString(); }
     bool isFavourite() const { return value("favourite").toBool(); }
     bool hasAlarm() const { return value("alarm").toBool(); }
     QString language() const { return value("language").toString(); }
     bool isFavourite() const { return value("favourite").toBool(); }
     bool hasAlarm() const { return value("alarm").toBool(); }

+    bool hasTimeConflict() const { return true; /*return value("warning").toBool()*/; } //TODO

     // Table 2 : virtual table for FTS (Full Text Search)
     QString tag() const { return value("tag").toString(); }
     QString title() const { return value("title").toString(); }
     // Table 2 : virtual table for FTS (Full Text Search)
     QString tag() const { return value("tag").toString(); }
     QString title() const { return value("title").toString(); }