update version 3.2.4
This commit is contained in:
tanyulong2021
parent
4c977bed36
commit
222f574502
@ -1,70 +0,0 @@
|
||||
diff -Naur peony-3.0.4/libpeony-qt/controls/menu/directory-view-menu/directory-view-menu.cpp peony-3.0.4~/libpeony-qt/controls/menu/directory-view-menu/directory-view-menu.cpp
|
||||
--- peony-3.0.4/libpeony-qt/controls/menu/directory-view-menu/directory-view-menu.cpp 2020-11-03 09:02:05.000000000 +0800
|
||||
+++ peony-3.0.4~/libpeony-qt/controls/menu/directory-view-menu/directory-view-menu.cpp 2021-10-26 14:11:07.134058887 +0800
|
||||
@@ -616,26 +616,22 @@
|
||||
if (m_selections.count() >1 && m_is_trash)
|
||||
return l;
|
||||
|
||||
- if (!m_is_search) {
|
||||
- if (m_is_trash && m_selections.count() != 1){
|
||||
-
|
||||
- }else{
|
||||
- l<<addAction(QIcon::fromTheme("preview-file"), tr("Properties"));
|
||||
- connect(l.last(), &QAction::triggered, [=]() {
|
||||
- //FIXME:
|
||||
- if (m_selections.isEmpty()) {
|
||||
- QStringList uris;
|
||||
- uris<<m_directory;
|
||||
- PropertiesWindow *p = new PropertiesWindow(uris);
|
||||
- p->setAttribute(Qt::WA_DeleteOnClose);
|
||||
- p->show();
|
||||
- } else {
|
||||
- PropertiesWindow *p = new PropertiesWindow(m_selections);
|
||||
- p->setAttribute(Qt::WA_DeleteOnClose);
|
||||
- p->show();
|
||||
- }
|
||||
- });
|
||||
- }
|
||||
+ if (! m_is_search) {
|
||||
+ l<<addAction(QIcon::fromTheme("preview-file"), tr("Properties"));
|
||||
+ connect(l.last(), &QAction::triggered, [=]() {
|
||||
+ //FIXME:
|
||||
+ if (m_selections.isEmpty()) {
|
||||
+ QStringList uris;
|
||||
+ uris<<m_directory;
|
||||
+ PropertiesWindow *p = new PropertiesWindow(uris);
|
||||
+ p->setAttribute(Qt::WA_DeleteOnClose);
|
||||
+ p->show();
|
||||
+ } else {
|
||||
+ PropertiesWindow *p = new PropertiesWindow(m_selections);
|
||||
+ p->setAttribute(Qt::WA_DeleteOnClose);
|
||||
+ p->show();
|
||||
+ }
|
||||
+ });
|
||||
} else if (m_selections.count() == 1) {
|
||||
l<<addAction(QIcon::fromTheme("preview-file"), tr("Properties"));
|
||||
connect(l.last(), &QAction::triggered, [=]() {
|
||||
diff -Naur peony-3.0.4/peony-qt-desktop/desktop-icon-view-delegate.cpp peony-3.0.4~/peony-qt-desktop/desktop-icon-view-delegate.cpp
|
||||
--- peony-3.0.4/peony-qt-desktop/desktop-icon-view-delegate.cpp 2020-11-03 09:02:05.000000000 +0800
|
||||
+++ peony-3.0.4~/peony-qt-desktop/desktop-icon-view-delegate.cpp 2021-10-26 14:11:45.075056788 +0800
|
||||
@@ -197,13 +197,16 @@
|
||||
topRight.setY(topRight.y() + 10);
|
||||
auto linkRect = QRect(topRight, lockerIconSize);
|
||||
|
||||
- if (file->canRead() && !file->canWrite() && !file->canExecute()) {
|
||||
- QIcon symbolicLinkIcon = QIcon::fromTheme("emblem-readonly");
|
||||
- symbolicLinkIcon.paint(painter, linkRect, Qt::AlignCenter);
|
||||
- } else if (!file->canRead() && !file->canWrite() && !file->canExecute()) {
|
||||
+ if (! file->canRead())
|
||||
+ {
|
||||
QIcon symbolicLinkIcon = QIcon::fromTheme("emblem-unreadable");
|
||||
symbolicLinkIcon.paint(painter, linkRect, Qt::AlignCenter);
|
||||
}
|
||||
+ else if(! file->canWrite() && ! file->canExecute())
|
||||
+ {
|
||||
+ QIcon symbolicLinkIcon = QIcon::fromTheme("emblem-readonly");
|
||||
+ symbolicLinkIcon.paint(painter, linkRect, Qt::AlignCenter);
|
||||
+ }
|
||||
}
|
||||
|
||||
if (index.data(Qt::UserRole + 1).toBool()) {
|
||||
@ -1,21 +0,0 @@
|
||||
diff -ur peony-3.0.4/libpeony-qt/file-launcher/file-launch-action.cpp peony-3.0.4~/libpeony-qt/file-launcher/file-launch-action.cpp
|
||||
--- peony-3.0.4/libpeony-qt/file-launcher/file-launch-action.cpp 2020-10-28 17:37:13.000000000 +0800
|
||||
+++ peony-3.0.4~/libpeony-qt/file-launcher/file-launch-action.cpp 2020-10-29 17:47:37.262720436 +0800
|
||||
@@ -123,7 +123,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
- if (executable && !isDesktopFileAction() && !skipDialog && isShellScript) {
|
||||
+ if (executable && !isDesktopFileAction() && !skipDialog) {
|
||||
QMessageBox msg;
|
||||
auto defaultAction = msg.addButton("By Default App", QMessageBox::ButtonRole::ActionRole);
|
||||
auto exec = msg.addButton(tr("Execute Directly"), QMessageBox::ButtonRole::ActionRole);
|
||||
@@ -219,7 +219,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
- if (executable && !isDesktopFileAction() && !skipDialog && isShellScript) {
|
||||
+ if (executable && !isDesktopFileAction() && !skipDialog) {
|
||||
QMessageBox msg;
|
||||
auto defaultAction = msg.addButton(tr("By Default App"), QMessageBox::ButtonRole::ActionRole);
|
||||
auto exec = msg.addButton(tr("Execute Directly"), QMessageBox::ButtonRole::ActionRole);
|
||||
Binary file not shown.
BIN
peony-3.2.4.tar.gz
Normal file
BIN
peony-3.2.4.tar.gz
Normal file
Binary file not shown.
24
peony.spec
24
peony.spec
@ -1,8 +1,8 @@
|
||||
%define debug_package %{nil}
|
||||
|
||||
Name: peony
|
||||
Version: 3.0.4
|
||||
Release: 2
|
||||
Version: 3.2.4
|
||||
Release: 1
|
||||
Summary: file Manager for the UKUI desktop
|
||||
License: GPL-2.0+ GPL-3.0+ Expat LGPL-3.0+
|
||||
URL: http://www.ukui.org
|
||||
@ -13,11 +13,15 @@ BuildRequires: libudisks2-devel
|
||||
BuildRequires: libnotify-devel
|
||||
BuildRequires: gtk2-devel
|
||||
BuildRequires: pkg-config, qt5-qtbase-devel, qt5-qtbase-private-devel, qtchooser, glib2-devel, qt5-qtx11extras-devel, gsettings-qt-devel, poppler-devel, poppler-qt5-devel, kf5-kwindowsystem-devel, libcanberra-devel
|
||||
Requires: peony-common, libpeony3
|
||||
Requires: gvfs
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: kf5-kwayland
|
||||
BuildRequires: kf5-kwayland-devel
|
||||
BuildRequires: wayland-devel
|
||||
BuildRequires: qt5-qttools-devel
|
||||
|
||||
Requires: peony-common, libpeony3
|
||||
Requires: gvfs, dvd+rw-tools ,libcanberra-devel
|
||||
|
||||
patch0: 001-fix-excute-file.patch
|
||||
patch1: 0001-adjust-desktop-readonly-icon-agree-with-icon-view.patch
|
||||
|
||||
%description
|
||||
Peony is the official file manager for the UKUI desktop. It allows one
|
||||
@ -73,8 +77,6 @@ Provides: libpeony
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
qmake-qt5
|
||||
@ -107,6 +109,8 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_prefix}/bin/*
|
||||
%{_datadir}/applications/*
|
||||
#%%{_sysconfdir}/xdg/autostart/*
|
||||
/etc/xdg/autostart/peony-desktop.desktop
|
||||
/usr/share/glib-2.0/schemas/org.ukui.peony.settings.gschema.xml
|
||||
|
||||
%files common
|
||||
%doc debian/copyright debian/changelog
|
||||
@ -124,8 +128,10 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_prefix}/%{_lib}/pkgconfig/*.pc
|
||||
%{_prefix}/%{_lib}/*.so
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Feb 22 2022 tanyulong <tanyulong@kylinos.cn> - 3.2.4-1
|
||||
- update version 3.2.4
|
||||
|
||||
* Tue Oct 26 2021 douyan <douyan@kylinos.cn> - 3.0.4-2
|
||||
- add patch:0001-adjust-desktop-readonly-icon-agree-with-icon-view.patch
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user