Changeset 508de33

Timestamp:

05/05/10 15:58:23 (12 years ago)

Author:

kirilma <kirilma@…>

Branches:

master, qt5

Children:

525448c

Parents:

0d995ed

Message:

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

Location:

src/mvc

Files:

• delegate.cpp (modified) (6 diffs)
• room.h (modified) (1 diff)

src/mvc/delegate.cpp

@@ -24 +24 @@
 #include <QPainter>
 
+#include "room.h"
+
 const int RADIUS = 10;
 const int SPACER = 10;
@@ -61 +63 @@
     {
         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;
@@ -84 +87 @@
 
         //Time conflicts are colored differently
-        if(static_cast<Event*>(index.internalPointer())->hasTimeConflict())
+        if(event->hasTimeConflict())
             bkgrColor = conflictColor;
 
@@ -130 +133 @@
         // draw Controls
         // favourite
-        if(static_cast<Event*>(index.internalPointer())->isFavourite())
+        if(event->isFavourite())
             painter->drawImage(mControls[FavouriteControlOn]->drawPoint(option.rect),*mControls[FavouriteControlOn]->image());
         else
@@ -136 +139 @@
 #ifdef MAEMO
         // alarm
-        if(static_cast<Event*>(index.internalPointer())->hasAlarm())
+        if(event->hasAlarm())
             painter->drawImage(mControls[AlarmControlOn]->drawPoint(option.rect),*mControls[AlarmControlOn]->image());
         else
@@ -142 +145 @@
 #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
-        if(static_cast<Event*>(index.internalPointer())->hasTimeConflict())
+        if(event->hasTimeConflict())
             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);

src/mvc/room.h

@@ -36 +36 @@
     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: