packages/kiran-cpanel-timedate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!3 update to 2.2.0

Browse Source 
Merge pull request !3 from kylinsecos/master
This commit is contained in:
openeuler-ci-bot 2022-01-24 03:34:13 +00:00 committed by Gitee
commit 4b4eb71471
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 108 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
0000-fix-timedate-fixed-issue-where-month-1-could-not-adj-c152213d.patch Normal file
View File

@ -0,0 +1,48 @@
From c152213d0f5cad71381a1d2b436b83df44f834f0 Mon Sep 17 00:00:00 2001
From: liuxinhao <liuxinhao@kylinos.com.cn>
Date: Thu, 16 Dec 2021 10:49:43 +0800
Subject: [PATCH 0/1] fix(timedate): fixed issue where month 1 could not adjust
date
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 修复当前设置为1月份，重新打开日期时间设置加载当前日期未触发对应槽函数更新日期spinbox限制导致的"日"不能正常加减
Closes #47649
---
src/widgets/kiran-date-picker-widget.cpp | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/widgets/kiran-date-picker-widget.cpp b/src/widgets/kiran-date-picker-widget.cpp
index 2738caf..4b3ea8f 100644
--- a/src/widgets/kiran-date-picker-widget.cpp
+++ b/src/widgets/kiran-date-picker-widget.cpp
@@ -41,6 +41,7 @@ void KiranDatePickerWidget::initUI()
//年
ui->spinbox_year->setMaximum(2070);
ui->spinbox_year->setMinimum(1970);
+ ui->spinbox_year->setValue(1970);
connect(ui->spinbox_year,QOverload<int>::of(&QSpinBox::valueChanged),[this](int year){
//年份切换只影响二月天数
if(ui->spinbox_month->value()!=2){
@@ -53,6 +54,7 @@ void KiranDatePickerWidget::initUI()
//月
ui->spinbox_month->setMaximum(12);
ui->spinbox_month->setMinimum(1);
+ ui->spinbox_month->setValue(1);
connect(ui->spinbox_month,QOverload<int>::of(&QSpinBox::valueChanged),[this](int month){
QDate date(ui->spinbox_year->value(),month,1);
ui->spinbox_day->setMaximum(date.daysInMonth());
@@ -60,6 +62,7 @@ void KiranDatePickerWidget::initUI()
//日
ui->spinbox_day->setMinimum(1);
-
+ QDate date(ui->spinbox_year->value(),ui->spinbox_month->value(),1);
+ ui->spinbox_day->setMaximum(date.daysInMonth());
setCurrentDate(QDate::currentDate());
}
--
2.27.0

29
0001-fix-control-center-fix-kiran-session-time-date-manag-d10ba418.patch Normal file
View File

@ -0,0 +1,29 @@
From d10ba4185a14256823b1766bab007400dbdbba89 Mon Sep 17 00:00:00 2001
From: liuxinhao <liuxinhao@kylinos.com.cn>
Date: Thu, 30 Dec 2021 10:16:23 +0800
Subject: [PATCH 1/1] fix(control center): fix kiran session time date
management is not displayed in the control panel
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 修复日期时间管理工具由于desktop之中OnlyShowIn=MATE导致的不能显示在KIRAN桌面的mate-control-center之中
---
config/kiran-cpanel-timedate.desktop.in | 1 -
1 file changed, 1 deletion(-)
diff --git a/config/kiran-cpanel-timedate.desktop.in b/config/kiran-cpanel-timedate.desktop.in
index ec0bd3b..f854387 100755
--- a/config/kiran-cpanel-timedate.desktop.in
+++ b/config/kiran-cpanel-timedate.desktop.in
@@ -11,7 +11,6 @@ Icon=kcp-timedate
StartupNotify=true
Categories=GTK;Settings;HardwareSettings;X-System-Server;X-Common-Features;
Keywords=mate-control-center;MATE;clock;date;time;preferences;
-OnlyShowIn=MATE;
X-KIRAN-NoDisplay=true
[Kiran Control Panel Plugin]
--
2.27.0

BIN
kiran-cpanel-timedate-2.1.0.tar.gz
View File

Binary file not shown.

BIN
kiran-cpanel-timedate-2.2.0.tar.gz Normal file
View File

Binary file not shown.

38
kiran-cpanel-timedate.spec
View File

@ -1,6 +1,6 @@
Name: kiran-cpanel-timedate
Version: 2.1.0
Release: 5%{?dist}
Version: 2.2.0
Release: 2.kb2
Summary: Time And Date Manager
Summary(zh_CN): 设置本地系统的时间和日期
@ -8,6 +8,8 @@ License: Mulan PSL v2
#URL:
Source0: %{name}-%{version}.tar.gz
Patch0001: 0000-fix-timedate-fixed-issue-where-month-1-could-not-adj-c152213d.patch
Patch0002: 0001-fix-control-center-fix-kiran-session-time-date-manag-d10ba418.patch
BuildRequires: cmake
BuildRequires: gcc-c++
@ -71,18 +73,40 @@ fi
rm -rf %{buildroot}
%changelog
* Mon Oct 18 2021 xiewenhao <xiewenhao@kylinos.com.cn> - 2.1.0-3.kb2
- KYOS-B: fix license information (#43502)
* Thu Dec 30 2021 liuxinhao <liuxinhao@kylinos.com.cn> - 2.2.0-2.kb2
- KYOS-B: fixed issue where month 1 could not adjust date (#47649)
- KYOS-B: fixed kiran session time date management is not displayed in the control panel
* Wed Dec 29 2021 kpkg <kpkg@kylinos.com.cn> - 2.2.0-2.kb1
- rebuild for KY3.4-MATE-modules-dev
* Wed Dec 29 2021 caoyuanji<caoyuanji@kylinos.com.cn> - 2.2.0-2
- Upgrade version number for easy upgrade
* Mon Dec 20 2021 caoyuanji <caoyuanji@kylinos.com.cn> - 2.2.0-1.kb2
- rebuild for KY3.4-4-KiranUI-2.2
* Mon Dec 20 2021 caoyuanji <caoyuanji@kylinos.com.cn> - 2.2.0-1.kb1
- rebuild for KY3.4-4-KiranUI-2.2
* Thu Dec 02 2021 liuxinhao <liuxinhao@kylinos.com.cn> - 2.2.0-1
- KYBD: rebuild for 2.2,changed required name to kiran-widgets-qt5
* Thu Dec 02 2021 liuxinhao <liuxinhao@kylinos.com.cn> - 2.1.0-4.kb2
- KYBD: changed required name to kiranwidgets-qt5
* Fri Nov 05 2021 liuxinhao <liuxinhao@kylinos.com.cn> - 2.1.0-4.kb1
- KYBD: changed required name and license
* Tue Aug 03 2021 liuxinhao <liuxinhao@kylinos.com.cn> - 2.1.0-3.kb1
- KYOS-B: siderbar display hour format (#42082)
* Tue Jul 20 2021 liuxinhao <liuxinhao@kylinos.com.cn> - 2.1.0-2.kb1
- KYOS-B: install desktop link (#38890)
- KYOS-B: install desktop link
* Thu Jun 17 2021 liuxinhao <liuxinhao@kylinos.com.cn> - 2.1.0-1.kb1
- KYOS-B: fix the problem that the date and time setting does not take effect
- KYOS-B: fix the problem that the date and time setting does not take effect
* Wed Jun 09 2021 liuxinhao <liuxinhao@kylinos.com.cn> - 2.0.3-1.kb1
- KYOS-F: build for KiranControlPanel plugin