This uses settings to save the expanded state of the pools in the media list.

I was interested in not re-setting the expanded state each time.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@5890 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/qt-console/medialist/medialist.cpp b/bacula/src/qt-console/medialist/medialist.cpp
index ee8a9d3321c50c2ba091354431282a82b1934671..a9e792460cad7cfddfb5e5b904e052c3b7f28267 100644 (file)
--- a/bacula/src/qt-console/medialist/medialist.cpp
+++ b/bacula/src/qt-console/medialist/medialist.cpp
@@ -64,6 +64,8 @@ MediaList::MediaList()
 
 MediaList::~MediaList()
 {
+   if (m_populated)
+      writeExpandedSettings();
 }
 
 /*
@@ -72,7 +74,7 @@ MediaList::~MediaList()
  */
 void MediaList::populateTree()
 {
-   QTreeWidgetItem *mediatreeitem, *pooltreeitem, *topItem;
+   QTreeWidgetItem *mediatreeitem, *pooltreeitem;
 
    if (!m_console->preventInUseConnect())
        return;
@@ -85,23 +87,31 @@ void MediaList::populateTree()
    int statusIndex = headerlist.indexOf("Status");
 
    m_checkcurwidget = false;
+   if (m_populated)
+      writeExpandedSettings();
    mp_treeWidget->clear();
    m_checkcurwidget = true;
    mp_treeWidget->setColumnCount(headerlist.count());
-   topItem = new QTreeWidgetItem(mp_treeWidget);
-   topItem->setText(0, "Pools");
-   topItem->setData(0, Qt::UserRole, 0);
-   topItem->setExpanded(true);
+   m_topItem = new QTreeWidgetItem(mp_treeWidget);
+   m_topItem->setText(0, "Pools");
+   m_topItem->setData(0, Qt::UserRole, 0);
+   m_topItem->setExpanded(true);
    
    mp_treeWidget->setHeaderLabels(headerlist);
 
+   QSettings settings(m_console->m_dir->name(), "bat");
+   settings.beginGroup("MediaListTreeExpanded");
    QString query;
 
    foreach (QString pool_listItem, m_console->pool_list) {
-      pooltreeitem = new QTreeWidgetItem(topItem);
+      pooltreeitem = new QTreeWidgetItem(m_topItem);
       pooltreeitem->setText(0, pool_listItem);
       pooltreeitem->setData(0, Qt::UserRole, 1);
-      pooltreeitem->setExpanded(true);
+      if(settings.contains(pool_listItem)) {
+         pooltreeitem->setExpanded(settings.value(pool_listItem).toBool());
+      } else {
+         pooltreeitem->setExpanded(true);
+      }
 
       query =  "SELECT Media.VolumeName AS Media, "
          " Media.MediaId AS Id, Media.VolStatus AS VolStatus,"
@@ -150,6 +160,7 @@ void MediaList::populateTree()
          } /* foreach resultline */
       } /* if results from query */
    } /* foreach pool_listItem */
+   settings.endGroup();
    /* Resize the columns */
    for(int cnter=0; cnter<headerlist.count(); cnter++) {
       mp_treeWidget->resizeColumnToContents(cnter);
@@ -361,3 +372,18 @@ void MediaList::volumeFromPool()
    consoleCommand(cmd);
    populateTree();
 }
+
+/*
+ * Write settings to save expanded states of the pools
+ */
+void MediaList::writeExpandedSettings()
+{
+   QSettings settings(m_console->m_dir->name(), "bat");
+   settings.beginGroup("MediaListTreeExpanded");
+   int childcount = m_topItem->childCount();
+   for (int cnt=0; cnt<childcount; cnt++) {
+      QTreeWidgetItem *poolitem = m_topItem->child(cnt);
+      settings.setValue(poolitem->text(0), poolitem->isExpanded());
+   }
+   settings.endGroup();
+}

diff --git a/bacula/src/qt-console/medialist/medialist.h b/bacula/src/qt-console/medialist/medialist.h
index c8cb0a5f535706abdd7ff9e84e213dc50868b6e6..ded7677c461cc818b772e2a881372066d8062073 100644 (file)
--- a/bacula/src/qt-console/medialist/medialist.h
+++ b/bacula/src/qt-console/medialist/medialist.h
@@ -66,10 +66,12 @@ private slots:
 private:
    void createContextMenu();
    void setStatusColor(QTreeWidgetItem *, QString &, int &);
+   void writeExpandedSettings();
    QString m_currentVolumeName;
    QString m_currentVolumeId;
    bool m_populated;
    bool m_checkcurwidget;
+   QTreeWidgetItem *m_topItem;
 };
 
 #endif /* _MEDIALIST_H_ */