dhb Simplify MainWin::undockWindowButton. Make the columns in medialist

     resemble the columns in list media at a console command.

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

diff --git a/bacula/src/qt-console/mainwin.cpp b/bacula/src/qt-console/mainwin.cpp
index aa23377287d2b1525f08238e44f30ef2a56a5cf9..f210cf5eb4141683877eea7fd2df90bc5d29e95e 100644 (file)
--- a/bacula/src/qt-console/mainwin.cpp
+++ b/bacula/src/qt-console/mainwin.cpp
@@ -347,12 +347,6 @@ void MainWin::undockWindow()
 
 void MainWin::undockWindowButton()
 {
-   int curindex = stackedWidget->currentIndex();
-   
-   foreach (Pages* pagesItem,  m_pageshash){
-      if (curindex == stackedWidget->indexOf(pagesItem)) {
-         pagesItem->togglePageDocking();
-         break;
-      }
-   }
+   Pages* page = (Pages*)stackedWidget->currentWidget();
+   page->togglePageDocking();
 }

diff --git a/bacula/src/qt-console/medialist/medialist.cpp b/bacula/src/qt-console/medialist/medialist.cpp
index 452d90f81ffcd6d8dafac97c422d39b1ece13b16..51d368b801b182a619467eb3fb579f97f89030d5 100644 (file)
--- a/bacula/src/qt-console/medialist/medialist.cpp
+++ b/bacula/src/qt-console/medialist/medialist.cpp
@@ -68,7 +68,7 @@ void MediaList::populateTree()
    QTreeWidgetItem *mediatreeitem, *pooltreeitem, *topItem;
 
    m_treeWidget->clear();
-   m_treeWidget->setColumnCount(3);
+   m_treeWidget->setColumnCount(9);
    topItem = new QTreeWidgetItem(m_treeWidget);
    topItem->setText(0, "Pools");
    topItem->setData(0, Qt::UserRole, 0);
@@ -83,15 +83,22 @@ void MediaList::populateTree()
    /* Start with a list of pools */
    m_poollist->clear();
    m_headerlist->clear();
+   //m_headerlist->append("Media Id");
    m_headerlist->append("Volume Name");
    m_headerlist->append("Media Id");
-   m_headerlist->append("Type");
+   m_headerlist->append("Volume Status");
+   m_headerlist->append("Enabled");
+   m_headerlist->append("Volume Bytes");
+   m_headerlist->append("Volume Files");
+   m_headerlist->append("Volume Retention");
+   m_headerlist->append("Media Type");
+   m_headerlist->append("Last Written");
    m_treeWidget->setHeaderLabels(*m_headerlist);
 
    QString currentpool("");
    QString resultline;
    QStringList results;
-   const char* m_cmd = ".sql \"select p.name, m.volumename, m.mediaid, m.mediatype from media m, pool p ORDER BY p.name\"";
+   QString m_cmd(".sql \"select p.name, m.volumename, m.mediaid, m.volstatus, m.enabled, m.volbytes, m.volfiles, m.volretention, m.mediatype, m.lastwritten FROM media m, pool p ORDER BY p.name\"");
    if ( m_console->dir_cmd(m_cmd,results)){
       int recordcounter=0;
       foreach( resultline, results ){