!85 合并最新upstream，修复pebuild错误

Merge pull request !85 from xibowen/debian/unstable

GUIDE_ZH_CN.md

@@ -1,6 +1,6 @@
 # 项目指南
 
-## [Wiki](https://github.com/ukui/peony/wiki)
+## [Wiki](https://gitee.com/openkylin/peony/wiki)
 
 ## 项目之外的相关资源（重要）
 
@@ -31,7 +31,7 @@
 
 目前的Peony项目已经接近初次提测，大家请关注github和launchpad平台上的动向：
 
-> [GitHub源码仓库](https://github.com/ukui/peony)
+> [Gitee源码仓库](https://gitee.com/openkylin/peony)
 
 > [Launchpad PPA](https://launchpad.net/~ubuntukylin-members/+archive/ubuntu/ukui3.0
 )
@@ -48,7 +48,7 @@
 
 ### 步骤(以优麒麟为例)
 
-> git clone https://github.com/ukui/peony.git
+> git clone https://gitee.com/openkylin/peony.git
 
 > cd peony && mkdir build && cd build
 

README.md

@@ -1,17 +1,13 @@
 # peony
 
-[![build](https://github.com/ukui/peony/workflows/Check%20build/badge.svg?branch=master)](https://github.com/ukui/peony)
-
 peony is the filemanager application of UKUI3.0.
 
 # About this project
 
-- [Wiki on GitHub](https://github.com/ukui/peony/wiki)
+- [Wiki on Gitee](https://gitee.com/openkylin/peony/wiki)
 
 - [zh_CN](GUIDE_ZH_CN.md)
 
-- [project preview](https://github.com/orgs/explorer-cs/projects/3?fullscreen=true)
-
 # Description
 Peony is intent to be the default FileManager application in UKUI3.0.
 
@@ -70,7 +66,7 @@ If there are some problems during porting peony to other distros, commit an issu
 
 ## build from source and test
 
-> git clone https://github.com/ukui/peony.git
+> git clone https://gitee.com/openkylin/peony.git
 
 > cd peony && mkdir build && cd build
 

common.pri

@@ -32,3 +32,25 @@ exists(/usr/include/kysdk/applications/ukuistylehelper/ukuistylehelper.h) {
     message("kywaylandhelper find")
     DEFINES += KY_SDK_WAYLANDHELPER
 }
+
+exists("/usr/include/libkyudfburn/udfburn_global.h") {
+    DEFINES += KY_UDF_BURN
+}
+
+exists("/usr/include/ukui-search/libsearch_global.h") {
+    DEFINES += KY_UKUI_SEARCH
+}
+
+exists("/usr/include/kysdk/desktop/kysdk-soundeffects_global.h") {
+    DEFINES += KY_SDK_SOUND_EFFECTS
+    PKGCONFIG += kysdk-soundeffects
+}
+
+exists("/usr/include/kysdk/kysdk-system/libkydate.h") {
+    DEFINES += KY_SDK_DATE
+}
+
+exists(/usr/include/kysdk/kysdk-system/libkysysinfo.h) {
+    message("kysysinfo find")
+    DEFINES += KY_SDK_SYSINFO
+}

data/peony-home.desktop

@@ -4,9 +4,11 @@ GenericName=Home
 GenericName[tr]=Giriş
 GenericName[zh_CN]=打开个人目录
 GenericName[bo_CN]=སྒེར་གྱི་དཀར་ཆག
+GenericName[mn]=ᠬᠤᠪᠢ ᠬᠦᠮᠦᠨ
 Name[tr]=Giriş
 Name[zh_CN]=个人目录
 Name[bo_CN]=སྒེར་གྱི་དཀར་ཆག
+Name[mn]=ᠬᠤᠪᠢ ᠬᠦᠮᠦᠨ
 Exec=/usr/bin/peony
 Icon=user-home
 Terminal=false

data/peony-trash.desktop

@@ -4,9 +4,11 @@ GenericName=Trash
 GenericName[tr]=Çöp
 GenericName[zh_CN]=打开回收站
 GenericName[bo_CN]=སྙིགས་སྒམ།
+GenericName[mn]=ᠬᠤᠭᠯᠠᠭᠤᠷ
 Name[tr]=Çöp
 Name[zh_CN]=回收站
 Name[bo_CN]=སྙིགས་སྒམ།
+Name[mn]=ᠬᠤᠭᠯᠠᠭᠤᠷ
 Exec=/usr/bin/peony trash:///
 Icon=user-trash
 Terminal=false

data/peony.desktop

@@ -4,9 +4,11 @@ GenericName=UKUI File Manager
 GenericName[tr]=UKUI Dosya Yöneticisi
 GenericName[zh_CN]=文件管理器
 GenericName[bo_CN]=ཡིག་ཆ་དོ་དམ་ཆས།
+GenericName[mn]=ᠹᠠᠢᠯ ᠤ᠋ᠨ ᠬᠠᠮᠢᠶᠠᠷᠤᠭᠤᠷ
 Name[tr]=Peony
 Name[zh_CN]=文件管理器
 Name[bo_CN]=ཡིག་ཆ་དོ་དམ་ཆས།
+Name[mn]=ᠹᠠᠢᠯ ᠤ᠋ᠨ ᠬᠠᠮᠢᠶᠠᠷᠤᠭᠤᠷ
 Exec=/usr/bin/peony %U
 MimeType=inode/directory
 Icon=system-file-manager

data/system-file-manager/en_US/index.md

@@ -131,15 +131,11 @@ The various documents are sorted as follows:
 
 (6)Sort by folder path: sort by path of folder storage.
 
-(7)Sort by tag: The file manager provides the tagging function, and after the user tags, the default sort by tag is, sort by color red > orange > yellow > green > green > blue > purple > gray > no color.
+(7)Incremental sorting: sort documents in numerical, alphabetical ascending order.
 
-![Fig 10 Mark sort-big](image/10.png)
+(8)Descending sorting: sort documents in numerical, alphabetical descending order.
 
-(8)Incremental sorting: sort documents in numerical, alphabetical ascending order.
-
-(9)Descending sorting: sort documents in numerical, alphabetical descending order.
-
-(10)Sort items ... : By selecting this item, the user can customize the sorting method in the menu.
+(9)Sort items ... : By selecting this item, the user can customize the sorting method in the menu.
 
 ### Advanced Search Function
 The Peony provides advanced search for users, using the Simple Search feature by default.Simple search function:Click the "![](image/icon18-o.png)"icon button to switch to the search input box.users can search for files in the current directory by entering the contents in the search box and pressing the Enter key.
@@ -152,43 +148,31 @@ Advanced search function:Under the current directory (contains subdirectories),
 
 ### Common Operation
 (1)Copy
-
 * Way 1:Check, right-click > "Copy"> Target, right-click > "Paste"
-
 * Way 2:Check, Ctrl+C > Target, Ctrl+V
-
 * Way 3:Drag from the folder window where the project is located to the destination folder window
 
 In way 3, if both folders are on the same hard disk device on the computer, the item is moved;If dragged from a USB stick to the system folder, the item will be copied.To drag copy on the same device, users need to hold down "Ctrl"while dragging.
 
 (2)Move
-
 * Way 1:Check, right-click > "Cut"> Target, right-click > "Paste"
-
 * Way 2:Check, Ctrl+X > Target, Ctrl+V
 
 (3)Delete
 
 Delete to recycling bin:
-
 * Way 1:Check, right-click > "Delete"
-
 * Way 2:Selected, Delete
-
 * Way 3:Select it and drag it to the "Trash"on the desktop
 
 If the deleted files are on a removable device, eject the device without emptying the Trash, the deleted files on the removable device may not be visible on other operating systems, but they still exist;When the device is reinserted into the system used to delete this file, it will be visible in the Trash.
 
 Delete permanently:
-
 * Way 1:Delete again in the "Trash"
-
 * Way 2:Selected, Shift+Delete
 
 (4)Rename
-
 * Way 1:Check, right-click > "Rename"
-
 * Way 2:Selected, F2
 
 To undo a rename, press Ctrl+Z to restore it.
@@ -198,7 +182,6 @@ In the sidebar, for the device accessing the system, right-click and the menu ap
 ![Fig 13 Mobile device right-click menu](image/13.png)
 
 * Unload/pop:Both of these serve the purpose of offloading mobile devices.The difference is that the device still exists in the system after uninstallation (unmounted state) and can no longer be found in the system when ejected.The "![](image/icon18-o.png)"button on the right side of the device is the pop-up role.
-
 * Formatting:System default format is FAT32 file system, users can change to Ext2/3/4 or NTFS format;To use this feature, users need to uninstall the device first.
 
 ![Fig 14 Formatted](image/14.png)
@@ -233,14 +216,14 @@ Advanced settings are the peony preferences.21,Preferences are divided into thre
 
 (2)Share: sharing, printer, zip, mailbox sharing
 
-(3)Drop-down menus:Keep Allow , Show Hidden, Show File Extension, Forbid thumbnailing, Resident in Backend,Parallel Operations,Help, About.
+(3)Drop-down menus:Keep Allow , Show Hidden, Show File Extension, Forbid thumbnailing, Resident in Backend,Parallel Operations,Set samba password,Help, About.
 
 |Icons|Description|Icons|Description
 | :------------ | :------------ | :------------ | :------------ |
 |![](image/icon20.png)|	Reproduction of selected projects|![](image/icon21.png)|	Paste selected items
-	|![](image/icon22.png)|Cut the selected item|![](image/icon23.png)|Trash, empty all items	
-	|![](image/icon24.png)|Share selected projects|![](image/icon25.png)|Printer and scanner functional items
-	|![](image/icon26.png)|Share the selected zip file|![](image/icon27.png)|Send email function item
+|![](image/icon22.png)|Cut the selected item|![](image/icon23.png)|Trash, empty all items	
+|![](image/icon24.png)|Share selected projects|![](image/icon25.png)|Printer and scanner functional items
+|![](image/icon26.png)|Share the selected zip file|![](image/icon27.png)|Send email function item
 
 <br>
 
@@ -256,6 +239,7 @@ The content that can be set contains multiple aspects, and the functions corresp
 |Forbid thumbnailing|Whether to display the preview thumbnails of pictures, videos, and wps office files
 |Resident in Backend|Whether the file manager program has been kept in the background without completely exiting
 |Parallel Operations|Whether multiple file operations can be performed simultaneously
+|Set samba password|You can set the samba password for the current user
 |Help|Jump to User Manual
 |About|Show details of the peony