This adds the fixes to avoid the repeated popups of busy dialogs from the head

to the 2.4 branch.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.4@7459 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/qt-console/clients/clients.cpp b/bacula/src/qt-console/clients/clients.cpp
index b04f1af2430a247c0e6dce0fb35f8c42be906307..7b2e4ba66c3ef34ace3bad1ffa4700f6508bf783 100644 (file)
--- a/bacula/src/qt-console/clients/clients.cpp
+++ b/bacula/src/qt-console/clients/clients.cpp
@@ -51,6 +51,7 @@ Clients::Clients()
 
    /* mp_treeWidget, Storage Tree Tree Widget inherited from ui_client.h */
    m_populated = false;
+   m_populating = false;
    m_checkcurwidget = true;
    m_closeable = false;
    /* add context sensitive menu items specific to this classto the page
@@ -70,6 +71,9 @@ Clients::~Clients()
  */
 void Clients::populateTree()
 {
+   if (m_populating)
+      return;
+   m_populating = true;
    QTreeWidgetItem *clientItem, *topItem;
 
    if (!m_console->preventInUseConnect())
@@ -135,6 +139,7 @@ void Clients::populateTree()
    for(int cnter=0; cnter<headerlist.size(); cnter++) {
       mp_treeWidget->resizeColumnToContents(cnter);
    }
+   m_populating = false;
 }
 
 /*

diff --git a/bacula/src/qt-console/clients/clients.h b/bacula/src/qt-console/clients/clients.h
index 6b4b77a879bd073941bd8a79f0f0cf259856e118..1ca21c3d934c04679829872b9372bee52f5c3a12 100644 (file)
--- a/bacula/src/qt-console/clients/clients.h
+++ b/bacula/src/qt-console/clients/clients.h
@@ -62,6 +62,7 @@ private:
    void createContextMenu();
    QString m_currentlyselected;
    bool m_populated;
+   bool m_populating;
    bool m_checkcurwidget;
 };
 

diff --git a/bacula/src/qt-console/fileset/fileset.cpp b/bacula/src/qt-console/fileset/fileset.cpp
index b1ed4933f7c1d48b7c9e2441dc90f5a7ec2774c3..a07c9569c422dad3919e75bec4767ec3818368fd 100644 (file)
--- a/bacula/src/qt-console/fileset/fileset.cpp
+++ b/bacula/src/qt-console/fileset/fileset.cpp
@@ -50,6 +50,7 @@ FileSet::FileSet()
 
    /* mp_treeWidget, FileSet Tree Tree Widget inherited from ui_fileset.h */
    m_populated = false;
+   m_populating = false;
    m_checkcurwidget = true;
    m_closeable = false;
    readSettings();
@@ -70,6 +71,10 @@ FileSet::~FileSet()
  */
 void FileSet::populateTree()
 {
+   if (m_populating)
+      return;
+   m_populating = true;
+
    QTreeWidgetItem *filesetItem, *topItem;
 
    if (!m_console->preventInUseConnect())
@@ -135,7 +140,7 @@ void FileSet::populateTree()
    for (int cnter=0; cnter<headerlist.size(); cnter++) {
       mp_treeWidget->resizeColumnToContents(cnter);
    }
-
+   m_populating = false;
 }
 
 /*

diff --git a/bacula/src/qt-console/fileset/fileset.h b/bacula/src/qt-console/fileset/fileset.h
index ad13973ee2a21afb1425233b0bcfb1460bbc6ab2..fff0338bdacb92698fb987ba63943cbc3b5107f3 100644 (file)
--- a/bacula/src/qt-console/fileset/fileset.h
+++ b/bacula/src/qt-console/fileset/fileset.h
@@ -62,6 +62,7 @@ private:
    void createContextMenu();
    QString m_currentlyselected;
    bool m_populated;
+   bool m_populating;
    bool m_checkcurwidget;
 };
 

diff --git a/bacula/src/qt-console/joblist/joblist.cpp b/bacula/src/qt-console/joblist/joblist.cpp
index c83cbbdf15e9e1dbad06e4405e4d998da3321878..4dc426fe6988c3b92ebb0ea365fb3e54eede84b3 100644 (file)
--- a/bacula/src/qt-console/joblist/joblist.cpp
+++ b/bacula/src/qt-console/joblist/joblist.cpp
@@ -60,6 +60,7 @@ JobList::JobList(const QString &mediaName, const QString &clientName,
 
    m_resultCount = 0;
    m_populated = false;
+   m_populating = false;
    m_closeable = false;
    if ((m_mediaName != "") || (m_clientName != "") || (m_jobName != "") || (m_filesetName != ""))
       m_closeable=true;
@@ -106,6 +107,10 @@ JobList::~JobList()
  */
 void JobList::populateTable()
 {
+   if (m_populating)
+      return;
+   m_populating = true;
+
    QStringList results;
    QString resultline;
    QBrush blackBrush(Qt::black);
@@ -293,6 +298,7 @@ void JobList::populateTable()
           tr("The Jobs query returned no results.\n"
          "Press OK to continue?"), QMessageBox::Ok );
    }
+   m_populating = false;
 }
 
 void JobList::setStatusColor(QTableWidgetItem *item, QString &field)

diff --git a/bacula/src/qt-console/joblist/joblist.h b/bacula/src/qt-console/joblist/joblist.h
index 27e65e4e96745a9540e1a996deedfbcf3bb883a0..2a7f9346ce13f2f4fe12c856548d903d19140d26 100644 (file)
--- a/bacula/src/qt-console/joblist/joblist.h
+++ b/bacula/src/qt-console/joblist/joblist.h
@@ -85,6 +85,7 @@ private:
    QString m_filesetName;
    QString m_currentJob;
    bool m_populated;
+   bool m_populating;
    bool m_checkCurrentWidget;
    int m_purgedIndex;
    int m_typeIndex;

diff --git a/bacula/src/qt-console/jobs/jobs.cpp b/bacula/src/qt-console/jobs/jobs.cpp
index bc1046363f9afe83ddc9d2ca9c87906519c422af..80fb95d2f7700248ef659ae326c4abb02375a0c8 100644 (file)
--- a/bacula/src/qt-console/jobs/jobs.cpp
+++ b/bacula/src/qt-console/jobs/jobs.cpp
@@ -49,6 +49,7 @@ Jobs::Jobs()
 
    /* mp_treeWidget, Storage Tree Tree Widget inherited from ui_client.h */
    m_populated = false;
+   m_populating = false;
    m_checkcurwidget = true;
    m_closeable = false;
    /* add context sensitive menu items specific to this classto the page
@@ -68,6 +69,9 @@ Jobs::~Jobs()
  */
 void Jobs::populateTree()
 {
+   if (m_populating)
+      return;
+   m_populating = true;
    QTreeWidgetItem *jobsItem, *topItem;
 
    if (!m_console->preventInUseConnect())

diff --git a/bacula/src/qt-console/jobs/jobs.h b/bacula/src/qt-console/jobs/jobs.h
index 64abd2f8791bd91497179d9565fcfe61796884ca..6087642cebc46a8cf1428e9c4264ae720d7a4683 100644 (file)
--- a/bacula/src/qt-console/jobs/jobs.h
+++ b/bacula/src/qt-console/jobs/jobs.h
@@ -66,6 +66,7 @@ private:
    void createContextMenu();
    QString m_currentlyselected;
    bool m_populated;
+   bool m_populating;
    bool m_checkcurwidget;
    int m_typeIndex;
 };

diff --git a/bacula/src/qt-console/medialist/medialist.cpp b/bacula/src/qt-console/medialist/medialist.cpp
index 3c80ca9f42c5c92424679e5f436859bce5c2e436..49639a2ee456b2b2f1adc6d29171272462535fdb 100644 (file)
--- a/bacula/src/qt-console/medialist/medialist.cpp
+++ b/bacula/src/qt-console/medialist/medialist.cpp
@@ -54,6 +54,7 @@ MediaList::MediaList()
 
    /* mp_treeWidget, Storage Tree Tree Widget inherited from ui_medialist.h */
    m_populated = false;
+   m_populating = false;
    m_checkcurwidget = true;
    m_closeable = false;
    /* add context sensitive menu items specific to this classto the page
@@ -73,6 +74,9 @@ MediaList::~MediaList()
 void MediaList::populateTree()
 {
    QTreeWidgetItem *mediatreeitem, *pooltreeitem, *topItem;
+   if (m_populating)
+      return;
+   m_populating = true;
 
    if (!m_console->preventInUseConnect())
        return;
@@ -155,6 +159,7 @@ void MediaList::populateTree()
    for(int cnter=0; cnter<headerlist.count(); cnter++) {
       mp_treeWidget->resizeColumnToContents(cnter);
    }
+   m_populating = false;
 }
 
 void MediaList::setStatusColor(QTreeWidgetItem *item, QString &field, int &index)

diff --git a/bacula/src/qt-console/medialist/medialist.h b/bacula/src/qt-console/medialist/medialist.h
index c8cb0a5f535706abdd7ff9e84e213dc50868b6e6..61b6f8d62861eda2f45cef3691ac923d7f18dca7 100644 (file)
--- a/bacula/src/qt-console/medialist/medialist.h
+++ b/bacula/src/qt-console/medialist/medialist.h
@@ -69,6 +69,7 @@ private:
    QString m_currentVolumeName;
    QString m_currentVolumeId;
    bool m_populated;
+   bool m_populating;
    bool m_checkcurwidget;
 };
 

diff --git a/bacula/src/qt-console/storage/storage.cpp b/bacula/src/qt-console/storage/storage.cpp
index a13f34904e58b8409b3b8d9f2b9ae24364d1ebaa..be26fa8ee1d77198aeeb86d3716a19e18a2cf908 100644 (file)
--- a/bacula/src/qt-console/storage/storage.cpp
+++ b/bacula/src/qt-console/storage/storage.cpp
@@ -52,6 +52,7 @@ Storage::Storage()
 
    /* mp_treeWidget, Storage Tree Tree Widget inherited from ui_storage.h */
    m_populated = false;
+   m_populating = false;
    m_checkcurwidget = true;
    m_closeable = false;
    m_currentStorage = "";
@@ -71,6 +72,9 @@ Storage::~Storage()
  */
 void Storage::populateTree()
 {
+   if (m_populating)
+      return;
+   m_populating = true;
    QTreeWidgetItem *storageItem, *topItem;
 
    if (!m_console->preventInUseConnect())
@@ -135,6 +139,7 @@ void Storage::populateTree()
    for(int cnter=0; cnter<headerlist.size(); cnter++) {
       mp_treeWidget->resizeColumnToContents(cnter);
    }
+   m_populating = false;
 }
 
 /*

diff --git a/bacula/src/qt-console/storage/storage.h b/bacula/src/qt-console/storage/storage.h
index fa33d80e725e0959d7dcc7dc7739a6385b648015..0e659f1b0baf8ddf4edd2c6ffd57dfbe08122963 100644 (file)
--- a/bacula/src/qt-console/storage/storage.h
+++ b/bacula/src/qt-console/storage/storage.h
@@ -66,6 +66,7 @@ private:
    QString m_currentStorage;
    int m_currentAutoChanger;
    bool m_populated;
+   bool m_populating;
    bool m_checkcurwidget;
 };