bck feat dock network plugin

archlinux/PKGBUILD

@@ -41,6 +41,7 @@ makedepends=('git'
              'ninja'
              'extra-cmake-modules'
              'wayland-protocols'
+             'networkmanager-qt'
 )
 conflicts=('dde-shell')
 provides=('dde-shell')

debian/control

@@ -42,6 +42,7 @@ Build-Depends:
  libxres-dev,
  libxtst-dev,
  libdframeworkdbus-dev,
+ libkf6networkmanagerqt-dev,
 Standards-Version: 3.9.8
 Homepage: http://www.deepin.org
 

debian/dde-shell.install

@@ -8,6 +8,8 @@ usr/share/dde-shell/org.deepin.ds.dock*/
 usr/lib/*/qt6/qml/org/deepin/ds/dock/*
 usr/lib/*/dde-shell/org.deepin.ds.notification*
 usr/share/dde-shell/org.deepin.ds.notification*/
+usr/lib/*/dde-shell/org.deepin.ds.dde-am*
+usr/share/dde-shell/org.deepin.ds.dde-am*/
 usr/libexec/dockplugin-loader
 usr/lib/*/qt5/plugins/wayland-shell-integration
 usr/lib/*/libdde-dockplugin-interface.so.*
@@ -16,3 +18,4 @@ usr/lib/dde-dock/tmp/plugins
 usr/lib/dde-dock/tmp/plugins/quick-trays
 usr/share/dde-dock/tmp/translations
 usr/share/dde-shell/*/translations
+usr/share/dock-network-plugin/tmp/translations

panels/dock/tray/CMakeLists.txt

@@ -74,28 +74,6 @@ endfunction(generation_dbus_interface)
 
 file(GLOB INTERFACES "interfaces/*.h")
 add_definitions(-DCVERSION="${VERSION}")
-#因为单元测试需要直接测试源代码，而主程序代码中include的单元使用了相对路径
-#单元测试的CMakeLists和主程序的CMakeLists路径不同，编译单元测试时会提示找不到文件
-#因此设置搜索路径
-include_directories(
-    frame/accessible
-    frame/controller
-    frame/dbus
-    frame/dbus/sni
-    frame/display
-    frame/item
-    frame/item/components
-    frame/item/resources
-    frame/model
-    frame/util
-    frame/window
-    frame/window/components
-    frame/window/tray
-    frame/window/tray/widgets
-    frame/xcb
-    ../widgets
-    ../interfaces
-    )
 aux_source_directory(frame/accessible ACCESSIBLE)
 aux_source_directory(frame/controller CONTROLLER)
 aux_source_directory(frame/dbus DBUS)
@@ -132,6 +110,30 @@ file(GLOB SRC_PATH
 add_subdirectory("frame")
 add_subdirectory("plugins")
 add_subdirectory("libdbusmenu-qt")
+
+#因为单元测试需要直接测试源代码，而主程序代码中include的单元使用了相对路径
+#单元测试的CMakeLists和主程序的CMakeLists路径不同，编译单元测试时会提示找不到文件
+#因此设置搜索路径
+# include_directories(
+#     frame/accessible
+#     frame/controller
+#     frame/dbus
+#     frame/dbus/sni
+#     frame/display
+#     frame/item
+#     frame/item/components
+#     frame/item/resources
+#     frame/model
+#     frame/util
+#     frame/window
+#     frame/window/components
+#     frame/window/tray
+#     frame/window/tray/widgets
+#     frame/xcb
+#     ../widgets
+#     ../interfaces
+#     )
+
 ## qm files
 file(GLOB QM_FILES "translations/*.qm")
 install(FILES ${QM_FILES}

panels/dock/tray/frame/CMakeLists.txt

@@ -53,6 +53,7 @@ target_include_directories(${BIN_NAME} PUBLIC
     accessible
     controller
     dbus
+    dbus/sni
     display
     item
     item/components

panels/dock/tray/plugins/CMakeLists.txt

@@ -11,3 +11,4 @@ add_subdirectory("bluetooth")
 add_subdirectory("airplane-mode")
 add_subdirectory("notification")
 add_subdirectory("deepin-screen-recorder")
+add_subdirectory("dde-network-core")

panels/dock/tray/plugins/bluetooth/CMakeLists.txt

@@ -34,6 +34,7 @@ set_target_properties(${PLUGIN_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../quic
 target_include_directories(${PLUGIN_NAME} PUBLIC ${DtkWidget_INCLUDE_DIRS}
   ../../interfaces
   ../../frame
+  ../../frame/util
   ../../frame/qtdbusextended
   ./dbusinterface/generation_dbus_interface
   componments)

panels/dock/tray/plugins/dde-network-core/CMakeLists.txt

@@ -0,0 +1,30 @@
+cmake_minimum_required(VERSION 3.7)
+
+set(VERSION "2.0.18" CACHE STRING "define project version")
+project(dde-network-core
+  VERSION ${VERSION}
+  DESCRIPTION "DDE Network Core"
+  HOMEPAGE_URL "https://github.com/linuxdeepin/dde-network-core"
+  LANGUAGES CXX C
+)
+
+# 增加安全编译参数
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-all")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector-all")
+set(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} -z relro -z now -z noexecstack -pie")
+
+option(ENABLE_DEEPIN_NMQT "enable nmqt patch on deepin" OFF)
+
+find_package(QT NAMES Qt6 REQUIRED COMPONENTS Core)
+set(QT_MAJOR_VERSION 6)
+find_package(Qt6 COMPONENTS Core Widgets DBus Network LinguistTools REQUIRED)
+find_package(KF6NetworkManagerQt REQUIRED)
+
+if (ENABLE_DEEPIN_NMQT)
+    add_definitions(-DUSE_DEEPIN_NMQT)
+endif()
+
+message(STATUS DEEPIN_NMQT_TEST ": ${DEEPIN_NMQT_TEST}")
+
+add_subdirectory("src")
+add_subdirectory("dock-network-plugin")

panels/dock/tray/plugins/dde-network-core/README.md

@@ -0,0 +1,58 @@
+## DDE Network Core
+
+DDE network library framework
+
+## Dependencies
+You can also check the "Depends" provided in the debian/control file.
+
+### Build dependencies
+You can also check the "Build-Depends" provided in the debian/control file.
+
+## Installation
+
+### Build from source code
+
+1. Make sure you have installed all dependencies.
+
+2. Build:
+```
+$ cd dde-network-core
+$ mkdir Build
+$ cd Build
+$ cmake ..
+$ make
+```
+
+3. Install:
+```
+$ sudo make install
+```
+
+The executable binary file could be found at `/usr/bin/dde-network-dialog` after the installation is finished, and plugins will be placed into related module plugin directory.
+
+## Usage
+
+Execute `dde-network-dialog -h` to get more details.
+
+## Getting help
+
+You can press `F1` to start [deepin-manual](https://github.com/linuxdeepin/deepin-manual) when you focus on DDE Control Center network module.
+
+You may also find these channels useful if you encounter any other issues:
+
+* [Gitter](https://gitter.im/orgs/linuxdeepin/rooms)
+* [IRC Channel](https://webchat.freenode.net/?channels=deepin)
+* [Official Forum](https://bbs.deepin.org/)
+* [Wiki](https://wiki.deepin.org/)
+* [Developer Center](https://github.com/linuxdeepin/dde-network-core) 
+
+## Getting involved
+
+We encourage you to report issues and contribute changes
+
+* [Contribution guide for developers](https://github.com/linuxdeepin/developer-center/wiki/Contribution-Guidelines-for-Developers-en). (English)
+* [开发者代码贡献指南](https://github.com/linuxdeepin/developer-center/wiki/Contribution-Guidelines-for-Developers) (中文)
+
+## License
+
+DDE Network Core is licensed under [LGPL-3.0-or-later](LICENSE).

panels/dock/tray/plugins/dde-network-core/README.zh_CN.md

@@ -0,0 +1,57 @@
+## DDE网络核心框架
+DDE网络核心框架是UOS桌面环境的网络连接框架。
+
+## 依赖
+请查看“debian/control”文件中提供的“Depends”。
+
+### 编译依赖
+请查看“debian/control”文件中提供的“Build-Depends”。
+
+## 安装
+
+### 构建过程
+
+1. 确保已经安装了所有的编译依赖
+
+2. 构建
+```
+$ cd dde-network-core
+$ mkdir Build
+$ cd Build
+$ cmake ..
+$ make
+```
+
+3. 安装
+```
+$ sudo make install
+```
+
+安装完成后可执行二进制文件在/usr/bin/dde-network-dialog，插件会放在相关模块的插件目录下。
+
+## 用法
+
+执行 `dde-network-dialog -h` 以获取更多详细信息。
+
+## 获得帮助
+
+当你使用DDE控制中心，进入网络模块时，您可以按 `F1` 启动 [deepin-manual](https://github.com/linuxdeepin/deepin-manual)。
+
+如果您遇到任何其他问题，您可能还会发现这些渠道很有用：
+
+* [Gitter](https://gitter.im/orgs/linuxdeepin/rooms)
+* [IRC Channel](https://webchat.freenode.net/?channels=deepin)
+* [官方论坛](https://bbs.deepin.org/)
+* [Wiki](https://wiki.deepin.org/)
+* [项目地址](https://github.com/linuxdeepin/dde-network-core) 
+
+## 贡献指南
+
+我们鼓励您报告问题并做出更改
+
+* [Contribution guide for developers](https://github.com/linuxdeepin/developer-center/wiki/Contribution-Guidelines-for-Developers-en). (English)
+* [开发者代码贡献指南](https://github.com/linuxdeepin/developer-center/wiki/Contribution-Guidelines-for-Developers) (中文)
+
+## License
+
+DDE网络核心框架在 [LGPL-3.0-or-later](LICENSE)下发布。