close-cd:129650:结束应用进程后，系统监视器卡顿

close-cd:128887:【wayland】【系统监视器】用户手册上系统监视器相关描述有误

data/kylin-system-monitor/en_US/index.md

@@ -1,6 +1,6 @@
 # System Monitor
 ## Overview
-System Monitor is a professional application for monitoring system processes, system resources and file systems on domestic Galaxy Kylin and Ukylin. Through its concise and clear interface, it can intuitively display system-related information that users want to find.
+System Monitor is a professional application for monitoring system processes, system resources and file systems on openKylin. Through its concise and clear interface, it can intuitively display system-related information that users want to find.
 
 ![Fig 1 System Monitor-big](image/1.png)
 <br>

data/kylin-system-monitor/zh_CN/index.md

@@ -1,6 +1,6 @@
 # 系统监视器
 ## 概 述 
-系统监视器是国产银河麒麟及优麒麟上监控系统进程，系统资源和文件系统的专业应用，通过其简洁明了的界面，可直观显示用户想要查找的系统相关信息。
+系统监视器是开放麒麟上监控系统进程，系统资源和文件系统的专业应用，通过其简洁明了的界面，可直观显示用户想要查找的系统相关信息。
 
 ![图 1 系统监视器-big](image/1.png)
 <br>

debian/changelog

@@ -1,3 +1,10 @@
+ukui-system-monitor (3.14.0.0-ok4) yangtez; urgency=medium
+
+  * close-cd:129650:结束应用进程后，系统监视器卡顿
+  * close-cd:128887:【wayland】【系统监视器】用户手册上系统监视器相关描述有误
+
+ -- F_Chao <fengchao@kylinos.cn>  Sun, 17 Jul 2022 14:39:20 +0800
+
 ukui-system-monitor (3.14.0.0-ok3) yangtez; urgency=medium
 
   * close-cd#127120:在软件商店等应用打开情况下，系统监视器应用程序界面显示无搜索结果

src/controls/mydialog.cpp

@@ -40,11 +40,14 @@ MyDialog::MyDialog(const QString &title, const QString &message, QWidget *parent
     , m_titleWidth(0)
     , mousePressed(false)
 {
-    MotifWmHints hints;
-    hints.flags = MWM_HINTS_FUNCTIONS|MWM_HINTS_DECORATIONS;
-    hints.functions = MWM_FUNC_ALL;
-    hints.decorations = MWM_DECOR_BORDER;
-    XAtomHelper::getInstance()->setWindowMotifHint(this->winId(), hints);
+   QString platform = QGuiApplication::platformName();
+   if (!platform.startsWith(QLatin1String("wayland"),Qt::CaseInsensitive)) {
+       MotifWmHints hints;
+       hints.flags = MWM_HINTS_FUNCTIONS|MWM_HINTS_DECORATIONS;
+       hints.functions = MWM_FUNC_ALL;
+       hints.decorations = MWM_DECOR_BORDER;
+       XAtomHelper::getInstance()->setWindowMotifHint(this->winId(), hints);
+   }
     //this->setWindowFlags(this->windowFlags() | Qt::Tool | Qt::WindowCloseButtonHint);
     m_sizeModel = sizeModel;
 

src/dialog/procpropertiesdlg.cpp

@@ -53,11 +53,14 @@ ProcPropertiesDlg::ProcPropertiesDlg(pid_t processId, QWidget *parent) : QDialog
   , mousePressed(false)
   , fontSettings(nullptr)
 {
-    MotifWmHints hints;
-    hints.flags = MWM_HINTS_FUNCTIONS|MWM_HINTS_DECORATIONS;
-    hints.functions = MWM_FUNC_ALL;
-    hints.decorations = MWM_DECOR_BORDER;
-    XAtomHelper::getInstance()->setWindowMotifHint(this->winId(), hints);
+    QString platform = QGuiApplication::platformName();
+    if (!platform.startsWith(QLatin1String("wayland"),Qt::CaseInsensitive)) {
+        MotifWmHints hints;
+        hints.flags = MWM_HINTS_FUNCTIONS|MWM_HINTS_DECORATIONS;
+        hints.functions = MWM_FUNC_ALL;
+        hints.decorations = MWM_DECOR_BORDER;
+        XAtomHelper::getInstance()->setWindowMotifHint(this->winId(), hints);
+    }
     //this->setWindowFlags(this->windowFlags() | Qt::FramelessWindowHint | Qt::Tool);
 
     this->setAttribute(Qt::WA_TranslucentBackground);

src/dialog/renicedialog.cpp

@@ -36,11 +36,14 @@ ReniceDialog::ReniceDialog(const QString &procName, const QString &procId, QWidg
     : QDialog(parent)
     , m_mousePressed(false)
 {
-    MotifWmHints hints;
-    hints.flags = MWM_HINTS_FUNCTIONS|MWM_HINTS_DECORATIONS;
-    hints.functions = MWM_FUNC_ALL;
-    hints.decorations = MWM_DECOR_BORDER;
-    XAtomHelper::getInstance()->setWindowMotifHint(this->winId(), hints);
+    QString platform = QGuiApplication::platformName();
+    if (!platform.startsWith(QLatin1String("wayland"),Qt::CaseInsensitive)) {
+        MotifWmHints hints;
+        hints.flags = MWM_HINTS_FUNCTIONS|MWM_HINTS_DECORATIONS;
+        hints.functions = MWM_FUNC_ALL;
+        hints.decorations = MWM_DECOR_BORDER;
+        XAtomHelper::getInstance()->setWindowMotifHint(this->winId(), hints);
+    }
     //this->setWindowFlags(this->windowFlags() | Qt::FramelessWindowHint | Qt::Tool);
     this->setFixedSize(480+SHADOW_LEFT_TOP_PADDING+SHADOW_LEFT_TOP_PADDING, 300+SHADOW_RIGHT_BOTTOM_PADDING+SHADOW_RIGHT_BOTTOM_PADDING);
     this->setAttribute(Qt::WA_DeleteOnClose);

src/dialog/usmaboutdialog.cpp

@@ -32,6 +32,7 @@
 #include <QTextOption>
 #include <QTextBlock>
 #include <QTextBlockFormat>
+#include <QGuiApplication>
 
 USMAboutDialog::USMAboutDialog(QWidget *parent)
     : QDialog(parent)
@@ -39,11 +40,14 @@ USMAboutDialog::USMAboutDialog(QWidget *parent)
     setFixedSize(420, 486);
 
     //XAtomHelper::getInstance()->setUKUIDecoraiontHint(this->winId(), true);
-    MotifWmHints hints;
-    hints.flags = MWM_HINTS_FUNCTIONS|MWM_HINTS_DECORATIONS;
-    hints.functions = MWM_FUNC_ALL;
-    hints.decorations = MWM_DECOR_BORDER;
-    XAtomHelper::getInstance()->setWindowMotifHint(this->winId(), hints);
+    QString platform = QGuiApplication::platformName();
+    if (!platform.startsWith(QLatin1String("wayland"),Qt::CaseInsensitive)) {
+        MotifWmHints hints;
+        hints.flags = MWM_HINTS_FUNCTIONS|MWM_HINTS_DECORATIONS;
+        hints.functions = MWM_FUNC_ALL;
+        hints.decorations = MWM_DECOR_BORDER;
+        XAtomHelper::getInstance()->setWindowMotifHint(this->winId(), hints);
+    }
     m_fFontSize = DEFAULT_FONT_SIZE;
     initWidgets();
     initConnections();