Changeset b8a3ad1
- Timestamp:
- 01/22/10 07:18:25 (13 years ago)
- Branches:
- master, qt5
- Children:
- 8b71fb3
- Parents:
- d336730
- Location:
- src
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
src/gui/mainwindow.cpp
rd336730 rb8a3ad1 26 26 setupUi(this); 27 27 28 // TODO: conference ID should be assigned based on actual data in the DB29 // for testing only30 AppSettings::setConfId(1);31 32 28 // connect Menu actions 33 29 connect(actionImportSchedule, SIGNAL(triggered()), SLOT(importSchedule())); … … 80 76 searchTreeView->setItemDelegate(new Delegate(searchTreeView)); 81 77 78 // NOW View 79 nowTreeView->setHeaderHidden(true); 80 nowTreeView->setRootIsDecorated(false); 81 nowTreeView->setIndentation(0); 82 nowTreeView->setAnimated(true); 83 nowTreeView->setModel(new EventModel()); 84 nowTreeView->setItemDelegate(new Delegate(nowTreeView)); 85 82 86 // event details have changed 83 87 connect(dayTreeView, SIGNAL(eventHasChanged(int)), SLOT(eventHasChanged(int))); … … 85 89 connect(trackTreeView, SIGNAL(eventHasChanged(int)), SLOT(eventHasChanged(int))); 86 90 connect(searchTreeView, SIGNAL(eventHasChanged(int)), SLOT(eventHasChanged(int))); 91 connect(nowTreeView, SIGNAL(eventHasChanged(int)), SLOT(eventHasChanged(int))); 87 92 88 93 // event clicked … … 91 96 connect(trackTreeView, SIGNAL(clicked(const QModelIndex &)), SLOT(itemClicked(const QModelIndex &))); 92 97 connect(searchTreeView, SIGNAL(clicked(const QModelIndex &)), SLOT(itemClicked(const QModelIndex &))); 98 connect(nowTreeView, SIGNAL(clicked(const QModelIndex &)), SLOT(itemClicked(const QModelIndex &))); 93 99 // request for map to be displayed 94 100 connect(dayTreeView, SIGNAL(requestForMap(const QModelIndex &)), SLOT(displayMap(const QModelIndex &))); … … 96 102 connect(trackTreeView, SIGNAL(requestForMap(const QModelIndex &)), SLOT(displayMap(const QModelIndex &))); 97 103 connect(searchTreeView, SIGNAL(requestForMap(const QModelIndex &)), SLOT(displayMap(const QModelIndex &))); 104 connect(nowTreeView, SIGNAL(requestForMap(const QModelIndex &)), SLOT(displayMap(const QModelIndex &))); 98 105 // request for warning to be displayed 99 106 connect(dayTreeView, SIGNAL(requestForWarning(const QModelIndex &)), SLOT(displayWarning(const QModelIndex &))); … … 101 108 connect(trackTreeView, SIGNAL(requestForWarning(const QModelIndex &)), SLOT(displayWarning(const QModelIndex &))); 102 109 connect(searchTreeView, SIGNAL(requestForWarning(const QModelIndex &)), SLOT(displayWarning(const QModelIndex &))); 110 connect(nowTreeView, SIGNAL(requestForWarning(const QModelIndex &)), SLOT(displayWarning(const QModelIndex &))); 103 111 // event search button clicked 104 112 connect(searchButton, SIGNAL(clicked()), SLOT(searchClicked())); … … 215 223 } 216 224 225 void MainWindow::updateNowView() 226 { 227 EventModel *model = static_cast<EventModel*>(nowTreeView->model()); 228 model->loadNowEvents(AppSettings::confId()); 229 nowTreeView->reset(); 230 nowTreeView->setAllExpanded(true); 231 } 232 217 233 void MainWindow::itemClicked(const QModelIndex &aIndex) 218 234 { … … 275 291 static_cast<EventModel*>(trackTreeView->model())->updateModel(aEventId); 276 292 static_cast<EventModel*>(searchTreeView->model())->updateModel(aEventId); 293 static_cast<EventModel*>(nowTreeView->model())->updateModel(aEventId); 277 294 } 278 295 … … 281 298 Q_UNUSED(aIndex); 282 299 300 // TODO: only if it changed to favourities tab 283 301 updateFavouritesView(favouriteDayNavigator->getCurrentDate()); 284 } 285 302 // TODO: only if it changed to now tab 303 updateNowView(); 304 } 305 -
src/gui/mainwindow.h
rd336730 rb8a3ad1 23 23 void updateFavouritesView(const QDate &aDate); 24 24 void updateSearchView(const QDate &aDate); 25 void updateNowView(); 25 26 void itemClicked(const QModelIndex &aIndex); 26 27 void displayMap(const QModelIndex &aIndex); -
src/gui/mainwindow.ui
rd336730 rb8a3ad1 6 6 <x>0</x> 7 7 <y>0</y> 8 <width>6 09</width>9 <height>4 31</height>8 <width>654</width> 9 <height>444</height> 10 10 </rect> 11 11 </property> … … 322 322 </layout> 323 323 </widget> 324 <widget class="QWidget" name="tab" > 325 <attribute name="title" > 326 <string>Now</string> 327 </attribute> 328 <layout class="QGridLayout" name="gridLayout_7" > 329 <item row="0" column="0" > 330 <widget class="TreeView" name="nowTreeView" /> 331 </item> 332 </layout> 333 </widget> 324 334 </widget> 325 335 </item> … … 331 341 <x>0</x> 332 342 <y>0</y> 333 <width>6 09</width>343 <width>654</width> 334 344 <height>22</height> 335 345 </rect> -
src/mvc/event.cpp
rd336730 rb8a3ad1 36 36 query.bindValue(":start", convertToDb(date, QVariant::DateTime)); 37 37 query.bindValue(":end", convertToDb(date.addDays(1), QVariant::DateTime)); 38 39 return load(query); 40 } 41 42 QList<Event> Event::nowEvents(int conferenceId, QString orderBy) 43 { 44 //uint curTime_t = QDateTime(QDate::currentDate(),QTime::currentTime(),Qt::UTC).toTime_t(); 45 uint curTime_t = 1265457610; // for testing 46 47 QSqlQuery query; 48 query.prepare(selectQuery() + QString("WHERE xid_conference = :conf AND start <= :now1 AND ( start + duration ) > :now2 ORDER BY %1").arg(orderBy)); 49 query.bindValue(":conf", conferenceId); 50 query.bindValue(":now1", convertToDb(curTime_t, QVariant::DateTime)); 51 query.bindValue(":now2", convertToDb(curTime_t, QVariant::DateTime)); 38 52 39 53 return load(query); -
src/mvc/event.h
rd336730 rb8a3ad1 25 25 static QList<Event> getFavByDate(const QDate & date, int conferenceId); // get Favourities by Date 26 26 static QList<Event> getSearchResultByDate(const QDate& date, int conferenceId, QString orderBy); 27 static QList<Event> nowEvents(int conferenceId, QString orderBy); // get events scheduled NOW 27 28 public: 28 29 int id() const { return value("id").toInt(); } -
src/mvc/eventmodel.cpp
rd336730 rb8a3ad1 221 221 } 222 222 223 void EventModel::loadNowEvents(int aConferenceId) 224 { 225 clearModel(); 226 // check for existence of the conference in the DB 227 if(Conference::getAll().count()) 228 { 229 qDebug() << "Loading Conference Data: [" << Conference::getById(aConferenceId).title() << "] scheduled NOW"; 230 mEvents = Event::nowEvents(aConferenceId, "start"); 231 } 232 createTimeGroups(); 233 } 234 223 235 void EventModel::updateModel(int aEventId) 224 236 { -
src/mvc/eventmodel.h
rd336730 rb8a3ad1 21 21 void loadEventsByTrack(const QDate &aDate, int aConferenceId); // loads Events grouped by Track from the DB 22 22 int loadSearchResultEvents(const QDate &aDate, int aConferenceId); 23 void loadNowEvents(int aConferenceId); // loads Now events from the DB 23 24 24 25 private: -
src/mvc/treeview.cpp
rd336730 rb8a3ad1 133 133 } 134 134 135 void TreeView::setAllExpanded(bool aExpanded) 136 { 137 for(int i=0; i<model()->rowCount(QModelIndex()); i++) 138 { 139 setExpanded(model()->index(i,0,QModelIndex()),aExpanded); 140 } 141 } 142 -
src/mvc/treeview.h
rd336730 rb8a3ad1 13 13 void mouseReleaseEvent(QMouseEvent *aEvent); 14 14 bool testForControlClicked(const QModelIndex &aIndex, const QPoint &aPoint); 15 public slots: 16 void setAllExpanded(bool aExpanded); // (aExpanded==true) => expanded; (aExpanded==false) => collapsed 15 17 private slots: 16 18 void handleItemClicked(const QModelIndex &index);
Note: See TracChangeset
for help on using the changeset viewer.