From ec750fde0aa5138dd2482c52b53eaed7419f3300 Mon Sep 17 00:00:00 2001 From: zhangyuanyuan1 Date: Thu, 27 Jul 2023 18:26:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(=E6=89=98=E7=9B=98):=20=E7=BD=91?= =?UTF-8?q?=E7=BB=9C=E5=B1=9E=E6=80=A7=E5=BC=B9=E7=AA=97=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=9B=BE=E6=A0=87=E4=BA=8E=E4=BB=BB=E5=8A=A1=E6=A0=8F?= =?UTF-8?q?(bug184606)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/frontend/enterprise-wlan/enterprisewlandialog.cpp | 4 ++++ src/frontend/netdetails/joinhiddenwifipage.cpp | 3 +++ src/frontend/netdetails/netdetail.cpp | 3 +++ 3 files changed, 10 insertions(+) diff --git a/src/frontend/enterprise-wlan/enterprisewlandialog.cpp b/src/frontend/enterprise-wlan/enterprisewlandialog.cpp index e78891f7..306e75c8 100644 --- a/src/frontend/enterprise-wlan/enterprisewlandialog.cpp +++ b/src/frontend/enterprise-wlan/enterprisewlandialog.cpp @@ -21,6 +21,9 @@ #include #include #include "xatom-helper.h" +#include "kwindowsystem.h" +#include "kwindowsystem_export.h" + #define MAIN_SIZE_EXPAND 480,580 #define MAIN_SIZE_NARROW 480,484 #define SCROAREA_WIDTH 480 @@ -51,6 +54,7 @@ EnterpriseWlanDialog::EnterpriseWlanDialog(KyWirelessNetItem &wirelessNetItem, Q this->setWindowFlag(Qt::Window); // this->setWindowTitle(tr("Connect Enterprise WLAN")); this->setWindowIcon(QIcon::fromTheme("kylin-network")); + KWindowSystem::setState(this->winId(), NET::SkipTaskbar | NET::SkipPager); m_wirelessNetItem = wirelessNetItem; m_deviceName = device; diff --git a/src/frontend/netdetails/joinhiddenwifipage.cpp b/src/frontend/netdetails/joinhiddenwifipage.cpp index 95cb54a9..e995da25 100644 --- a/src/frontend/netdetails/joinhiddenwifipage.cpp +++ b/src/frontend/netdetails/joinhiddenwifipage.cpp @@ -20,6 +20,8 @@ #include "joinhiddenwifipage.h" #include +#include "kwindowsystem.h" +#include "kwindowsystem_export.h" #define THEME_SCHAME "org.ukui.style" #define COLOR_THEME "styleName" @@ -48,6 +50,7 @@ JoinHiddenWiFiPage::JoinHiddenWiFiPage(QString devName, KDialog *parent) initComponent(); setAttribute(Qt::WA_DeleteOnClose); + KWindowSystem::setState(this->winId(), NET::SkipTaskbar | NET::SkipPager); setJoinBtnEnable(); } diff --git a/src/frontend/netdetails/netdetail.cpp b/src/frontend/netdetails/netdetail.cpp index 697c17ac..597fbcc1 100644 --- a/src/frontend/netdetails/netdetail.cpp +++ b/src/frontend/netdetails/netdetail.cpp @@ -32,6 +32,8 @@ #include #include "windowmanager/windowmanager.h" +#include "kwindowsystem.h" +#include "kwindowsystem_export.h" #define WINDOW_WIDTH 520 #define WINDOW_HEIGHT 602 @@ -145,6 +147,7 @@ NetDetail::NetDetail(QString interface, QString name, QString uuid, bool isActiv //#else // this->setWindowFlags(Qt::Dialog /*| Qt::FramelessWindowHint*/); this->setWindowFlag(Qt::Window); + KWindowSystem::setState(this->winId(), NET::SkipTaskbar | NET::SkipPager); //#endif // this->setProperty("useStyleWindowManager", false); //禁用拖动 // setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint ); From ec2fb0ecf5fa0c183a12112dd77b5273db38430f Mon Sep 17 00:00:00 2001 From: zhangyuanyuan1 Date: Fri, 28 Jul 2023 09:12:02 +0800 Subject: [PATCH 2/2] update changelog --- debian/changelog | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/debian/changelog b/debian/changelog index 1ea65e39..07f6e8a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +kylin-nm (3.24.0.0-0k2.12) v101; urgency=medium + + * BUG号: + -#173999 【走查】【VPN】托盘窗口寻光主题下为深色 + -#133746 【WIFI】默认主题连接企业网TLS从文件选择弹框背景为深色，切换为深色主题再切换为默认主题部分输入框变为白色 + -#184606 【走查】【网络】网络属性作为控制面板功能不显示图标在任务栏 + -#181187 【网络连接】开启热点后，依旧可以看见其他wifi列表 + * 需求号： + * 其他改动： + * 影响域：自身 + + -- zhangyuanyuan1 Fri, 28 Jul 2023 16:10:56 +0800 + kylin-nm (3.24.0.0-0k2.11) v101; urgency=medium * BUG号: