!37 sync by openEuler-22.03-LTS-SP3

From: @Venland 
Reviewed-by: @xzyangha 
Signed-off-by: @xzyangha

0001-Hidden-state.patch

@@ -0,0 +1,25 @@
+From 3fb294dfcd3369d687b1076782613ae48b13b6bd Mon Sep 17 00:00:00 2001
+From: root <root@localhost.localdomain>
+Date: Tue, 18 Apr 2023 17:45:20 +0800
+Subject: [PATCH] Hidden state
+
+---
+ frame/util/menuworker.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/frame/util/menuworker.cpp b/frame/util/menuworker.cpp
+index 86a46fb..49d7dd0 100644
+--- a/frame/util/menuworker.cpp
++++ b/frame/util/menuworker.cpp
+@@ -97,7 +97,7 @@ QMenu *MenuWorker::createMenu(QMenu *settingsMenu)
+     }
+ 
+     // 状态
+-    if (!menuSettings || !menuSettings->keys().contains("statusVisible") || menuSettings->get("statusVisible").toBool()) {
++    if (0) {
+         const HideMode hideMode = static_cast<HideMode>(m_dockInter->hideMode());
+ 
+         QMenu *statusSubMenu = new QMenu(settingsMenu);
+-- 
+2.31.1
+

0001-Mask-intelligent-hiding.patch

@@ -0,0 +1,45 @@
+From 59e9fb9918869197cbe52dd8475e263a0f8032ce Mon Sep 17 00:00:00 2001
+From: root <root@localhost.localdomain>
+Date: Tue, 11 Apr 2023 13:26:54 +0800
+Subject: [PATCH] Mask intelligent hiding
+
+---
+ frame/util/menuworker.cpp | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/frame/util/menuworker.cpp b/frame/util/menuworker.cpp
+index 61094b6..86a46fb 100644
+--- a/frame/util/menuworker.cpp
++++ b/frame/util/menuworker.cpp
+@@ -105,23 +105,23 @@ QMenu *MenuWorker::createMenu(QMenu *settingsMenu)
+ 
+         QAction *keepShownAct = new QAction(tr("Keep Shown"), this);
+         QAction *keepHiddenAct = new QAction(tr("Keep Hidden"), this);
+-        QAction *smartHideAct = new QAction(tr("Smart Hide"), this);
++        //QAction *smartHideAct = new QAction(tr("Smart Hide"), this);
+ 
+         keepShownAct->setCheckable(true);
+         keepHiddenAct->setCheckable(true);
+-        smartHideAct->setCheckable(true);
++        //smartHideAct->setCheckable(true);
+ 
+         keepShownAct->setChecked(hideMode == KeepShowing);
+         keepHiddenAct->setChecked(hideMode == KeepHidden);
+-        smartHideAct->setChecked(hideMode == SmartHide);
++        //smartHideAct->setChecked(hideMode == SmartHide);
+ 
+         connect(keepShownAct, &QAction::triggered, this, [ = ]{ m_dockInter->setHideMode(KeepShowing); });
+         connect(keepHiddenAct, &QAction::triggered, this, [ = ]{ m_dockInter->setHideMode(KeepHidden); });
+-        connect(smartHideAct, &QAction::triggered, this, [ = ]{ m_dockInter->setHideMode(SmartHide); });
++        //connect(smartHideAct, &QAction::triggered, this, [ = ]{ m_dockInter->setHideMode(SmartHide); });
+ 
+         statusSubMenu->addAction(keepShownAct);
+         statusSubMenu->addAction(keepHiddenAct);
+-        statusSubMenu->addAction(smartHideAct);
++        //statusSubMenu->addAction(smartHideAct);
+ 
+         QAction *act = new QAction(tr("Status"), this);
+         act->setMenu(statusSubMenu);
+-- 
+2.31.1
+

0001-hide-status-box.patch

@@ -0,0 +1,26 @@
+From 080dfa8891d2dfc38430154a4b20024ab5c23f6e Mon Sep 17 00:00:00 2001
+From: songmingliang <songmingliang@uniontech.com>
+Date: Sat, 6 May 2023 16:33:03 +0800
+Subject: [PATCH] hide status box
+
+---
+ plugins/dcc-dock-plugin/module_widget.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/plugins/dcc-dock-plugin/module_widget.cpp b/plugins/dcc-dock-plugin/module_widget.cpp
+index 03f3bbf..f111ff8 100644
+--- a/plugins/dcc-dock-plugin/module_widget.cpp
++++ b/plugins/dcc-dock-plugin/module_widget.cpp
+@@ -151,7 +151,8 @@ void ModuleWidget::initUI()
+     }
+ 
+     // 状态
+-    if (Utils::SettingValue("com.deepin.dde.dock.module.menu", QByteArray(), "statusVisible", true).toBool()) {
++    //if (Utils::SettingValue("com.deepin.dde.dock.module.menu", QByteArray(), "statusVisible", true).toBool()) {
++    if (0) {
+         static QMap<QString, int> g_stateMap = {{tr("Keep shown"), KeepShowing}
+                                                 , {tr("Keep hidden"), KeepHidden}
+                                                 , {tr("Smart hide"), SmartHide}};
+-- 
+2.27.0
+

README.en.md

@@ -1,22 +1,79 @@
 # dde-dock
 
 #### Description
-dde dock
+Dock is at the bottom of the desktop by default to help you quickly open frequently-used applications, which includes Launcher, applications, system tray, and plugins. In the dock, you can open launcher, show the desktop, enter the workspaces, open and exit apps, set input methods, adjust the volume, connect to the network, view the calendar and enter the shutdown interface, and so on.
 
 #### Software Architecture
 Software architecture description
 
 #### Installation
 
-1.  xxxx
-2.  xxxx
-3.  xxxx
+dnf install dde-dock
 
 #### Instructions
 
-1.  xxxx
-2.  xxxx
-3.  xxxx
+1.Icons on Dock
+
+In the Dock, there are icons of Launcher, applications, system tray, and plugins.
+
+![20210817112439](./images/20210817112439.png)
+
+2.Switch Display Mode
+
+There are two display modes of Dock: fashion mode and efficient mode, icon sizes are different in them.
+
+![20210817113315](./images/20210817113315.png)
+
+You can switch the display modes by the following operations:
+
+(1)Right-click the Dock and select **Mode**.
+
+(2)Select the display mode.
+
+3.Change Dock Location
+
+You can place Dock on any direction of your desktop.
+
+(1)Right-click the Dock and select **Location**.
+
+(2)Select a location.
+
+4.Change Dock Height
+
+Drag the top edge to increase or decrease the height
+
+5.Show/Hide Plugins
+
+(1)Right-click the Dock and select **Plugins**.
+
+(2)On the submenu, you can check or uncheck **Trash, Power, Show Desktop, Onboard**, and **Datetime** 	to show or hide the corresponding icon in the Dock
+
+6.View Notifications
+
+When there are system or application notifications, they will be shown in the middle of the screen. If 		there are buttons in the message, click buttons to do the actions; if there are not, click the message to 		close it.
+
+![20210817114321](./images/20210817114321.png)
+
+7.Vies Date and Time
+
+- Hover the cursor over the Time icon in Dock to view the current time, date and day of the week.
+- Click the Time icon to open Calendar.
+
+8.Enter Shutdown Interfack
+
+There are two ways to enter the shutdown interface:
+
+- Click ![shutdown](https://docs.openeuler.org/en/docs/20.03_LTS_SP2/docs/desktop/figures/icon122-o.svg) in Dock.
+- Click ![poweroff_normal](https://docs.openeuler.org/en/docs/20.03_LTS_SP2/docs/desktop/figures/icon136-o.svg) at the bottom right corner of Launcher mini mode.
+
+| Function                                                     | Description                                                  |
+| :----------------------------------------------------------- | :----------------------------------------------------------- |
+| Shut down ![poweroff_normal](https://docs.openeuler.org/en/docs/20.03_LTS_SP2/docs/desktop/figures/icon136-o.svg) | Shut down the computer.                                      |
+| Reboot ![reboot_normal](https://docs.openeuler.org/en/docs/20.03_LTS_SP2/docs/desktop/figures/icon110-o.svg) | Restart the computer.                                        |
+| Lock ![lock_normal](https://docs.openeuler.org/en/docs/20.03_LTS_SP2/docs/desktop/figures/icon90-o.svg) | Lock the computer with the password. Or press **Super** + **L** to lock it. |
+| Switch user ![userswitch_normal](https://docs.openeuler.org/en/docs/20.03_LTS_SP2/docs/desktop/figures/icon128-o.svg) | Log in with another user account.                            |
+| Log out ![logout_normal](https://docs.openeuler.org/en/docs/20.03_LTS_SP2/docs/desktop/figures/icon92-o.svg) | End all the processes and initialize the system.             |
+| Start system monitor![deepin-system-monitor](https://docs.openeuler.org/en/docs/20.03_LTS_SP2/docs/desktop/figures/icon68-o.svg) | View the running processes and end the one you want          |
 
 #### Contribution
 

README.md

@@ -1,7 +1,7 @@
 # dde-dock
 
 #### 介绍
-dde dock
+ 任务栏是指位于桌面底部的长条，主要由启动器、应用程序图标、托盘区、系统插件等组成。在任务栏，您可以打开启动器、显示桌面、进入工作区，对其上的应用程序进行打开、新建、关闭、强制退出等操作，还可以设置输入法，调节音量，连接网络，查看日历，进入关机界面等。
 
 #### 软件架构
 软件架构说明
@@ -9,15 +9,72 @@ dde dock
 
 #### 安装教程
 
-1.  xxxx
-2.  xxxx
-3.  xxxx
+dnf install dde-dock
 
 #### 使用说明
 
-1.  xxxx
-2.  xxxx
-3.  xxxx
+ 1.认识任务栏图标
+
+任务栏图标包括启动器图标、应用程序图标、托盘区图标、系统插件图标等。
+
+![20210817112439](./images/20210817112439.png)
+
+2.切换显示模式
+
+任务栏提供两种显示模式：时尚模式和高效模式，显示不同的图标大小和应用窗口激活效果。
+
+![20210817113315](./images/20210817113315.png)
+
+您可以通过以下操作来切换显示模式：
+
+ (1)右键单击任务栏。
+
+  (2)在 **模式** 子菜单中选择一种显示模式。
+
+3.设置任务栏位置
+
+您可以将任务栏放置在桌面的任意方向。
+
+ (1)右键单击任务栏。
+
+ (2)在 **位置** 子菜单中选择一个方向
+
+4.调整任务栏高度
+
+鼠标拖动任务栏边缘，改变任务栏高度。
+
+5.显示/隐藏插件
+
+(1)右键单击任务栏。
+
+(2)在 **插件** 子菜单中勾选或取消勾选 **回收站、电源、显示桌面、屏幕键盘、通知中心、时间**，可以设置这些插件在任务栏上的显示和隐藏效果
+
+6.查看通知
+
+当有系统或应用通知时，会在桌面上方弹出通知消息。若有按钮，单击按钮执行对应操作；若无按钮，单击关闭此消息。
+
+![20210817114321](./images/20210817114321.png)
+
+您还可以单击任务栏上的 ![notification](https://docs.openeuler.org/zh/docs/21.03/docs/desktop/figures/icon101-o.svg)， 打开通知中心，查看所有通知
+
+7.查看日期时间
+
+(1)鼠标指针悬停在任务栏的时间上，查看当前日期、星期和时间。
+
+(2)单击时间，打开日历
+
+8.进入关机界面
+
+您可以单击任务栏上的 ![shutdown](https://docs.openeuler.org/zh/docs/21.03/docs/desktop/figures/icon136-o.svg) 进入关机界面，也可以在启动器的小窗口模式中单击 ![poweroff_normal](https://docs.openeuler.org/zh/docs/21.03/docs/desktop/figures/icon136-o.svg)。
+
+| 功能                                                         | 说明                                                    |
+| :----------------------------------------------------------- | :------------------------------------------------------ |
+| 关机![poweroff_normal](https://docs.openeuler.org/zh/docs/21.03/docs/desktop/figures/icon136-o.svg) | 关闭电脑。                                              |
+| 重启![reboot_normal](https://docs.openeuler.org/zh/docs/21.03/docs/desktop/figures/icon110-o.svg) | 关机后再次重新运行您的电脑。                            |
+| 锁定![lock_normal](https://docs.openeuler.org/zh/docs/21.03/docs/desktop/figures/icon90-o.svg) | 锁定电脑，或按下键盘上的 **Super** + **L** 组合键锁定。 |
+| 切换用户![userswitch_normal](https://docs.openeuler.org/zh/docs/21.03/docs/desktop/figures/icon128-o.svg) | 选择另一个用户帐户登录。                                |
+| 注销![logout_normal](https://docs.openeuler.org/zh/docs/21.03/docs/desktop/figures/icon92-o.svg) | 清除当前登录用户的信息。                                |
+| 系统监视器![deepin-system-monitor](https://docs.openeuler.org/zh/docs/21.03/docs/desktop/figures/icon68-o.svg) | 快速启动系统监视器。                                    |
 
 #### 参与贡献
 

dde-dock.spec

@@ -1,19 +1,24 @@
 %global sname deepin-dock
 
 Name:           dde-dock
-Version:        5.1.0.13
-Release:        2
+Version:        5.5.76
+Release:        1
 Summary:        Deepin desktop-environment - Dock module
 License:        GPLv3
-URL:            http://shuttle.corp.deepin.com/cache/repos/eagle/release-candidate/RERFNS4wLjAuNjU3NQ/pool/main/d/dde-dock/
-Source0:        http://shuttle.corp.deepin.com/cache/repos/eagle/release-candidate/RERFNS4wLjAuNjU3NQ/pool/main/d/%{name}/%{name}_%{version}.orig.tar.xz	
+URL:            https://github.com/linuxdeepin/dde-dock
+Source0:        %{name}-%{version}.tar.gz
+Patch1:         0001-Hidden-state.patch
+Patch2:         0001-hide-status-box.patch
+Patch3:         0001-Mask-intelligent-hiding.patch
 
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
+BuildRequires:  libarchive
 BuildRequires:  pkgconfig(dbusmenu-qt5)
-BuildRequires:  pkgconfig(dde-network-utils)
+BuildRequires:  dde-network-core-devel
 BuildRequires:  dtkwidget-devel >= 5.1
 BuildRequires:  dtkcore-devel >= 5.1
+BuildRequires:  dtkcommon-devel
 BuildRequires:  pkgconfig(dframeworkdbus) >= 2.0
 BuildRequires:  pkgconfig(gsettings-qt)
 BuildRequires:  pkgconfig(gtk+-2.0)
@@ -30,12 +35,25 @@ BuildRequires:  pkgconfig(xcb-ewmh)
 BuildRequires:  pkgconfig(xcb-icccm)
 BuildRequires:  pkgconfig(xcb-image)
 BuildRequires:  qt5-linguist
+BuildRequires:  gtest-devel
+BuildRequires:  gmock-devel
+BuildRequires:  qt5-qtbase-private-devel
+BuildRequires:  qt5-qttools-devel
+BuildRequires:  libXtst-devel
+BuildRequires:  libxcb
+BuildRequires:  dde-control-center-devel >= 5.5.77
+BuildRequires:  dde-control-center >= 5.5.77
+
 Requires:       dbusmenu-qt5
-Requires:       dde-network-utils
+Requires:       dde-network-core
 Requires:       dde-qt-dbus-factory
 Requires:       xcb-util-wm
 Requires:       xcb-util-image
 Requires:       libxcb
+Requires:       deepin-desktop-schemas
+Requires:       dde-daemon
+Requires:       libqtxdg-devel
+Requires:       onboard
 
 %description
 Deepin desktop-environment - Dock module.
@@ -55,25 +73,34 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 deepin desktop-environment - dock plugin.
 
 %prep
-%setup -q -n %{name}-%{version}
-sed -i '/TARGETS/s|lib|%{_lib}|' plugins/*/CMakeLists.txt \
-                                 plugins/plugin-guide/plugins-developer-guide.md
+%setup -q
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
-sed -i -E '30,39d' CMakeLists.txt
+find plugins/ -mindepth 2 -maxdepth 2 -type f -name CMakeLists.txt | grep -vE 'dcc-dock-plugin/CMakeLists.txt' | xargs -I '{file_name}' sed -i '/TARGETS/s|lib|%{_lib}|' '{file_name}'
+
+sed -i '/TARGETS/s|lib|%{_lib}|' plugins/plugin-guide/plugins-developer-guide.md
 
 sed -i 's|/lib|/%{_lib}|' frame/controller/dockpluginscontroller.cpp \
-                          frame/panel/mainpanelcontrol.cpp \
+                          frame/window/mainpanelcontrol.cpp \
                           plugins/tray/system-trays/systemtrayscontroller.cpp
 
 
-sed -i 's|/lib|/libexec|g' plugins/show-desktop/showdesktopplugin.cpp
+sed -i 's|/lib|/libexec|g' plugins/show-desktop/showdesktopplugin.cpp \
+                           frame/window/mainpanelcontrol.cpp \
+                           frame/window/components/desktop_widget.cpp
+
+sed -i 's:libdir.*:libdir=%{_libdir}:' dde-dock.pc.in
 
 sed -i 's|/usr/lib/dde-dock/plugins|%{_libdir}/dde-dock/plugins|' plugins/plugin-guide/plugins-developer-guide.md
 sed -i 's|local/lib/dde-dock/plugins|local/%{_lib}/dde-dock/plugins|' plugins/plugin-guide/plugins-developer-guide.md
 
+sed -i 's|lrelease|lrelease-qt5|' translate_generation.sh
+
 %build
 export PATH=%{_qt5_bindir}:$PATH
-%cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=%{_arch} .
+%cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=%{_arch} -DCMAKE_INSTALL_SYSCONFDIR=/etc .
 %make_build
 
 %install
@@ -82,16 +109,20 @@ export PATH=%{_qt5_bindir}:$PATH
 %ldconfig_scriptlets
 
 %files
+%{_datadir}/%{name}/translations/*.qm
 %license LICENSE
-%{_sysconfdir}/%{name}/indicator/keybord_layout.json
 %{_bindir}/%{name}
 %{_libdir}/%{name}/
-%{_datadir}/%{name}/
-%{_datadir}/dbus-1/services/*.service
 %{_datarootdir}/glib-2.0/schemas/com.deepin.dde.dock.module.gschema.xml
 %{_datarootdir}/polkit-1/actions/com.deepin.dde.dock.overlay.policy
+%config %{_sysconfdir}/%{name}/indicator/keybord_layout.json
+%{_datadir}/dsg/
+%{_datadir}/dcc-dock-plugin/
+%{_prefix}/lib/dde-control-center/modules/
+%{_sysconfdir}/%{name}/
 
 %files devel
+%doc plugins/plugin-guide
 %{_includedir}/%{name}/
 %{_libdir}/pkgconfig/%{name}.pc
 %{_libdir}/cmake/DdeDock/DdeDockConfig.cmake
@@ -101,8 +132,24 @@ export PATH=%{_qt5_bindir}:$PATH
 
 
 %changelog
+* Wed Aug 02 2023 leeffo <liweiganga@uniontech.com> - 5.5.76-1
+- upgrade to version 5.5.76
+
+* Wed Mar 29 2023 liweiganga <liweiganga@uniontech.com> - 5.4.56.2-1
+- update: update to 5.4.56.2
+
+* Mon Jul 18 2022 konglidong <konglidong@uniontech.com> - 5.4.12.7-1
+- Update to 5.4.12.7
+
+* Fri Jun 17 2022 loong_C <loong_c@yeah.net> - 5.3.0.31-2
+- fix build error
+
+* Thu Jul 08 2021 weidong <weidong@uniontech.com> - 5.3.0.31-1
+- Update to 5.3.0.31
+
 * Thu Sep 3 2020 weidong <weidong@uniontech.com> - 5.1.0.13-2
 - fix source url in spec
 
 * Thu Jul 30 2020 openEuler Buildteam <buildteam@openeuler.org> - 5.1.0.13-1
 - Package init
+