Make undocking work

diff --git a/bacula/src/qt-console/clients/clients.cpp b/bacula/src/qt-console/clients/clients.cpp
index 2c39953d2425dc5ee6a16b75453a7753d2a0098a..d336f4e2fe2b0d92eccf3cde5d94126216714862 100644 (file)
--- a/bacula/src/qt-console/clients/clients.cpp
+++ b/bacula/src/qt-console/clients/clients.cpp
@@ -190,7 +190,9 @@ void Clients::PgSeltreeWidgetClicked()
    if(!m_populated) {
       populateTable();
    }
-   dockPage();
+   if (!isOnceDocked()) {
+      dockPage();
+   }
 }
 
 /*

diff --git a/bacula/src/qt-console/fileset/fileset.cpp b/bacula/src/qt-console/fileset/fileset.cpp
index f2323229a03357dad92309e9333a7b1cfcf29eb1..5a97f3400b40be0866fe213315924e86a2f8d5e7 100644 (file)
--- a/bacula/src/qt-console/fileset/fileset.cpp
+++ b/bacula/src/qt-console/fileset/fileset.cpp
@@ -183,7 +183,9 @@ void FileSet::PgSeltreeWidgetClicked()
       populateTable();
       createContextMenu();
    }
-   dockPage();
+   if (!isOnceDocked()) {
+      dockPage();
+   }
 }
 
 /*

diff --git a/bacula/src/qt-console/joblist/joblist.cpp b/bacula/src/qt-console/joblist/joblist.cpp
index d131b0bdf9c9366a168c78720de0a56aa0e11a24..fec05bc4412b3db13763d1982ca5aaaaa5dd2f65 100644 (file)
--- a/bacula/src/qt-console/joblist/joblist.cpp
+++ b/bacula/src/qt-console/joblist/joblist.cpp
@@ -353,7 +353,9 @@ void JobList::PgSeltreeWidgetClicked()
          m_splitter->setSizes(sizes);
       }
    }
-   dockPage();
+   if (!isOnceDocked()) {
+      dockPage();
+   }
 }
 
 /*

diff --git a/bacula/src/qt-console/mainwin.cpp b/bacula/src/qt-console/mainwin.cpp
index 00261525c3805e053766a02335334909d2bf9356..ff92afaf26c98a01a21705e24a0574738ccddea0 100644 (file)
--- a/bacula/src/qt-console/mainwin.cpp
+++ b/bacula/src/qt-console/mainwin.cpp
@@ -517,7 +517,7 @@ void MainWin::treeItemChanged(QTreeWidgetItem *currentitem, QTreeWidgetItem *pre
       }
       /* set the value for the currently active console */
       int stackindex = tabWidget->indexOf(nextPage);
-      if (!nextPage->isDocked()) {
+      if (!nextPage->isOnceDocked()) {
          nextPage->dockPage();
       }
    

diff --git a/bacula/src/qt-console/medialist/medialist.cpp b/bacula/src/qt-console/medialist/medialist.cpp
index 96b9f1ee4b0ee6bd483c0ee911e72f5e419e4294..2def8025e9fc1ab9bef373cdb5fccfecbf33de36 100644 (file)
--- a/bacula/src/qt-console/medialist/medialist.cpp
+++ b/bacula/src/qt-console/medialist/medialist.cpp
@@ -297,7 +297,9 @@ void MediaList::PgSeltreeWidgetClicked()
       populateTree();
       createContextMenu();
    }
-   dockPage();
+   if (!isOnceDocked()) {
+      dockPage();
+   }
 }
 
 /*

diff --git a/bacula/src/qt-console/medialist/mediaview.cpp b/bacula/src/qt-console/medialist/mediaview.cpp
index 7b0f7838e9578ea7088c894f06cc44a774e5cec3..2c8653831dc757aabc47547e8a0997b082fe9b23 100644 (file)
--- a/bacula/src/qt-console/medialist/mediaview.cpp
+++ b/bacula/src/qt-console/medialist/mediaview.cpp
@@ -396,7 +396,9 @@ void MediaView::PgSeltreeWidgetClicked()
       populateForm();
       populateTable();
    }
-   dockPage();
+   if (!isOnceDocked()) {
+      dockPage();
+   }
 }
 
 /*

diff --git a/bacula/src/qt-console/restore/restoretree.cpp b/bacula/src/qt-console/restore/restoretree.cpp
index 1dc8c5cb16e0737d126732c1de749ba47adf4a43..dbcbb6ac24dd10f733f0b691af8e92d4e7249fd0 100644 (file)
--- a/bacula/src/qt-console/restore/restoretree.cpp
+++ b/bacula/src/qt-console/restore/restoretree.cpp
@@ -1860,5 +1860,7 @@ int restoreTree::queryFileIndex(QString &fullPath, int jobId)
 
 void restoreTree::PgSeltreeWidgetClicked()
 {
-   dockPage();
+   if (!isOnceDocked()) {
+      dockPage();
+   }
 }

diff --git a/bacula/src/qt-console/run/runcmd.cpp b/bacula/src/qt-console/run/runcmd.cpp
index c063aa683daf599363eea7bbe7ccc8cc6397cd28..f1831034a9a0777cbbeb1b282b3e8ab5956938a9 100644 (file)
--- a/bacula/src/qt-console/run/runcmd.cpp
+++ b/bacula/src/qt-console/run/runcmd.cpp
@@ -61,7 +61,7 @@ runCmdPage::runCmdPage(int conn)
 
    connect(okButton, SIGNAL(pressed()), this, SLOT(okButtonPushed()));
    connect(cancelButton, SIGNAL(pressed()), this, SLOT(cancelButtonPushed()));
-   dockPage();
+   //dockPage();
    setCurrent();
    this->show();
 

diff --git a/bacula/src/qt-console/status/dirstat.cpp b/bacula/src/qt-console/status/dirstat.cpp
index 91796d04c66049306bcf9de44050957f9ebbb084..f8eb3176453e32c1efe1153485721e4765ffe0e1 100644 (file)
--- a/bacula/src/qt-console/status/dirstat.cpp
+++ b/bacula/src/qt-console/status/dirstat.cpp
@@ -286,7 +286,9 @@ void DirStat::PgSeltreeWidgetClicked()
       populateAll();
       m_populated=true;
    }
-   dockPage();
+   if (!isOnceDocked()) {
+      dockPage();
+   }
 }
 
 /*

diff --git a/bacula/src/qt-console/storage/storage.cpp b/bacula/src/qt-console/storage/storage.cpp
index 2f26b550fdcb6ac345807787a329cab76e6c7f24..762b17a0891af4b864212ebee255a8fb9213d8c2 100644 (file)
--- a/bacula/src/qt-console/storage/storage.cpp
+++ b/bacula/src/qt-console/storage/storage.cpp
@@ -234,7 +234,9 @@ void Storage::PgSeltreeWidgetClicked()
       populateTree();
       createContextMenu();
    }
-   dockPage();
+   if (!isOnceDocked()) {
+      dockPage();
+   }
 }
 
 /*