!27 Optimize new and close logic

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

ukui-sidebar-repair-clock-stopwatch-when-not-started-reset-button.patch

@@ -1,84 +0,0 @@
-From 36f8d3649bc63d6326ccf6c5568c52fcf6540646 Mon Sep 17 00:00:00 2001
-From: huayadong <huayadong@kylinos.cn>
-Date: Thu, 9 Dec 2021 20:10:11 +0800
-Subject: [PATCH] Repair clock stopwatch when not started / reset button can be
- pressed
-
----
- src/plugins/ukui-clock/clock.cpp                | 7 ++++++-
- src/plugins/ukui-clock/noticeAlarm.cpp          | 1 +
- src/plugins/ukui-clock/setAlarmRepeatDialog.cpp | 1 +
- src/plugins/ukui-clock/setupPage.cpp            | 1 +
- 4 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/src/plugins/ukui-clock/clock.cpp b/src/plugins/ukui-clock/clock.cpp
-index 250bf5b..6ff0aa6 100755
---- a/src/plugins/ukui-clock/clock.cpp
-+++ b/src/plugins/ukui-clock/clock.cpp
-@@ -361,7 +361,8 @@ void Clock::stopwatch_init()
-     ui->pushButton_Start->raise();
-     ui->pushButton_ring->raise();
-     ui->pushButton_timeselect->raise();
--    ui->pushButton_timeselect->hide();
-+    ui->pushButton_timeselect->setEnabled(false);
-+    ui->pushButton_ring->setEnabled(false);
- }
- //闹钟页初始化
- // Alarm page initialization
-@@ -540,6 +541,8 @@ void Clock::Count_down()
- void Clock::on_pushButton_Start_clicked()
- {
-     if (!isStarted) {
-+        ui->pushButton_timeselect->setEnabled(true);
-+        ui->pushButton_ring->setEnabled(true);
-         ui->pushButton_timeselect->hide();
-         ui->pushButton_Start->setText(tr("suspend"));
- 
-@@ -665,6 +668,8 @@ void Clock::on_pushButton_timeselect_clicked()
-     if (nullptr != timer) {
-         if (isStarted)
-             return;
-+        ui->pushButton_timeselect->setEnabled(false);
-+        ui->pushButton_ring->setEnabled(false);
-         timer->stop();
-         timer_2->stop();
-         ui->label_4->setText("00:00.00");
-diff --git a/src/plugins/ukui-clock/noticeAlarm.cpp b/src/plugins/ukui-clock/noticeAlarm.cpp
-index 72275d5..00cadf1 100755
---- a/src/plugins/ukui-clock/noticeAlarm.cpp
-+++ b/src/plugins/ukui-clock/noticeAlarm.cpp
-@@ -22,6 +22,7 @@
- #include <QMediaPlayer>
- #include <QMediaPlaylist>
- #include <QDebug>
-+#include <QPainterPath>
- 
- extern void qt_blurImage(QImage &blurImage, qreal radius, bool quality, int transposed);
- 
-diff --git a/src/plugins/ukui-clock/setAlarmRepeatDialog.cpp b/src/plugins/ukui-clock/setAlarmRepeatDialog.cpp
-index cf7be2c..0f3b7de 100755
---- a/src/plugins/ukui-clock/setAlarmRepeatDialog.cpp
-+++ b/src/plugins/ukui-clock/setAlarmRepeatDialog.cpp
-@@ -23,6 +23,7 @@
- #include <QPainter>
- #include <QDebug>
- #include <QScroller>
-+#include <QPainterPath>
- 
- extern void qt_blurImage(QImage &blurImage, qreal radius, bool quality, int transposed);
- 
-diff --git a/src/plugins/ukui-clock/setupPage.cpp b/src/plugins/ukui-clock/setupPage.cpp
-index ff8cca3..a6e1091 100755
---- a/src/plugins/ukui-clock/setupPage.cpp
-+++ b/src/plugins/ukui-clock/setupPage.cpp
-@@ -22,6 +22,7 @@
- #include "setAlarmRepeatDialog.h"
- #include <QDebug>
- #include <QBitmap>
-+#include <QPainterPath>
- #include "customStyle.h"
- 
- extern void qt_blurImage(QImage &blurImage, qreal radius, bool quality, int transposed);
--- 
-2.30.0
-

ukui-sidebar.spec

@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 Name:           ukui-sidebar
 Version:        3.0.1
-Release:        8
+Release:        9
 Summary:        parallels toolbox for UKUI
 License:        GPL-3+
 URL:            http://www.ukui.org
@@ -26,7 +26,6 @@ Requires: qt5-qttools-devel
 Requires: gsettings-qt-devel
 Requires: dconf-devel
 
-patch0: ukui-sidebar-repair-clock-stopwatch-when-not-started-reset-button.patch
 
 
 %description
@@ -37,7 +36,6 @@ patch0: ukui-sidebar-repair-clock-stopwatch-when-not-started-reset-button.patch
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 mkdir build && cd build
@@ -82,6 +80,9 @@ done
 %{_datadir}/ukui-clock/
 
 %changelog
+* Wed Apr 06 2022 huayadong <huayadong@kylinos.cn> - 3.0.1-9
+- Optimize new and close logic
+
 * Wed Apr 06 2022 tanyulong <tanyulong@kylinos.cn> - 3.0.1-8
 - add yaml file