From: pavelpa <pavelpa@localhost>
Date: Wed, 27 Jan 2010 21:33:36 +0000 (+0000)
Subject: 'conflict' list is automatically expanded
X-Git-Tag: 0.5.0~166
X-Git-Url: https://git.toastfreeware.priv.at/toast/confclerk.git/commitdiff_plain/0401cc235f87dd02b56dc6948d8ce3f7609d635c

'conflict' list is automatically expanded
---

diff --git a/src/gui/conflictdialogcontainer.cpp b/src/gui/conflictdialogcontainer.cpp
index b83bb8f..220ba89 100644
--- a/src/gui/conflictdialogcontainer.cpp
+++ b/src/gui/conflictdialogcontainer.cpp
@@ -8,7 +8,15 @@ ConflictDialogContainer::ConflictDialogContainer(QWidget *aParent)
 
 void ConflictDialogContainer::loadEvents( const QDate &aDate, const int aConferenceId )
 {
+    Q_UNUSED(aDate);
+
     static_cast<EventModel*>(treeView->model())->loadConflictEvents( mEventId, aConferenceId );
     dayNavigator->hide();
 }
 
+void ConflictDialogContainer::updateTreeView(const QDate &aDate)
+{
+    TabContainer::updateTreeView(aDate);
+    treeView->setAllExpanded(true);
+}
+
diff --git a/src/gui/conflictdialogcontainer.h b/src/gui/conflictdialogcontainer.h
index 44b34b2..a541737 100644
--- a/src/gui/conflictdialogcontainer.h
+++ b/src/gui/conflictdialogcontainer.h
@@ -16,6 +16,9 @@ public:
 protected:
     virtual void loadEvents( const QDate &aDate, const int aConferenceId );
 
+protected slots:
+    virtual void updateTreeView(const QDate &aDate);
+
 private:
     int mEventId;
 };
diff --git a/src/gui/tabcontainer.h b/src/gui/tabcontainer.h
index bcc26cf..c6c0c1f 100644
--- a/src/gui/tabcontainer.h
+++ b/src/gui/tabcontainer.h
@@ -32,7 +32,7 @@ public slots:
     void setDates(const QDate &aStart, const QDate &aEnd);
 
 protected slots:
-    void updateTreeView(const QDate &aDate);
+    virtual void updateTreeView(const QDate &aDate);
     void itemClicked(const QModelIndex &aIndex);
     void displayMap(const QModelIndex &aIndex);
     void displayConflicts(const QModelIndex &aIndex);