update to 5.6.22
This commit is contained in:
liuzhilin
parent
617fb35ce9
commit
227fda3130
24
0001-fix-build-error.patch
Normal file
24
0001-fix-build-error.patch
Normal file
@ -0,0 +1,24 @@
|
||||
From 41137b56b8aeac3bfe54b643810c3d1875c9e98e Mon Sep 17 00:00:00 2001
|
||||
From: liuzhilin <liuzhilin@uniontech.com>
|
||||
Date: Fri, 1 Sep 2023 17:41:04 +0800
|
||||
Subject: [PATCH] fix-build-error
|
||||
|
||||
---
|
||||
frame/item/components/overflowwidget.cpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/frame/item/components/overflowwidget.cpp b/frame/item/components/overflowwidget.cpp
|
||||
index 0383382..bd1e7e6 100644
|
||||
--- a/frame/item/components/overflowwidget.cpp
|
||||
+++ b/frame/item/components/overflowwidget.cpp
|
||||
@@ -9,6 +9,7 @@
|
||||
#include <QPushButton>
|
||||
#include <QDebug>
|
||||
#include <QScrollBar>
|
||||
+#include <QPainterPath>
|
||||
|
||||
// Min distance to hide btn
|
||||
const int SCROLL_MIN_RANGE = 70;
|
||||
--
|
||||
2.39.3
|
||||
|
||||
30
0001-fix-dde-trash-error.patch
Normal file
30
0001-fix-dde-trash-error.patch
Normal file
@ -0,0 +1,30 @@
|
||||
From 7c3c6fadf6043408fd17167bab794f99ee61e7e4 Mon Sep 17 00:00:00 2001
|
||||
From: liuzhilin <liuzhilin@uniontech.com>
|
||||
Date: Wed, 27 Dec 2023 09:55:04 +0800
|
||||
Subject: [PATCH] fix-dde-trash-error
|
||||
|
||||
---
|
||||
plugins/trash/popupcontrolwidget.cpp | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/plugins/trash/popupcontrolwidget.cpp b/plugins/trash/popupcontrolwidget.cpp
|
||||
index 77d3810a..d5ad0bba 100644
|
||||
--- a/plugins/trash/popupcontrolwidget.cpp
|
||||
+++ b/plugins/trash/popupcontrolwidget.cpp
|
||||
@@ -14,11 +14,12 @@
|
||||
#include <DDesktopServices>
|
||||
|
||||
#include <QCoreApplication>
|
||||
+#include <QStandardPaths>
|
||||
|
||||
DWIDGET_USE_NAMESPACE
|
||||
DCORE_USE_NAMESPACE
|
||||
|
||||
-const QString TrashDir = QDir::homePath() + "/.local/share/Trash";
|
||||
+const QString TrashDir = QStandardPaths::writableLocation(QStandardPaths::HomeLocation) + "/.local/share/Trash";
|
||||
const QDir::Filters ItemsShouldCount = QDir::AllEntries | QDir::Hidden | QDir::System | QDir::NoDotAndDotDot;
|
||||
|
||||
|
||||
--
|
||||
2.39.3
|
||||
|
||||
93
README.en.md
93
README.en.md
@ -1,93 +0,0 @@
|
||||
# dde-dock
|
||||
|
||||
#### Description
|
||||
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
|
||||
|
||||
dnf install dde-dock
|
||||
|
||||
#### Instructions
|
||||
|
||||
1.Icons on Dock
|
||||
|
||||
In the Dock, there are icons of Launcher, applications, system tray, and plugins.
|
||||
|
||||
|
||||
|
||||
2.Switch Display Mode
|
||||
|
||||
There are two display modes of Dock: fashion mode and efficient mode, icon sizes are different in them.
|
||||
|
||||
|
||||
|
||||
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.
|
||||
|
||||
|
||||
|
||||
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  in Dock.
|
||||
- Click  at the bottom right corner of Launcher mini mode.
|
||||
|
||||
| Function | Description |
|
||||
| :----------------------------------------------------------- | :----------------------------------------------------------- |
|
||||
| Shut down  | Shut down the computer. |
|
||||
| Reboot  | Restart the computer. |
|
||||
| Lock  | Lock the computer with the password. Or press **Super** + **L** to lock it. |
|
||||
| Switch user  | Log in with another user account. |
|
||||
| Log out  | End all the processes and initialize the system. |
|
||||
| Start system monitor | View the running processes and end the one you want |
|
||||
|
||||
#### Contribution
|
||||
|
||||
1. Fork the repository
|
||||
2. Create Feat_xxx branch
|
||||
3. Commit your code
|
||||
4. Create Pull Request
|
||||
|
||||
|
||||
#### 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)
|
||||
3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
|
||||
4. The most valuable open source project [GVP](https://gitee.com/gvp)
|
||||
5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
|
||||
6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
|
||||
94
README.md
94
README.md
@ -1,94 +0,0 @@
|
||||
# dde-dock
|
||||
|
||||
#### 介绍
|
||||
任务栏是指位于桌面底部的长条，主要由启动器、应用程序图标、托盘区、系统插件等组成。在任务栏，您可以打开启动器、显示桌面、进入工作区，对其上的应用程序进行打开、新建、关闭、强制退出等操作，还可以设置输入法，调节音量，连接网络，查看日历，进入关机界面等。
|
||||
|
||||
#### 软件架构
|
||||
软件架构说明
|
||||
|
||||
|
||||
#### 安装教程
|
||||
|
||||
dnf install dde-dock
|
||||
|
||||
#### 使用说明
|
||||
|
||||
1.认识任务栏图标
|
||||
|
||||
任务栏图标包括启动器图标、应用程序图标、托盘区图标、系统插件图标等。
|
||||
|
||||
|
||||
|
||||
2.切换显示模式
|
||||
|
||||
任务栏提供两种显示模式：时尚模式和高效模式，显示不同的图标大小和应用窗口激活效果。
|
||||
|
||||
|
||||
|
||||
您可以通过以下操作来切换显示模式：
|
||||
|
||||
(1)右键单击任务栏。
|
||||
|
||||
(2)在 **模式** 子菜单中选择一种显示模式。
|
||||
|
||||
3.设置任务栏位置
|
||||
|
||||
您可以将任务栏放置在桌面的任意方向。
|
||||
|
||||
(1)右键单击任务栏。
|
||||
|
||||
(2)在 **位置** 子菜单中选择一个方向
|
||||
|
||||
4.调整任务栏高度
|
||||
|
||||
鼠标拖动任务栏边缘，改变任务栏高度。
|
||||
|
||||
5.显示/隐藏插件
|
||||
|
||||
(1)右键单击任务栏。
|
||||
|
||||
(2)在 **插件** 子菜单中勾选或取消勾选 **回收站、电源、显示桌面、屏幕键盘、通知中心、时间**，可以设置这些插件在任务栏上的显示和隐藏效果
|
||||
|
||||
6.查看通知
|
||||
|
||||
当有系统或应用通知时，会在桌面上方弹出通知消息。若有按钮，单击按钮执行对应操作；若无按钮，单击关闭此消息。
|
||||
|
||||
|
||||
|
||||
您还可以单击任务栏上的 ， 打开通知中心，查看所有通知
|
||||
|
||||
7.查看日期时间
|
||||
|
||||
(1)鼠标指针悬停在任务栏的时间上，查看当前日期、星期和时间。
|
||||
|
||||
(2)单击时间，打开日历
|
||||
|
||||
8.进入关机界面
|
||||
|
||||
您可以单击任务栏上的  进入关机界面，也可以在启动器的小窗口模式中单击 。
|
||||
|
||||
| 功能 | 说明 |
|
||||
| :----------------------------------------------------------- | :------------------------------------------------------ |
|
||||
| 关机 | 关闭电脑。 |
|
||||
| 重启 | 关机后再次重新运行您的电脑。 |
|
||||
| 锁定 | 锁定电脑，或按下键盘上的 **Super** + **L** 组合键锁定。 |
|
||||
| 切换用户 | 选择另一个用户帐户登录。 |
|
||||
| 注销 | 清除当前登录用户的信息。 |
|
||||
| 系统监视器 | 快速启动系统监视器。 |
|
||||
|
||||
#### 参与贡献
|
||||
|
||||
1. Fork 本仓库
|
||||
2. 新建 Feat_xxx 分支
|
||||
3. 提交代码
|
||||
4. 新建 Pull Request
|
||||
|
||||
|
||||
#### 码云特技
|
||||
|
||||
1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
|
||||
2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com)
|
||||
3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目
|
||||
4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目
|
||||
5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
|
||||
6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
|
||||
Binary file not shown.
BIN
dde-dock-5.6.22.tar.gz
Normal file
BIN
dde-dock-5.6.22.tar.gz
Normal file
Binary file not shown.
@ -1,25 +1,28 @@
|
||||
%global sname deepin-dock
|
||||
|
||||
Name: dde-dock
|
||||
Version: 5.5.76
|
||||
Release: 1
|
||||
Version: 5.6.22
|
||||
Release: 1%{?dist}.03
|
||||
Summary: Deepin desktop-environment - Dock module
|
||||
License: GPLv3
|
||||
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
|
||||
URL: https://github.com/linuxdeepin/dde-dock/
|
||||
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
|
||||
Patch1: 0001-Mask-intelligent-hiding.patch
|
||||
Patch2: 0001-Hidden-state.patch
|
||||
Patch3: 0001-hide-status-box.patch
|
||||
Patch4: 0001-fix-build-error.patch
|
||||
Patch5: 0001-fix-dde-trash-error.patch
|
||||
|
||||
BuildRequires: cmake
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: libarchive
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: pkgconfig(dbusmenu-qt5)
|
||||
BuildRequires: dde-network-core-devel
|
||||
BuildRequires: dtkwidget-devel >= 5.1
|
||||
BuildRequires: dtkcore-devel >= 5.1
|
||||
#####BuildRequires: dde-network-core-devel
|
||||
BuildRequires: dtkcommon-devel
|
||||
BuildRequires: pkgconfig(dframeworkdbus) >= 2.0
|
||||
BuildRequires: dtkwidget-devel >= 5.4.19
|
||||
BuildRequires: dtkcore-devel >= 5.4.14
|
||||
BuildRequires: dtkgui-devel >= 5.4.13
|
||||
BuildRequires: pkgconfig(dframeworkdbus)
|
||||
BuildRequires: pkgconfig(gsettings-qt)
|
||||
BuildRequires: pkgconfig(gtk+-2.0)
|
||||
BuildRequires: pkgconfig(Qt5Core)
|
||||
@ -34,27 +37,31 @@ BuildRequires: pkgconfig(xcb-composite)
|
||||
BuildRequires: pkgconfig(xcb-ewmh)
|
||||
BuildRequires: pkgconfig(xcb-icccm)
|
||||
BuildRequires: pkgconfig(xcb-image)
|
||||
BuildRequires: pkgconfig(xcb-damage)
|
||||
BuildRequires: qt5-linguist
|
||||
BuildRequires: gtest-devel
|
||||
BuildRequires: gmock-devel
|
||||
BuildRequires: qt5-qtbase-private-devel
|
||||
BuildRequires: qt5-qttools-devel
|
||||
BuildRequires: libXtst-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-core
|
||||
######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: dde-daemon
|
||||
Requires: startdde
|
||||
Requires: libqtxdg-devel
|
||||
Requires: onboard
|
||||
|
||||
|
||||
|
||||
%description
|
||||
Deepin desktop-environment - Dock module.
|
||||
|
||||
@ -73,10 +80,12 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
deepin desktop-environment - dock plugin.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%setup -q -n %{name}-%{version}
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
|
||||
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}'
|
||||
|
||||
@ -105,6 +114,7 @@ export PATH=%{_qt5_bindir}:$PATH
|
||||
|
||||
%install
|
||||
%make_install INSTALL_ROOT=%{buildroot}
|
||||
chmod +x %{buildroot}/%{_bindir}/%{name}-wrapper
|
||||
|
||||
%ldconfig_scriptlets
|
||||
|
||||
@ -112,14 +122,15 @@ export PATH=%{_qt5_bindir}:$PATH
|
||||
%{_datadir}/%{name}/translations/*.qm
|
||||
%license LICENSE
|
||||
%{_bindir}/%{name}
|
||||
%{_bindir}/%{name}-wrapper
|
||||
%{_libdir}/%{name}/
|
||||
%{_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}/
|
||||
#%{_sysconfdir}/xdg/autostop/clearDumpRecord.sh
|
||||
|
||||
%files devel
|
||||
%doc plugins/plugin-guide
|
||||
@ -132,24 +143,44 @@ export PATH=%{_qt5_bindir}:$PATH
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Aug 02 2023 leeffo <liweiganga@uniontech.com> - 5.5.76-1
|
||||
- upgrade to version 5.5.76
|
||||
* Thu Dec 28 2023 liuzhilin <liuzhilin@uniontech.com> - 5.6.22-1.02
|
||||
- fix: fix-dde-trash-error
|
||||
|
||||
* Wed Mar 29 2023 liweiganga <liweiganga@uniontech.com> - 5.4.56.2-1
|
||||
- update: update to 5.4.56.2
|
||||
* Mon Oct 16 2023 liweigang <liweiganga@uniontech.com> - 5.6.22-1.01
|
||||
- chore: dde-dock-wrapper add +x
|
||||
|
||||
* Mon Jul 18 2022 konglidong <konglidong@uniontech.com> - 5.4.12.7-1
|
||||
- Update to 5.4.12.7
|
||||
* Mon Oct 09 2023 liweigang <liweiganga@uniontech.com> - 5.6.22-1
|
||||
- update: update to version 5.6.22
|
||||
|
||||
* Fri Jun 17 2022 loong_C <loong_c@yeah.net> - 5.3.0.31-2
|
||||
- fix build error
|
||||
* Thu Aug 17 2023 liuzhilin <liuzhilin@uniontech.com> - 5.6.11.1-1
|
||||
- update: update to 5.6.11.1 and fix build error
|
||||
|
||||
* Thu Jul 08 2021 weidong <weidong@uniontech.com> - 5.3.0.31-1
|
||||
- Update to 5.3.0.31
|
||||
* Sat May 06 2023 songmingliang <songmingliangliang@uniontech.com> - 5.5.76-8
|
||||
- fix: Mask dcc state(bugid:187109)
|
||||
|
||||
* Thu Sep 3 2020 weidong <weidong@uniontech.com> - 5.1.0.13-2
|
||||
- fix source url in spec
|
||||
* Tue Apr 18 2023 mahailiang <mahailiang@uniontech.com> - 5.5.76-7
|
||||
- fix: Mask state(bugid:187109)
|
||||
|
||||
* Thu Jul 30 2020 openEuler Buildteam <buildteam@openeuler.org> - 5.1.0.13-1
|
||||
- Package init
|
||||
* Tue Apr 11 2023 mahailiang <mahailiang@uniontech.com> - 5.5.76-6
|
||||
- fix: Mask intelligent hiding(bugid:187109)
|
||||
|
||||
* Thu Mar 09 2023 liweiganga <liweiganga@uniontech.com> - 5.5.76-5
|
||||
- feat: fix show desktop function
|
||||
|
||||
* Fri Feb 03 2023 liweiganga <liweiganga@uniontech.com> - 5.5.76-3
|
||||
- spec: modify dde-control-center plugin path
|
||||
|
||||
* Fri Feb 03 2023 liweiganga <liweiganga@uniontech.com> - 5.5.76-2
|
||||
- spec: dde-network-utils replace for dde-network-core
|
||||
|
||||
* Tue Jan 17 2023 liweiganga <liweiganga@uniontech.com> - 5.5.76-1.01
|
||||
- spec: fix /etc/dde-dock path
|
||||
|
||||
* Mon Jan 09 2023 liweiganga <liweiganga@uniontech.com> - 5.5.76-1
|
||||
- update: update to 5.5.76
|
||||
|
||||
* Fri Jun 10 2022 haomimi <haomimi@uniontech.com> - 5.4.56.2-1.02
|
||||
- Fix the desktop feature displayed in the lower right corner(bugID:112852)
|
||||
|
||||
* Fri Jun 10 2022 uoser <uoser@uniontech.com> - 5.4.56.2-1
|
||||
- package init
|
||||
|
||||
@ -1,4 +0,0 @@
|
||||
version_control: github
|
||||
src_repo: linuxdeepin/dde-dock
|
||||
tag_prefix: ^v
|
||||
seperator: .
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 49 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 53 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 14 KiB |
Loading…
x
Reference in New Issue
Block a user