diff --git a/0001-fix-network-After-receiving-the-Connection-Update-si.patch b/0001-fix-network-After-receiving-the-Connection-Update-si.patch index 98990394ae8c0f4d7121d276dc7e2eea002082e5..c8338dea9d878fd04b5390c02cf04f3e853f3114 100644 --- a/0001-fix-network-After-receiving-the-Connection-Update-si.patch +++ b/0001-fix-network-After-receiving-the-Connection-Update-si.patch @@ -1,8 +1,8 @@ From c3f02b61332c2cbac185e0306ff2583f639e5ca8 Mon Sep 17 00:00:00 2001 From: luoqing Date: Tue, 22 Aug 2023 15:57:19 +0800 -Subject: [PATCH] fix(network):After receiving the Connection::Update signal - from an active connection, the connection is no longer automatically +Subject: [PATCH 1/5] fix(network):After receiving the Connection::Update + signal from an active connection, the connection is no longer automatically reactivated MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 diff --git a/0002-feature-display-When-switching-resolutions-refresh-r.patch b/0002-feature-display-When-switching-resolutions-refresh-r.patch index e9a76b04c572746829b77e6688b9b1b2b5820ffb..4c80fcdbaa0cd82d95a965b66ff8e61b25c686c9 100644 --- a/0002-feature-display-When-switching-resolutions-refresh-r.patch +++ b/0002-feature-display-When-switching-resolutions-refresh-r.patch @@ -1,7 +1,7 @@ From 8468d6df5794ede71a39905e2d31f4cadda244b7 Mon Sep 17 00:00:00 2001 From: luoqing Date: Wed, 23 Aug 2023 11:11:09 +0800 -Subject: [PATCH] feature(display):When switching resolutions, refresh rate +Subject: [PATCH 2/5] feature(display):When switching resolutions, refresh rate preferentially selects the recommended refresh rate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 diff --git a/0001-fix-wallpaper-change-system-wallpaper-xml-path-to-ki.patch b/0003-fix-wallpaper-change-system-wallpaper-xml-path-to-ki.patch similarity index 88% rename from 0001-fix-wallpaper-change-system-wallpaper-xml-path-to-ki.patch rename to 0003-fix-wallpaper-change-system-wallpaper-xml-path-to-ki.patch index f25ed9d42135047f489ef5af17423004b4a8b03a..0d86368a2b0b2399bcd0e6ecd5d02cc0b2d8d6e6 100644 --- a/0001-fix-wallpaper-change-system-wallpaper-xml-path-to-ki.patch +++ b/0003-fix-wallpaper-change-system-wallpaper-xml-path-to-ki.patch @@ -1,7 +1,7 @@ -From bb700629b3b1246b8c23be4f0739a46850685eb5 Mon Sep 17 00:00:00 2001 +From 22d4318174acee6af3008fe648f7b8fdf96404cb Mon Sep 17 00:00:00 2001 From: yuanxing Date: Fri, 25 Aug 2023 10:49:36 +0800 -Subject: [PATCH] fix(wallpaper):change system wallpaper xml path to kiran +Subject: [PATCH 3/5] fix(wallpaper):change system wallpaper xml path to kiran MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -25,5 +25,5 @@ index d27c921..adefaf9 100644 #define FILENAME "filename" -- -2.27.0 +2.33.0 diff --git a/0001-fix-wallpaper-don-t-call-xmlWriter-if-system-backgro.patch b/0004-fix-wallpaper-don-t-call-xmlWriter-if-system-backgro.patch similarity index 88% rename from 0001-fix-wallpaper-don-t-call-xmlWriter-if-system-backgro.patch rename to 0004-fix-wallpaper-don-t-call-xmlWriter-if-system-backgro.patch index 00cbda88a8417f16e95bc2f50746adc4889800b5..f5c7ecdb4710e7b28a94184903a075cb996d19e2 100644 --- a/0001-fix-wallpaper-don-t-call-xmlWriter-if-system-backgro.patch +++ b/0004-fix-wallpaper-don-t-call-xmlWriter-if-system-backgro.patch @@ -1,8 +1,8 @@ -From 2dc6afb3447969964b51c3d02986796f0d7bd77d Mon Sep 17 00:00:00 2001 +From ae26631a045b39aeb760ada4c1cfd98783599fda Mon Sep 17 00:00:00 2001 From: yuanxing Date: Fri, 25 Aug 2023 13:47:13 +0800 -Subject: [PATCH] fix(wallpaper):don't call xmlWriter if system background xml - not exists to solve segmentation fault +Subject: [PATCH 4/5] fix(wallpaper):don't call xmlWriter if system background + xml not exists to solve segmentation fault MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -40,5 +40,5 @@ index 8d174ab..385eb9e 100644 { KLOG_DEBUG() << "open " << localFile << " failed!"; -- -2.27.0 +2.33.0 diff --git a/0005-fix-account-Fixed-issues-related-to-creating-and-del.patch b/0005-fix-account-Fixed-issues-related-to-creating-and-del.patch new file mode 100644 index 0000000000000000000000000000000000000000..d40b2e07c2f30ef3c979ee6aa4d1db3dcb3ffd4f --- /dev/null +++ b/0005-fix-account-Fixed-issues-related-to-creating-and-del.patch @@ -0,0 +1,129 @@ +From 766a1ac3345852e3f95a005bd6ef2469ab9f1dd9 Mon Sep 17 00:00:00 2001 +From: liuxinhao +Date: Mon, 28 Aug 2023 19:17:41 +0800 +Subject: [PATCH 5/5] fix(account): Fixed issues related to creating and + deleting users in account management +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- 修复账户管理创建删除用户中出现的相关问题 + +Closes #13994, #13990 +--- + plugins/account/src/kiran-account-manager.cpp | 15 ++++++--------- + .../account/src/widgets/animation-push-button.cpp | 11 +++++++++++ + .../account/src/widgets/animation-push-button.h | 1 + + .../account/src/widgets/avatar-item-button.cpp | 2 +- + plugins/account/src/widgets/mask-widget.cpp | 2 +- + 5 files changed, 20 insertions(+), 11 deletions(-) + +diff --git a/plugins/account/src/kiran-account-manager.cpp b/plugins/account/src/kiran-account-manager.cpp +index 01b4fbf..15653d9 100644 +--- a/plugins/account/src/kiran-account-manager.cpp ++++ b/plugins/account/src/kiran-account-manager.cpp +@@ -109,14 +109,11 @@ void KiranAccountManager::appendSiderbarItem(const QString &userPath) + void KiranAccountManager::setDefaultSiderbarItem() + { + //设置默认侧边栏项 +- if (m_tabList->count() > 1) ++ auto items = m_tabList->findItems(AccountsGlobalInfo::instance()->getCurrentUser(), Qt::MatchCaseSensitive); ++ if ( items.size() >= 1 ) + { +- auto items = m_tabList->findItems(AccountsGlobalInfo::instance()->getCurrentUser(), Qt::MatchCaseSensitive); +- if (items.size() == 1) +- { +- auto item = items.at(0); +- m_tabList->setCurrentRow(m_tabList->row(item)); +- } ++ auto item = items.at(0); ++ m_tabList->setCurrentRow(m_tabList->row(item)); + } + else + { +@@ -128,7 +125,7 @@ void KiranAccountManager::initUI() + { + /* 遮罩,用于繁忙时屏蔽用户操作 */ + m_maskWidget = new MaskWidget(this); +- m_maskWidget->setVisible(false); ++ m_maskWidget->setVisible(true); + + /* 初始化界面主布局 */ + auto contentLayout = new QHBoxLayout(this); +@@ -444,7 +441,7 @@ void KiranAccountManager::setMaskVisible(bool visible) + { + if (visible) + { +- this->stackUnder(m_maskWidget); ++ m_maskWidget->raise(); + m_maskWidget->show(); + } + else +diff --git a/plugins/account/src/widgets/animation-push-button.cpp b/plugins/account/src/widgets/animation-push-button.cpp +index 65791f0..d65b348 100644 +--- a/plugins/account/src/widgets/animation-push-button.cpp ++++ b/plugins/account/src/widgets/animation-push-button.cpp +@@ -16,6 +16,7 @@ + #include + #include + #include ++#include + + #include "animation-push-button.h" + +@@ -85,6 +86,16 @@ void AnimationPushButton::paintEvent(QPaintEvent *event) + } + } + ++void AnimationPushButton::mousePressEvent(QMouseEvent *e) ++{ ++ if( m_isBusy ) ++ { ++ e->ignore(); ++ return; ++ } ++ QPushButton::mousePressEvent(e); ++} ++ + void AnimationPushButton::initTimeLine() + { + m_timeLine.setCurrentTime(0); +diff --git a/plugins/account/src/widgets/animation-push-button.h b/plugins/account/src/widgets/animation-push-button.h +index 9a172e2..f39e9a4 100644 +--- a/plugins/account/src/widgets/animation-push-button.h ++++ b/plugins/account/src/widgets/animation-push-button.h +@@ -38,6 +38,7 @@ private: + + protected: + virtual void paintEvent(QPaintEvent *event) override; ++ virtual void mousePressEvent(QMouseEvent *e) override; + + private: + bool m_isBusy = false; +diff --git a/plugins/account/src/widgets/avatar-item-button.cpp b/plugins/account/src/widgets/avatar-item-button.cpp +index a078974..a9e5a4b 100644 +--- a/plugins/account/src/widgets/avatar-item-button.cpp ++++ b/plugins/account/src/widgets/avatar-item-button.cpp +@@ -106,7 +106,7 @@ void AvatarItemButton::paintEvent(QPaintEvent *event) + QPoint checkedIconLeftop((this->width() - checkedIconSize.width()) / 2, + (this->height() - checkedIconSize.height()) / 2); + QRect checkedIconRect(checkedIconLeftop, checkedIconSize); +- QSvgRenderer svgRenderer(QString(":/kcp-account/images/success-indicator.svg")); ++ QSvgRenderer svgRenderer(QString(":/kiran-control-panel/images/success-indicator.svg")); + svgRenderer.render(&painter, checkedIconRect); + } + } +diff --git a/plugins/account/src/widgets/mask-widget.cpp b/plugins/account/src/widgets/mask-widget.cpp +index 088fd48..476cbb3 100644 +--- a/plugins/account/src/widgets/mask-widget.cpp ++++ b/plugins/account/src/widgets/mask-widget.cpp +@@ -41,5 +41,5 @@ bool MaskWidget::eventFilter(QObject *watched, QEvent *event) + break; + } + } +- return QObject::eventFilter(watched, event); ++ return QWidget::eventFilter(watched, event); + } +-- +2.33.0 + diff --git a/kiran-control-panel.spec b/kiran-control-panel.spec index 2944b81138090a58cb1d337addc626c48839a87f..9562794186d550a62d349157efdcbbfca15146ee 100644 --- a/kiran-control-panel.spec +++ b/kiran-control-panel.spec @@ -1,6 +1,6 @@ Name: kiran-control-panel Version: 2.5.5 -Release: 3 +Release: 4%{?dist} Summary: Kiran Control Panel Summary(zh_CN): Kiran桌面控制面板 @@ -9,8 +9,9 @@ Source0: %{name}-%{version}.tar.gz Patch0001: 0001-fix-network-After-receiving-the-Connection-Update-si.patch Patch0002: 0002-feature-display-When-switching-resolutions-refresh-r.patch -Patch0003: 0001-fix-wallpaper-change-system-wallpaper-xml-path-to-ki.patch -Patch0004: 0001-fix-wallpaper-don-t-call-xmlWriter-if-system-backgro.patch +Patch0003: 0003-fix-wallpaper-change-system-wallpaper-xml-path-to-ki.patch +Patch0004: 0004-fix-wallpaper-don-t-call-xmlWriter-if-system-backgro.patch +Patch0005: 0005-fix-account-Fixed-issues-related-to-creating-and-del.patch BuildRequires: gcc-c++ BuildRequires: cmake >= 3.2 @@ -168,6 +169,9 @@ make %{?_smp_mflags} rm -rf %{buildroot} %changelog +* Mon Aug 28 2023 liuxinhao - 2.5.5-4 +- KYOS-F: Fixed issues related to creating and deleting users in account management(#13994,#13990) + * Fri Aug 25 2023 yuanxing - 2.5.5-3 - KYOS-F: search system wallpaper xml path from kiran-background-properties - KYOS-F: don't call xmlWriter if system background xml not exists to solve segmentation fault