openkylin
/
wpa
mirror of https://gitee.com/openkylin/wpa.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use KDE's KNotify when running under KDE 

Bug-Debian: http://bugs.debian.org/582793

Gbp-Pq: Name 12_wpa_gui_knotify_support.patch
This commit is contained in:
Raphael Geissert 2022-05-14 03:18:56 +08:00 committed by openKylinBot
parent 53e5534e40
commit a4945d4877
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
wpa_supplicant/wpa_gui-qt4/wpagui.cpp
View File

@ -11,11 +11,14 @@
#endif /* CONFIG_NATIVE_WINDOWS */ #endif /* CONFIG_NATIVE_WINDOWS */
#include <cstdio> #include <cstdio>
#include <cstdlib>
#include <unistd.h> #include <unistd.h>
#include <QMessageBox> #include <QMessageBox>
#include <QCloseEvent> #include <QCloseEvent>
#include <QImageReader> #include <QImageReader>
#include <QProcess>
#include <QSettings> #include <QSettings>
#include <QStringList>
#include "wpagui.h" #include "wpagui.h"
#include "dirent.h" #include "dirent.h"
@ -1415,10 +1418,21 @@ void WpaGui::createTrayIcon(bool trayOnly)
void WpaGui::showTrayMessage(QSystemTrayIcon::MessageIcon type, int sec, void WpaGui::showTrayMessage(QSystemTrayIcon::MessageIcon type, int sec,
const QString & msg) const QString & msg)
{ {
if (!QSystemTrayIcon::supportsMessages()) if (isVisible() || !tray_icon || !tray_icon->isVisible() || quietMode)
return; return;
if (isVisible() || !tray_icon || !tray_icon->isVisible() || quietMode) /* first try to use KDE's notifications system if running under
* a KDE session */
if (getenv("KDE_FULL_SESSION") != NULL) {
QStringList args;
args << "--passivepopup" << msg << QString::number(sec);
args << "--title" << "wpa_gui";
if (QProcess::execute("/usr/bin/kdialog", args) == 0)
return;
}
if (!QSystemTrayIcon::supportsMessages())
return; return;
tray_icon->showMessage(qAppName(), msg, type, sec * 1000); tray_icon->showMessage(qAppName(), msg, type, sec * 1000);