packages/ukui-sidebar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!31 Fix alarm clock modify the alarm time to one

Browse Source 
From: @hua_yadong 
Reviewed-by: @dou33 
Signed-off-by: @dou33
This commit is contained in:
openeuler-ci-bot 2022-08-08 08:23:20 +00:00 committed by Gitee
commit ce8a71221c
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 85 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
0001-Fix-bug-27479-alarm-clock-modify-the-alarm-time-to-1.patch Normal file
View File

@ -0,0 +1,79 @@
From 0c5743e4f557e495153a86303334495938017a8e Mon Sep 17 00:00:00 2001
From: huayadong <yadong.hua@cs2c.com.cn>
Date: Fri, 4 Dec 2020 11:31:31 +0800
Subject: [PATCH] Fix bug 27479 [alarm clock], modify the alarm time to 12
hours, add an alarm clock - time of 12:00, and the left text morning jitters
---
src/plugins/ukui-clock/clock.cpp | 7 -------
src/plugins/ukui-clock/clock.ui | 2 +-
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/src/plugins/ukui-clock/clock.cpp b/src/plugins/ukui-clock/clock.cpp
index 390f98e..cf5bc79 100644
--- a/src/plugins/ukui-clock/clock.cpp
+++ b/src/plugins/ukui-clock/clock.cpp
@@ -848,7 +848,6 @@ void Clock::text_timerUpdate()
if(model_setup->index(0, 2).data().toInt() == 1){
ui->label_6->setText(change_NUM_to_str(time_H)+":"+change_NUM_to_str(time_M)+":"+change_NUM_to_str(time_S));
ui->label_15->setText("");
- ui->label_17->setText("");
if(system_time_flag == 0){
system_time_flag = 1;
for (int i = 0; i < rowNum; i++) {
@@ -863,11 +862,9 @@ void Clock::text_timerUpdate()
if (time_H >=12) {
ui->label_6->setText(change_NUM_to_str(time_H - 12)+":"+change_NUM_to_str(time_M)+":"+change_NUM_to_str(time_S));
ui->label_15->setText(tr("PM"));
- ui->label_17->setText(tr("PM"));
} else {
ui->label_6->setText(change_NUM_to_str(time_H)+":"+change_NUM_to_str(time_M)+":"+change_NUM_to_str(time_S));
ui->label_15->setText(tr("AM"));
- ui->label_17->setText(tr("AM"));
}
if(time_H == 0)
@@ -891,7 +888,6 @@ void Clock::text_timerUpdate()
if (str_output.compare("'24'\n") == 0) {
ui->label_6->setText(change_NUM_to_str(time_H)+":"+change_NUM_to_str(time_M)+":"+change_NUM_to_str(time_S));
ui->label_15->setText("");
- ui->label_17->setText("");
if (system_time_flag == 0) {
system_time_flag = 1;
for(int i = 0; i < rowNum; i++) {
@@ -906,11 +902,9 @@ void Clock::text_timerUpdate()
if (time_H >= 12) {
ui->label_6->setText(change_NUM_to_str(time_H - 12)+":"+change_NUM_to_str(time_M)+":"+change_NUM_to_str(time_S));
ui->label_15->setText(tr("PM"));
- ui->label_17->setText(tr("PM"));
} else {
ui->label_6->setText(change_NUM_to_str(time_H)+":"+change_NUM_to_str(time_M)+":"+change_NUM_to_str(time_S));
ui->label_15->setText(tr("AM"));
- ui->label_17->setText(tr("AM"));
}
if(time_H == 0)
@@ -919,7 +913,6 @@ void Clock::text_timerUpdate()
if(time_H == 12)
ui->label_6->setText(change_NUM_to_str(time_H)+":"+change_NUM_to_str(time_M)+":"+change_NUM_to_str(time_S));
-
if (system_time_flag == 1) {
system_time_flag = 0;
for (int i = 0; i < rowNum; i++) {
diff --git a/src/plugins/ukui-clock/clock.ui b/src/plugins/ukui-clock/clock.ui
index d339720..8edef78 100644
--- a/src/plugins/ukui-clock/clock.ui
+++ b/src/plugins/ukui-clock/clock.ui
@@ -751,7 +751,7 @@ border-radius:4px;
<property name="geometry">
<rect>
<x>50</x>
- <y>80</y>
+ <y>123</y>
<width>31</width>
<height>22</height>
</rect>
--
2.33.0

7
ukui-sidebar.spec
View File

@ -1,13 +1,14 @@
%define debug_package %{nil}
Name: ukui-sidebar
Version: 3.0.1
Release: 11
Release: 12
Summary: parallels toolbox for UKUI
License: GPL-3+
URL: http://www.ukui.org
Source0: %{name}-%{version}.tar.gz
Patch0: 0001-25555-alarm-clock-in-all-drop-down-boxes-the-highlig.patch
Patch1: 0001-Fix-bug-27479-alarm-clock-modify-the-alarm-time-to-1.patch
BuildRequires: glib2-devel
BuildRequires: qt5-qtbase-devel
@ -41,6 +42,7 @@ Requires: qt5-qtx11extras-devel
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
mkdir build && cd build
@ -85,6 +87,9 @@ done
%{_datadir}/ukui-clock/
%changelog
* Wed Aug 8 2022 huayadong <huayadong@kylinos.cn> - 3.0.1-11
- Fix alarm clock modify the alarm time to one
* Wed Aug 8 2022 huayadong <huayadong@kylinos.cn> - 3.0.1-11
- fix alarm clock in all drop down boxes the highlig