- Timestamp:
- 01/16/10 16:31:15 (13 years ago)
- Branches:
- master, qt5
- Children:
- c790268
- Parents:
- 8860ff4
- Location:
- src/mvc
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
src/mvc/delegate.cpp
r8860ff4 r680a4da 84 84 85 85 // draw Controls 86 painter->drawImage(mControls[FavouriteControl]->drawPoint(option.rect),*mControls[FavouriteControl]->image()); 87 painter->drawImage(mControls[AlarmControl]->drawPoint(option.rect),*mControls[AlarmControl]->image()); 86 if(static_cast<Event*>(index.internalPointer())->isFavourite()) 87 painter->drawImage(mControls[FavouriteControlOn]->drawPoint(option.rect),*mControls[FavouriteControlOn]->image()); 88 else 89 painter->drawImage(mControls[FavouriteControlOff]->drawPoint(option.rect),*mControls[FavouriteControlOff]->image()); 90 painter->drawImage(mControls[AlarmControlOn]->drawPoint(option.rect),*mControls[AlarmControlOn]->image()); 88 91 painter->drawImage(mControls[MapControl]->drawPoint(option.rect),*mControls[MapControl]->image()); 89 92 } … … 201 204 { 202 205 Control *control; 203 // FAVOURITE ICON 204 control = new Control(FavouriteControl,QString(":icons/favourite-on.png")); 206 // FAVOURITE ICONs 207 // on 208 control = new Control(FavouriteControlOn,QString(":icons/favourite-on.png")); 205 209 control->setDrawPoint(QPoint(-control->image()->width()-SPACER,SPACER)); 206 mControls.insert(FavouriteControl,control); 207 208 // ALARM ICON 209 control = new Control(AlarmControl,QString(":icons/alarm-on.png")); 210 control->setDrawPoint(QPoint(-mControls[FavouriteControl]->image()->width()-control->image()->width()-2*SPACER,SPACER)); 211 mControls.insert(AlarmControl,control); 210 mControls.insert(FavouriteControlOn,control); 211 // off 212 control = new Control(FavouriteControlOff,QString(":icons/favourite-off.png")); 213 control->setDrawPoint(QPoint(-control->image()->width()-SPACER,SPACER)); 214 mControls.insert(FavouriteControlOff,control); 215 216 // ALARM ICONs 217 // on 218 control = new Control(AlarmControlOn,QString(":icons/alarm-on.png")); 219 control->setDrawPoint(QPoint(-mControls[FavouriteControlOn]->image()->width()-control->image()->width()-2*SPACER,SPACER)); 220 mControls.insert(AlarmControlOn,control); 221 // off 222 control = new Control(AlarmControlOff,QString(":icons/alarm-off.png")); 223 control->setDrawPoint(QPoint(-mControls[FavouriteControlOff]->image()->width()-control->image()->width()-2*SPACER,SPACER)); 224 mControls.insert(AlarmControlOff,control); 212 225 213 226 // MAP ICON 214 227 control = new Control(MapControl,QString(":icons/compass.png")); 215 control->setDrawPoint(QPoint(-mControls[AlarmControl ]->image()->width()-control->image()->width()216 -mControls[FavouriteControl ]->image()->width()-3*SPACER,SPACER));228 control->setDrawPoint(QPoint(-mControls[AlarmControlOn]->image()->width()-control->image()->width() 229 -mControls[FavouriteControlOn]->image()->width()-3*SPACER,SPACER)); 217 230 mControls.insert(MapControl,control); 218 231 } -
src/mvc/delegate.h
r8860ff4 r680a4da 15 15 { 16 16 ControlNone = 0, 17 FavouriteControl, 18 AlarmControl, 17 FavouriteControlOn, 18 FavouriteControlOff, 19 AlarmControlOn, 20 AlarmControlOff, 19 21 MapControl 20 22 }; -
src/mvc/event.cpp
r8860ff4 r680a4da 8 8 << QSqlField("xid_activity", QVariant::Int) 9 9 << QSqlField("type", QVariant::String) 10 << QSqlField("language", QVariant::String)); 10 << QSqlField("language", QVariant::String) 11 << QSqlField("favourite", QVariant::Bool)); 11 12 12 13 QString const Event::sTableName = QString("event"); … … 31 32 return load(query); 32 33 } 34 -
src/mvc/event.h
r8860ff4 r680a4da 7 7 8 8 #include <ormrecord.h> 9 10 9 11 10 /** … … 34 33 QString type() const { return value("type").toString(); } 35 34 QString language() const { return value("language").toString(); } 35 bool isFavourite() const { return value("favourite").toBool(); } 36 36 37 37 void setId(int id) { setValue("id", id); } … … 42 42 void setType(const QString& type) { setValue("type", type); } 43 43 void setLanguage(const QString& language) { setValue("language", language); } 44 void setFavourite(bool favourite) { setValue("favourite", favourite); } 44 45 45 46 friend class EventTest; 46 47 }; 47 48 49 #endif // EVENT_H 48 50 49 50 #endif // EVENT_H -
src/mvc/treeview.cpp
r8860ff4 r680a4da 3 3 #include "treeview.h" 4 4 #include "delegate.h" 5 #include "event.h" 5 6 6 7 #include <QDebug> … … 31 32 switch(delegate->whichControlClicked(aIndex,aPoint)) 32 33 { 33 case Delegate::FavouriteControl: 34 case Delegate::FavouriteControlOn: 35 case Delegate::FavouriteControlOff: 34 36 { 35 37 // handle Favourite Control clicked 36 qDebug() << "FAVOURITE CLICKED: " << qVariantValue<QString>(aIndex.data()); 38 Event event = Event::getById(aIndex.data().toInt(),1); 39 if(event.isFavourite()) 40 { 41 static_cast<Event*>(aIndex.internalPointer())->setFavourite(false); // list of events 42 event.setFavourite(false); // update DB 43 } 44 else 45 { 46 static_cast<Event*>(aIndex.internalPointer())->setFavourite(true); // list of events 47 event.setFavourite(true); 48 } 49 qDebug() << " FAVOURITE [" << qVariantValue<QString>(aIndex.data()) << "] -> " << event.isFavourite(); 50 event.update("favourite"); 51 // TODO: since the Favourite icon has changed, update TreeView accordingly 52 // not really working solution is the following 53 // maybe the call to MainWindow->update() fix the problem ??? 54 QTreeView::update(); 55 update(); 37 56 } 38 57 break; 39 case Delegate::AlarmControl: 58 case Delegate::AlarmControlOn: 59 case Delegate::AlarmControlOff: 40 60 { 41 61 // handle Alarm Control clicked
Note: See TracChangeset
for help on using the changeset viewer.