do not draw showmap button for event is there is no map for its room

diff --git a/src/mvc/delegate.cpp b/src/mvc/delegate.cpp
index 403795e51a69f8a640fc142591dbab2d978ec05f..dac1bdfa2da2140f0b8f39de691e6887937e4939 100644 (file)
--- a/src/mvc/delegate.cpp
+++ b/src/mvc/delegate.cpp
@@ -23,6 +23,8 @@
 #include <QDebug>
 #include <QPainter>
 
 #include <QDebug>
 #include <QPainter>
 

+#include "room.h"
+

 const int RADIUS = 10;
 const int SPACER = 10;
 
 const int RADIUS = 10;
 const int SPACER = 10;
 


@@ -60,6 +62,7 @@ void Delegate::paint(QPainter *painter, const QStyleOptionViewItem &option, cons
     if(hasParent(index))
     {
         int aux = option.rect.height() - mControls[FavouriteControlOn]->drawPoint().y() - mControls[FavouriteControlOn]->image()->height();
     if(hasParent(index))
     {
         int aux = option.rect.height() - mControls[FavouriteControlOn]->drawPoint().y() - mControls[FavouriteControlOn]->image()->height();

+        Event *event = static_cast<Event*>(index.internalPointer());

         // font SMALL
         QFont fontSmall = option.font;
         fontSmall.setBold(false);
         // font SMALL
         QFont fontSmall = option.font;
         fontSmall.setBold(false);


@@ -83,7 +86,7 @@ void Delegate::paint(QPainter *painter, const QStyleOptionViewItem &option, cons
         //int spacer = (fmSmall.boundingRect("999").width() < SPACER) ? SPACER : fmSmall.boundingRect("999").width();
 
         //Time conflicts are colored differently
         //int spacer = (fmSmall.boundingRect("999").width() < SPACER) ? SPACER : fmSmall.boundingRect("999").width();
 
         //Time conflicts are colored differently

-        if(static_cast<Event*>(index.internalPointer())->hasTimeConflict())
+        if(event->hasTimeConflict())

             bkgrColor = conflictColor;
 
         QLinearGradient itemGradient(option.rect.topLeft(), option.rect.bottomLeft());
             bkgrColor = conflictColor;
 
         QLinearGradient itemGradient(option.rect.topLeft(), option.rect.bottomLeft());


@@ -129,25 +132,26 @@ void Delegate::paint(QPainter *painter, const QStyleOptionViewItem &option, cons
 
         // draw Controls
         // favourite
 
         // draw Controls
         // favourite

-        if(static_cast<Event*>(index.internalPointer())->isFavourite())
+        if(event->isFavourite())

             painter->drawImage(mControls[FavouriteControlOn]->drawPoint(option.rect),*mControls[FavouriteControlOn]->image());
         else
             painter->drawImage(mControls[FavouriteControlOff]->drawPoint(option.rect),*mControls[FavouriteControlOff]->image());
 #ifdef MAEMO
         // alarm
             painter->drawImage(mControls[FavouriteControlOn]->drawPoint(option.rect),*mControls[FavouriteControlOn]->image());
         else
             painter->drawImage(mControls[FavouriteControlOff]->drawPoint(option.rect),*mControls[FavouriteControlOff]->image());
 #ifdef MAEMO
         // alarm

-        if(static_cast<Event*>(index.internalPointer())->hasAlarm())
+        if(event->hasAlarm())

             painter->drawImage(mControls[AlarmControlOn]->drawPoint(option.rect),*mControls[AlarmControlOn]->image());
         else
             painter->drawImage(mControls[AlarmControlOff]->drawPoint(option.rect),*mControls[AlarmControlOff]->image());
 #endif
         // map
             painter->drawImage(mControls[AlarmControlOn]->drawPoint(option.rect),*mControls[AlarmControlOn]->image());
         else
             painter->drawImage(mControls[AlarmControlOff]->drawPoint(option.rect),*mControls[AlarmControlOff]->image());
 #endif
         // map

-        painter->drawImage(mControls[MapControl]->drawPoint(option.rect),*mControls[MapControl]->image());
+        if (event->room()->hasMap()) {
+            painter->drawImage(mControls[MapControl]->drawPoint(option.rect),*mControls[MapControl]->image());
+        }

         // Time conflict
         // Time conflict

-        if(static_cast<Event*>(index.internalPointer())->hasTimeConflict())
+        if(event->hasTimeConflict())

             painter->drawImage(mControls[WarningControl]->drawPoint(option.rect),*mControls[WarningControl]->image());
 
         // draw texts
             painter->drawImage(mControls[WarningControl]->drawPoint(option.rect),*mControls[WarningControl]->image());
 
         // draw texts

-        Event *event = static_cast<Event*>(index.internalPointer());

         QPointF titlePointF(mControls[FavouriteControlOn]->drawPoint(option.rect));
         titlePointF.setX(option.rect.x()+SPACER);
         titlePointF.setY(titlePointF.y()+mControls[FavouriteControlOn]->image()->height());
         QPointF titlePointF(mControls[FavouriteControlOn]->drawPoint(option.rect));
         titlePointF.setX(option.rect.x()+SPACER);
         titlePointF.setY(titlePointF.y()+mControls[FavouriteControlOn]->image()->height());

diff --git a/src/mvc/room.h b/src/mvc/room.h
index 11544a217fd7738c0093e8b3cb385b1f6c31fda4..b961458ff664e3675c50ba45bb8d272e703fa5b9 100644 (file)
--- a/src/mvc/room.h
+++ b/src/mvc/room.h
@@ -35,7 +35,13 @@ public:
     QString name() const { return value("name").toString(); }
     void setName(const QString & type) { setValue("name", type); }
     // TODO: make naming consistent - either "picture" or "map"
     QString name() const { return value("name").toString(); }
     void setName(const QString & type) { setValue("name", type); }
     // TODO: make naming consistent - either "picture" or "map"

-     QVariant map() const { return value("picture"); }
+    QVariant map() const { return value("picture"); }
+    bool hasMap() const
+    {
+        // empty strings also treasted as NULL,
+        // as storing NULLs requires rewrite of storing code and DB scheme
+        return !isNull("picture") and !value("picture").toString().isEmpty();
+    }

     int insert();
 public:
     static QList<Room> getAll();
     int insert();
 public:
     static QList<Room> getAll();