packages/peony-extensions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!7 fix-peony-share-failed-issue

Browse Source 
From: @dou33
Reviewed-by: @handsome_feng
Signed-off-by: @handsome_feng
This commit is contained in:
openeuler-ci-bot 2020-12-08 13:51:33 +08:00 committed by Gitee
commit aad69c4a23
2 changed files with 240 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

233
0001-fix-peony-share-failed-issue.patch Normal file
View File

@ -0,0 +1,233 @@
diff -ur peony-extensions-3.0.1/peony-share/peony-share.pro peony-extensions-3.0.1~/peony-share/peony-share.pro
--- peony-extensions-3.0.1/peony-share/peony-share.pro 2019-05-27 15:48:18.000000000 +0800
+++ peony-extensions-3.0.1~/peony-share/peony-share.pro 2020-12-08 10:21:43.000000000 +0800
@@ -22,8 +22,8 @@
share-properties-page-plugin.h
TRANSLATIONS += translations/peony-share-extension_cs.ts \
- translations/peony-admin-extension_tr.ts \
- translations/peony-admin-extension_zh_CN.ts
+ translations/peony-share-extension_tr.ts \
+ translations/peony-share-extension_zh_CN.ts
RESOURCES += resources.qrc
diff -ur peony-extensions-3.0.1/peony-share/share-page.cpp peony-extensions-3.0.1~/peony-share/share-page.cpp
--- peony-extensions-3.0.1/peony-share/share-page.cpp 2019-05-27 15:48:18.000000000 +0800
+++ peony-extensions-3.0.1~/peony-share/share-page.cpp 2020-12-08 10:08:13.000000000 +0800
@@ -34,6 +34,7 @@
#include <QTextEdit>
#include <QDebug>
+#include <QMessageBox>
SharePage::SharePage(const QString &uri, QWidget *parent) : QWidget(parent)
{
@@ -125,6 +126,9 @@
add emblem info to peony-qt's tags(emblems) & cloumns extensions frameworks.
before do it, i have to implement that frameworks first...
*/
+ } else {
+ //when have errors like samba config has issue or other errors, m_share_info.isShared could be false and return a warning.
+ QMessageBox::information(nullptr,tr("Error"),tr("Share failed. Please check samba config."));
}
} else {
s->setVisible(false);
diff -ur peony-extensions-3.0.1/peony-share/translations/peony-share-extension_cs.ts peony-extensions-3.0.1~/peony-share/translations/peony-share-extension_cs.ts
--- peony-extensions-3.0.1/peony-share/translations/peony-share-extension_cs.ts 2019-05-27 15:48:18.000000000 +0800
+++ peony-extensions-3.0.1~/peony-share/translations/peony-share-extension_cs.ts 2020-12-08 10:58:55.000000000 +0800
@@ -11,12 +11,12 @@
<context>
<name>Peony::SharePropertiesPagePlugin</name>
<message>
- <location filename="../share-properties-page-plugin.h" line="26"/>
+ <location filename="../share-properties-page-plugin.h" line="48"/>
<source>Peony Qt Share Extension</source>
<translation>Rozšíření do Peony Qt pro správu sdílení</translation>
</message>
<message>
- <location filename="../share-properties-page-plugin.h" line="27"/>
+ <location filename="../share-properties-page-plugin.h" line="49"/>
<source>Allow user share folders</source>
<translation>Umožnit uživateli sdílet složku</translation>
</message>
@@ -24,29 +24,39 @@
<context>
<name>SharePage</name>
<message>
- <location filename="../share-page.cpp" line="50"/>
+ <location filename="../share-page.cpp" line="73"/>
<source>Share folder</source>
<translation>Sdílet složku</translation>
</message>
<message>
- <location filename="../share-page.cpp" line="52"/>
+ <location filename="../share-page.cpp" line="75"/>
<source>Share:</source>
<translation>Zdroj:</translation>
</message>
<message>
- <location filename="../share-page.cpp" line="58"/>
+ <location filename="../share-page.cpp" line="81"/>
<source>Read Only</source>
<translation>Pouze pro čtení</translation>
</message>
<message>
- <location filename="../share-page.cpp" line="61"/>
+ <location filename="../share-page.cpp" line="84"/>
<source>Allow Anonymous</source>
<translation>Umožnit anonymní</translation>
</message>
<message>
- <location filename="../share-page.cpp" line="73"/>
+ <location filename="../share-page.cpp" line="96"/>
<source>Comment:</source>
<translation>Komentář:</translation>
</message>
+ <message>
+ <location filename="../share-page.cpp" line="131"/>
+ <source>Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../share-page.cpp" line="131"/>
+ <source>Share failed. Please check samba config.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
</TS>
diff -ur peony-extensions-3.0.1/peony-share/translations/peony-share-extension_tr.ts peony-extensions-3.0.1~/peony-share/translations/peony-share-extension_tr.ts
--- peony-extensions-3.0.1/peony-share/translations/peony-share-extension_tr.ts 2019-05-27 15:48:18.000000000 +0800
+++ peony-extensions-3.0.1~/peony-share/translations/peony-share-extension_tr.ts 2020-12-08 10:58:55.000000000 +0800
@@ -11,12 +11,12 @@
<context>
<name>Peony::SharePropertiesPagePlugin</name>
<message>
- <location filename="../share-properties-page-plugin.h" line="26"/>
+ <location filename="../share-properties-page-plugin.h" line="48"/>
<source>Peony Qt Share Extension</source>
<translation>Peony Qt Share Eklentisi</translation>
</message>
<message>
- <location filename="../share-properties-page-plugin.h" line="27"/>
+ <location filename="../share-properties-page-plugin.h" line="49"/>
<source>Allow user share folders</source>
<translation>Kullanıcı paylaşım klasörlerine izin ver</translation>
</message>
@@ -24,29 +24,39 @@
<context>
<name>SharePage</name>
<message>
- <location filename="../share-page.cpp" line="50"/>
+ <location filename="../share-page.cpp" line="73"/>
<source>Share folder</source>
<translation>Klasör paylaş</translation>
</message>
<message>
- <location filename="../share-page.cpp" line="52"/>
+ <location filename="../share-page.cpp" line="75"/>
<source>Share:</source>
<translation>Paylaş:</translation>
</message>
<message>
- <location filename="../share-page.cpp" line="58"/>
+ <location filename="../share-page.cpp" line="81"/>
<source>Read Only</source>
<translation>Sadece Okunabilir</translation>
</message>
<message>
- <location filename="../share-page.cpp" line="61"/>
+ <location filename="../share-page.cpp" line="84"/>
<source>Allow Anonymous</source>
<translation>Herkese İzin Ver</translation>
</message>
<message>
- <location filename="../share-page.cpp" line="73"/>
+ <location filename="../share-page.cpp" line="96"/>
<source>Comment:</source>
<translation>Yorum yap:</translation>
</message>
+ <message>
+ <location filename="../share-page.cpp" line="131"/>
+ <source>Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../share-page.cpp" line="131"/>
+ <source>Share failed. Please check samba config.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
</TS>
二进制文件 peony-extensions-3.0.1/peony-share/translations/peony-share-extension_zh_CN.qm 和 peony-extensions-3.0.1~/peony-share/translations/peony-share-extension_zh_CN.qm 不同
diff -ur peony-extensions-3.0.1/peony-share/translations/peony-share-extension_zh_CN.ts peony-extensions-3.0.1~/peony-share/translations/peony-share-extension_zh_CN.ts
--- peony-extensions-3.0.1/peony-share/translations/peony-share-extension_zh_CN.ts 2019-05-27 15:48:18.000000000 +0800
+++ peony-extensions-3.0.1~/peony-share/translations/peony-share-extension_zh_CN.ts 2020-12-08 11:04:22.000000000 +0800
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.1" language="en_US">
+<TS version="2.1" language="zh_CN">
<context>
<name>NetUsershareHelper</name>
<message>
@@ -11,12 +11,12 @@
<context>
<name>Peony::SharePropertiesPagePlugin</name>
<message>
- <location filename="../share-properties-page-plugin.h" line="26"/>
+ <location filename="../share-properties-page-plugin.h" line="48"/>
<source>Peony Qt Share Extension</source>
<translation>共享</translation>
</message>
<message>
- <location filename="../share-properties-page-plugin.h" line="27"/>
+ <location filename="../share-properties-page-plugin.h" line="49"/>
<source>Allow user share folders</source>
<translation>允许共享文件夹</translation>
</message>
@@ -24,29 +24,39 @@
<context>
<name>SharePage</name>
<message>
- <location filename="../share-page.cpp" line="50"/>
+ <location filename="../share-page.cpp" line="73"/>
<source>Share folder</source>
<translation>共享文件夹</translation>
</message>
<message>
- <location filename="../share-page.cpp" line="52"/>
+ <location filename="../share-page.cpp" line="75"/>
<source>Share:</source>
<translation>共享:</translation>
</message>
<message>
- <location filename="../share-page.cpp" line="58"/>
+ <location filename="../share-page.cpp" line="81"/>
<source>Read Only</source>
<translation>只读</translation>
</message>
<message>
- <location filename="../share-page.cpp" line="61"/>
+ <location filename="../share-page.cpp" line="84"/>
<source>Allow Anonymous</source>
<translation>允许游客访问</translation>
</message>
<message>
- <location filename="../share-page.cpp" line="73"/>
+ <location filename="../share-page.cpp" line="96"/>
<source>Comment:</source>
<translation>注释:</translation>
</message>
+ <message>
+ <location filename="../share-page.cpp" line="131"/>
+ <source>Error</source>
+ <translation>错误</translation>
+ </message>
+ <message>
+ <location filename="../share-page.cpp" line="131"/>
+ <source>Share failed. Please check samba config.</source>
+ <translation>分享失败。请检查samba设置。</translation>
+ </message>
</context>
</TS>

8
peony-extensions.spec
View File

@ -1,7 +1,7 @@
%define debug_package %{nil} %define debug_package %{nil}
Name: peony-extensions Name: peony-extensions
Version: 3.0.1 Version: 3.0.1
Release: 1 Release: 2
Summary: Peony qt extensions (common files) Summary: Peony qt extensions (common files)
License: LGPL-3.0+ License: LGPL-3.0+
URL: http://www.ukui.org URL: http://www.ukui.org
@ -27,12 +27,15 @@ Requires: libpeony3
Requires: qt5-qtimageformats Requires: qt5-qtimageformats
Requires: polkit Requires: polkit
patch0: 0001-fix-peony-share-failed-issue.patch
%description %description
Peony is the official file manager for the UKUI desktop. This Peony is the official file manager for the UKUI desktop. This
package adds extended functionality to the Peony file manager. package adds extended functionality to the Peony file manager.
%prep %prep
%setup -q %setup -q
%patch0 -p1
%build %build
export PATH=%{_qt5_bindir}:$PATH export PATH=%{_qt5_bindir}:$PATH
@ -57,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
%{_prefix}/share/ %{_prefix}/share/
%changelog %changelog
* Tue Dec 8 2020 douyan <douyan@kylinos.cn> - 3.0.1-2
- fix-peony-share-failed-issue
* Wen Nov 11 2020 douyan <douyan@kylinos.cn> - 3.0.1-1 * Wen Nov 11 2020 douyan <douyan@kylinos.cn> - 3.0.1-1
- update to upstream version 3.0.0-1+1031.1 - update to upstream version 3.0.0-1+1031.1