chore: sync code

Description: sync code

Log: 同步代码

debian/changelog

@@ -1,3 +1,9 @@
+ukui-control-center (3.22.1.25-ok5) yangtze; urgency=medium
+
+  * fix#I5QBV0,I64O6W
+
+ -- zhoubin <zhoubin@kylinos.cn>  Fri, 30 Dec 2022 16:57:42 +0800
+
 ukui-control-center (3.22.1.25-ok4) yangtze; urgency=medium
 
   * fix#I5QBV0,I64O6W

plugins/system/about/about.cpp

@@ -653,6 +653,9 @@ void About::setVersionNumCompenent()
     version_t ver= kdk_system_get_version_detaile();
     mVersionNumberLabel_2->setText(ver.os_version);
     mPatchVersionLabel_2->setText(QString(ver.update_version));
+
+    mVersionNumberFrame->setHidden(mVersionNumberLabel_2->text().isEmpty());
+    mPatchVersionFrame->setHidden(mPatchVersionLabel_2->text().isEmpty());
 }
 
 /* 获取logo图片和版本名称 */

plugins/system/display/widget.cpp

@@ -1286,7 +1286,7 @@ void Widget::slotIdentifyButtonClicked(bool checked)
 
 void Widget::slotIdentifyOutputs(KScreen::ConfigOperation *op)
 {
-    if (op->hasError()) {
+    if (op->hasError() || Common::isOpenkylin()) {
         return;
     }
 
@@ -2134,7 +2134,7 @@ void Widget::initNightStatus()
                             "/ColorCorrect",
                             "org.freedesktop.DBus.Properties",
                             QDBusConnection::sessionBus());
-    if (colorIft.isValid() && !Common::isWayland()) {
+    if (colorIft.isValid() && !Common::isOpenkylin() && !Common::isWayland()) {
         this->mRedshiftIsValid = true;
         QDBusReply<QVariant> reply = colorIft.call("Get", "org.ukui.kwin.ColorCorrect", "available");
         if (!reply.value().toBool()) {

registeredSession/plugins/area/areainterface.cpp

@@ -1,4 +1,5 @@
 #include "areainterface.h"
+#include "common.h"
 #include <unistd.h>
 #include <QDBusConnection>
 
@@ -102,6 +103,9 @@ const QStringList AreaInterface::getShowLanguageList()
 
 const QStringList AreaInterface::getLanguageList()
 {
+    if (Common::isOpenkylin()) {
+        return QStringList() << QString("zh_CN") << QString("en");
+    }
     return QStringList() << QString("zh_CN") << QString("en") << QString("bo_CN");
 }
 

registeredSession/registeredSession.pro

@@ -12,6 +12,8 @@ PKGCONFIG += gio-2.0 \
              gsettings-qt
 
 QMAKE_CXXFLAGS *= -D_FORTIFY_SOURCE=2 -O2
+INCLUDEPATH += ../libukcc/interface/ \
+               ../libukcc/
 
 # The following define makes your compiler emit warnings if you use
 # any Qt feature that has been marked deprecated (the exact warnings
@@ -37,6 +39,7 @@ INSTALLS += inst1
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
 
 SOURCES += \
+        ../libukcc/interface/common.cpp \
         json.cpp \
         main.cpp \
         plugins/area/areainterface.cpp \
@@ -53,6 +56,7 @@ target.path = /usr/bin/
 
 
 HEADERS += \
+        ../libukcc/interface/common.h \
         json.h \
         plugins/area/areainterface.h \
         plugins/keyboard/keyboardinterface.h \