From: <bar...@us...> - 2009-06-19 00:10:48
|
Revision: 8914 http://bacula.svn.sourceforge.net/bacula/?rev=8914&view=rev Author: bartleyd2 Date: 2009-06-19 00:10:29 +0000 (Fri, 19 Jun 2009) Log Message: ----------- 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. Modified Paths: -------------- trunk/bacula/src/qt-console/bcomm/dircomm.cpp trunk/bacula/src/qt-console/console/console.cpp trunk/bacula/src/qt-console/console/console.h trunk/bacula/src/qt-console/joblist/joblist.cpp Modified: trunk/bacula/src/qt-console/bcomm/dircomm.cpp =================================================================== --- trunk/bacula/src/qt-console/bcomm/dircomm.cpp 2009-06-18 23:29:21 UTC (rev 8913) +++ trunk/bacula/src/qt-console/bcomm/dircomm.cpp 2009-06-19 00:10:29 UTC (rev 8914) @@ -381,7 +381,9 @@ 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); Modified: trunk/bacula/src/qt-console/console/console.cpp =================================================================== --- trunk/bacula/src/qt-console/console/console.cpp 2009-06-18 23:29:21 UTC (rev 8913) +++ trunk/bacula/src/qt-console/console/console.cpp 2009-06-19 00:10:29 UTC (rev 8914) @@ -47,6 +47,7 @@ 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)); Modified: trunk/bacula/src/qt-console/console/console.h =================================================================== --- trunk/bacula/src/qt-console/console/console.h 2009-06-18 23:29:21 UTC (rev 8913) +++ trunk/bacula/src/qt-console/console/console.h 2009-06-19 00:10:29 UTC (rev 8914) @@ -144,6 +144,7 @@ public: DIRRES *m_dir; /* so various pages can reference it */ + bool m_warningPrevent; private: QTextEdit *m_textEdit; Modified: trunk/bacula/src/qt-console/joblist/joblist.cpp =================================================================== --- trunk/bacula/src/qt-console/joblist/joblist.cpp 2009-06-18 23:29:21 UTC (rev 8913) +++ trunk/bacula/src/qt-console/joblist/joblist.cpp 2009-06-19 00:10:29 UTC (rev 8914) @@ -503,11 +503,13 @@ 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(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |