!11 fix-dialog-pop-twice-after-modifying-resolution and fix-effects-mode-not-available

From: @myshow2258
Reviewed-by: @dou33
Signed-off-by: @dou33

0003-fix-dialog-pop-twice-after-modifying-resolution-bug.patch

@@ -0,0 +1,31 @@
+From bb73b40db7489201f2d5237a675cfd2ff7ae01bc Mon Sep 17 00:00:00 2001
+From: myshow <296570182@qq.com>
+Date: Tue, 1 Dec 2020 14:45:48 +0800
+Subject: [PATCH 4/5] =?UTF-8?q?fix-dialog-pop-twice-after-modifying-resolu?=
+ =?UTF-8?q?tion-bug=20=E4=BF=AE=E5=A4=8D=E4=BF=AE=E6=94=B9=E5=88=86?=
+ =?UTF-8?q?=E8=BE=A8=E7=8E=87=E4=B9=8B=E5=90=8E=E5=AF=B9=E8=AF=9D=E6=A1=86?=
+ =?UTF-8?q?=E5=BC=B9=E5=87=BA=E4=B8=A4=E6=AC=A1=E7=9A=84=E9=97=AE=E9=A2=98?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ plugins/system/display/widget.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/system/display/widget.cpp b/plugins/system/display/widget.cpp
+index 7055733..7c175ed 100644
+--- a/plugins/system/display/widget.cpp
++++ b/plugins/system/display/widget.cpp
+@@ -78,7 +78,7 @@ Widget::Widget(QWidget *parent)
+     ui->monitorLabel->setStyleSheet("QLabel{font-size: 18px; color: palette(windowText);}");
+     ui->quickWidget->setResizeMode(QQuickWidget::SizeRootObjectToView);
+ 
+-#if QT_VERSION <= QT_VERSION_CHECK(5, 12, 0)
++#if QT_VERSION <= QT_VERSION_CHECK(5, 6, 0)
+     oriApply = true;
+ #else
+     oriApply = false;
+-- 
+2.29.2.windows.2
+

0004-fix-effects-mode-not-available-bug.patch

@@ -0,0 +1,47 @@
+From d0e9549cf4c08d0566bd3656b49a3c9e73d72383 Mon Sep 17 00:00:00 2001
+From: myshow <296570182@qq.com>
+Date: Tue, 1 Dec 2020 15:31:10 +0800
+Subject: [PATCH 5/5] =?UTF-8?q?fix-effects-mode-not-available-bug=20?=
+ =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=89=B9=E6=95=88=E6=A8=A1=E5=BC=8F=E4=B8=8D?=
+ =?UTF-8?q?=E5=8F=AF=E7=94=A8=E7=9A=84=E9=97=AE=E9=A2=98?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ plugins/personalized/theme/theme.cpp | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/plugins/personalized/theme/theme.cpp b/plugins/personalized/theme/theme.cpp
+index a62cf4a..5e9d066 100644
+--- a/plugins/personalized/theme/theme.cpp
++++ b/plugins/personalized/theme/theme.cpp
+@@ -536,6 +536,7 @@ void Theme::initConnection() {
+     connect(effectSwitchBtn, &SwitchButton::checkedChanged, [this](bool checked) {
+         if (!checked) {
+             personliseGsettings->set(PERSONALSIE_TRAN_KEY, 1.0);
++            ui->tranSlider->setValue(100);
+         }
+         // 提供给外部监听特效接口
+         personliseGsettings->set(PERSONALSIE_EFFECT_KEY, checked);
+@@ -657,7 +658,7 @@ void Theme::writeKwinSettings(bool change, QString theme, bool effect) {
+         kwinSettings->setValue("kwin4_effect_translucencyEnabled", false);
+         kwinSettings->setValue("zoomEnabled", false);
+         kwinSettings->endGroup();
+-#if QT_VERSION <= QT_VERSION_CHECK(5, 12, 0)
++#if QT_VERSION <= QT_VERSION_CHECK(5, 6, 0)
+ 
+ #else
+         for (int i = 0; i < effectList.length(); i++) {
+@@ -676,7 +677,7 @@ void Theme::writeKwinSettings(bool change, QString theme, bool effect) {
+         kwinSettings->setValue("kwin4_effect_translucencyEnabled", true);
+         kwinSettings->setValue("zoomEnabled", true);
+         kwinSettings->endGroup();
+-#if QT_VERSION <= QT_VERSION_CHECK(5, 12, 0)
++#if QT_VERSION <= QT_VERSION_CHECK(5, 6, 0)
+ 
+ #else
+         // 开启模糊特效：
+-- 
+2.29.2.windows.2
+

ukui-control-center.spec

@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 Name:           ukui-control-center
 Version:        3.0.1
-Release:        2
+Release:        3
 Summary:        utilities to configure the UKUI desktop
 License:        GPL-2+
 URL:            http://www.ukui.org
@@ -71,6 +71,8 @@ Requires: qt5-qtquickcontrols
 
 patch0: 0001-fix-system-overview-failed.patch
 patch1: 0002-fix-autologin-nopasswdlogin-failed.patch
+patch2: 0003-fix-dialog-pop-twice-after-modifying-resolution-bug.patch
+patch3: 0004-fix-effects-mode-not-available-bug.patch
 
 Recommends: qt5-qtquickcontrols
 
@@ -93,6 +95,8 @@ Suggests: ukui-settings-daemon
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 qmake-qt5
@@ -136,6 +140,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/polkit-1/actions/org.ukui.groupmanager.policy
 
 %changelog
+* Thu Dec 3 2020 lvhan <lvhan@kylinos.cn> - 3.0.1-3
+- fix dialog pop twice after modifying resolution
+- fix effects mode not available
+
 * Mon Nov 30 2020 lvhan <lvhan@kylinos.cn> - 3.0.1-2
 - fix autologin nopasswdlogin failed
 - fix system overview failed