Changeset dc66a91 for src

Timestamp:

10/17/11 20:15:33 (11 years ago)

Author:

Philipp Spitzer <philipp@…>

Branches:

master, qt5

Children:

c81f30a

Parents:

264f5e7

Message:

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

Location:

src

Files:

• gui/mainwindow.cpp (modified) (2 diffs)
• gui/mainwindow.h (modified) (1 diff)
• gui/tabcontainer.cpp (modified) (1 diff)
• gui/tabcontainer.h (modified) (1 diff)
• mvc/treeview.cpp (modified) (2 diffs)
• mvc/treeview.h (modified) (1 diff)

src/gui/mainwindow.cpp

@@ -85 +85 @@
 
     // 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
@@ -155 +155 @@
 
 
-
-void MainWindow::redisplayEvent(int aEventId, bool aReloadModel)
-{
+void MainWindow::onEventChanged(int aEventId, bool favouriteChanged) {
     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);
 }
+
 
 void MainWindow::useConference(int id)

src/gui/mainwindow.h

@@ -49 +49 @@
     void on_searchAction_triggered();
 
-    void redisplayEvent(int aEventId, bool aReloadModel);
+    void onEventChanged(int aEventId, bool favouriteChanged);
     // TODO: remove
     void networkQueryFinished(QNetworkReply*);

src/gui/tabcontainer.cpp

@@ -87 +87 @@
 
 
-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);
 }
 

src/gui/tabcontainer.h

@@ -45 +45 @@
 
 public slots:
-    virtual void redisplayEvent(int aEventId, bool aReloadModel = false);
+    virtual void redisplayEvent(int aEventId);
     void redisplayDate(const QDate& curDate);
 

src/mvc/treeview.cpp

@@ -80 +80 @@
                 }
 
-                // 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++)
-                    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
-                emit(eventHasChanged(event.id(),true));
+                emit eventChanged(event.id(), true);
 
                 handled = true;
@@ -119 +119 @@
                 // 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;
             }

src/mvc/treeview.h

@@ -38 +38 @@
 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
 };