!37 Remove unnecessary macro decisions

From: @haomi0602 Reviewed-by: @open-bot Signed-off-by: @open-bot
Remove unnecessary macro decisions
2023-11-24 08:05:15 +00:00 · 2023-11-24 15:35:04 +08:00 · 2023-11-21 10:29:36 +00:00 · 2023-11-21 17:47:00 +08:00 · 2022-08-04 03:01:34 +00:00 · 2022-08-04 10:39:10 +08:00
6 changed files with 231 additions and 43 deletions
--- a/0001-hide-authorized-watermask.patch
+++ b/0001-hide-authorized-watermask.patch
@ -0,0 +1,27 @@
+From 03eba42faf61623cc10daf4c3b8da86ee097880c Mon Sep 17 00:00:00 2001
+From: leeffo <leeffo@yeah.net>
+Date: Tue, 23 Aug 2022 13:55:54 +0800
+Subject: [PATCH] hide authorized watermask
+---
+ src/dde-desktop/view/watermaskframe.cpp | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+diff --git a/src/dde-desktop/view/watermaskframe.cpp b/src/dde-desktop/view/watermaskframe.cpp
+index b4d1e8b..cfce261 100644
+--- a/src/dde-desktop/view/watermaskframe.cpp
+++ b/src/dde-desktop/view/watermaskframe.cpp
+@@ -336,9 +336,10 @@ bool WaterMaskFrame::isNeedState()
+ {
+     DSysInfo::DeepinType deepinType = DSysInfo::deepinType();
+     qInfo() << "deepinType" << deepinType;
+-    return (DSysInfo::DeepinType::DeepinProfessional == deepinType
+-            || DSysInfo::DeepinType::DeepinPersonal == deepinType
+-            || DSysInfo::DeepinType::DeepinServer == deepinType );
+    //return (DSysInfo::DeepinType::DeepinProfessional == deepinType
+    //        || DSysInfo::DeepinType::DeepinPersonal == deepinType
+    //        || DSysInfo::DeepinType::DeepinServer == deepinType );
+    return 0;
+ }
+ 
+ bool WaterMaskFrame::parseJson(QString key)
+-- 
+2.20.1
--- a/README.en.md
+++ b/README.en.md
@ -1,24 +1,74 @@
 # dde-file-manager

-#### Description
-dde file manager
+## Description
+dde-file-manager is a powerful, easy-to-use file management tool. It follows the classic functions and layouts of traditional file managers, and on this basis simplifies user operations and adds many special functions. The clear navigation bar, intelligently recognized search box, diverse views and sorting make it easy for you to manage, classic and beyond, just to give you a better experience!

-#### Software Architecture
+## Software Architecture
 Software architecture description

-#### Installation
+## Installation

-1.  xxxx
-2.  xxxx
-3.  xxxx
+```shell
+dnf install dde-file-manager
+```

-#### Instructions
+## Instructions

-1.  xxxx
-2.  xxxx
-3.  xxxx
+### Run dde-file-manager

-#### Contribution
+1. Click the launcher icon on the dock to enter the launcher interface.
+2. Scroll the mouse wheel up or down to browse or search for the dde-file-manager icon , and click Run.
+3. By right-clicking the dde-file-manager icon, you can:
+   - Click **Send to Desktop** to create a shortcut on the desktop.
+   - Click **Send to dock** to pin the app to the dock.
+   - Click **Add to startup** to add the application to the startup items to automatically run the application when the computer is turned on.
+
+> TIP: You can also use the shortcut **Super + E** to launch the dde-file-manager.
+
+### Close the dde-file-manager
+
+- In the dde-file-manager interface, click X to exit the dde-file-manager.
+- Right-click the dde-file-manager icon on the taskbar and select **Close All** to exit the dde-file-manager.
+- On the dde-file-manager interface, click the menu bar and select Exit to exit the dde-file-manager.
+
+### View shortcut keys
+
+In the dde-file-manager interface, use the shortcut keys **Ctrl + Shift + /** to open the shortcut key preview interface. Skilled use of shortcut keys will greatly improve your operational efficiency.
+
+![image-hot_key_en](./image/hot_key_en.png)
+
+## Basic Skills
+
+The dde-file-manager has basic file management functions, and it is very simple to create, copy, rename, and delete files (folders).
+
+### Create a new file
+
+#### New document
+
+1. In a blank area of the file manager, right-click.
+2. Select **New Document**.
+3. Select the type of new file from the drop-down menu.
+4. Enter a name for the new file.
+
+![image-newdo_en](./image/newdo_en.png)
+
+#### New folder
+
+1. In a blank area of the file manager, right-click.
+2. Select **New Folder**.
+3. Enter a name for the new folder.
+
+### Rename file
+
+1. In the file manager interface, right-click the file.
+2. Select **Rename**.
+3. Enter the file name and press **Enter** or click in the blank area of the interface.
+
+![image-rename_en](./image/rename_en.png)
+
+> Tip: Check "Hide file extension when rename" in **Settings**, it can be more convenient to modify the file name
+
+## Contribution

 1.  Fork the repository
 2.  Create Feat_xxx branch
@ -26,7 +76,7 @@ Software architecture description
 4.  Create Pull Request


-#### Gitee Feature
+## Gitee Feature

 1.  You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
 2.  Gitee blog [blog.gitee.com](https://blog.gitee.com)
--- a/README.md
+++ b/README.md
@ -1,25 +1,75 @@
 # dde-file-manager

-#### 介绍
-dde file manager
+## 介绍
+文件管理器是一款功能强大、简单易用的文件管理工具。它沿用了传统文件管理器的经典功能和布局，并在此基础上简化了用户操作，增加了很多特色功能。一目了然的导航栏、智能识别的搜索框、多样化的视图及排序让您管理起来得心应手，经典和超越，只为给您更好的体验！

-#### 软件架构
+## 软件架构
 软件架构说明


-#### 安装教程
+## 安装教程

-1.  xxxx
-2.  xxxx
-3.  xxxx
+```shell
+dnf install dde-file-manager
+```

-#### 使用说明
+## 使用说明

-1.  xxxx
-2.  xxxx
-3.  xxxx
+### 运行文件管理器

-#### 参与贡献
+1. 单击任务栏上的启动器图标，进入启动器界面。
+2. 上下滚动鼠标滚轮浏览或通过搜索，找到文件管理器图标 ，单击运行。
+3. 右键单击文件管理器图标，您可以：
+   - 单击 **发送到桌面**，在桌面创建快捷方式。
+   - 单击 **发送到任务栏**，将应用程序固定到任务栏。
+   - 单击 **开机自动启动**，将应用程序添加到开机启动项，在电脑开机时自动运行该应用。
+
+> 窍门：您也可以使用快捷键 **Super + E** 启动文件管理器。
+
+### 关闭文件管理器
+
+- 在文件管理器界面，单击 X，退出文件管理器。
+- 在任务栏右键单击文件管理器图标，选择 **关闭所有** ，退出文件管理器。
+- 在文件管理器界面，单击菜单栏，选择退出，退出文件管理器。
+
+### 查看快捷键
+
+在文件管理器界面，使用快捷键 **Ctrl + Shift + /** 打开快捷键预览界面。熟练地使用快捷键，将大大提升您的操作效率。
+
+![image-hot_key](./image/hot_key.png)
+
+## 基本功能
+
+文件管理器具备基本的文件管理功能，对文件（夹）进行新建、复制、重命名、删除等操作都非常简单。
+
+### 新建文件
+
+#### 新建文档
+
+1. 在文件管理器空白区域，单击鼠标右键。
+2. 选择 **新建文档**。
+3. 在下拉菜单中选择新建文件的类型。
+4. 输入新建文件的名称。
+
+![image-newdo](./image/newdo.png)
+
+#### 新建文件夹
+
+1. 在文件管理器空白区域，单击鼠标右键。
+2. 选择 **新建文件夹**。
+3. 输入新建文件夹的名称。
+
+### 重命名文件
+
+1. 在文件管理器界面，右键单击文件。
+2. 选择 **重命名**。
+3. 输入文件名称，按 **Enter** 键或者单击界面空白区域。
+
+![image-rename](./image/rename.png)
+
+> 窍门：在 **设置** 中勾选“重命名时隐藏文件扩展名”，能更方便地修改文件名称
+
+## 参与贡献

 1.  Fork 本仓库
 2.  新建 Feat_xxx 分支
@ -27,7 +77,7 @@ dde file manager
 4.  新建 Pull Request


-#### 码云特技
+## 码云特技

 1.  使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
 2.  码云官方博客 [blog.gitee.com](https://blog.gitee.com)
--- a/dde-file-manager-5.1.2.3.tar.bz2
+++ b/dde-file-manager-5.1.2.3.tar.bz2
--- a/dde-file-manager.spec
+++ b/dde-file-manager.spec
@ -1,20 +1,22 @@
 Name:           dde-file-manager
-Version:        5.1.2.3
-Release:        9
+Version:        5.2.63
+Release:        2 
 Summary:        Deepin File Manager
 License:        GPLv3
 URL:            https://github.com/linuxdeepin/dde-file-manager
-Source0:        %{name}-%{version}.tar.bz2
+Source0:        %{name}_%{version}.tar.gz
+Patch0:         0001-hide-authorized-watermask.patch

 BuildRequires:  gcc-c++
 BuildRequires:  desktop-file-utils
 BuildRequires:  deepin-gettext-tools
 BuildRequires:  dde-dock-devel
 BuildRequires:  file-devel
+#BuildRequires:  jemalloc-devel
+#BuildRequires:  cmake(KF5Codecs)
 BuildRequires:  pkgconfig(atk)
-BuildRequires:  dtkcore-devel
 BuildRequires:  dtkgui-devel
-BuildRequires:  dtkwidget-devel
+BuildRequires:  pkgconfig(dtkwidget) >= 5.1
 BuildRequires:  pkgconfig(dframeworkdbus) >= 2.0
 BuildRequires:  pkgconfig(gtk+-2.0)
 BuildRequires:  pkgconfig(gsettings-qt)
@ -32,10 +34,12 @@ BuildRequires:  pkgconfig(Qt5X11Extras)
 BuildRequires:  qt5-qtbase-private-devel
 %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
 BuildRequires:  pkgconfig(taglib)
+#BuildRequires:  pkgconfig(uchardet)
 BuildRequires:  pkgconfig(xcb-util)
 BuildRequires:  pkgconfig(xcb-ewmh)
 BuildRequires:  qt5-linguist
 BuildRequires:  jemalloc-devel
+#BuildRequires:  udisks2-qt5
 BuildRequires:  udisks2-qt5-devel
 BuildRequires:  disomaster-devel
 BuildRequires:  libgio-qt libgio-qt-devel
@ -43,10 +47,31 @@ BuildRequires:  openssl-devel
 BuildRequires:  libqtxdg-devel
 BuildRequires:  libmediainfo-devel
 BuildRequires:  kf5-kcodecs-devel
+#BuildRequires:  libudisks2-qt5-devel
+BuildRequires:  lucene++-devel
+BuildRequires:  htmlcxx-devel
+BuildRequires:  libgsf-devel
+BuildRequires:  mimetic-devel
+BuildRequires:  boost-devel
+BuildRequires:	deepin-anything-devel
+BuildRequires:  deepin-anything-server
+BuildRequires:  pcre-devel
+
+# run command by QProcess
+#Requires:       deepin-shortcut-viewer
 Requires:       deepin-terminal
 Requires:       dde-desktop
-Requires:       file-roller
+#Requires:       file-roller
+Requires:       jemalloc
+Requires:       libglvnd-glx
+Requires:       libdde-file-manager
+Requires:		deepin-anything-dkms deepin-anything-server
+#Requires:       gvfs-client
+#Requires:       samba
+#Requires:       xdg-user-dirs
+#Requires:       gstreamer-plugins-good
 Recommends:     deepin-manual
+Recommends:     cryfs

 %description
 File manager front end of Deepin OS.
@ -61,6 +86,16 @@ Header files and libraries for %{name}.
 %package -n libdde-file-manager
 Summary:        DDE File Manager library
 Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       kf5-kcodecs
+Requires:       jemalloc
+Requires:       poppler-cpp
+Requires:       libmediainfo
+Requires:       libzen
+Requires:       udisks2-qt5
+Requires:       taglib
+Requires:       libgio-qt
+Requires:		deepin-anything-libs
+

 %description -n libdde-file-manager
 DDE File Manager library.
@ -78,21 +113,26 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       dde-dock
 Requires:       dde-launcher
 Requires:       dde-session-ui
+Requires:       tinyxml2

 %description -n dde-desktop
 Deepin desktop environment - desktop module.

 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}_%{version}
+%patch0 -p1

+# fix file permissions
 find -type f -perm 775 -exec chmod 644 {} \;
-sed -i '/deepin-daemon/s|lib|libexec|' dde-zone/mainwindow.h
-sed -i 's|lib/gvfs|libexec|' %{name}-lib/gvfs/networkmanager.cpp
-sed -i 's|/lib/dde-dock/plugins|/lib64/dde-dock/plugins|' dde-dock-plugins/disk-mount/disk-mount.pro
+#sed -i '/target.path/s|lib|%{_lib}|' src/dde-dock-plugins/disk-mount/disk-mount.pro
+sed -i '/deepin-daemon/s|lib|libexec|' src/dde-zone/mainwindow.h
+sed -i 's|lib/gvfs|libexec|' src/%{name}-lib/gvfs/networkmanager.cpp
+#sed -i 's|%{_datadir}|%{_libdir}|' dde-sharefiles/appbase.pri
+sed -i 's|/lib/dde-dock/plugins|/lib64/dde-dock/plugins|' src/dde-dock-plugins/disk-mount/disk-mount.pro

 %build
 export PATH=%{_qt5_bindir}:$PATH
-%qmake_qt5 PREFIX=%{_prefix} QMAKE_CFLAGS_ISYSTEM= CONFIG+="DISABLE_FFMPEG DISABLE_ANYTHING"
+%qmake_qt5 PREFIX=%{_prefix} QMAKE_CFLAGS_ISYSTEM= CONFIG+="DISABLE_FFMPEG"  DEFINES+="VERSION=%{version}" filemanager.pro
 %make_build

 %install
@ -102,6 +142,7 @@ export PATH=%{_qt5_bindir}:$PATH
 desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
 desktop-file-validate %{buildroot}%{_datadir}/applications/dde-computer.desktop ||:
 desktop-file-validate %{buildroot}%{_datadir}/applications/dde-trash.desktop ||:
+desktop-file-validate %{buildroot}%{_datadir}/applications/dde-home.desktop ||:

 %ldconfig_scriptlets

@ -112,16 +153,24 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/dde-trash.desktop ||:
 %{_bindir}/%{name}
 %{_bindir}/%{name}-daemon
 %{_bindir}/%{name}-pkexec
+%ifnarch x86_64
+%{_bindir}/*.sh
+%{_sysconfdir}/xdg/autostart/dde-file-manager-autostart.desktop
+%endif
 %{_bindir}/dde-property-dialog
 /usr/lib/systemd/system/dde-filemanager-daemon.service
+
+%{_datadir}/applications/dde-open.desktop
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/dbus-1/interfaces/com.deepin.filemanager.filedialog.xml
 %{_datadir}/dbus-1/interfaces/com.deepin.filemanager.filedialogmanager.xml
 %{_datadir}/dbus-1/services/com.deepin.filemanager.filedialog.service
 %{_datadir}/dbus-1/services/org.freedesktop.FileManager.service
 %{_datadir}/dbus-1/system-services/com.deepin.filemanager.daemon.service
-%{_polkit_qt_policydir}/com.deepin.filemanager.daemon.policy
-%{_polkit_qt_policydir}/com.deepin.pkexec.dde-file-manager.policy
+%{_datadir}/polkit-1/actions/com.deepin.filemanager.daemon.policy
+%{_datadir}/polkit-1/actions/com.deepin.pkexec.dde-file-manager.policy
+%{_datadir}/deepin-manual/manual-assets/application/dde-file-manager
+%{_datadir}/applications/context-menus/.readme

 %files -n libdde-file-manager
 %{_libdir}/dde-file-manager/plugins/previews/libdde-image-preview-plugin.so
@ -137,6 +186,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/dde-trash.desktop ||:
 %{_datadir}/dde-file-manager/mimetypes/image.mimetype
 %{_datadir}/dde-file-manager/mimetypes/text.mimetype
 %{_datadir}/dde-file-manager/mimetypes/video.mimetype
+%{_datadir}/dde-file-manager/templates/newDoc.wps
+%{_datadir}/dde-file-manager/templates/newExcel.et
+%{_datadir}/dde-file-manager/templates/newPowerPoint.dps
 %{_datadir}/dde-file-manager/templates/newDoc.doc
 %{_datadir}/dde-file-manager/templates/newExcel.xls
 %{_datadir}/dde-file-manager/templates/newPowerPoint.ppt
@ -147,15 +199,15 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/dde-trash.desktop ||:
 %{_datadir}/icons/hicolor/scalable/apps/dde-file-manager.svg
 %{_libdir}/libdde-file-manager.so.1
 %{_libdir}/libdde-file-manager.so.1.8
+%ifarch x86_64
+%{_libdir}/deepin-anything-server-lib/plugins/handlers/libdde-anythingmonitor.so
+%endif

 %files -n dde-disk-mount-plugin
 %{_libdir}/dde-dock/plugins/system-trays/libdde-disk-mount-plugin.so
 %{_datadir}/dde-disk-mount-plugin/translations
 %{_datadir}/glib-2.0/schemas/com.deepin.dde.dock.module.disk-mount.gschema.xml

-
-
-
 %files devel
 %{_includedir}/%{name}/*.h
 %{_includedir}/%{name}/gvfs/
@ -167,16 +219,25 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/dde-trash.desktop ||:
 %files -n dde-desktop
 %{_bindir}/dde-desktop
 %{_datadir}/applications/dde-computer.desktop
-%exclude %{_datadir}/applications/dde-open.desktop
+%{_datadir}/applications/dde-home.desktop
 %{_datadir}/applications/dde-trash.desktop
 %dir %{_datadir}/dde-desktop
 %{_datadir}/dde-desktop/translations/
 %{_datadir}/dbus-1/services/com.deepin.dde.desktop.service

 %changelog
+* Fri Nov 24 2023 haomimi <haomimi@uniontech.com> - 5.2.63-2
+- Remove unnecessary macro decisions
+
+* Tue Nov 21 2023 hanshuang <hanshuang@uniontech.com> - 5.2.63-1
+- update version
+
 * Tue Sep 8 2020 chenbo pan <panchenbo@uniontech.com> - 5.1.2.3-9
 - fix compile error
+
 * Mon Aug 17 2020 chenbo pan <panchenbo@uniontech.com> - 5.1.2.3-8
 - fix spec name
+
 * Thu Jul 30 2020 openEuler Buildteam <buildteam@openeuler.org> - 5.1.2.3-7
 - Package init
+
--- a/dde-file-manager_5.2.63.tar.gz
+++ b/dde-file-manager_5.2.63.tar.gz
Author	SHA1	Message	Date
openeuler-ci-bot	4d13e47a30	!37 Remove unnecessary macro decisions From: @haomi0602 Reviewed-by: @open-bot Signed-off-by: @open-bot	2023-11-24 08:05:15 +00:00
haomimi	534758d406	Remove unnecessary macro decisions	2023-11-24 15:35:04 +08:00
openeuler-ci-bot	b5db0dfb45	!36 update package From: @hanshuang123456 Reviewed-by: @open-bot, @ut-layne-yang Signed-off-by: @ut-layne-yang	2023-11-21 10:29:36 +00:00
hanshuang	0ec87aa135	update dde-file-manager package	2023-11-21 17:47:00 +08:00
openeuler-ci-bot	3ed2496da8	!14 [sync] PR-7: update readme From: @openeuler-sync-bot Reviewed-by: @panchenbo Signed-off-by: @panchenbo	2022-08-04 03:01:34 +00:00
wangpeng	7d301fc2fe	update readme (cherry picked from commit 74ad78d674e73d9f5f18fef97ccf34fec0dea1d3)	2022-08-04 10:39:10 +08:00
openeuler-ci-bot	339afea5d2	!4 fix compile error Merge pull request !4 from panchenbo/master	2020-09-08 12:34:06 +08:00
panchenbo	f8fe42b59c	fix compile error	2020-09-08 11:41:22 +08:00
panchenbo	f0cf2cd837	fix compile error	2020-09-08 11:20:01 +08:00
panchenbo	9539869a10	fix compile error	2020-09-08 10:59:51 +08:00