fix: theme

Description: 202752 ubuntu系统安装ukui桌面环境，控制面板里点击主题崩溃

Log: 202752 ubuntu系统安装ukui桌面环境，控制面板里点击主题崩溃
Bug: 202752 ubuntu系统安装ukui桌面环境，控制面板里点击主题崩溃

debian/changelog

@@ -1,3 +1,12 @@
+ukui-control-center (3.22.1.25-ok60) yangtze; urgency=medium
+
+  * BUG: #202752  ubuntu系统安装ukui桌面环境，控制面板里点击主题崩溃
+  * 需求号: 无
+  * 其他改动说明：解决编译问题
+  * 其他改动影响域:无,重新编译
+
+ -- zhoubin <zhoubin@kylinos.cn>  Fri, 05 Apr 2024 17:11:19 +0800
+
 ukui-control-center (3.22.1.25-ok59) yangtze; urgency=medium
 
   * BUG: #I7WDUY修改时区为北京或者乌鲁木齐都会变为上海

group-manager-server/group_manager_server.cpp

@@ -33,21 +33,6 @@ group_manager_server::group_manager_server()
 	
 }
 
-bool group_manager_server::setAuth(bool auth)
-{
-    if (authoriy) {
-        //密码校验
-        if (!authoriyEdit()){
-            authoriy = auth;
-            return false;
-        }
-    }
-
-    authoriy = auth;
-
-    return true;
-}
-
 // 解析组文件
 QVariantList group_manager_server::getGroup()
 {

group-manager-server/group_manager_server.h

@@ -45,7 +45,6 @@ private:
     bool _changeOtherUserPasswd(QString username, QString pwd);
 
 public slots:
-    bool setAuth(bool auth);
     QVariantList getGroup();
     QVariantList getPasswd();
     bool add(QString groupName, QString groupId);

group-manager-server/org.ukui.groupmanager.xml

@@ -1,10 +1,6 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node>
   <interface name="org.ukui.groupmanager.interface">
-    <method name="setAuth">
-      <arg type="b" direction="out"/>
-      <arg name="auth" type="b" direction="in"/>
-    </method>
     <method name="getGroup">
       <arg type="av" direction="out"/>
     </method>

libukcc/interface/ukcccommon.cpp

@@ -192,7 +192,7 @@ bool UkccCommon::isWayland() {
 bool UkccCommon::isOpenkylin()
 {
     QString systemName = QString(QLatin1String(kdk_system_get_systemName()));
-    QString version = QString(QLatin1String(kdk_system_get_version(1)));
+    QString version = QString(QLatin1String(kdk_system_get_version(0)));
     if (systemName.compare("openkylin", Qt::CaseInsensitive) == 0
             && version.contains("yangtze", Qt::CaseInsensitive)) {
         return true;
@@ -203,7 +203,7 @@ bool UkccCommon::isOpenkylin()
 bool UkccCommon::isOpenkylinNile()
 {
     QString systemName = QString(QLatin1String(kdk_system_get_systemName()));
-    QString version = QString(QLatin1String(kdk_system_get_version(1)));
+    QString version = QString(QLatin1String(kdk_system_get_version(0)));
     if (systemName.compare("openkylin", Qt::CaseInsensitive) == 0
             && version.contains("nile", Qt::CaseInsensitive)) {
         return true;

plugins/personalized/theme/theme.cpp

@@ -254,14 +254,13 @@ void Theme::initSearchText() {
 }
 
 void Theme::setupSettings() {
-    QString filename;
     if (UkccCommon::isOpenkylin()) {
-       filename = QDir::homePath() + "/.config/kwinrc";
+       m_kwinFile = QDir::homePath() + "/.config/kwinrc";
     } else {
-       filename = QDir::homePath() + "/.config/ukui-kwinrc";
+       m_kwinFile = QDir::homePath() + "/.config/ukui-kwinrc";
     }
 
-    kwinSettings = new QSettings(filename, QSettings::IniFormat, this);
+    kwinSettings = new QSettings(m_kwinFile, QSettings::IniFormat, this);
 
     QStringList keys = kwinSettings->childGroups();
     kwinSettings->beginGroup("Plugins");
@@ -1114,6 +1113,10 @@ void Theme::resetBtnClickSlot() {
 }
 
 void Theme::writeKwinSettings(bool change) {
+    if (!QFile::exists(m_kwinFile)) {
+        return;
+    }
+
     if (!change) {
         kwinSettings->beginGroup("Plugins");
         kwinSettings->setValue("kwin4_effect_maximizeEnabled", false);

plugins/personalized/theme/theme.h

@@ -189,6 +189,7 @@ public:
     void setThemeBtnStatus();
 
     QString mGlobalName;
+    QString m_kwinFile;
     bool mIsUpgrade = false;
 
     bool mIsOpenkylin = false;

plugins/system/display/qml/Output.qml

@@ -227,7 +227,7 @@ QMLOutput {
                     right: parent.right;
                 }
                 horizontalAlignment: Text.AlignHCenter;
-                color: "#FFFFFF";
+                color: root.focus ? "#FFFFFF" : "#262626";
                 font.pixelSize: 12;
                 elide: Text.ElideRight;
             }