feat: merge branch chinalife

merge branch chinalife 73eb0006--db1f846e

Log: merge branch  for useraccounts

deepin-system-monitor-main/CMakeLists.txt

@@ -57,6 +57,7 @@ find_library(LIB_XEXT NAMES Xext REQUIRED)
 find_library(LIB_ICCCM NAMES xcb-icccm REQUIRED)
 find_package(ICU COMPONENTS i18n uc REQUIRED)
 
+pkg_search_module(DFrameworkDBus REQUIRED dframeworkdbus)  # chinalife
 pkg_search_module(LIB_NL3 REQUIRED libnl-3.0)
 pkg_search_module(LIB_NL3_ROUTE REQUIRED libnl-route-3.0)
 pkg_search_module(LIB_UDEV REQUIRED libudev)
@@ -71,6 +72,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/3rdparty)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/include)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libsmartcols/src)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../)
+include_directories(${DFrameworkDBus_INCLUDE_DIRS})  # chinalife
 
 #安全测试加固编译参数
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  -z relro -z now -z noexecstack -pie")
@@ -178,6 +180,9 @@ set(HPP_MODEL
     model/block_dev_info_model.h
     model/block_dev_info_sort_filter_proxy_model.h
     model/model_manager.h
+    model/accounts_info_model.h
+    model/user.h
+
 )
 set(CPP_MODEL
     model/system_service_table_model.cpp
@@ -196,6 +201,8 @@ set(CPP_MODEL
     model/block_dev_stat_model.cpp
     model/block_dev_info_sort_filter_proxy_model.cpp
     model/model_manager.cpp
+    model/accounts_info_model.cpp
+    model/user.cpp
 )
 
 set(HPP_GUI
@@ -239,6 +246,10 @@ set(HPP_GUI
     gui/block_dev_item_widget.h
     gui/dialog/systemprotectionsetting.h
     gui/dialog/custombuttonbox.h
+    gui/user_page_widget.h
+    gui/accounts_widget.h
+    gui/onlineicon.h
+    gui/user_list_view.h
 )
 set(CPP_GUI
     gui/base/base_detail_item_delegate.cpp
@@ -282,6 +293,10 @@ set(CPP_GUI
     gui/dialog/systemprotectionsetting.cpp
     gui/dialog/settingsdialog.cpp
     gui/dialog/custombuttonbox.cpp
+    gui/user_page_widget.cpp
+    gui/accounts_widget.cpp
+    gui/onlineicon.cpp
+    gui/user_list_view.cpp
 )
 
 set(HPP_PROCESS
@@ -575,6 +590,7 @@ set(LIBS
     ${LIB_NL3_LIBRARIES}
     ${LIB_NL3_ROUTE_LIBRARIES}
     ${LIB_UDEV_LIBRARIES}
+    ${DFrameworkDBus_LIBRARIES}   # chinalife
 )
 if (USE_DEEPIN_WAYLAND)
     list(APPEND LIBS DWaylandClient DWaylandServer)

deepin-system-monitor-main/accessible.h

@@ -97,6 +97,7 @@ SET_FORM_ACCESSIBLE(CompactNetworkMonitor, "CompactNetworkMonitor")
 SET_FORM_ACCESSIBLE(CpuMonitor, "CpuMonitor")
 SET_FORM_ACCESSIBLE(MemoryMonitor, "MemoryMonitor")
 SET_FORM_ACCESSIBLE(NetworkMonitor, "NetworkMonitor")
+SET_FORM_ACCESSIBLE(UserPageWidget, "UserPageWidget")
 
 // Qt控件
 SET_FORM_ACCESSIBLE(QFrame, m_w->objectName().isEmpty() ? "frame" : m_w->objectName())
@@ -156,6 +157,7 @@ QAccessibleInterface *accessibleFactory(const QString &classname, QObject *objec
     USE_ACCESSIBLE(QString(classname).replace("dccV20::", ""), CpuMonitor);
     USE_ACCESSIBLE(QString(classname).replace("dccV20::", ""), MemoryMonitor);
     USE_ACCESSIBLE(QString(classname).replace("dccV20::", ""), NetworkMonitor);
+    USE_ACCESSIBLE(QString(classname).replace("dccV20::", ""), UserPageWidget);
 
     //  Qt 控件
     USE_ACCESSIBLE(QString(classname).replace("dccV20::", ""), QFrame);

deepin-system-monitor-main/assets/deepin-system-monitor/system-monitor/en_US/d_system-monitor.md

@@ -132,6 +132,17 @@ In the list of system services, force-ending of application is prohibited.
 
 You can also right-click a system process and select **Restart**. 
 
+
+
+
+### User Management
+
+On the "Users" tab, you can view the names and types of logged-in user accounts. After selecting an account, you can:
+- Right-click and select **Edit account information** to modify the account info in the Accounts window of Control Center.
+- View all processes under the account on the right, and right-click a process to end or suspend it, change its priority, etc.
+
+![user](fig/user.png)
+
 ## Main Menu
 
 In the main menu, you can force ending applications, switch monitoring modes and themes, view help manual, and learn more information of System Monitor.

deepin-system-monitor-main/assets/deepin-system-monitor/system-monitor/en_US/system-monitor.md

@@ -132,6 +132,16 @@ In the list of system services, force-ending of application is prohibited.
 
 You can also right-click a system process and select **Restart**. 
 
+
+
+### User Management
+
+On the "Users" tab, you can view the names and types of logged-in user accounts. After selecting an account, you can:
+- Right-click and select **Edit account information** to modify the account info in the Accounts window of Control Center.
+- View all processes under the account on the right, and right-click a process to end or suspend it, change its priority, etc.
+
+![user](fig/user.png)
+
 ## Main Menu
 
 In the main menu, you can force ending applications, switch monitoring modes and themes, view help manual, and learn more information of System Monitor.