- Timestamp:
- 01/28/10 15:47:21 (13 years ago)
- Branches:
- master, qt5
- Children:
- 83020cd
- Parents:
- eb21333
- Location:
- src
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
src/gui/eventdialog.cpp
reb21333 r872aeaa 67 67 qDebug() << " FAVOURITE [" << event.id() << "] -> " << event.isFavourite(); 68 68 69 // since the Favourite icon has changed, update TreeViews accordingly70 // all TreeViews have to listen on this signal71 emit(eventHasChanged(event.id()));72 73 69 // have to emit 'eventHasChanged' signal on all events in conflict 74 70 for(int i=0; i<conflicts.count(); i++) 75 71 emit(eventHasChanged(conflicts[i].id())); 72 73 // since the Favourite icon has changed, update TreeViews accordingly 74 // all TreeViews have to listen on this signal 75 emit(eventHasChanged(event.id(),true)); 76 76 } 77 77 -
src/gui/eventdialog.h
reb21333 r872aeaa 16 16 void alarmClicked(); 17 17 signals: 18 void eventHasChanged(int aEventId ); // emited when user changes some event details, eg. sets it Favourite18 void eventHasChanged(int aEventId, bool aReloadModel = false); // emited when user changes some event details, eg. sets it Favourite 19 19 private: 20 20 int mEventId; -
src/gui/favtabcontainer.cpp
reb21333 r872aeaa 11 11 } 12 12 13 void FavTabContainer::updateTreeViewModel(int aEventId)14 {15 Q_UNUSED(aEventId);16 17 // requires special handling18 // we need to reload favourites, because some favourite could be deleted19 //static_cast<EventModel*>(favTreeView->model())->updateModel(aEventId);20 int confId = Conference::activeConference();21 QDate startDate = Conference::getById(confId).start();22 QDate endDate = Conference::getById(confId).end();23 dayNavigator->setDates(startDate, endDate);24 updateTreeView( Conference::getById(confId).start() );25 }26 -
src/gui/favtabcontainer.h
reb21333 r872aeaa 12 12 virtual ~FavTabContainer(){} 13 13 14 public slots:15 virtual void updateTreeViewModel(int aEventId);16 17 14 protected: 18 15 virtual void loadEvents( const QDate &aDate, const int aConferenceId ); -
src/gui/mainwindow.cpp
reb21333 r872aeaa 32 32 33 33 // event details have changed 34 connect(dayTabContainer, SIGNAL(eventHasChanged(int )), SLOT(eventHasChanged(int)));35 connect(favsTabContainer, SIGNAL(eventHasChanged(int )), SLOT(eventHasChanged(int)));36 connect(tracksTabContainer, SIGNAL(eventHasChanged(int )), SLOT(eventHasChanged(int)));37 connect(roomsTabContainer, SIGNAL(eventHasChanged(int )), SLOT(eventHasChanged(int)));38 connect(nowTabContainer, SIGNAL(eventHasChanged(int )), SLOT(eventHasChanged(int)));39 connect(searchTabContainer, SIGNAL(eventHasChanged(int )), SLOT(eventHasChanged(int)));34 connect(dayTabContainer, SIGNAL(eventHasChanged(int,bool)), SLOT(eventHasChanged(int,bool))); 35 connect(favsTabContainer, SIGNAL(eventHasChanged(int,bool)), SLOT(eventHasChanged(int,bool))); 36 connect(tracksTabContainer, SIGNAL(eventHasChanged(int,bool)), SLOT(eventHasChanged(int,bool))); 37 connect(roomsTabContainer, SIGNAL(eventHasChanged(int,bool)), SLOT(eventHasChanged(int,bool))); 38 connect(nowTabContainer, SIGNAL(eventHasChanged(int,bool)), SLOT(eventHasChanged(int,bool))); 39 connect(searchTabContainer, SIGNAL(eventHasChanged(int,bool)), SLOT(eventHasChanged(int,bool))); 40 40 41 41 // event conference map button clicked … … 105 105 } 106 106 107 void MainWindow::eventHasChanged(int aEventId )107 void MainWindow::eventHasChanged(int aEventId, bool aReloadModel) 108 108 { 109 109 dayTabContainer->updateTreeViewModel(aEventId); 110 favsTabContainer->updateTreeViewModel(aEventId );110 favsTabContainer->updateTreeViewModel(aEventId,aReloadModel); 111 111 tracksTabContainer->updateTreeViewModel(aEventId); 112 112 nowTabContainer->updateTreeViewModel(aEventId); … … 138 138 tracksTabContainer->setDates(startDate, endDate); 139 139 roomsTabContainer->setDates(startDate, endDate); 140 //favsTabContainer->setDates(startDate, endDate);141 //searchTabContainer->setDates(startDate, endDate);140 favsTabContainer->setDates(startDate, endDate); 141 searchTabContainer->setDates(startDate, endDate); 142 142 searchTabContainer->searchAgainClicked(); 143 143 nowTabContainer->updateTreeView(QDate::currentDate()); -
src/gui/mainwindow.h
reb21333 r872aeaa 18 18 void aboutApp(); 19 19 void conferenceMapClicked(); 20 void eventHasChanged(int aEventId );20 void eventHasChanged(int aEventId, bool aReloadModel); 21 21 private: 22 22 void fillAndShowConferenceHeader(); -
src/gui/tabcontainer.cpp
reb21333 r872aeaa 27 27 connect(dayNavigator, SIGNAL(dateChanged(const QDate &)), SLOT(updateTreeView(const QDate &))); 28 28 29 connect(treeView, SIGNAL(eventHasChanged(int )), SIGNAL(eventHasChanged(int)));29 connect(treeView, SIGNAL(eventHasChanged(int,bool)), SIGNAL(eventHasChanged(int,bool))); 30 30 connect(treeView, SIGNAL(clicked(const QModelIndex &)), SLOT(itemClicked(const QModelIndex &))); 31 31 connect(treeView, SIGNAL(requestForMap(const QModelIndex &)), SLOT(displayMap(const QModelIndex &))); … … 50 50 51 51 EventDialog dialog(static_cast<Event*>(aIndex.internalPointer())->id(),this); 52 connect(&dialog, SIGNAL(eventHasChanged(int )), this, SIGNAL(eventHasChanged(int)));52 connect(&dialog, SIGNAL(eventHasChanged(int,bool)), this, SIGNAL(eventHasChanged(int,bool))); 53 53 dialog.exec(); 54 disconnect(&dialog, SIGNAL(eventHasChanged(int )), this, SIGNAL(eventHasChanged(int)));54 disconnect(&dialog, SIGNAL(eventHasChanged(int,bool)), this, SIGNAL(eventHasChanged(int,bool))); 55 55 } 56 56 … … 79 79 { 80 80 ConflictsDialog dialog(static_cast<Event*>(aIndex.internalPointer())->id(),this); 81 connect(&dialog, SIGNAL(eventHasChanged(int )), this, SIGNAL(eventHasChanged(int)));81 connect(&dialog, SIGNAL(eventHasChanged(int,bool)), this, SIGNAL(eventHasChanged(int,bool))); 82 82 dialog.exec(); 83 disconnect(&dialog, SIGNAL(eventHasChanged(int )), this, SIGNAL(eventHasChanged(int)));83 disconnect(&dialog, SIGNAL(eventHasChanged(int,bool)), this, SIGNAL(eventHasChanged(int,bool))); 84 84 } 85 85 86 void TabContainer::updateTreeViewModel(int aEventId )86 void TabContainer::updateTreeViewModel(int aEventId, bool aReloadModel) 87 87 { 88 static_cast<EventModel*>(treeView->model())->updateModel(aEventId); 88 if(aReloadModel) 89 { 90 // requires special handling 91 // eg. in case of favourities - some favourities may have changed 92 // and so we need to reload them 93 int confId = Conference::activeConference(); 94 QDate startDate = Conference::getById(confId).start(); 95 QDate endDate = Conference::getById(confId).end(); 96 dayNavigator->setDates(startDate, endDate); 97 updateTreeView( Conference::getById(confId).start() ); 98 } 99 else 100 { 101 // just update event in the question 102 static_cast<EventModel*>(treeView->model())->updateModel(aEventId); 103 } 89 104 } 90 105 -
src/gui/tabcontainer.h
reb21333 r872aeaa 26 26 27 27 signals: 28 void eventHasChanged(int aEventId );28 void eventHasChanged(int aEventId, bool aReloadModel); 29 29 30 30 public slots: 31 virtual void updateTreeViewModel(int aEventId );31 virtual void updateTreeViewModel(int aEventId, bool aReloadModel = false); 32 32 void setDates(const QDate &aStart, const QDate &aEnd); 33 33 -
src/mvc/treeview.cpp
reb21333 r872aeaa 65 65 } 66 66 67 // since the Favourite icon has changed, update TreeViews accordingly68 // all TreeViews have to listen on this signal69 emit(eventHasChanged(event.id()));70 71 67 // have to emit 'eventHasChanged' signal on all events in conflict 72 68 for(int i=0; i<conflicts.count(); i++) 73 69 emit(eventHasChanged(conflicts[i].id())); 70 71 // since the Favourite icon has changed, update TreeViews accordingly 72 // all TreeViews have to listen on this signal 73 emit(eventHasChanged(event.id(),true)); 74 74 75 75 handled = true; -
src/mvc/treeview.h
reb21333 r872aeaa 20 20 void requestForMap(const QModelIndex &aIndex); 21 21 void requestForConflicts(const QModelIndex &aIndex); 22 void eventHasChanged(int aEventId ); // emited when user changes some event details, eg. sets it Favourite22 void eventHasChanged(int aEventId, bool aReloadModel = false); // emited when user changes some event details, eg. sets it Favourite 23 23 }; 24 24
Note: See TracChangeset
for help on using the changeset viewer.