The favorite tab gets updated again after changing the favorite state.

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index 730755d87244391afa21f1d33cc46554203321fd..a9748a73decab5fc23f58cc21823f6b39791518d 100644 (file)
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -84,11 +84,11 @@ MainWindow::MainWindow(int aEventId, QWidget *aParent)
     QNetworkProxy::setApplicationProxy(proxy);
 
     // event details have changed
     QNetworkProxy::setApplicationProxy(proxy);
 
     // event details have changed

-    connect(dayTabContainer, SIGNAL(eventChanged(int,bool)), SLOT(redisplayEvent(int,bool)));
-    connect(favsTabContainer, SIGNAL(eventChanged(int,bool)), SLOT(redisplayEvent(int,bool)));
-    connect(tracksTabContainer, SIGNAL(eventChanged(int,bool)), SLOT(redisplayEvent(int,bool)));
-    connect(roomsTabContainer, SIGNAL(eventChanged(int,bool)), SLOT(redisplayEvent(int,bool)));
-    connect(searchTabContainer, SIGNAL(eventChanged(int,bool)), SLOT(redisplayEvent(int,bool)));
+    connect(dayTabContainer, SIGNAL(eventChanged(int,bool)), SLOT(onEventChanged(int,bool)));
+    connect(favsTabContainer, SIGNAL(eventChanged(int,bool)), SLOT(onEventChanged(int,bool)));
+    connect(tracksTabContainer, SIGNAL(eventChanged(int,bool)), SLOT(onEventChanged(int,bool)));
+    connect(roomsTabContainer, SIGNAL(eventChanged(int,bool)), SLOT(onEventChanged(int,bool)));
+    connect(searchTabContainer, SIGNAL(eventChanged(int,bool)), SLOT(onEventChanged(int,bool)));

 
     // date has changed
     connect(dayNavigator, SIGNAL(dateChanged(QDate)), dayTabContainer, SLOT(redisplayDate(QDate)));
 
     // date has changed
     connect(dayNavigator, SIGNAL(dateChanged(QDate)), dayTabContainer, SLOT(redisplayDate(QDate)));


@@ -154,16 +154,16 @@ void MainWindow::on_searchAction_triggered() {
 }
 
 
 }
 
 

-
-void MainWindow::redisplayEvent(int aEventId, bool aReloadModel)
-{
+void MainWindow::onEventChanged(int aEventId, bool favouriteChanged) {

     dayTabContainer->redisplayEvent(aEventId);
     dayTabContainer->redisplayEvent(aEventId);

-    favsTabContainer->redisplayEvent(aEventId,aReloadModel);
+    if (favouriteChanged) favsTabContainer->redisplayDate(dayNavigator->curDate());
+    else favsTabContainer->redisplayEvent(aEventId);

     tracksTabContainer->redisplayEvent(aEventId);
     roomsTabContainer->redisplayEvent(aEventId);
     searchTabContainer->redisplayEvent(aEventId);
 }
 
     tracksTabContainer->redisplayEvent(aEventId);
     roomsTabContainer->redisplayEvent(aEventId);
     searchTabContainer->redisplayEvent(aEventId);
 }
 

+

 void MainWindow::useConference(int id)
 {
     if (id == -1)  // in case no conference is active
 void MainWindow::useConference(int id)
 {
     if (id == -1)  // in case no conference is active

diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h
index 1d3833305eafdcdc06650d602cdb9800eb437737..127620d06a22ac05cd544c790c39644961e63b2b 100644 (file)
--- a/src/gui/mainwindow.h
+++ b/src/gui/mainwindow.h
@@ -48,7 +48,7 @@ private slots:
     void on_nowAction_triggered();
     void on_searchAction_triggered();
 
     void on_nowAction_triggered();
     void on_searchAction_triggered();
 

-    void redisplayEvent(int aEventId, bool aReloadModel);
+    void onEventChanged(int aEventId, bool favouriteChanged);

     // TODO: remove
     void networkQueryFinished(QNetworkReply*);
     void importFromNetwork(const QString&);
     // TODO: remove
     void networkQueryFinished(QNetworkReply*);
     void importFromNetwork(const QString&);

diff --git a/src/gui/tabcontainer.cpp b/src/gui/tabcontainer.cpp
index 694ce78580e10ae8effa0a28ec051ffb2218a652..822a80b1380bad7545b0138c4f0aa8e15fdc7ca3 100644 (file)
--- a/src/gui/tabcontainer.cpp
+++ b/src/gui/tabcontainer.cpp
@@ -86,9 +86,8 @@ void TabContainer::displayConflicts(const QModelIndex &aIndex)
 }
 
 
 }
 
 

-void TabContainer::redisplayEvent(int aEventId, bool aReloadModel) {
-    /* if (aReloadModel) updateTreeView(dayNavigator->curDate());
-    else */ static_cast<EventModel*>(treeView->model())->updateModel(aEventId);
+void TabContainer::redisplayEvent(int aEventId) {
+    static_cast<EventModel*>(treeView->model())->updateModel(aEventId);

 }
 
 
 }
 
 

diff --git a/src/gui/tabcontainer.h b/src/gui/tabcontainer.h
index fa85b7322831e56272abe924e56aade7bf3d4d1b..437fbe415bde78597f819fa9240c0ef24b301acb 100644 (file)
--- a/src/gui/tabcontainer.h
+++ b/src/gui/tabcontainer.h
@@ -44,7 +44,7 @@ signals:
     void eventChanged(int aEventId, bool aReloadModel);
 
 public slots:
     void eventChanged(int aEventId, bool aReloadModel);
 
 public slots:

-    virtual void redisplayEvent(int aEventId, bool aReloadModel = false);
+    virtual void redisplayEvent(int aEventId);

     void redisplayDate(const QDate& curDate);
 
 protected slots:
     void redisplayDate(const QDate& curDate);
 
 protected slots:

diff --git a/src/mvc/treeview.cpp b/src/mvc/treeview.cpp
index 6f514e91c848fc5a37164bfc0daa38a2a8295c4d..57de75217f31923e21520cc482b044ac7510ceee 100644 (file)
--- a/src/mvc/treeview.cpp
+++ b/src/mvc/treeview.cpp
@@ -79,13 +79,13 @@ bool TreeView::testForControlClicked(const QModelIndex &aIndex, const QPoint &aP
                     conflicts = Event::conflictEvents(event.id(),Conference::activeConference());
                 }
 
                     conflicts = Event::conflictEvents(event.id(),Conference::activeConference());
                 }
 

-                // have to emit 'eventHasChanged' signal on all events in conflict
+                // have to emit 'eventChanged' signal on all events in conflict

                 for(int i=0; i<conflicts.count(); i++)
                 for(int i=0; i<conflicts.count(); i++)

-                    emit(eventHasChanged(conflicts[i].id()));
+                    emit eventChanged(conflicts[i].id(), false);

 
                 // since the Favourite icon has changed, update TreeViews accordingly
                 // all TreeViews have to listen on this signal
 
                 // since the Favourite icon has changed, update TreeViews accordingly
                 // all TreeViews have to listen on this signal

-                emit(eventHasChanged(event.id(),true));
+                emit eventChanged(event.id(), true);

 
                 handled = true;
             }
 
                 handled = true;
             }


@@ -118,7 +118,7 @@ bool TreeView::testForControlClicked(const QModelIndex &aIndex, const QPoint &aP
                 event.update("alarm");
                 // since the Alarm icon has changed, update TreeView accordingly
                 // all TreeViews have to listen on this signal
                 event.update("alarm");
                 // since the Alarm icon has changed, update TreeView accordingly
                 // all TreeViews have to listen on this signal

-                emit(eventHasChanged(event.id()));
+                emit eventChanged(event.id(), false);

                 handled = true;
             }
             break;
                 handled = true;
             }
             break;

diff --git a/src/mvc/treeview.h b/src/mvc/treeview.h
index 888b6f75b9d0d44db4fff138893907231135856d..c47d6eb2a08a40e08c2ce2be5d6e09aaf30a408e 100644 (file)
--- a/src/mvc/treeview.h
+++ b/src/mvc/treeview.h
@@ -37,7 +37,7 @@ private slots:
     void handleItemClicked(const QModelIndex &index);
 signals:
     void requestForConflicts(const QModelIndex &aIndex);
     void handleItemClicked(const QModelIndex &index);
 signals:
     void requestForConflicts(const QModelIndex &aIndex);

-    void eventHasChanged(int aEventId, bool aReloadModel = false); // emited when user changes some event details, eg. sets it Favourite
+    void eventChanged(int aEventId, bool favouriteChanged); // emited when user changes some event details, eg. sets it Favourite

 };
 
 #endif /* TREEVIEW_H */
 };
 
 #endif /* TREEVIEW_H */