Compare commits
11 Commits
2097974f88
...
9993357593
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9993357593 | ||
|
|
80eb30bd4f | ||
|
|
5290580c79 | ||
|
|
d23bc783f6 | ||
|
|
470d800397 | ||
|
|
59471fb39f | ||
|
|
0e75886ac2 | ||
|
|
289e9d02e0 | ||
|
|
6adc27f1b1 | ||
|
|
6319af37c2 | ||
|
|
78ab1af3f7 |
@ -17,7 +17,7 @@ index e2999fb..7891cda 100644
|
|||||||
src \
|
src \
|
||||||
+
|
+
|
||||||
+guide.files += data/kylin-system-monitor/*
|
+guide.files += data/kylin-system-monitor/*
|
||||||
+guide.path = /usr/share/kylin-user-guide/data/guide
|
+guide.path = /usr/share/kylin-user-guide/data/guide/kylin-system-monitor
|
||||||
+
|
+
|
||||||
+translation.files += src/translation/ukui-system-monitor*.qm
|
+translation.files += src/translation/ukui-system-monitor*.qm
|
||||||
+translation.path = /usr/share/ukui-system-monitor/translations/
|
+translation.path = /usr/share/ukui-system-monitor/translations/
|
||||||
|
|||||||
32
fix-search-widget-display-error.patch
Normal file
32
fix-search-widget-display-error.patch
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
diff -Naur ukui-system-monitor-3.1.2/src/krightwidget.cpp ukui-system-monitor-3.1.2~/src/krightwidget.cpp
|
||||||
|
--- ukui-system-monitor-3.1.2/src/krightwidget.cpp 2022-02-21 09:12:09.000000000 +0800
|
||||||
|
+++ ukui-system-monitor-3.1.2~/src/krightwidget.cpp 2024-05-09 17:26:47.485293509 +0800
|
||||||
|
@@ -408,24 +408,21 @@
|
||||||
|
m_animationSearch->setEndValue(m_rectSeachAnimationEnd);
|
||||||
|
m_animationSearch->setEasingCurve(QEasingCurve::OutQuad);
|
||||||
|
m_animationSearch->start();
|
||||||
|
+ m_queryWid->layout()->removeWidget(m_queryText);
|
||||||
|
+ m_searchEditNew->setTextMargins(30,1,0,1);
|
||||||
|
} else {
|
||||||
|
m_queryText->adjustSize();
|
||||||
|
m_animationSearch->setStartValue(m_rectSeachAnimationEnd);
|
||||||
|
m_animationSearch->setEndValue(m_rectSeachAnimationBegin);
|
||||||
|
m_animationSearch->setEasingCurve(QEasingCurve::InQuad);
|
||||||
|
m_animationSearch->start();
|
||||||
|
+ m_queryWid->layout()->addWidget(m_queryText);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void KRightWidget::animationFinishedSlot()
|
||||||
|
{
|
||||||
|
- if(m_queryText->parent() == m_queryWid) {
|
||||||
|
- m_queryWid->layout()->removeWidget(m_queryText);
|
||||||
|
- m_queryText->setParent(nullptr);
|
||||||
|
- m_searchEditNew->setTextMargins(30,1,0,1);
|
||||||
|
- } else {
|
||||||
|
- m_queryWid->layout()->addWidget(m_queryText);
|
||||||
|
- }
|
||||||
|
+
|
||||||
|
}
|
||||||
|
|
||||||
|
void KRightWidget::onRefreshSearchResult()
|
||||||
@ -1,13 +1,13 @@
|
|||||||
%define debug_package %{nil}
|
|
||||||
Name: ukui-system-monitor
|
Name: ukui-system-monitor
|
||||||
Version: 3.1.2
|
Version: 3.1.2
|
||||||
Release: 1
|
Release: 5
|
||||||
Summary: Monitor for UKUI desktop environment
|
Summary: Monitor for UKUI desktop environment
|
||||||
License: GPL-3+ and GPL-2+
|
License: GPL-3+ and GPL-2+
|
||||||
URL: http://www.ukui.org
|
URL: http://www.ukui.org
|
||||||
Source0: %{name}-%{version}.tar.gz
|
Source0: %{name}-%{version}.tar.gz
|
||||||
Patch01: 0001-modify-version-is-pull.patch
|
Patch01: 0001-modify-version-is-pull.patch
|
||||||
Patch02: 0001-fix-compile-error-of-ukui-system-monitor.patch
|
Patch02: 0001-fix-compile-error-of-ukui-system-monitor.patch
|
||||||
|
Patch03: fix-search-widget-display-error.patch
|
||||||
|
|
||||||
BuildRequires: qt5-qtbase-devel >= 5.1
|
BuildRequires: qt5-qtbase-devel >= 5.1
|
||||||
BuildRequires: qt5-qtsvg-devel
|
BuildRequires: qt5-qtsvg-devel
|
||||||
@ -25,8 +25,8 @@ BuildRequires: ukui-interface
|
|||||||
BuildRequires: qt5-qtcharts-devel
|
BuildRequires: qt5-qtcharts-devel
|
||||||
BuildRequires: qt5-qtcharts
|
BuildRequires: qt5-qtcharts
|
||||||
|
|
||||||
Requires: libcap-devel
|
Requires: libcap
|
||||||
Requires: glib2-devel
|
Requires: glib2
|
||||||
|
|
||||||
%description
|
%description
|
||||||
UKUI system monitor allows you to graphically view and manipulate the
|
UKUI system monitor allows you to graphically view and manipulate the
|
||||||
@ -37,6 +37,7 @@ Requires: glib2-devel
|
|||||||
%setup -q
|
%setup -q
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
|
%patch3 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export PATH=%{_qt5_bindir}:$PATH
|
export PATH=%{_qt5_bindir}:$PATH
|
||||||
@ -70,7 +71,19 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_datadir}/ukui-system-monitor/translations/*
|
%{_datadir}/ukui-system-monitor/translations/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Mon Dec 31 2022 peijiankang <peijiankang@kylinos.cn> - 3.1.2-1
|
* Thu Jun 13 2024 houhongxun <houhongxun@kylinos.cn> - 3.1.2-5
|
||||||
|
- fix wrong runtime dependencies
|
||||||
|
|
||||||
|
* Thu May 09 2024 douyan <douyan@kylinos.cn> - 3.1.2-4
|
||||||
|
- add fix-search-widget-display-error.patch
|
||||||
|
|
||||||
|
* Thu Mar 02 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.2-3
|
||||||
|
- add file kylin-system-monitor for kylin-user-guide
|
||||||
|
|
||||||
|
* Tue Feb 07 2023 tanyulong <tanyulong@kylinos.cn> - 3.1.2-2
|
||||||
|
- Enable debuginfo for fix strip
|
||||||
|
|
||||||
|
* Mon Dec 5 2022 peijiankang <peijiankang@kylinos.cn> - 3.1.2-1
|
||||||
- update version to 3.1.2
|
- update version to 3.1.2
|
||||||
|
|
||||||
* Fri Jul 29 2022 tanyulong<tanyulong@kylinos.cn> - 1.0.1-18
|
* Fri Jul 29 2022 tanyulong<tanyulong@kylinos.cn> - 1.0.1-18
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user