Merge branch '2309bug1' into 'yhkylin/v101'

fix(托盘): 网络属性弹窗不显示图标于任务栏(bug184606)  & update changelog

See merge request kylinos-src/kylin-nm!234

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 <zhangyuanyuan1@kylinos.cn>  Fri, 28 Jul 2023 16:10:56 +0800
+
 kylin-nm (3.24.0.0-0k2.11) v101; urgency=medium
 
   * BUG号:

src/frontend/enterprise-wlan/enterprisewlandialog.cpp

@@ -21,6 +21,9 @@
 #include <QApplication>
 #include <QDesktopWidget>
 #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;

src/frontend/netdetails/joinhiddenwifipage.cpp

@@ -20,6 +20,8 @@
 #include "joinhiddenwifipage.h"
 
 #include <QApplication>
+#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();
 }

src/frontend/netdetails/netdetail.cpp

@@ -32,6 +32,8 @@
 #include <QScrollBar>
 
 #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 );