The conflict editor works again.

diff --git a/src/gui/conflictdialogcontainer.cpp b/src/gui/conflictdialogcontainer.cpp
index 2149c6b6a18a3bcab1ee5fe9933358fd98891921..c04bc3e4980bbd89d7079ecb5e3c9f3f8d7bbe8c 100644 (file)
--- a/src/gui/conflictdialogcontainer.cpp
+++ b/src/gui/conflictdialogcontainer.cpp
@@ -21,20 +21,29 @@
 #include "conflictdialogcontainer.h"
 
 ConflictDialogContainer::ConflictDialogContainer(QWidget *aParent)
-    : TabContainer( aParent )
-{
-}
+    : TabContainer( aParent ), mEventId(-1), mConferenceId(-1)
+{}
 
-void ConflictDialogContainer::loadEvents( const QDate &aDate, const int aConferenceId )
-{
-    Q_UNUSED(aDate);
 
-    static_cast<EventModel*>(treeView->model())->loadConflictEvents( mEventId, aConferenceId );
+void ConflictDialogContainer::setEventId(int aEventId, int conferenceId) {
+    mEventId = aEventId;
+    mConferenceId = conferenceId;
+    loadEvents();
 }
 
-void ConflictDialogContainer::updateTreeView(const QDate &aDate)
-{
-    TabContainer::updateTreeView(aDate);
+
+void ConflictDialogContainer::loadEvents() {
+    static_cast<EventModel*>(treeView->model())->loadConflictEvents(mEventId, mConferenceId);
     treeView->setAllExpanded(true);
 }
 
+
+void ConflictDialogContainer::loadEvents(const QDate &aDate, const int aConferenceId) {
+    Q_UNUSED(aDate);
+    Q_ASSERT(aConferenceId == mConferenceId);
+    Q_ASSERT(mConferenceId > 0);
+    Q_ASSERT(mEventId > 0);
+    loadEvents();
+}
+
+

diff --git a/src/gui/conflictdialogcontainer.h b/src/gui/conflictdialogcontainer.h
index 9f1616b245a11c03d876d4a1195c20712a881a1f..068c081fe3d1c54b85a38bb15cefac3ed88a363a 100644 (file)
--- a/src/gui/conflictdialogcontainer.h
+++ b/src/gui/conflictdialogcontainer.h
@@ -28,18 +28,18 @@ class ConflictDialogContainer: public TabContainer
     Q_OBJECT
 public:
     ConflictDialogContainer(QWidget *aParent);
-    virtual ~ConflictDialogContainer(){}
+    virtual ~ConflictDialogContainer() {}
 
-    void setEventId(int aEventId) { mEventId = aEventId; }
+public slots:
+    void setEventId(int aEventId, int conferenceId);
+    void loadEvents(); // update the conflicts
 
 protected:
-    virtual void loadEvents( const QDate &aDate, const int aConferenceId );
-
-protected slots:
-    virtual void updateTreeView(const QDate &aDate);
+    virtual void loadEvents(const QDate &aDate, const int aConferenceId); // the date and conference are ignored
 
 private:
     int mEventId;
+    int mConferenceId;
 };
 
 #endif /* CONFLICTDIALOGCONTAINER_H */

diff --git a/src/gui/conflictsdialog.cpp b/src/gui/conflictsdialog.cpp
index b4832f7ba93fe2d591a269a009777452379acd04..74e66d19ca179670849fe4b0cf0f57158fd8cf7b 100644 (file)
--- a/src/gui/conflictsdialog.cpp
+++ b/src/gui/conflictsdialog.cpp
@@ -19,18 +19,19 @@
  */
 #include "conflictsdialog.h"
 
-ConflictsDialog::ConflictsDialog(int aEventId, QWidget *aParent)
+ConflictsDialog::ConflictsDialog(int aEventId, int aConferenceId, QWidget *aParent)
     : QDialog(aParent)
 {
     setupUi(this);
-    connect(container, SIGNAL(eventHasChanged(int,bool)), this, SIGNAL(eventHasChanged(int,bool)));
-    connect(container, SIGNAL(eventHasChanged(int,bool)), container, SLOT(updateTreeViewModel(int,bool)));
+    connect(container, SIGNAL(eventChanged(int,bool)), this, SIGNAL(eventChanged(int,bool)));
+    connect(container, SIGNAL(eventChanged(int,bool)), container, SLOT(loadEvents()));
 
-    container->setEventId(aEventId);
+    container->setEventId(aEventId, aConferenceId);
 }
 
+
 ConflictsDialog::~ConflictsDialog()
 {
-    disconnect(container, SIGNAL(eventHasChanged(int,bool)), this, SIGNAL(eventHasChanged(int,bool)));
+    disconnect(container, SIGNAL(eventChanged(int,bool)), this, SIGNAL(eventChanged(int,bool)));
 }
 

diff --git a/src/gui/conflictsdialog.h b/src/gui/conflictsdialog.h
index cca88db6cb9d5b240640531fd1dac7bdb507ff82..4a8accc512df2cc7d8b3e351abe363a4e98b7fbb 100644 (file)
--- a/src/gui/conflictsdialog.h
+++ b/src/gui/conflictsdialog.h
@@ -27,10 +27,10 @@ class ConflictsDialog : public QDialog, Ui::ConflictsDialog
 {
     Q_OBJECT
 public:
-    ConflictsDialog(int aEventId, QWidget *aParent = NULL);
+    ConflictsDialog(int aEventId, int aConferenceId, QWidget *aParent = NULL);
     ~ConflictsDialog();
 signals:
-    void eventHasChanged(int aEventId, bool aReloadModel = false);
+    void eventChanged(int aEventId, bool favouriteChanged);
 };
 
 #endif /* CONFLICTSDIALOG_H */ 

diff --git a/src/gui/eventdialog.cpp b/src/gui/eventdialog.cpp
index 6fd700470f040fd3537f769db554d15b9ee46178..ee749371b0515e54ff7a0548032da25406974939 100644 (file)
--- a/src/gui/eventdialog.cpp
+++ b/src/gui/eventdialog.cpp
@@ -86,13 +86,13 @@ void EventDialog::favouriteClicked()
         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++)
-        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);
 }
 
 void EventDialog::alarmClicked()
@@ -123,6 +123,6 @@ void EventDialog::alarmClicked()
     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);
 }
 

diff --git a/src/gui/eventdialog.h b/src/gui/eventdialog.h
index afd0b23cbd9e030f247545776d851a174a9eb06a..1b05073758404e600227d69ad2f22f8aa6c541f4 100644 (file)
--- a/src/gui/eventdialog.h
+++ b/src/gui/eventdialog.h
@@ -34,7 +34,7 @@ private slots:
     void favouriteClicked();
     void alarmClicked();
 signals:
-    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
 private:
     int mEventId;
 };

diff --git a/src/gui/tabcontainer.cpp b/src/gui/tabcontainer.cpp
index 822a80b1380bad7545b0138c4f0aa8e15fdc7ca3..2dc6c56f3a6e94c9533f11099063feafe75e9b3e 100644 (file)
--- a/src/gui/tabcontainer.cpp
+++ b/src/gui/tabcontainer.cpp
@@ -76,7 +76,8 @@ void TabContainer::itemClicked(const QModelIndex &aIndex)
 
 void TabContainer::displayConflicts(const QModelIndex &aIndex)
 {
-    ConflictsDialog dialog(static_cast<Event*>(aIndex.internalPointer())->id(),this);
+    Event* event = static_cast<Event*>(aIndex.internalPointer());
+    ConflictsDialog dialog(event->id(), event->conferenceId(), this);
 #ifdef N810
     dialog.setFixedWidth(static_cast<QWidget*>(parent())->width());
 #endif