Add a boolean to console class to allow for the warning popup, except

in cases where I want to prevent the popup.  So far this is only for
purging jobs.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8914 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/qt-console/bcomm/dircomm.cpp b/bacula/src/qt-console/bcomm/dircomm.cpp
index 86f52651a3e0293447c07c7e5c3433db458401c7..43024e7ff33763a025289267ee5519a6a8249633 100644 (file)
--- a/bacula/src/qt-console/bcomm/dircomm.cpp
+++ b/bacula/src/qt-console/bcomm/dircomm.cpp
@@ -381,7 +381,9 @@ int DirComm::read()
       case BNET_WARNING_MSG:
          if (mainWin->m_commDebug) Pmsg1(000, "conn %i WARNING MSG\n", m_conn);
          stat = sock_read();          /* get the message */
-         /* QMessageBox::critical(m_console, "Warning", msg(), QMessageBox::Ok); */
+         if (!m_console->m_warningPrevent) {
+            QMessageBox::critical(m_console, "Warning", msg(), QMessageBox::Ok);
+         }
          break;
       case BNET_INFO_MSG:
          if (mainWin->m_commDebug) Pmsg1(000, "conn %i INFO MSG\n", m_conn);

diff --git a/bacula/src/qt-console/console/console.cpp b/bacula/src/qt-console/console/console.cpp
index 496f99ae551ec13e7d33b616b45eeca18a75031a..d84feb4a13c34dc70f3fc1bf9de32213a5475044 100644 (file)
--- a/bacula/src/qt-console/console/console.cpp
+++ b/bacula/src/qt-console/console/console.cpp
@@ -47,6 +47,7 @@ Console::Console(QStackedWidget *parent)
    m_parent = parent;
    m_closeable = false;
    m_console = this;
+   m_warningPrevent = false;
    m_dircommCounter = 0;
    m_dircommHash.insert(m_dircommCounter, new DirComm(this, m_dircommCounter));
 

diff --git a/bacula/src/qt-console/console/console.h b/bacula/src/qt-console/console/console.h
index 8518ea3bd7899239908e7c13119424cc7bb89d63..f798748f9aac00ac7e78f52b851f52911935b9cb 100644 (file)
--- a/bacula/src/qt-console/console/console.h
+++ b/bacula/src/qt-console/console/console.h
@@ -144,6 +144,7 @@ public slots:
 
 public:
    DIRRES *m_dir;                  /* so various pages can reference it */
+   bool m_warningPrevent;
 
 private:
    QTextEdit *m_textEdit;

diff --git a/bacula/src/qt-console/joblist/joblist.cpp b/bacula/src/qt-console/joblist/joblist.cpp
index a7536450078d127ad46bd881570239d7d043c4c5..2650789048c3d8d9d39045acd7be209c4ec2adab 100644 (file)
--- a/bacula/src/qt-console/joblist/joblist.cpp
+++ b/bacula/src/qt-console/joblist/joblist.cpp
@@ -503,11 +503,13 @@ void JobList::consolePurgeFiles()
       QMessageBox::Ok | QMessageBox::Cancel)
       == QMessageBox::Cancel) { return; }
 
+   m_console->m_warningPrevent = true;
    foreach(QString job, m_selectedJobsList) {
       QString cmd("purge files jobid=");
       cmd += job;
       consoleCommand(cmd, false);
    }
+   m_console->m_warningPrevent = false;
    populateTable();
 }