'conflict' list is automatically expanded

diff --git a/src/gui/conflictdialogcontainer.cpp b/src/gui/conflictdialogcontainer.cpp
index b83bb8f73626de66a4b97ac05a4eb487df50b2c1..220ba89d89e792037ae685093106e76496f2a31d 100644 (file)
--- 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 )
 {
 
 void ConflictDialogContainer::loadEvents( const QDate &aDate, const int aConferenceId )
 {

+    Q_UNUSED(aDate);
+

     static_cast<EventModel*>(treeView->model())->loadConflictEvents( mEventId, aConferenceId );
     dayNavigator->hide();
 }
 
     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 44b34b2974dc22712aea13ca17f165da23839e19..a5417379ec143ddff1939d0cc2e3c3f5bc1356d6 100644 (file)
--- 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:
     virtual void loadEvents( const QDate &aDate, const int aConferenceId );
 

+protected slots:
+    virtual void updateTreeView(const QDate &aDate);
+

 private:
     int mEventId;
 };
 private:
     int mEventId;
 };

diff --git a/src/gui/tabcontainer.h b/src/gui/tabcontainer.h
index bcc26cfc6be35d46eeea2608703e3304b489c238..c6c0c1fd12e2ec7365b40b2b461d9553673cda54 100644 (file)
--- 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 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);
     void itemClicked(const QModelIndex &aIndex);
     void displayMap(const QModelIndex &aIndex);
     void displayConflicts(const QModelIndex &aIndex);