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

Merge branch '2309-0925' into 'yhkylin/v101' 

fix(ui): set firewall dialog to skip taskbar, modify main logic(bug#194718)

See merge request kylinos-src/kylin-nm!274
This commit is contained in:
赵世旭 2023-09-26 06:49:00 +00:00
parent 520bd25635 435749c5c7
commit baeb261ad5
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/frontend/networkmode/firewalldialog.cpp
View File

@ -20,6 +20,9 @@
#include "firewalldialog.h" #include "firewalldialog.h"
#include <QApplication> #include <QApplication>
#include "windowmanager/windowmanager.h"
#include "kwindowsystem.h"
#include "kwindowsystem_export.h"
#define THEME_SCHAME "org.ukui.style" #define THEME_SCHAME "org.ukui.style"
#define COLOR_THEME "styleName" #define COLOR_THEME "styleName"
@ -30,6 +33,7 @@ FirewallDialog::FirewallDialog(QWidget *parent): KDialog(parent)
initUI(); initUI();
this->setWindowIcon(QIcon::fromTheme("kylin-network")); this->setWindowIcon(QIcon::fromTheme("kylin-network"));
this->setFixedSize(480, 204); this->setFixedSize(480, 204);
KWindowSystem::setState(this->winId(), NET::SkipTaskbar | NET::SkipPager);
setAttribute(Qt::WA_DeleteOnClose); setAttribute(Qt::WA_DeleteOnClose);
// centerToScreen(); // centerToScreen();
connect(qApp, &QApplication::paletteChanged, this, &FirewallDialog::onPaletteChanged); connect(qApp, &QApplication::paletteChanged, this, &FirewallDialog::onPaletteChanged);

5
src/main.cpp
View File

@ -141,10 +141,11 @@ int main(int argc, char *argv[])
QDBusReply<uint> pid = interface1->servicePid(serviceName); QDBusReply<uint> pid = interface1->servicePid(serviceName);
qDebug() << "current display " << getenv("DISPLAY") << QApplication::applicationPid() qDebug() << "current display " << getenv("DISPLAY") << QApplication::applicationPid()
<< "exist kylin-nm display" << displayFromPid(pid.value()); << "exist kylin-nm display" << displayFromPid(pid.value());
if (getenv("DISPLAY") != displayFromPid(pid.value())) { if (getenv("DISPLAY") == displayFromPid(pid.value())) {
return 0; interface.call(QStringLiteral("showKylinNM"), 2);
} }
} }
return 0;
} }
QThread *thread = new QThread(); QThread *thread = new QThread();