Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
8ffad5b9d2
!23 fix(style): replace ParentStyle with QProxyStyle and adapt to QT5.9.7 version
From: @SkyzcYou 
Reviewed-by: @liubuguiii 
Signed-off-by: @liubuguiii
2024-04-15 09:05:15 +00:00
youzhengcai
fc22990a21 fix(*): Specify trayicon as the icon in the resource file, without using the theme icon.
- 指定 trayicon 为资源文件中图标,不使用主题图标。防止部分系统有差异
2024-04-15 15:31:14 +08:00
openeuler-ci-bot
c036ac4930
!19 rebuild
From: @luoqing_kylinsec 
Reviewed-by: @liubuguiii 
Signed-off-by: @liubuguiii
2023-11-24 03:05:08 +00:00
luoqing
ec6f1b6620 rebuild 2023-11-24 09:42:09 +08:00
openeuler-ci-bot
a65ea599e1
!16 修复自启动设置失效
From: @luoqing_kylinsec 
Reviewed-by: @liubuguiii 
Signed-off-by: @liubuguiii
2023-11-23 08:44:53 +00:00
luoqing
5b581d5a33 fix(geneneralconf):Fix the autostart failure
- 修复自启动设置失效

Closes #20621,#21058
2023-11-23 15:02:28 +08:00
openeuler-ci-bot
d440644d08
!14 fix(ButtonHandler): fix issue that program will stick when multi screen
From: @wangyucheng1 
Reviewed-by: @tangjie02 
Signed-off-by: @tangjie02
2023-10-10 09:45:12 +00:00
wangyucheng
e87edc6a81 fix(ButtonHandler): fix issue that program will stick when multi screen
- 修复当多屏模式下,不同分辨率时,截图截在大分辨率相比小分辨率多出来的那一部分时应用卡住的问题(#17107, #17108)
2023-10-10 15:24:01 +08:00
openeuler-ci-bot
af7bc6bac2
!12 add windows capture mode
From: @wangyucheng1 
Reviewed-by: @tangjie02 
Signed-off-by: @tangjie02
2023-04-25 09:09:51 +00:00
wangyucheng
702fc456fd feature(*): add windows capture mode
- 新增窗口捕获功能
2023-04-25 16:22:36 +08:00
5 changed files with 51 additions and 6064 deletions

View File

@ -0,0 +1,32 @@
From e66ba013a3d58e47859f2ea2e81659667a82421e Mon Sep 17 00:00:00 2001
From: youzhengcai <youzhengcai@kylinsec.com.cn>
Date: Mon, 15 Apr 2024 15:19:34 +0800
Subject: [PATCH] fix(*): Specify trayicon as the icon in the resource file,
without using the theme icon.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 指定 trayicon 为资源文件中图标,不使用主题图标。防止部分系统有差异
#35052
---
src/core/controller.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/controller.cpp b/src/core/controller.cpp
index 36abfbf..60e0228 100644
--- a/src/core/controller.cpp
+++ b/src/core/controller.cpp
@@ -254,7 +254,7 @@ void Controller::enableTrayIcon() {
m_trayIcon = new QSystemTrayIcon();
m_trayIcon->setToolTip(tr("click to take screenshot"));
m_trayIcon->setContextMenu(trayIconMenu);
- QIcon trayicon = QIcon::fromTheme("flameshot-tray", QIcon(":img/app/kiran128x128.png"));
+ QIcon trayicon = QIcon(":img/app/kiran128x128.png");
m_trayIcon->setIcon(trayicon);
connect(m_trayIcon,SIGNAL(activated(QSystemTrayIcon::ActivationReason)),this, SLOT(trayIconActivated(QSystemTrayIcon::ActivationReason)));
--
2.27.0

File diff suppressed because it is too large Load Diff

Binary file not shown.

Binary file not shown.

View File

@ -1,6 +1,6 @@
Name: kiran-flameshot Name: kiran-flameshot
Version: 2.2.2 Version: 2.2.4
Release: 3 Release: 2%{?dist}
# Main code: GPLv3 # Main code: GPLv3
# Logo: Free Art License v1.3 # Logo: Free Art License v1.3
@ -14,8 +14,8 @@ Summary: Powerful and simple to use screenshot software
URL: https://github.com/lupoDharkael/flameshot URL: https://github.com/lupoDharkael/flameshot
Source0: %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source0: %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Patch0: 0001-fix-translate-add-some-translation.patch
Patch0000: 0000-fix-Specify-trayicon-as-the-icon-in-the-resource-fil.patch
BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(Qt5Network) BuildRequires: pkgconfig(Qt5Network)
@ -30,6 +30,7 @@ BuildRequires: qt5-linguist
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: gcc BuildRequires: gcc
BuildRequires: kiran-log-qt5-devel BuildRequires: kiran-log-qt5-devel
BuildRequires: qt5-qtx11extras-devel
BuildRequires: kiran-qt5-integration-devel BuildRequires: kiran-qt5-integration-devel
Requires: kiran-qt5-integration Requires: kiran-qt5-integration
@ -77,8 +78,21 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/*/apps/*.* %{_datadir}/icons/hicolor/*/apps/*.*
%changelog %changelog
* Mon Apr 10 2023 wangyucheng <wangyucheng@kylinsec.om.cn> - 2.2.2-2 * Apr Mon 15 2024 youzhengcai <youzhengcai@kylinsec.om.cn> - 2.2.4-2
- KYOS-T: add some translation - KYOS-F: Specify trayicon as the icon in the resource file. (#35052)
* Fri Nov 24 2023 luoqing <luoqing@kylinsec.om.cn> - 2.2.4-1
- rebuild
* Thu Nov 23 2023 luoqing <luoqing@kylinsec.om.cn> - 2.2.3-3
- KYOS-F: Fix the autostart failure (#20621,#21058)
* Tue Oct 10 2023 wangyucheng <wangyucheng@kylinsec.om.cn> - 2.2.3-2
- KYOS-F: fix(ButtonHandler): fix issue that program will stick when multi screen (#17107, #17108)
* Tue Aug 22 2023 yinhongchang <yinhongchang@kylinsec.com.cn> - 2.2.3-1
- KYOS-F:add some translation(#67661)
- KYOS-F:add windows capture mode
* Thu Aug 04 2022 luoqing <luoqing@kylinsec.com.cn> - 2.2.2-2 * Thu Aug 04 2022 luoqing <luoqing@kylinsec.com.cn> - 2.2.2-2
- KYOS-F: Modify license - KYOS-F: Modify license