wpa_gui: Quiet mode - disable tray icon messages

If tray icon messages are perceived as disturbing, one can pass `-q`
parameter on the command line to disable them permanently.

Signed-off-by: Arkadiusz Bokowy <arkadiusz.bokowy@gmail.com>

diff --git a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
index 09e547f..6276176 100644 (file)
--- a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
+++ b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
@@ -130,6 +130,7 @@ WpaGui::WpaGui(QApplication *_app, QWidget *parent, const char *, Qt::WFlags)
        udr = NULL;
        tray_icon = NULL;
        startInTray = false;
+       quietMode = false;
        ctrl_iface = NULL;
        ctrl_conn = NULL;
        monitor_conn = NULL;
@@ -234,7 +235,7 @@ void WpaGui::parse_argv()
 {
        int c;
        for (;;) {
-               c = getopt(qApp->argc(), qApp->argv(), "i:p:t");
+               c = getopt(qApp->argc(), qApp->argv(), "i:p:tq");
                if (c < 0)
                        break;
                switch (c) {
@@ -249,6 +250,9 @@ void WpaGui::parse_argv()
                case 't':
                        startInTray = true;
                        break;
+               case 'q':
+                       quietMode = true;
+                       break;
                }
        }
 }
@@ -1336,7 +1340,7 @@ void WpaGui::showTrayMessage(QSystemTrayIcon::MessageIcon type, int sec,
        if (!QSystemTrayIcon::supportsMessages())
                return;
 
-       if (isVisible() || !tray_icon || !tray_icon->isVisible())
+       if (isVisible() || !tray_icon || !tray_icon->isVisible() || quietMode)
                return;
 
        tray_icon->showMessage(qAppName(), msg, type, sec * 1000);

diff --git a/wpa_supplicant/wpa_gui-qt4/wpagui.h b/wpa_supplicant/wpa_gui-qt4/wpagui.h
index 33634ac..026eacb 100644 (file)
--- a/wpa_supplicant/wpa_gui-qt4/wpagui.h
+++ b/wpa_supplicant/wpa_gui-qt4/wpagui.h
@@ -117,6 +117,7 @@ private:
        void createTrayIcon(bool);
        bool ackTrayIcon;
        bool startInTray;
+       bool quietMode;
 
        int openCtrlConnection(const char *ifname);