!38 sync by openEuler-24.03-LTS

From: @pang-qing 
Reviewed-by: @ut-layne-yang 
Signed-off-by: @ut-layne-yang

0001-Solve-the-problem-of-not-being-able-to-shrink-after-magnification.patch

@@ -0,0 +1,71 @@
+From b81dafbd4fca202cfd65a51cfd38293c8d014ddc Mon Sep 17 00:00:00 2001
+From: maqi <maqi@uniontech.com>
+Date: Mon, 13 May 2024 15:09:33 +0800
+Subject: [PATCH] Solve the problem of not being able to shrink after
+ magnification
+
+---
+ src/windowedframe.cpp | 11 -----------
+ 1 file changed, 11 deletions(-)
+
+diff --git a/src/windowedframe.cpp b/src/windowedframe.cpp
+index 55c34069..bf997690 100644
+--- a/src/windowedframe.cpp
++++ b/src/windowedframe.cpp
+@@ -87,18 +87,14 @@ WindowedFrame::WindowedFrame(QWidget *parent)
+     , m_displayMode(All)
+     , m_calcUtil(CalculateUtil::instance())
+     , m_focusPos(Applist)
+-    , m_modeToggleBtn(new ModeToggleButton(this))
+     , m_searcherEdit(new DSearchEdit(this))
+     , m_enterSearchEdit(false)
+     , m_dockFrontInfc(new DBusDockInterface(this))
+ {
+-    if (!getDConfigValue("enableFullScreenMode", true).toBool())
+-        m_modeToggleBtn->hide();
+ 
+     m_searcherEdit->setAccessibleName("searcherEdit");
+     m_maskBg->setAccessibleName("MaskBg");
+     m_switchBtn->setAccessibleName("switchBtn");
+-    m_modeToggleBtn->setAccessibleName("modeToggleBtn");
+     m_tipsLabel->setAccessibleName("tipsLabel");
+ 
+     setMaskColor(DBlurEffectWidget::AutoColor);
+@@ -135,7 +131,6 @@ WindowedFrame::WindowedFrame(QWidget *parent)
+     searchLayout->setContentsMargins(9, 0, DLauncher::MINI_FRAME_LAYOUT_SPACE2, 0);
+     searchLayout->addWidget(m_searcherEdit);
+     searchLayout->setSpacing(6);
+-    searchLayout->addWidget(m_modeToggleBtn);
+ 
+     QHBoxLayout *appsLayout = new QHBoxLayout;
+     appsLayout->setContentsMargins(DLauncher::MINI_FRAME_LAYOUT_SPACE1, 0, 0, 0);
+@@ -225,7 +220,6 @@ WindowedFrame::WindowedFrame(QWidget *parent)
+     connect(m_delayHideTimer, &QTimer::timeout, this, &WindowedFrame::prepareHideLauncher, Qt::QueuedConnection);
+ 
+     connect(m_appearanceInter, &Appearance::OpacityChanged, this, &WindowedFrame::onOpacityChanged);
+-    connect(m_modeToggleBtn, &DToolButton::clicked, this, &WindowedFrame::onToggleFullScreen);
+ 
+     QTimer::singleShot(1, this, &WindowedFrame::onWMCompositeChanged);
+     onOpacityChanged(m_appearanceInter->opacity());
+@@ -235,10 +229,6 @@ WindowedFrame::WindowedFrame(QWidget *parent)
+     connect(this, &WindowedFrame::visibleChanged, this, &WindowedFrame::onHideMenu);
+ 
+     // 状态切换
+-    m_switchBtn->updateStatus(All);
+-    m_modeToggleBtn->setIconSize(QSize(32,32));
+-    m_modeToggleBtn->setFixedSize(40, 40);
+-    m_modeToggleBtn->setFocusPolicy(Qt::NoFocus);
+ 
+     // 重置控件样式
+     resetWidgetStyle();
+@@ -928,7 +918,6 @@ void WindowedFrame::onToggleFullScreen()
+     if (delegate)
+         delegate->setActived(false);
+ 
+-    m_modeToggleBtn->setHovered(false);
+ 
+     // 全屏状态标识
+     m_calcUtil->setFullScreen(true);
+-- 
+2.39.3
+

README.en.md

@@ -1,37 +0,0 @@
-# dde-launcher
-
-#### Description
-dde launcher: Launcher helps you manage all the installed applications, where you can quickly find an application by category navigation or by a search
-
-#### Software Architecture
-Software architecture description
-
-#### Installation
-
-1.  dnf install dde-launcher 
-
-#### Instructions
-
-1.  Switch Launcher Modes,There are two display modes of Launcher: fullscreen mode and mini mode. Click the icon at the upper right corner to switch modes.
-2.  Sort Applications,In fullscreen mode, all applications in Launcher are listed by the installation time by default. You can sort the application icons as the ways below,Hover the cursor over an application icon, hold down the left key of mouse, drag and drop the application icon to arrange it freely.
-3.  Find Applications,If you already know the application name, just search for it.
-4.  Create App Shortcut,Select Send to desktop to create a shortcut on the desktop.Select Send to dock to fix the application icon in Dock.
-5.  Run Applications,Click the application icon in Dock or right-click it and select  open.
-6.  For the frequently-used applications, right-click the app icon and select Add to startup to run it when the computer boots.
-
-#### 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/)

README.md

@@ -1,38 +0,0 @@
-# dde-launcher
-
-#### 介绍
-dde launcher：帮助您管理系统中已安装的所有应用，在启动器中使用分类导航或搜索功能可以快速找到您需要的应用程序
-
-#### 软件架构
-软件架构说明
-
-
-#### 安装教程
-
-1.  dnf install dde-launcher 
-
-#### 使用说明
-
-1.  模式切换，启动器有全屏和小窗口两种模式。单击启动器界面右上角的图标来切换模式。
-2.  排列应用，全屏模式下，系统默认按照安装时间排列所有应用，也可以将鼠标悬停在应用图标上，按住鼠标左键不放，将应用图标拖拽到指定的位置自由排列。
-3.  应用查找，直接在搜索框中输入关键字，快速定位到需要的应用。
-4.  创建快捷方式，打开应用图片右键发送应用到任务栏或者桌面创建快捷方式
-5.  运行应用，在启动器中直接单击应用图标打开，或右键单击应用图标选择打开
-6.  对于经常使用的应用，您可以在启动器中，右键单击应用图标选择 开机自动启动
-
-#### 参与贡献
-
-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/)

dde-launcher.spec

@@ -1,17 +1,17 @@
-%global sname deepin-launcher
+%global sname dde-launcher
 
 Name:           dde-launcher
-Version:        5.3.0.23
-Release:        1
-Summary:        Deepin desktop-environment - Launcher module
+Version:        5.6.10
+Release:        2%{?dist}
+Summary:        dde desktop-environment - Launcher module
 License:        GPLv3
-URL:            http://shuttle.corp.deepin.com/cache/repos/eagle/release-candidate/RERFNS4wLjAuNjU3NQ/pool/main/d/dde-launcher/
-Source0:        %{name}_%{version}.orig.tar.xz
+URL:            https://github.com/linuxdeepin/%{name}
+Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
 
 BuildRequires:  cmake
 BuildRequires:  cmake(Qt5LinguistTools)
 BuildRequires:  dtkwidget-devel
-BuildRequires:  dtkcore-devel dtkcore
+BuildRequires:  pkgconfig(dtkcore)
 BuildRequires:  pkgconfig(dframeworkdbus)
 BuildRequires:  pkgconfig(gsettings-qt)
 BuildRequires:  pkgconfig(xcb-ewmh)
@@ -20,24 +20,26 @@ BuildRequires:  pkgconfig(Qt5DBus)
 BuildRequires:  pkgconfig(Qt5Svg)
 BuildRequires:  pkgconfig(Qt5X11Extras)
 BuildRequires:  qt5-qtbase-private-devel
+BuildRequires:  gtest-devel
+BuildRequires:  libarchive
+BuildRequires:  dtkgui-devel
+BuildRequires:  dtkcommon-devel
+BuildRequires:  qt5-qttools-devel
+BuildRequires:  gmock-devel
+Patch:		0001-Solve-the-problem-of-not-being-able-to-shrink-after-magnification.patch
 %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
 Requires:       deepin-menu
 Requires:       dde-daemon
 Requires:       startdde
 Requires:       hicolor-icon-theme
+Requires:       libqtxdg
 
 %description
 %{summary}.
 
-%package devel
-Summary:        Development package for %{sname}
-Requires:       %{name}%{?_isa} = %{version}-%{release}
-
-%description devel
-Header files and libraries for %{sname}.
 
 %prep
-%setup -q -n %{name}-%{version}
+%autosetup -p1
 sed -i 's|lrelease|lrelease-qt5|' translate_generation.sh
 
 %build
@@ -51,22 +53,29 @@ sed -i 's|lrelease|lrelease-qt5|' translate_generation.sh
 %license LICENSE
 %{_bindir}/%{name}
 %{_datadir}/%{name}/
+%{_bindir}/dde-launcher-wapper
+%{_datadir}/applications/dde-launcher.desktop
 %{_datadir}/dbus-1/services/*.service
-%{_datadir}/icons/hicolor/scalable/apps/%{sname}.svg
+%{_datadir}/icons/hicolor/scalable/apps/deepin-launcher.svg
+%{_datadir}/glib-2.0/schemas/com.deepin.dde.launcher.gschema.xml
+%{_datadir}/dsg/configs/org.deepin.dde.launcher/org.deepin.dde.launcher.json
 
-%files devel
-%{_includedir}/%{name}/
 
 %changelog
-* Thu Jul 08 2021 weidong <weidong@uniontech.com> - 5.3.0.23-3
-- update 5.3.0.23
+* Mon May 13 2024 maqi <maqi@uniontech.com> - 5.6.10-2
+- fix: Solve the problem of not being able to shrink after magnification 
 
-* Thu Sep 3 2020 weidong <weidong@uniontech.com> - 5.1.0.6-3
-- fix source url in spec
+* Mon Oct 09 2023 liweigang <liweiganga@uniontech.com> - 5.6.10-1
+- update: update to version 5.6.10
 
-* Tue Aug 18 2020 chenbo pan <panchenbo@uniontech.com> - 5.1.0.6-2
-- fix compile fail
+* Wed Aug 16 2023 liuzhilin <liuzhilin@uniontech.com> - 5.6.7-1
+- update: update to 5.6.7
 
-* Thu Jul 30 2020 openEuler Buildteam <buildteam@openeuler.org> - 5.1.0.6-1
-- Package init
+* Thu Mar 09 2023 liweiganga <liweiganga@uniontech.com> - 5.5.37-2
+- feat: fix dde-launcher disable icon(bugid:187227)
 
+* Wed Dec 28 2022 liweiganga <liweiganga@uniontech.com> - 5.5.37-1
+- update: update to 5.5.37
+
+* Mon Jun 13 2022 uoser <uoser@uniontech.com> - 5.4.45-1.01
+- update: update to 5.4.45-1.01

dde-launcher.yaml

@@ -1,4 +0,0 @@
-version_control: github
-src_repo: linuxdeepin/dde-launcher
-tag_prefix: ^v
-seperator: .