Changeset 508de33
- Timestamp:
- 05/05/10 15:58:23 (13 years ago)
- Branches:
- master, qt5
- Children:
- 525448c
- Parents:
- 0d995ed
- Location:
- src/mvc
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
src/mvc/delegate.cpp
r0d995ed r508de33 24 24 #include <QPainter> 25 25 26 #include "room.h" 27 26 28 const int RADIUS = 10; 27 29 const int SPACER = 10; … … 61 63 { 62 64 int aux = option.rect.height() - mControls[FavouriteControlOn]->drawPoint().y() - mControls[FavouriteControlOn]->image()->height(); 65 Event *event = static_cast<Event*>(index.internalPointer()); 63 66 // font SMALL 64 67 QFont fontSmall = option.font; … … 84 87 85 88 //Time conflicts are colored differently 86 if( static_cast<Event*>(index.internalPointer())->hasTimeConflict())89 if(event->hasTimeConflict()) 87 90 bkgrColor = conflictColor; 88 91 … … 130 133 // draw Controls 131 134 // favourite 132 if( static_cast<Event*>(index.internalPointer())->isFavourite())135 if(event->isFavourite()) 133 136 painter->drawImage(mControls[FavouriteControlOn]->drawPoint(option.rect),*mControls[FavouriteControlOn]->image()); 134 137 else … … 136 139 #ifdef MAEMO 137 140 // alarm 138 if( static_cast<Event*>(index.internalPointer())->hasAlarm())141 if(event->hasAlarm()) 139 142 painter->drawImage(mControls[AlarmControlOn]->drawPoint(option.rect),*mControls[AlarmControlOn]->image()); 140 143 else … … 142 145 #endif 143 146 // map 144 painter->drawImage(mControls[MapControl]->drawPoint(option.rect),*mControls[MapControl]->image()); 147 if (event->room()->hasMap()) { 148 painter->drawImage(mControls[MapControl]->drawPoint(option.rect),*mControls[MapControl]->image()); 149 } 145 150 // Time conflict 146 if( static_cast<Event*>(index.internalPointer())->hasTimeConflict())151 if(event->hasTimeConflict()) 147 152 painter->drawImage(mControls[WarningControl]->drawPoint(option.rect),*mControls[WarningControl]->image()); 148 153 149 154 // draw texts 150 Event *event = static_cast<Event*>(index.internalPointer());151 155 QPointF titlePointF(mControls[FavouriteControlOn]->drawPoint(option.rect)); 152 156 titlePointF.setX(option.rect.x()+SPACER); -
src/mvc/room.h
r0d995ed r508de33 36 36 void setName(const QString & type) { setValue("name", type); } 37 37 // TODO: make naming consistent - either "picture" or "map" 38 QVariant map() const { return value("picture"); } 38 QVariant map() const { return value("picture"); } 39 bool hasMap() const 40 { 41 // empty strings also treasted as NULL, 42 // as storing NULLs requires rewrite of storing code and DB scheme 43 return !isNull("picture") and !value("picture").toString().isEmpty(); 44 } 39 45 int insert(); 40 46 public:
Note: See TracChangeset
for help on using the changeset viewer.