fetch upstream release to 1.0.26
This commit is contained in:
parent
295d8f00f9
commit
0b2559ff28
@ -1,33 +0,0 @@
|
|||||||
From f535ce4d5691a5d0540376da32cad76ec2673028 Mon Sep 17 00:00:00 2001
|
|
||||||
From: dou33 <johnwo3396@hotmail.com>
|
|
||||||
Date: Thu, 28 Oct 2021 15:13:26 +0800
|
|
||||||
Subject: [PATCH] fix switch translation issue
|
|
||||||
|
|
||||||
---
|
|
||||||
src/menumodule.cpp | 6 +++---
|
|
||||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/menumodule.cpp b/src/menumodule.cpp
|
|
||||||
index c5fa261..744b06d 100644
|
|
||||||
--- a/src/menumodule.cpp
|
|
||||||
+++ b/src/menumodule.cpp
|
|
||||||
@@ -148,13 +148,13 @@ void menuModule::triggerMenu(QAction *act){
|
|
||||||
helpAction();
|
|
||||||
}
|
|
||||||
else if(tr("standard") == str){
|
|
||||||
- emit menuModuleChanged(str);
|
|
||||||
+ emit menuModuleChanged(QString("standard"));
|
|
||||||
}
|
|
||||||
else if(tr("scientific") == str){
|
|
||||||
- emit menuModuleChanged(str);
|
|
||||||
+ emit menuModuleChanged(QString("scientific"));
|
|
||||||
}
|
|
||||||
else if(tr("exchange rate") == str){
|
|
||||||
- emit menuModuleChanged(str);
|
|
||||||
+ emit menuModuleChanged(QString("exchange rate"));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
--
|
|
||||||
2.24.3 (Apple Git-128)
|
|
||||||
|
|
||||||
Binary file not shown.
BIN
kylin-calculator-1.0.26.tar.gz
Normal file
BIN
kylin-calculator-1.0.26.tar.gz
Normal file
Binary file not shown.
@ -1,7 +1,7 @@
|
|||||||
%define debug_package %{nil}
|
%define debug_package %{nil}
|
||||||
Name: kylin-calculator
|
Name: kylin-calculator
|
||||||
Version: 1.0.25
|
Version: 1.0.26
|
||||||
Release: 2
|
Release: 1
|
||||||
Summary: Calculator tool for UKUI
|
Summary: Calculator tool for UKUI
|
||||||
License: GPL-3+
|
License: GPL-3+
|
||||||
URL: http://www.ukui.org
|
URL: http://www.ukui.org
|
||||||
@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_datadir}/pixmaps/calc.png
|
%{_datadir}/pixmaps/calc.png
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 7 2021 douyan <douyan@kylinos.cn> - 1.0.26
|
||||||
|
- update to upstream version 1.0.26
|
||||||
|
|
||||||
* Thu Oct 28 2021 douyan <douyan@kylinos.cn> - 1.0.25-2
|
* Thu Oct 28 2021 douyan <douyan@kylinos.cn> - 1.0.25-2
|
||||||
- fix switch translation issue
|
- fix switch translation issue
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user