This adds the ability to once again have classes that don't neccesarily dock. It...

diff --git a/bacula/src/qt-console/mainwin.cpp b/bacula/src/qt-console/mainwin.cpp
index 10cccd0bf1f08ddb4f0b615e0c31ff9fdb3f7c33..0530ba56d7da53446c22554951405baec97aa723 100644 (file)
--- a/bacula/src/qt-console/mainwin.cpp
+++ b/bacula/src/qt-console/mainwin.cpp
@@ -515,9 +515,7 @@ void MainWin::treeItemChanged(QTreeWidgetItem *currentitem, QTreeWidgetItem *pre
       }
       /* set the value for the currently active console */
       int stackindex = tabWidget->indexOf(nextPage);
-      if (!nextPage->isOnceDocked()) {
-         nextPage->dockPage();
-      }
+      nextPage->firstUseDock();
    
       /* Is this page currently on the stack or is it undocked */
       if (stackindex >= 0) {

diff --git a/bacula/src/qt-console/pages.cpp b/bacula/src/qt-console/pages.cpp
index e99ad6d7a3cdf50c6058174f12f89b9d8a72ba38..1efc60a1016037529ed5489e9418b8ddfed3978c 100644 (file)
--- a/bacula/src/qt-console/pages.cpp
+++ b/bacula/src/qt-console/pages.cpp
@@ -57,6 +57,15 @@ Pages::Pages()
    m_docked = false;
    m_onceDocked = false;
    m_closeable = true;
+   m_dockOnFirstUse = true;
+}
+
+/* first Use Dock */
+void Pages::firstUseDock()
+{
+   if (!m_onceDocked && m_dockOnFirstUse) {
+      dockPage();
+   }
 }
 
 /*

diff --git a/bacula/src/qt-console/pages.h b/bacula/src/qt-console/pages.h
index b938465b99403b6088f883d9ddcc1ecb87f11352..6e619aa322808d7b0f3dec5c4dbcd83c9f91ec72 100644 (file)
--- a/bacula/src/qt-console/pages.h
+++ b/bacula/src/qt-console/pages.h
@@ -78,6 +78,7 @@ public:
    QString &name() { return m_name; };
    void getVolumeList(QStringList &);
    void getStatusList(QStringList &);
+   void firstUseDock();
 
 public slots:
    /* closeEvent is a virtual function inherited from QWidget */
@@ -94,6 +95,7 @@ protected:
    bool m_closeable;
    bool m_docked;
    bool m_onceDocked;
+   bool m_dockOnFirstUse;
    Console *m_console;
    QString m_name;
 };

diff --git a/bacula/src/qt-console/run/run.cpp b/bacula/src/qt-console/run/run.cpp
index 714aac3f3574926494116048bbbe8e2f5131edb2..587cabc0e5ea91235d7af71ea16883880ea0a555 100644 (file)
--- a/bacula/src/qt-console/run/run.cpp
+++ b/bacula/src/qt-console/run/run.cpp
@@ -46,6 +46,7 @@ runPage::runPage()
 
 runPage::runPage(const QString &defJob)
 {
+   m_dockOnFirstUse = false;
    init();
    if (defJob != "")
       jobCombo->setCurrentIndex(jobCombo->findText(defJob, Qt::MatchExactly));
@@ -57,6 +58,7 @@ runPage::runPage(const QString &defJob, const QString &level,
                  const QString &pool, const QString &storage,
                  const QString &client, const QString &fileset)
 {
+   m_dockOnFirstUse = false;
    init();
    jobCombo->setCurrentIndex(jobCombo->findText(defJob, Qt::MatchExactly));
    job_name_change(0);