diff --git a/debian/changelog b/debian/changelog index 427d46a..8479b31 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +ukui-control-center (3.22.1.25-ok60) yangtze; urgency=medium + + * BUG: #202752 ubuntu系统安装ukui桌面环境,控制面板里点击主题崩溃 + * 需求号: 无 + * 其他改动说明:解决编译问题 + * 其他改动影响域:无,重新编译 + + -- zhoubin Fri, 05 Apr 2024 17:11:19 +0800 + ukui-control-center (3.22.1.25-ok59) yangtze; urgency=medium * BUG: #I7WDUY修改时区为北京或者乌鲁木齐都会变为上海 diff --git a/group-manager-server/group_manager_server.cpp b/group-manager-server/group_manager_server.cpp index 38be459..aa19b4b 100644 --- a/group-manager-server/group_manager_server.cpp +++ b/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() { diff --git a/group-manager-server/group_manager_server.h b/group-manager-server/group_manager_server.h index d385649..04a568c 100644 --- a/group-manager-server/group_manager_server.h +++ b/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); diff --git a/group-manager-server/org.ukui.groupmanager.xml b/group-manager-server/org.ukui.groupmanager.xml index f3ad640..672a34c 100644 --- a/group-manager-server/org.ukui.groupmanager.xml +++ b/group-manager-server/org.ukui.groupmanager.xml @@ -1,10 +1,6 @@ - - - - diff --git a/libukcc/interface/ukcccommon.cpp b/libukcc/interface/ukcccommon.cpp index 00d03ac..a9b78d7 100644 --- a/libukcc/interface/ukcccommon.cpp +++ b/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; diff --git a/plugins/personalized/theme/theme.cpp b/plugins/personalized/theme/theme.cpp index ec5672e..ce5b0fe 100644 --- a/plugins/personalized/theme/theme.cpp +++ b/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); diff --git a/plugins/personalized/theme/theme.h b/plugins/personalized/theme/theme.h index c7f7ef4..9366e81 100644 --- a/plugins/personalized/theme/theme.h +++ b/plugins/personalized/theme/theme.h @@ -189,6 +189,7 @@ public: void setThemeBtnStatus(); QString mGlobalName; + QString m_kwinFile; bool mIsUpgrade = false; bool mIsOpenkylin = false; diff --git a/plugins/system/display/qml/Output.qml b/plugins/system/display/qml/Output.qml index 9f012b3..b52143e 100644 --- a/plugins/system/display/qml/Output.qml +++ b/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; }