Implement a suppression of .messages if the console does not have the focus.

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

diff --git a/bacula/src/qt-console/console/console.cpp b/bacula/src/qt-console/console/console.cpp
index 97d4adf1189c47b6f9530f771a0e3d36e139fd7a..9fb2a0dc1133344466648e941b198557e9fb8328 100644 (file)
--- a/bacula/src/qt-console/console/console.cpp
+++ b/bacula/src/qt-console/console/console.cpp
@@ -647,7 +647,7 @@ int Console::read()
             break;
          } 
          app->processEvents();
-         if (m_api_set && m_messages_pending && is_notify_enabled()) {
+         if (m_api_set && m_messages_pending && is_notify_enabled() && hasFocus()) {
             write_dir(".messages");
             m_messages_pending = false;
          }
@@ -664,7 +664,7 @@ int Console::read()
       }
       switch (m_sock->msglen) {
       case BNET_MSGS_PENDING :
-         if (is_notify_enabled()) {
+         if (is_notify_enabled() && hasFocus()) {
             if (mainWin->m_commDebug) Pmsg0(000, "MSGS PENDING\n");
             write_dir(".messages");
             displayToPrompt();
@@ -950,3 +950,13 @@ void Console::getStatusList(QStringList &statusLongList)
       } /* foreach resultline */
    } /* if results from statusquery */
 }
+
+/* For suppressing .messages
+ * This may be rendered not needed if the multiple connections feature gets working */
+bool Console::hasFocus()
+{
+   if (mainWin->stackedWidget->currentIndex() == mainWin->stackedWidget->indexOf(this))
+      return true;
+   else
+      return false;
+}

diff --git a/bacula/src/qt-console/console/console.h b/bacula/src/qt-console/console/console.h
index 44e577c927a4dea226ede25042ad4f22b91ae95c..439003b0f6e2ee91f26e4b494164b6f68c2aab6f 100644 (file)
--- a/bacula/src/qt-console/console/console.h
+++ b/bacula/src/qt-console/console/console.h
@@ -145,6 +145,7 @@ private:
    bool m_api_set;
    bool m_messages_pending;
    QTimer *m_timer;
+   bool hasFocus();
 };
 
 #endif /* _CONSOLE_H_ */