bat: Call parent constructor in all pages

[bacula/bacula] / bacula / src / qt-console / storage / storage.cpp

diff --git a/bacula/src/qt-console/storage/storage.cpp b/bacula/src/qt-console/storage/storage.cpp
index 3fce0c04551767ce5881430a1569907c2f6f2fbf..8d5fd055ebf4416f42b8ee6fc4ee4e661d32e346 100644 (file)
--- a/bacula/src/qt-console/storage/storage.cpp
+++ b/bacula/src/qt-console/storage/storage.cpp
@@ -6,7 +6,7 @@
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
    This program is Free Software; you can redistribute it and/or
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
    This program is Free Software; you can redistribute it and/or

-   modify it under the terms of version two of the GNU General Public
+   modify it under the terms of version three of the GNU Affero General Public

    License as published by the Free Software Foundation and included
    in the file LICENSE.
 
    License as published by the Free Software Foundation and included
    in the file LICENSE.
 


@@ -15,7 +15,7 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    General Public License for more details.
 
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    General Public License for more details.
 

-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Affero General Public License

    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.


@@ -45,7 +45,7 @@
 #include "status/storstat.h"
 #include "util/fmtwidgetitem.h"
 
 #include "status/storstat.h"
 #include "util/fmtwidgetitem.h"
 

-Storage::Storage()
+Storage::Storage() : Pages()

 {
    setupUi(this);
    pgInitialize(tr("Storage"));
 {
    setupUi(this);
    pgInitialize(tr("Storage"));


@@ -234,7 +234,9 @@ void Storage::PgSeltreeWidgetClicked()
       populateTree();
       createContextMenu();
    }
       populateTree();
       createContextMenu();
    }

-   dockPage();
+   if (!isOnceDocked()) {
+      dockPage();
+   }

 }
 
 /*
 }
 
 /*


@@ -334,7 +336,10 @@ void Storage::createContextMenu()
 
 void Storage::contentWindow()
 {
 
 void Storage::contentWindow()
 {

-   new Content(m_currentStorage);
+   if (m_currentStorage != "" && m_currentAutoChanger) { 
+      QTreeWidgetItem *parentItem = mainWin->getFromHash(this);
+      new Content(m_currentStorage, parentItem);
+   }

 }
 
 /*
 }
 
 /*