From: Dirk Bartley Date: Sun, 14 Feb 2010 17:23:07 +0000 (+0100) Subject: Make undocking work X-Git-Tag: Release-5.2.1~1741 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=cf8b01f384aa461ddd34d3fe655dae5556e31c9b;p=bacula%2Fbacula Make undocking work --- diff --git a/bacula/src/qt-console/clients/clients.cpp b/bacula/src/qt-console/clients/clients.cpp index 2c39953d24..d336f4e2fe 100644 --- 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 f2323229a0..5a97f3400b 100644 --- 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 d131b0bdf9..fec05bc441 100644 --- 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 00261525c3..ff92afaf26 100644 --- 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 96b9f1ee4b..2def8025e9 100644 --- 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 7b0f7838e9..2c8653831d 100644 --- 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 1dc8c5cb16..dbcbb6ac24 100644 --- 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 c063aa683d..f1831034a9 100644 --- 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 91796d04c6..f8eb317645 100644 --- 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 2f26b550fd..762b17a089 100644 --- 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(); + } } /*