diff --git a/RELEASE.md b/RELEASE.md new file mode 100644 index 0000000000000000000000000000000000000000..bb3b71fcd6c6cc21d523c0f741abe6964eb549f3 --- /dev/null +++ b/RELEASE.md @@ -0,0 +1,103 @@ +# Release 2.7 (2025-06-30) （待完成） + +- 底部面板重构以及优化 + + - UI重构 + - 应用固定任务栏优化 + - 崩溃问题优化 + - 托盘系统功能整合（网络/电源/声音） +- 应用商店优化 +- 控制面板优化 + + - 网络设置重构 + - 主分类顺序调整 +- XDMCP优化 +- 右键菜单样式优化 +- 后端剪切板插件优化 +- QT平台插件和自定义样式架构调整 + +# Release 2.6 (2024-02-05) + +- 控制中心前端 + + - 新增 自启动应用设置界面 + - 新增 默认应用管理 + - 优化 字体设置 + - 优化 关于系统显示 + - 优化 音量设置，支持多声卡环境 + - 优化 网络设置，DNS配置，有线/无线网络配置 +- 控制中心后端 + + - 新增 medias-key插件 +- 主题 + + - 新增两套全新的图标主题 +- 底部面板 + + - 开始菜单，右键启动优化，更新开始菜单图标 + - 优化 音量通知区域图标 低音量下的显示 + - 优化 网络通知区域图标 新增状态 + - 网络已连接且可访问，图标显示已连接状态 + - 网络已连接，但无法访问互联网，图标显示警告状态 + - 网络未连接，图标显示断网状态 +- 新增 帮助手册 + + - 加入桌面环境，控制面板手册 + - 加入文件管理器、文本编辑器、截图工具、终端手册 + +# Release 2.5 (2023-6-30) + +- 多因子认证 + - 新增认证服务。支持生物认证，Ukey，虹膜，人脸，指纹，指静脉 + - 新增认证设备服务。兼容认证设备 + - 新增授权弹窗服务kiran-polkit-agent,支持认证服务 + - 控制中心加入认证管理插件 +- wayland会话支持 + - 调整会话管理，支持wayland会话 + - 调整桌面环境核心组件，解决在wayland会话中崩溃等问题 +- 新版图标主题 + +# Release 2.4 (2022-11-04) + +- 控制中心前端 + - 插件接口调整,更灵活,搜索信息更完整 + - 控制中心调整为色块设计 + - 网络设置重构 +- 会话管理 + - 会话管理拉起登陆器 + - 桌面会话提供两个选项：kiran和kiran-wayland + - 图形相关的功能都放入单独进程中进行实现 + - 整个项目由GTK改为QT +- kiran-widgets-qt5和kiran-qt5-integration：根据新的UI设计调整QT主题。 + +# Release 2.3 (2022-07-11) + +- 添加Qt5主题(kiran-qt5-integration) +- 控制中心前端： + - 整合控制中心插件 + - 添加音频设置工具 + - 添加网络设置工具 +- 托盘 + - 音频设置托盘 + - 网络设置托盘 + +# Release 2.2 (2021-11-22) + +- 控制中心前端： + - 添加个性化设置工具(kiran-cpanel-appearance) + - 添加键盘设置工具(kiran-cpanel-keyboard) + - 添加快捷键设置工具(kiran-cpanel-keybinding) + - 添加电源设置工具(kiran-cpanel-power) +- 控制中心后端 + - 开启appearance/keyboard/keybinding/mouse/power/touchpad/xsettings插件 +- 底部面板 + - 添加kiran-panel（mate-panel改名&适配） + - 修改面板插件，支持面板和插件的样式跟随主题变化 +- 添加屏幕保护程序(kiran-screensaver) +- 登陆锁屏 + - 登陆锁屏代码整合到同一个项目(kiran-session-guard) +- 添加新GTK主题(kiran-gtk-theme) +- 文件管理器布局调整&可跟随主题变化(caja) +- 添加会话管理(kiran-session-manager) +- 小程序 + - 添加计算器(kiran-calculator) diff --git a/docs/.keep b/docs/.keep new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/docs/en/.keep b/docs/en/.keep new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/docs/en/2209/.keep b/docs/en/2209/.keep new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/docs/en/2209/_toc.yaml b/docs/en/2209/_toc.yaml new file mode 100644 index 0000000000000000000000000000000000000000..8e6d2d731b5dc06923e5a83aef1f4b9bb6bdacf8 --- /dev/null +++ b/docs/en/2209/_toc.yaml @@ -0,0 +1,8 @@ +label: Kiran User Guide +isManual: true +description: Install and use Kiran. +sections: + - label: Kiran Installation + href: ./kiran_installation.md + - label: Kiran User Guide + href: ./kiran_user_guide.md diff --git a/docs/en/2209/figures/kiran-1.png b/docs/en/2209/figures/kiran-1.png new file mode 100644 index 0000000000000000000000000000000000000000..59b632062ba3ff6e26c550567e858eb4dfdfc780 Binary files /dev/null and b/docs/en/2209/figures/kiran-1.png differ diff --git a/docs/en/2209/figures/kiran-10.png b/docs/en/2209/figures/kiran-10.png new file mode 100644 index 0000000000000000000000000000000000000000..18cfa3074af1f4b8d49d064a77b016f24ab8c17c Binary files /dev/null and b/docs/en/2209/figures/kiran-10.png differ diff --git a/docs/en/2209/figures/kiran-11.png b/docs/en/2209/figures/kiran-11.png new file mode 100644 index 0000000000000000000000000000000000000000..b58fbb7ce8a798d5355855a4ac0638540df74d9e Binary files /dev/null and b/docs/en/2209/figures/kiran-11.png differ diff --git a/docs/en/2209/figures/kiran-12.png b/docs/en/2209/figures/kiran-12.png new file mode 100644 index 0000000000000000000000000000000000000000..920d0c7112be6bed509773413de36506d748b822 Binary files /dev/null and b/docs/en/2209/figures/kiran-12.png differ diff --git a/docs/en/2209/figures/kiran-13.png b/docs/en/2209/figures/kiran-13.png new file mode 100644 index 0000000000000000000000000000000000000000..f6632732bd2e8a10d0cda2bd0550f43741a7ba97 Binary files /dev/null and b/docs/en/2209/figures/kiran-13.png differ diff --git a/docs/en/2209/figures/kiran-14.png b/docs/en/2209/figures/kiran-14.png new file mode 100644 index 0000000000000000000000000000000000000000..52eae7cc40fe4f7c6b2a8fe9744209a1fcbc30d8 Binary files /dev/null and b/docs/en/2209/figures/kiran-14.png differ diff --git a/docs/en/2209/figures/kiran-15.png b/docs/en/2209/figures/kiran-15.png new file mode 100644 index 0000000000000000000000000000000000000000..5496c56ca72983780b9785d2d15c4008fb73aeef Binary files /dev/null and b/docs/en/2209/figures/kiran-15.png differ diff --git a/docs/en/2209/figures/kiran-16.png b/docs/en/2209/figures/kiran-16.png new file mode 100644 index 0000000000000000000000000000000000000000..6125b257245aa89f9b6592ed5b14a95d5699076e Binary files /dev/null and b/docs/en/2209/figures/kiran-16.png differ diff --git a/docs/en/2209/figures/kiran-17.png b/docs/en/2209/figures/kiran-17.png new file mode 100644 index 0000000000000000000000000000000000000000..d8a4cb88017efe9f41f78ffc2f9de06dedcc1b23 Binary files /dev/null and b/docs/en/2209/figures/kiran-17.png differ diff --git a/docs/en/2209/figures/kiran-18.png b/docs/en/2209/figures/kiran-18.png new file mode 100644 index 0000000000000000000000000000000000000000..0cb0c50d15597998fbd4cf3db2d1d0f9ec3c920e Binary files /dev/null and b/docs/en/2209/figures/kiran-18.png differ diff --git a/docs/en/2209/figures/kiran-19.png b/docs/en/2209/figures/kiran-19.png new file mode 100644 index 0000000000000000000000000000000000000000..58ef2d33a52cf6404ea03b6a2d37f8d8b8391539 Binary files /dev/null and b/docs/en/2209/figures/kiran-19.png differ diff --git a/docs/en/2209/figures/kiran-2.png b/docs/en/2209/figures/kiran-2.png new file mode 100644 index 0000000000000000000000000000000000000000..088bf53c1e763924e7cee46d0cdac98ad0a9d5e2 Binary files /dev/null and b/docs/en/2209/figures/kiran-2.png differ diff --git a/docs/en/2209/figures/kiran-20.png b/docs/en/2209/figures/kiran-20.png new file mode 100644 index 0000000000000000000000000000000000000000..e8608485553033eb2ae141162e4300fa48c578cd Binary files /dev/null and b/docs/en/2209/figures/kiran-20.png differ diff --git a/docs/en/2209/figures/kiran-21.png b/docs/en/2209/figures/kiran-21.png new file mode 100644 index 0000000000000000000000000000000000000000..4d4c0ff304bdfbc8e715d2e756315a005c008336 Binary files /dev/null and b/docs/en/2209/figures/kiran-21.png differ diff --git a/docs/en/2209/figures/kiran-22.png b/docs/en/2209/figures/kiran-22.png new file mode 100644 index 0000000000000000000000000000000000000000..6778d5a40a82e699da9531f4727a196d1442b9ae Binary files /dev/null and b/docs/en/2209/figures/kiran-22.png differ diff --git a/docs/en/2209/figures/kiran-23.png b/docs/en/2209/figures/kiran-23.png new file mode 100644 index 0000000000000000000000000000000000000000..fc1d5e284eb299a771c5abbfdff611270ddf2449 Binary files /dev/null and b/docs/en/2209/figures/kiran-23.png differ diff --git a/docs/en/2209/figures/kiran-24.png b/docs/en/2209/figures/kiran-24.png new file mode 100644 index 0000000000000000000000000000000000000000..a3ed57f9e9c300a65f867d29a44f287405a0509c Binary files /dev/null and b/docs/en/2209/figures/kiran-24.png differ diff --git a/docs/en/2209/figures/kiran-25.png b/docs/en/2209/figures/kiran-25.png new file mode 100644 index 0000000000000000000000000000000000000000..694e6173dfbf1fda8d07670a8e3daf4fbeb263ac Binary files /dev/null and b/docs/en/2209/figures/kiran-25.png differ diff --git a/docs/en/2209/figures/kiran-26.png b/docs/en/2209/figures/kiran-26.png new file mode 100644 index 0000000000000000000000000000000000000000..3b6ae2eeff3aae39107f15b60c5bb14ffc787cd8 Binary files /dev/null and b/docs/en/2209/figures/kiran-26.png differ diff --git a/docs/en/2209/figures/kiran-27.png b/docs/en/2209/figures/kiran-27.png new file mode 100644 index 0000000000000000000000000000000000000000..3b6ae2eeff3aae39107f15b60c5bb14ffc787cd8 Binary files /dev/null and b/docs/en/2209/figures/kiran-27.png differ diff --git a/docs/en/2209/figures/kiran-28.png b/docs/en/2209/figures/kiran-28.png new file mode 100644 index 0000000000000000000000000000000000000000..01ff3a8f47248d96c714e78b80fd81cd1ed16e0f Binary files /dev/null and b/docs/en/2209/figures/kiran-28.png differ diff --git a/docs/en/2209/figures/kiran-29.png b/docs/en/2209/figures/kiran-29.png new file mode 100644 index 0000000000000000000000000000000000000000..c5ad5b4438eae441f6086ce5e1aae2e6755aa12a Binary files /dev/null and b/docs/en/2209/figures/kiran-29.png differ diff --git a/docs/en/2209/figures/kiran-3.png b/docs/en/2209/figures/kiran-3.png new file mode 100644 index 0000000000000000000000000000000000000000..e1399424c52eee8804f9433c9e9bf203950008c6 Binary files /dev/null and b/docs/en/2209/figures/kiran-3.png differ diff --git a/docs/en/2209/figures/kiran-30.png b/docs/en/2209/figures/kiran-30.png new file mode 100644 index 0000000000000000000000000000000000000000..c1efc1e3931a129affd5dfcea9e319556e492f04 Binary files /dev/null and b/docs/en/2209/figures/kiran-30.png differ diff --git a/docs/en/2209/figures/kiran-31.png b/docs/en/2209/figures/kiran-31.png new file mode 100644 index 0000000000000000000000000000000000000000..c5ad5b4438eae441f6086ce5e1aae2e6755aa12a Binary files /dev/null and b/docs/en/2209/figures/kiran-31.png differ diff --git a/docs/en/2209/figures/kiran-32.png b/docs/en/2209/figures/kiran-32.png new file mode 100644 index 0000000000000000000000000000000000000000..fd900ec891b09313a7c558c61213b1816b803034 Binary files /dev/null and b/docs/en/2209/figures/kiran-32.png differ diff --git a/docs/en/2209/figures/kiran-33.png b/docs/en/2209/figures/kiran-33.png new file mode 100644 index 0000000000000000000000000000000000000000..64ba70b08ed63c6e0942478d61e36a8c443f0604 Binary files /dev/null and b/docs/en/2209/figures/kiran-33.png differ diff --git a/docs/en/2209/figures/kiran-34.png b/docs/en/2209/figures/kiran-34.png new file mode 100644 index 0000000000000000000000000000000000000000..4b869e7d172e2f2889d487157b92204a28a8dc4e Binary files /dev/null and b/docs/en/2209/figures/kiran-34.png differ diff --git a/docs/en/2209/figures/kiran-35.png b/docs/en/2209/figures/kiran-35.png new file mode 100644 index 0000000000000000000000000000000000000000..9b383f3c84964b4fc34c4d8e75400325f93908bc Binary files /dev/null and b/docs/en/2209/figures/kiran-35.png differ diff --git a/docs/en/2209/figures/kiran-36.png b/docs/en/2209/figures/kiran-36.png new file mode 100644 index 0000000000000000000000000000000000000000..0b16632852c5024e2c6ec4fbd49513e3b7a2b146 Binary files /dev/null and b/docs/en/2209/figures/kiran-36.png differ diff --git a/docs/en/2209/figures/kiran-37.png b/docs/en/2209/figures/kiran-37.png new file mode 100644 index 0000000000000000000000000000000000000000..2be3cc3b2528260c579b59f529e7a5663f1cc779 Binary files /dev/null and b/docs/en/2209/figures/kiran-37.png differ diff --git a/docs/en/2209/figures/kiran-38.png b/docs/en/2209/figures/kiran-38.png new file mode 100644 index 0000000000000000000000000000000000000000..fc1ffaf3aa920f922357f6d48700f42974600d77 Binary files /dev/null and b/docs/en/2209/figures/kiran-38.png differ diff --git a/docs/en/2209/figures/kiran-39.png b/docs/en/2209/figures/kiran-39.png new file mode 100644 index 0000000000000000000000000000000000000000..fd0e5add782b6c9cf4a8b9f6473c96641c39bd1d Binary files /dev/null and b/docs/en/2209/figures/kiran-39.png differ diff --git a/docs/en/2209/figures/kiran-4.png b/docs/en/2209/figures/kiran-4.png new file mode 100644 index 0000000000000000000000000000000000000000..bd318280b403912ab4846b694592d580b9e5d242 Binary files /dev/null and b/docs/en/2209/figures/kiran-4.png differ diff --git a/docs/en/2209/figures/kiran-40.png b/docs/en/2209/figures/kiran-40.png new file mode 100644 index 0000000000000000000000000000000000000000..083031058ff47dc1550881d3a9f189861d3e8563 Binary files /dev/null and b/docs/en/2209/figures/kiran-40.png differ diff --git a/docs/en/2209/figures/kiran-41.png b/docs/en/2209/figures/kiran-41.png new file mode 100644 index 0000000000000000000000000000000000000000..582893929e2c10a96c49696411bbed3ea9fd7c55 Binary files /dev/null and b/docs/en/2209/figures/kiran-41.png differ diff --git a/docs/en/2209/figures/kiran-42.png b/docs/en/2209/figures/kiran-42.png new file mode 100644 index 0000000000000000000000000000000000000000..eede1243506ccd309ee707465f56c31581dd8554 Binary files /dev/null and b/docs/en/2209/figures/kiran-42.png differ diff --git a/docs/en/2209/figures/kiran-43.png b/docs/en/2209/figures/kiran-43.png new file mode 100644 index 0000000000000000000000000000000000000000..4ea9f45ed8f327fce426352c4ae7fbf06cbefc84 Binary files /dev/null and b/docs/en/2209/figures/kiran-43.png differ diff --git a/docs/en/2209/figures/kiran-44.png b/docs/en/2209/figures/kiran-44.png new file mode 100644 index 0000000000000000000000000000000000000000..c86a100005f89dbb9b24055e42d716205d47399e Binary files /dev/null and b/docs/en/2209/figures/kiran-44.png differ diff --git a/docs/en/2209/figures/kiran-45.png b/docs/en/2209/figures/kiran-45.png new file mode 100644 index 0000000000000000000000000000000000000000..c5b5d75f972e594587f3393c8d384dcd76e7477e Binary files /dev/null and b/docs/en/2209/figures/kiran-45.png differ diff --git a/docs/en/2209/figures/kiran-46.png b/docs/en/2209/figures/kiran-46.png new file mode 100644 index 0000000000000000000000000000000000000000..e9a28632c62de95d8ea2d436ba9bc705ff980991 Binary files /dev/null and b/docs/en/2209/figures/kiran-46.png differ diff --git a/docs/en/2209/figures/kiran-47.png b/docs/en/2209/figures/kiran-47.png new file mode 100644 index 0000000000000000000000000000000000000000..a3606e3c899f944eb84d206d98cedc3377197c97 Binary files /dev/null and b/docs/en/2209/figures/kiran-47.png differ diff --git a/docs/en/2209/figures/kiran-48.png b/docs/en/2209/figures/kiran-48.png new file mode 100644 index 0000000000000000000000000000000000000000..b69202c9a83bfc2c835ab166ef0fc2455bb4bcd3 Binary files /dev/null and b/docs/en/2209/figures/kiran-48.png differ diff --git a/docs/en/2209/figures/kiran-49.png b/docs/en/2209/figures/kiran-49.png new file mode 100644 index 0000000000000000000000000000000000000000..d739e6107fd80ecd741dacaaf9dfb868afc61e37 Binary files /dev/null and b/docs/en/2209/figures/kiran-49.png differ diff --git a/docs/en/2209/figures/kiran-5.png b/docs/en/2209/figures/kiran-5.png new file mode 100644 index 0000000000000000000000000000000000000000..154dd54d43b5b98682eb798518046e72fc7e3f83 Binary files /dev/null and b/docs/en/2209/figures/kiran-5.png differ diff --git a/docs/en/2209/figures/kiran-50.png b/docs/en/2209/figures/kiran-50.png new file mode 100644 index 0000000000000000000000000000000000000000..96957676afc9f66bcc4b63c5e39eb8890f108015 Binary files /dev/null and b/docs/en/2209/figures/kiran-50.png differ diff --git a/docs/en/2209/figures/kiran-6.png b/docs/en/2209/figures/kiran-6.png new file mode 100644 index 0000000000000000000000000000000000000000..927b475d6687d60f04fed8a535b2225a8f4b23f7 Binary files /dev/null and b/docs/en/2209/figures/kiran-6.png differ diff --git a/docs/en/2209/figures/kiran-7.png b/docs/en/2209/figures/kiran-7.png new file mode 100644 index 0000000000000000000000000000000000000000..254ef11f36d958f6ef7c70853e5f61032f825463 Binary files /dev/null and b/docs/en/2209/figures/kiran-7.png differ diff --git a/docs/en/2209/figures/kiran-8.png b/docs/en/2209/figures/kiran-8.png new file mode 100644 index 0000000000000000000000000000000000000000..29b5845d2fa94cba92719b8649a5e86c926ea911 Binary files /dev/null and b/docs/en/2209/figures/kiran-8.png differ diff --git a/docs/en/2209/figures/kiran-9.png b/docs/en/2209/figures/kiran-9.png new file mode 100644 index 0000000000000000000000000000000000000000..46bcfdd0e1e88ad0f0ade4a3990c3ac5d66060e7 Binary files /dev/null and b/docs/en/2209/figures/kiran-9.png differ diff --git a/docs/en/2209/kiran_installation.md b/docs/en/2209/kiran_installation.md new file mode 100644 index 0000000000000000000000000000000000000000..4aab96decb8c766339c2913d7c671e27d81c61c9 --- /dev/null +++ b/docs/en/2209/kiran_installation.md @@ -0,0 +1,31 @@ +# Kiran Installation + +## Introduction + +Kiran desktop environment, developed by Kylinsec, is a stable, efficient, and easy-to-use desktop environment oriented towards user and market requirements. Kiran supports x86 and AArch64 architectures. + +## Procedure + +You are advised to install Kiran as the **root** user or a newly created administrator. + +1. Download the openEuler 22.09 ISO file and install the OS. + +2. Update the software repository. + +```shell +sudo dnf update +``` + +1. Install kiran-desktop. + +```shell +sudo dnf -y install kiran-desktop +``` + +1. Set the system to start with the graphical interface, and then restart the system using the `reboot` command. + +```shell +systemctl set-default graphical.target +``` + +After the reboot is complete, log in to the Kiran desktop. diff --git a/docs/en/2209/kiran_user_guide.md b/docs/en/2209/kiran_user_guide.md new file mode 100644 index 0000000000000000000000000000000000000000..7780aa7b5621ec35fa8976c19bb4fafa3cb6dd6a --- /dev/null +++ b/docs/en/2209/kiran_user_guide.md @@ -0,0 +1,298 @@ +# Kiran Desktop Environment + +## 1. Overview + +Kiran desktop environment is a stable, efficient, and easy-to-use desktop environment oriented towards user and market requirements. It consists of the desktop, taskbar, tray, control center, and window management components. This document describes how to use the Kiran desktop. + +## 2. Desktop + +### 2.1. Login Screen + +After the installation is complete, restart the system. After the system is started, enter the user name and password to log in to the system. The login screen displays the time, date, power button, and soft keyboard button. The adaptive UI supports screen zooming and multi-screen display. The login dialog box can be switched between screens following the mouse pointer. + +![Figure 1 Login screen](figures/kiran-1.png) + +### 2.2. Main Screen + +Enter the correct user name and password to log in to the system. The main screen is displayed, as shown in the following figure: + +![Figure 2-Main screen ](figures/kiran-2.png) + +Several icons are displayed on the desktop, such as **Computer**, **Home** folder, and **Trash**. The panel, located at the bottom of the screen, allows you to launch applications and switch between virtual desktops. +A desktop is a working area of a user. You will perform operations and run applications on the desktop. You can place the files and applications on the desktop for easy access. Double-click the icons to run the corresponding applications or open the files. You can drag, add, or delete desktop icons. Desktop icons allow you to complete your work more conveniently. + +![Figure 3-Computer](figures/kiran-3.png) **Computer**: Double-click to display all the local and remote disks and folders accessed from this computer. + +![Figure 4-Home folder](figures/kiran-4.png) **Home** folder: Double-click to display the contents in the home directory of the current user. + +![Figure 5- Trash](figures/kiran-5.png) **Trash**: Deleted files are temporarily stored in Trash. + +Shortcut menu: Right-click on the desktop to display the shortcut menu, which provides shortcuts for icon management, folder creation, document creation, desktop background settings, and theme settings. + +**Create Folder**: Creates a folder. + +**Create Launcher...**: Creates a launcher. + +**Create Document**: Creates an empty plain-text file. + +**Open Terminal...**: Opens the terminal application. + +**Organize Desktop by Name**: Sorts desktop files by name. + +**Keep Aligned**: If this option is selected, the desktop icons are aligned to the grid. + +**Change Desktop Background**: Opens Background to change the background picture of the desktop or lock screen. + +### 2.3 Panel + +The panel is usually located at the bottom of the screen and includes the start menu button, quick launch area, icons of frequently used applications and desktop applets, and taskbar that displays the currently running application. +When you hover the mouse pointer over an icon for several seconds, a white dialog box is displayed, describing the function of the icon. + +![Figure 6-System panel](figures/kiran-6.png) + +## 3. Taskbar + +Taskbar: displays running applications or opened documents. You can click an item on the taskbar to maximize or minimize the selected application window. You can right-click an item and choose Maximize, Minimize, or Close the application window from the shortcut menu. + +| Component | Description | +| :------------------------------------------------------ | :------------------------------------------------------------------------------------------------------------------ | +| ![Figure 7-Start Menu](figures/kiran-7.png) | Start Menu button: Similar to the Start button in Windows. When you click it, the cascaded start menu is displayed. | +| ![Figure 8 Workspace button](figures/kiran-8.png) | Click to display the workspaces. | +| ![Figure 9 File browser button](figures/kiran-9.png) | Click to start the file browser to view and manage files. | +| ![Figure 10 Terminal button](figures/kiran-10.png) | Click to start the terminal. | +| ![Figure 11 Web browser button](figures/kiran-11.png) | Click to start the Firefox browser. | +| ![Figure 12 Network control icon](figures/kiran-12.png) | Displays the current network status. Click to modify the network configuration. | +| ![Figure 13-Clock button](figures/kiran-13.png) | Displays the current date and time. You can customize the display style as required. | + +## 4. Control Center + +### 4.1. Start Menu Settings + +Choose **Start Menu** > **Control Center** > **Start Menu** Settings. +You can set the display mode and opacity of the start menu, as shown in the following figure: + +![Figure 14-Start Menu Settings](figures/kiran-14.png) + +The appearance start menu changes based on the opacity and display mode, as shown in the following figure: + +![Figure 15-Start menu](figures/kiran-15.png) + +### 4.2. Greeter Settings + +Choose **Start Menu** > **Control Center** > **Greeter Settings**. +In the Kiran desktop, you can set the login screen appearance by choosing **Greeter Settings** in **Control Center**, including the background image of the login screen, whether to enable automatic login, zoom ratio, whether to allow login by entering the user name, and whether to display the user list, as shown in the following figure: + +![Figure 16-Greeter Settings](figures/kiran-16.png) + +You can also set automatic login. Set the user name and delay for automatic login. After the system is restarted, the user automatically logs in without entering the password. + +![Figure 17 Autologin settings](figures/kiran-17.png) + +### 4.3 Display Settings + +Display attribute customization is required for every desktop environment. The Kiran desktop provides a powerful tool for customizing display attributes. You can choose **Start Menu** > **Control Center** > **Display Settings** to open the **Display Settings** window, as shown in the following figure: + +![Figure 18-Display Settings](figures/kiran-18.png) + +You can set the screen rotation, resolution, refresh rate, zoom rate, and flip. After the settings are complete, click **Apply**. + +### 4.4 Mouse Settings + +Configure the mouse by selecting **Kiran Cpanel Mouse** in **Control Center**. You can select left-hand or right-hand mode, adjust the mouse pointer speed, set whether to scroll naturally, and set whether to enable the middle button emulation by pressing the left and right button simultaneously. The following figure shows the normal mouse setting window: + +![Figure 19-Kiran Cpanel Mouse](figures/kiran-19.png) + +### 4.5. Account Manager + +Account Manager is an easy-to-use tool for managing users and user groups. You can use this tool to: + +1. Add users and set user attributes. +2. Modify user attributes. +3. View user attributes. +4. Delete users. + +User attributes include the user name, password, and login shell. User group attribute indicates the users in the user group. + +#### 4.5.1 Starting Account Manager + +In **Control Center**, choose **Account Manager** to start the account management tool, as shown in the following figure: + +![Figure 20 Account Manager](figures/kiran-20.png) + +In the window, you can see the user list on the left and the detailed information on the right. Currently, all users in the system except the root user are listed. Click a user on the left. The detailed information about the user is displayed, including the user ID and user type. +Click **Create new user**. On the page that is displayed on the right, enter the user name, user type, and password, and change the avatar as required. After setting the attributes, click **Confirm**. + +![Figure 21 Creating an account](figures/kiran-21.png) + +**Note**: If you have set the minimum length of a password (for example, four digits), you must enter a password of at least four digits. Otherwise, the system will not accept the password. + +Click the avatar area to change the avatar. The system has built-in avatars for you to select. You can also add your own avatar and click Confirm to save the settings. + +![Figure 22-Change avatar](figures/kiran-22.png) + +#### 4.5.2. Deleting a User + +Click the user to be deleted in the left area and click **Delete** on the toolbar on the right, as shown in the following figures: + +![Figure 23 Deleting a user](figures/kiran-23.png) +![Figure 24-Confirming the deletion](figures/kiran-24.png) + +In the displayed dialog box, click **No** to cancel the deletion, or click **Yes** to confirm the deletion. + +#### 4.5.3. Advanced Settings + +Choose **Create new user**, enter the user name and password, and then choose **Advanced Settings**. In the displayed dialog box, set the login shell, user ID, and user home directory. + +![Figure 25-Advanced Settings](figures/kiran-25.png) + +### 4.6. Appearance + +Display attribute customization is required for every desktop environment. The Kiran desktop provides a powerful tool for customizing display attributes. Appearance is a tool that provides unified configuration and management for the desktop background, theme, and font of the system. +Choose **Start Menu** > **Control Center** > **Appearance**. The **Appearance** window is displayed, as shown in the following figure: + +![Figure 26-Appearance Preferences](figures/kiran-26.png) + +#### 4.6.1. Theme + +Theme can be used to set the style of the dialog boxes, menus, system panels, and icons in a unified manner or separately according to your preference. + +1. Theme Settings + The system provides multiple themes by default. You can view the theme information in the **Theme** tab page. Click the theme in the **Theme** tab page to set the system theme, as shown in the following figure: + + ![Figure 27 Theme settings](figures/kiran-27.png) + +2. Customizing a Theme + You can click Customize... to customize a theme based on your preferences, as shown in the following figure. Customization options include controls, color, window border, icons, and pointer. + + ![Figure 28-Customize theme](figures/kiran-28.png) + +#### 4.6.2. Background + +You can set the desktop background, including the color and style. + +1. Background image settings + As shown in the following figure, click a wallpaper in the wallpaper area to set it as the desktop wallpaper. + + ![Figure 29-Background Settings](figures/kiran-29.png) + +2. Style + You can choose how the wallpaper fits the screen by choosing a style from the drop-down list. The styles include tile, zoom, center, scale, stretch, and span. + +3. Adding and removing wallpapers + You can click **Add...** to add your own wallpaper, as shown in the following figure: + + ![Figure 30-Add wallpaper](figures/kiran-30.png) + + Click **Open** to add the wallpaper. + You can also click **Remove** to remove wallpapers that you do not like. Simply select a wallpaper and click **Remove**. + +4. Desktop background color filling settings + You can set a color as the background. In the wallpaper tab page, choose **No Desktop Background** to use a color as the background. + The color filling styles include solid color, horizontal gradient, and vertical gradient. + + ![Figure 31-Background color filling](figures/kiran-31.png) + +#### 4.6.3. Font + +1. Font Settings + +You can set the fonts of the GUI of the system. The font styles include application, document, desktop, window title, and fixed width fonts. + +![Figure 32-Font settings](figures/kiran-32.png) + +1. Font rendering and details settings + +Font rendering settings: You can choose one of the following font rendering styles: monochrome, best shapes, best contrast, and subpixel smoothing. +By default, **best shapes** is used, as shown in the following figure: + +![Figure 33 Font rendering settings](figures/kiran-33.png) + +1. Font Details Settings + You can click **Details...** to set the font details. Details settings include resolution, smoothing, hinting, and subpixel order. + +![Figure 34-Font details setting](figures/kiran-34.png) + +You can choose whether to display icons in menus and on buttons. + +![Figure 35-Icon display settings](figures/kiran-35.png) + +## 5. Desktop Applications + +### 5.1. Text Editor + +To launch the text editor, click **Start Menu**> **All applications** > **Utilities**> **Pluma**. You can also start the text editor by entering **pluma** in the shell prompt. +A text editor is one of the most commonly used tools in all computer systems. Whether to you are creating a plain text file, data file, or source program, you need to use an editor. The text editor is used to view and modify plain text files. Plain text files, such as system logs and configuration files, are common text files that do not contain fonts or style formats. + +![Figure 36-Text editor](figures/kiran-36.png) + +### 5.2. Terminal + +In the desktop environment, you can use the Terminal application to enter the command line interface. To start Terminal, choose **Start Menu** > **All applications** > **Utilities** > **Terminal**, or click the icon on the desktop panel. + +![Figure 37-Terminal](figures/kiran-37.png) + +### 5.3. Firefox + +To launch Firefox, click **Start Menu** > **All applications** > **Network** > **Firefox**. +Firefox is a free and open source web browser. It uses the Gecko rendering engine and supports multiple operating systems, such as Windows, Mac OS X, and GNU/Linux. Firefox is small in size, fast in speed, and has other advanced features, such as tabbed browsing, faster loading speed, pop-up blocker, customizable toolbar, extension management, better search features, and a convenient sidebar. + +![Figure 38 Firefox](figures/kiran-38.png) + +### 5.4 Screenshot Tool + +Choose **Start Menu** > **All applications** > **Graphics** > **Screenshot tool** to start the screenshot tool. +Screenshot tool is a small and flexible screenshot software of the Kiran desktop. The operation UI is simple and easy to use. When the software is started, the icon of the screenshot tool is added to the tray. + +![Figure 39-Screenshot icon in the tray](figures/kiran-39.png) + +Click the icon to display the screenshot interface. You can select the screenshot area. You can right-click the icon and choose Open Launcher to set the capture area and delay. + +![Figure 40-Screenshot UI](figures/kiran-40.png) +![Figure 41-Launcher UI](figures/kiran-41.png) + +In the displayed dialog box, click **√** to save the file to the desktop, or choose Options and select a custom save location, as shown in the following figure: + +![Figure 42-Screenshot process](figures/kiran-42.png) + +### 5.5 Network Settings + +The Kiran desktop uses NetworkManager as the network configuration tool. NetworkManager can set, configure, and manage various network types, and provides advanced support for mobile broadband devices, Bluetooth, and IPv6 protocol. Choose Start Menu > **Control Center** > **Advanced Network Configuration**, or right-click the network icon in the lower right corner of the desktop and choose **Edit Connections...**, as shown in the following figure: + +![Figure 43-NetworkManager](figures/kiran-43.png) + +Wired connection settings: +Select the current NIC. For example, **ens33** is the NIC of the current system. Select the NIC and click the edit button. The NIC editing dialog box is displayed: + +![Figure 44 Editing an NIC](figures/kiran-44.png) + +IPv4 Settings are frequently used. In this example, DHCP is selected to obtain the IP address and DNS server. The system automatically obtains an IP address for the user. +When you need to manually enter the IP address, select **Manual** from the **Method** drop-down list, as shown in the following figure: + +![Figure 45 IPv4 settings](figures/kiran-45.png) + +Click **Add**, enter the IP address, subnet mask, gateway, and DNS server, as shown in the following figure: + +![Figure 46 Setting the network IP address and DNS](figures/kiran-46.png) + +Enter the IP address, subnet mask, gateway, and DNS, and Click **Save**. Click the network icon in the lower right corner of the desktop, choose **Disconnect** to disconnect from the network, and then reconnect to the network. + +--- + +### 5.6. Time and Date Manager + +To set the date and time, select **Time And Date Manager** in **Control Center**, or click the date area in the lower right corner of the desktop. The following window is displayed: + +![Figure 47 Time And Date Manager](figures/kiran-47.png) + +Automatic synchronization: Enable **Automatic synchronization** and connect to the Internet to automatically synchronize the date and time. +Time zone settings: Click **Change Time Zone**, select a time zone from the list on the right, and then click **Save**. + +![Figure 48 Change Time Zone](figures/kiran-48.png) + +Manually set the time: Disable **Automatic synchronization** and click **Set Time Manually** to manually set the year, month, day, and time. After the modification is complete, click **Save**. + +![Figure 49 Set Time Manually](figures/kiran-49.png) + +Modifying the date format: Click **Time date format setting** to modify the date format. You can set the long and short date display formats, time format, and whether to display seconds. + +![Figure 50 Time date format setting](figures/kiran-50.png) diff --git a/docs/zh/.keep b/docs/zh/.keep new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/docs/zh/2209/.keep b/docs/zh/2209/.keep new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/docs/zh/2209/_toc.yaml b/docs/zh/2209/_toc.yaml new file mode 100644 index 0000000000000000000000000000000000000000..2409e198619b27f36fcc3e26e5d712a8c3b0c69d --- /dev/null +++ b/docs/zh/2209/_toc.yaml @@ -0,0 +1,8 @@ +label: Kiran用户指南 +isManual: true +description: 安装并使用 Kiran 桌面环境 +sections: + - label: 安装 Kiran + href: ./kiran_installation.md + - label: 使用 Kiran + href: ./kiran_user_guide.md diff --git a/docs/zh/2209/figures/kiran-1.png b/docs/zh/2209/figures/kiran-1.png new file mode 100644 index 0000000000000000000000000000000000000000..59b632062ba3ff6e26c550567e858eb4dfdfc780 Binary files /dev/null and b/docs/zh/2209/figures/kiran-1.png differ diff --git a/docs/zh/2209/figures/kiran-10.png b/docs/zh/2209/figures/kiran-10.png new file mode 100644 index 0000000000000000000000000000000000000000..18cfa3074af1f4b8d49d064a77b016f24ab8c17c Binary files /dev/null and b/docs/zh/2209/figures/kiran-10.png differ diff --git a/docs/zh/2209/figures/kiran-11.png b/docs/zh/2209/figures/kiran-11.png new file mode 100644 index 0000000000000000000000000000000000000000..b58fbb7ce8a798d5355855a4ac0638540df74d9e Binary files /dev/null and b/docs/zh/2209/figures/kiran-11.png differ diff --git a/docs/zh/2209/figures/kiran-12.png b/docs/zh/2209/figures/kiran-12.png new file mode 100644 index 0000000000000000000000000000000000000000..920d0c7112be6bed509773413de36506d748b822 Binary files /dev/null and b/docs/zh/2209/figures/kiran-12.png differ diff --git a/docs/zh/2209/figures/kiran-13.png b/docs/zh/2209/figures/kiran-13.png new file mode 100644 index 0000000000000000000000000000000000000000..f6632732bd2e8a10d0cda2bd0550f43741a7ba97 Binary files /dev/null and b/docs/zh/2209/figures/kiran-13.png differ diff --git a/docs/zh/2209/figures/kiran-14.png b/docs/zh/2209/figures/kiran-14.png new file mode 100644 index 0000000000000000000000000000000000000000..52eae7cc40fe4f7c6b2a8fe9744209a1fcbc30d8 Binary files /dev/null and b/docs/zh/2209/figures/kiran-14.png differ diff --git a/docs/zh/2209/figures/kiran-15.png b/docs/zh/2209/figures/kiran-15.png new file mode 100644 index 0000000000000000000000000000000000000000..5496c56ca72983780b9785d2d15c4008fb73aeef Binary files /dev/null and b/docs/zh/2209/figures/kiran-15.png differ diff --git a/docs/zh/2209/figures/kiran-16.png b/docs/zh/2209/figures/kiran-16.png new file mode 100644 index 0000000000000000000000000000000000000000..6125b257245aa89f9b6592ed5b14a95d5699076e Binary files /dev/null and b/docs/zh/2209/figures/kiran-16.png differ diff --git a/docs/zh/2209/figures/kiran-17.png b/docs/zh/2209/figures/kiran-17.png new file mode 100644 index 0000000000000000000000000000000000000000..d8a4cb88017efe9f41f78ffc2f9de06dedcc1b23 Binary files /dev/null and b/docs/zh/2209/figures/kiran-17.png differ diff --git a/docs/zh/2209/figures/kiran-18.png b/docs/zh/2209/figures/kiran-18.png new file mode 100644 index 0000000000000000000000000000000000000000..0cb0c50d15597998fbd4cf3db2d1d0f9ec3c920e Binary files /dev/null and b/docs/zh/2209/figures/kiran-18.png differ diff --git a/docs/zh/2209/figures/kiran-19.png b/docs/zh/2209/figures/kiran-19.png new file mode 100644 index 0000000000000000000000000000000000000000..58ef2d33a52cf6404ea03b6a2d37f8d8b8391539 Binary files /dev/null and b/docs/zh/2209/figures/kiran-19.png differ diff --git a/docs/zh/2209/figures/kiran-2.png b/docs/zh/2209/figures/kiran-2.png new file mode 100644 index 0000000000000000000000000000000000000000..088bf53c1e763924e7cee46d0cdac98ad0a9d5e2 Binary files /dev/null and b/docs/zh/2209/figures/kiran-2.png differ diff --git a/docs/zh/2209/figures/kiran-20.png b/docs/zh/2209/figures/kiran-20.png new file mode 100644 index 0000000000000000000000000000000000000000..e8608485553033eb2ae141162e4300fa48c578cd Binary files /dev/null and b/docs/zh/2209/figures/kiran-20.png differ diff --git a/docs/zh/2209/figures/kiran-21.png b/docs/zh/2209/figures/kiran-21.png new file mode 100644 index 0000000000000000000000000000000000000000..4d4c0ff304bdfbc8e715d2e756315a005c008336 Binary files /dev/null and b/docs/zh/2209/figures/kiran-21.png differ diff --git a/docs/zh/2209/figures/kiran-22.png b/docs/zh/2209/figures/kiran-22.png new file mode 100644 index 0000000000000000000000000000000000000000..6778d5a40a82e699da9531f4727a196d1442b9ae Binary files /dev/null and b/docs/zh/2209/figures/kiran-22.png differ diff --git a/docs/zh/2209/figures/kiran-23.png b/docs/zh/2209/figures/kiran-23.png new file mode 100644 index 0000000000000000000000000000000000000000..fc1d5e284eb299a771c5abbfdff611270ddf2449 Binary files /dev/null and b/docs/zh/2209/figures/kiran-23.png differ diff --git a/docs/zh/2209/figures/kiran-24.png b/docs/zh/2209/figures/kiran-24.png new file mode 100644 index 0000000000000000000000000000000000000000..a3ed57f9e9c300a65f867d29a44f287405a0509c Binary files /dev/null and b/docs/zh/2209/figures/kiran-24.png differ diff --git a/docs/zh/2209/figures/kiran-25.png b/docs/zh/2209/figures/kiran-25.png new file mode 100644 index 0000000000000000000000000000000000000000..694e6173dfbf1fda8d07670a8e3daf4fbeb263ac Binary files /dev/null and b/docs/zh/2209/figures/kiran-25.png differ diff --git a/docs/zh/2209/figures/kiran-26.png b/docs/zh/2209/figures/kiran-26.png new file mode 100644 index 0000000000000000000000000000000000000000..3b6ae2eeff3aae39107f15b60c5bb14ffc787cd8 Binary files /dev/null and b/docs/zh/2209/figures/kiran-26.png differ diff --git a/docs/zh/2209/figures/kiran-27.png b/docs/zh/2209/figures/kiran-27.png new file mode 100644 index 0000000000000000000000000000000000000000..3b6ae2eeff3aae39107f15b60c5bb14ffc787cd8 Binary files /dev/null and b/docs/zh/2209/figures/kiran-27.png differ diff --git a/docs/zh/2209/figures/kiran-28.png b/docs/zh/2209/figures/kiran-28.png new file mode 100644 index 0000000000000000000000000000000000000000..01ff3a8f47248d96c714e78b80fd81cd1ed16e0f Binary files /dev/null and b/docs/zh/2209/figures/kiran-28.png differ diff --git a/docs/zh/2209/figures/kiran-29.png b/docs/zh/2209/figures/kiran-29.png new file mode 100644 index 0000000000000000000000000000000000000000..c5ad5b4438eae441f6086ce5e1aae2e6755aa12a Binary files /dev/null and b/docs/zh/2209/figures/kiran-29.png differ diff --git a/docs/zh/2209/figures/kiran-3.png b/docs/zh/2209/figures/kiran-3.png new file mode 100644 index 0000000000000000000000000000000000000000..e1399424c52eee8804f9433c9e9bf203950008c6 Binary files /dev/null and b/docs/zh/2209/figures/kiran-3.png differ diff --git a/docs/zh/2209/figures/kiran-30.png b/docs/zh/2209/figures/kiran-30.png new file mode 100644 index 0000000000000000000000000000000000000000..c1efc1e3931a129affd5dfcea9e319556e492f04 Binary files /dev/null and b/docs/zh/2209/figures/kiran-30.png differ diff --git a/docs/zh/2209/figures/kiran-31.png b/docs/zh/2209/figures/kiran-31.png new file mode 100644 index 0000000000000000000000000000000000000000..c5ad5b4438eae441f6086ce5e1aae2e6755aa12a Binary files /dev/null and b/docs/zh/2209/figures/kiran-31.png differ diff --git a/docs/zh/2209/figures/kiran-32.png b/docs/zh/2209/figures/kiran-32.png new file mode 100644 index 0000000000000000000000000000000000000000..fd900ec891b09313a7c558c61213b1816b803034 Binary files /dev/null and b/docs/zh/2209/figures/kiran-32.png differ diff --git a/docs/zh/2209/figures/kiran-33.png b/docs/zh/2209/figures/kiran-33.png new file mode 100644 index 0000000000000000000000000000000000000000..64ba70b08ed63c6e0942478d61e36a8c443f0604 Binary files /dev/null and b/docs/zh/2209/figures/kiran-33.png differ diff --git a/docs/zh/2209/figures/kiran-34.png b/docs/zh/2209/figures/kiran-34.png new file mode 100644 index 0000000000000000000000000000000000000000..4b869e7d172e2f2889d487157b92204a28a8dc4e Binary files /dev/null and b/docs/zh/2209/figures/kiran-34.png differ diff --git a/docs/zh/2209/figures/kiran-35.png b/docs/zh/2209/figures/kiran-35.png new file mode 100644 index 0000000000000000000000000000000000000000..9b383f3c84964b4fc34c4d8e75400325f93908bc Binary files /dev/null and b/docs/zh/2209/figures/kiran-35.png differ diff --git a/docs/zh/2209/figures/kiran-36.png b/docs/zh/2209/figures/kiran-36.png new file mode 100644 index 0000000000000000000000000000000000000000..0b16632852c5024e2c6ec4fbd49513e3b7a2b146 Binary files /dev/null and b/docs/zh/2209/figures/kiran-36.png differ diff --git a/docs/zh/2209/figures/kiran-37.png b/docs/zh/2209/figures/kiran-37.png new file mode 100644 index 0000000000000000000000000000000000000000..2be3cc3b2528260c579b59f529e7a5663f1cc779 Binary files /dev/null and b/docs/zh/2209/figures/kiran-37.png differ diff --git a/docs/zh/2209/figures/kiran-38.png b/docs/zh/2209/figures/kiran-38.png new file mode 100644 index 0000000000000000000000000000000000000000..fc1ffaf3aa920f922357f6d48700f42974600d77 Binary files /dev/null and b/docs/zh/2209/figures/kiran-38.png differ diff --git a/docs/zh/2209/figures/kiran-39.png b/docs/zh/2209/figures/kiran-39.png new file mode 100644 index 0000000000000000000000000000000000000000..fd0e5add782b6c9cf4a8b9f6473c96641c39bd1d Binary files /dev/null and b/docs/zh/2209/figures/kiran-39.png differ diff --git a/docs/zh/2209/figures/kiran-4.png b/docs/zh/2209/figures/kiran-4.png new file mode 100644 index 0000000000000000000000000000000000000000..bd318280b403912ab4846b694592d580b9e5d242 Binary files /dev/null and b/docs/zh/2209/figures/kiran-4.png differ diff --git a/docs/zh/2209/figures/kiran-40.png b/docs/zh/2209/figures/kiran-40.png new file mode 100644 index 0000000000000000000000000000000000000000..083031058ff47dc1550881d3a9f189861d3e8563 Binary files /dev/null and b/docs/zh/2209/figures/kiran-40.png differ diff --git a/docs/zh/2209/figures/kiran-41.png b/docs/zh/2209/figures/kiran-41.png new file mode 100644 index 0000000000000000000000000000000000000000..582893929e2c10a96c49696411bbed3ea9fd7c55 Binary files /dev/null and b/docs/zh/2209/figures/kiran-41.png differ diff --git a/docs/zh/2209/figures/kiran-42.png b/docs/zh/2209/figures/kiran-42.png new file mode 100644 index 0000000000000000000000000000000000000000..eede1243506ccd309ee707465f56c31581dd8554 Binary files /dev/null and b/docs/zh/2209/figures/kiran-42.png differ diff --git a/docs/zh/2209/figures/kiran-43.0.png b/docs/zh/2209/figures/kiran-43.0.png new file mode 100644 index 0000000000000000000000000000000000000000..caacc027322d4b7480e6508d4a1b4a13eefcf788 Binary files /dev/null and b/docs/zh/2209/figures/kiran-43.0.png differ diff --git a/docs/zh/2209/figures/kiran-43.png b/docs/zh/2209/figures/kiran-43.png new file mode 100644 index 0000000000000000000000000000000000000000..4ea9f45ed8f327fce426352c4ae7fbf06cbefc84 Binary files /dev/null and b/docs/zh/2209/figures/kiran-43.png differ diff --git a/docs/zh/2209/figures/kiran-44.png b/docs/zh/2209/figures/kiran-44.png new file mode 100644 index 0000000000000000000000000000000000000000..c86a100005f89dbb9b24055e42d716205d47399e Binary files /dev/null and b/docs/zh/2209/figures/kiran-44.png differ diff --git a/docs/zh/2209/figures/kiran-45.png b/docs/zh/2209/figures/kiran-45.png new file mode 100644 index 0000000000000000000000000000000000000000..c5b5d75f972e594587f3393c8d384dcd76e7477e Binary files /dev/null and b/docs/zh/2209/figures/kiran-45.png differ diff --git a/docs/zh/2209/figures/kiran-46.png b/docs/zh/2209/figures/kiran-46.png new file mode 100644 index 0000000000000000000000000000000000000000..e9a28632c62de95d8ea2d436ba9bc705ff980991 Binary files /dev/null and b/docs/zh/2209/figures/kiran-46.png differ diff --git a/docs/zh/2209/figures/kiran-47.png b/docs/zh/2209/figures/kiran-47.png new file mode 100644 index 0000000000000000000000000000000000000000..a3606e3c899f944eb84d206d98cedc3377197c97 Binary files /dev/null and b/docs/zh/2209/figures/kiran-47.png differ diff --git a/docs/zh/2209/figures/kiran-48.png b/docs/zh/2209/figures/kiran-48.png new file mode 100644 index 0000000000000000000000000000000000000000..b69202c9a83bfc2c835ab166ef0fc2455bb4bcd3 Binary files /dev/null and b/docs/zh/2209/figures/kiran-48.png differ diff --git a/docs/zh/2209/figures/kiran-49.png b/docs/zh/2209/figures/kiran-49.png new file mode 100644 index 0000000000000000000000000000000000000000..d739e6107fd80ecd741dacaaf9dfb868afc61e37 Binary files /dev/null and b/docs/zh/2209/figures/kiran-49.png differ diff --git a/docs/zh/2209/figures/kiran-5.png b/docs/zh/2209/figures/kiran-5.png new file mode 100644 index 0000000000000000000000000000000000000000..154dd54d43b5b98682eb798518046e72fc7e3f83 Binary files /dev/null and b/docs/zh/2209/figures/kiran-5.png differ diff --git a/docs/zh/2209/figures/kiran-50.png b/docs/zh/2209/figures/kiran-50.png new file mode 100644 index 0000000000000000000000000000000000000000..96957676afc9f66bcc4b63c5e39eb8890f108015 Binary files /dev/null and b/docs/zh/2209/figures/kiran-50.png differ diff --git a/docs/zh/2209/figures/kiran-6.png b/docs/zh/2209/figures/kiran-6.png new file mode 100644 index 0000000000000000000000000000000000000000..927b475d6687d60f04fed8a535b2225a8f4b23f7 Binary files /dev/null and b/docs/zh/2209/figures/kiran-6.png differ diff --git a/docs/zh/2209/figures/kiran-7.png b/docs/zh/2209/figures/kiran-7.png new file mode 100644 index 0000000000000000000000000000000000000000..254ef11f36d958f6ef7c70853e5f61032f825463 Binary files /dev/null and b/docs/zh/2209/figures/kiran-7.png differ diff --git a/docs/zh/2209/figures/kiran-8.png b/docs/zh/2209/figures/kiran-8.png new file mode 100644 index 0000000000000000000000000000000000000000..29b5845d2fa94cba92719b8649a5e86c926ea911 Binary files /dev/null and b/docs/zh/2209/figures/kiran-8.png differ diff --git a/docs/zh/2209/figures/kiran-9.png b/docs/zh/2209/figures/kiran-9.png new file mode 100644 index 0000000000000000000000000000000000000000..46bcfdd0e1e88ad0f0ade4a3990c3ac5d66060e7 Binary files /dev/null and b/docs/zh/2209/figures/kiran-9.png differ diff --git a/docs/zh/2209/kiran_installation.md b/docs/zh/2209/kiran_installation.md new file mode 100644 index 0000000000000000000000000000000000000000..144af15c3d478ea44bc238110d477eb4081a2c15 --- /dev/null +++ b/docs/zh/2209/kiran_installation.md @@ -0,0 +1,31 @@ +# 在 openEuler 上安装 Kiran + +## 简介 + +kiran 桌面是湖南麒麟信安团队以用户和市场需求为导向，研发的一个安全、稳定、高效、易用的桌面环境。Kiran 可以支持 x86 和 aarch64 架构。 + +## 安装方法 + +安装时建议使用 root 用户或者新建一个管理员用户。 + +1.下载 openEuler 23.09 镜像并安装系统。 + +2.更新软件源： + +```sh +sudo dnf update +``` + +3.安装 kiran-desktop： + +```sh +sudo dnf -y install kiran-desktop +``` + +4.设置以图形界面的方式启动，并重启（`reboot`）。 + +```sh +systemctl set-default graphical.target +``` + +重启系统即可通过 Kiran 桌面登录，您就可以尽情使用 Kiran 桌面了。 diff --git a/docs/zh/2209/kiran_user_guide.md b/docs/zh/2209/kiran_user_guide.md new file mode 100644 index 0000000000000000000000000000000000000000..f3e3f499f9a3011788aaa4beaf135c8d70f9b7f8 --- /dev/null +++ b/docs/zh/2209/kiran_user_guide.md @@ -0,0 +1,329 @@ +# Kiran桌面环境用户手册 + +## 1.概述 + +Kiran桌面是一款以用户和市场需求为主导的稳定、高效、易用的桌面环境，主要包括了桌面、任务栏、托盘、控制中心和窗口管理等组件。本文介绍了Kiran桌面的使用。 + +## 2.桌面 + +### 2.1.登录界面 + +安装完成后重启系统，系统启动后需要输入登录的用户名和密码才能进入系统，登录界面会显示时间日期，电源按钮，软键盘按钮。界面支持自适应调整，支持屏幕放缩，支持多屏显示，登录框可以跟随鼠标进行屏幕切换。 + +![图1-登录界面](figures/kiran-1.png) + +### 2.2.主界面 + +输入正确的用户名和密码后即可登录系统进入主界面，如下图所示： + +![图2-主界面](figures/kiran-2.png) + +桌面上放置有几个图标，如计算机、主文件夹、回收站等，位于屏幕底部的一个长条称为面板，从这里可以启动应用程序或在模拟桌面上切换。 +桌面是用户的工作区域，用户操作和程序运行都是在桌面上。桌面上还有用户希望能方便访问的文件和应用程序图标，用鼠标双击可以运行相应程序或打开文件。可以拖动、添加或删除桌面图标。使用桌面图标可以更加便捷地完成工作。 + +![图3-计算机](figures/kiran-3.png)计算机：双击可以显示从本计算机访问的所有本地和远程磁盘和文件夹。 + +![图4-主文件夹](figures/kiran-4.png)主文件夹：双击可以显示/root（家目录）下的内容。 + +![图5-回收站](figures/kiran-5.png)回收站：暂时存放已删除文件的地方。 + +桌面右键：提供了创建文件夹、创建启动器、创建文档、更改桌面背景、图标保持对齐等快捷方式。 + +创建文件夹：可以创建新的文件夹。 + +创建启动器：可以创建一个新的启动器。 + +创建文档：可以创建空的纯文本文档。 + +按名称组织桌面：按名称来进行排序桌面文件。 + +保持对齐：勾选了保持对齐，桌面图标会按照网格对齐排列。 + +打开终端：直接打开终端应用。 + +更改桌面背景：打开“背景”，以改变桌面或锁屏的背景图片。 + +### 2.3.面板 + +面板通常位于屏幕的底部，上面包括了开始菜单按钮、快速启动区域、经常使用的应用程序与桌面小程序图标和显示当前运行应用程序的任务条。 +将鼠标停在某个图标上呆几秒钟，会看到一个白色的弹出提示框，内容是对这个图标作用的描述。 + +![图6-系统面板](figures/kiran-6.png) + +## 3.任务栏 + +任务栏：显示正在运行的程序或打开的文档，点击任务条上某一项可以最大化或最小化被选中的程序。可以通过在对应项上点击鼠标右键对其运行窗口进行最大化、最小化或关闭等操作。 + +| 组件 | 说明 | +| :------------ | :------------ | +|![图7-开始菜单](figures/kiran-7.png)|开始菜单按钮：相当于Windows中的开始按钮，单击会弹出系统级联的开始菜单| +|![图8-工作区按钮](figures/kiran-8.png)|单机此按钮启动工作区| +|![图9-文件浏览器按钮](figures/kiran-9.png)|单击此按钮启动文件浏览器，可浏览管理文件| +|![图10-终端命令按钮](figures/kiran-10.png)|单击将启动终端| +|![图11-Web浏览器按钮](figures/kiran-11.png)|单击此按钮启动firefox浏览器| +|![图12-网络控制图标](figures/kiran-12.png)|显示当前网络状态，单击可修改系统的网络配置| +|![图13-时钟按钮](figures/kiran-13.png)|显示当前日期和时间，可以根据需要定制显示的样式| + +## 4.控制中心 + +### 4.1.开始菜单设置 + +选择“开始菜单”>“控制中心”>“开始菜单设置”。 +开始菜单可设置开始菜单样式，根据个人喜好设置开始菜单的显示模式与不透明度，如图所示： + +![图14-开始菜单设置](figures/kiran-14.png) + +开始菜单根据设置的透明度、显示模式而更改，如下图： + +![图15-开始菜单界面](figures/kiran-15.png) + +### 4.2.登录设置 + +选择“开始菜单”>“控制中心”>“登录设置”打开。 +在kiran桌面，用户可以通过选择控制中心中的登录设置对登录界面环境效果进行设置，其中包括登录界面背景图、是否自动登录、缩放比例、是否允许手动输入用户名登录、是否显示用户列表等，如图所示： + +![图16-登录设置](figures/kiran-16.png) + +还可以设置自动登录，设置自动登录的用户和延时，重启系统后会自动登录该用户，无需输入密码。 + +![图17-设置自动登录](figures/kiran-17.png) + +### 4.3.显示设置 + +定制显示属性是每个桌面系统所必备的，kiran桌面提供了强大的显示属性定制工具。您可以通过选择“开始菜单”>“控制中心”>“显示设置”进入显示设置界面，如下图所示： + +![图18-显示设置](figures/kiran-18.png) + +这里可以设置屏幕旋转、分辨率、刷新率、缩放率和旋转，设置完成后点击“应用”即可。 + +### 4.4.鼠标设置 + +用户可以通过选择控制中心中的“鼠标设置”对鼠标进行配置，可以修改鼠标手持模式为左手和右手模式，调整鼠标移动速度，可以设置是否自动滚动，是否同时按下左右键模拟中键功能。鼠标设置常见界面如图所示： + +![图19-鼠标设置](figures/kiran-19.png) + +### 4.5.账户管理工具 + +账户管理工具工具是对用户和组进行管理的一个简单易用工具，您可以通过这个工具对用户和组群进行配置和管理，主要包括： + +1)增加用户，设置用户属性； +2)修改用户属性； +3)显示用户属性； +4)删除用户； + +用户属性包括：账号、口令(密码)、登录 shell，用户组属性指在该组包含哪些用户。 + +#### 4.5.1.启动账户管理工具 + +在控制中心中选择启动“账户管理工具”选项即可启动账户管理工具，如图所示： + +![图20-账户管理工具](figures/kiran-20.png) + +在这个界面中您可以看到有左侧菜用户栏和右侧详细信息栏两个部分。目前在列出的是系统中的所有用户（除root用户除外）。点击左侧某个用户，详细信息栏将显示用户的基本信息（用户ID、用户类型等）。 + +点击“创建用户”，在右侧出现页面，如下图所示，按照要求填写您要添加的用户名、用户类型、设置密码、头像。填写完毕后，单击“创建”即完成添加。 + +![图21-创建账户](figures/kiran-21.png) + +【注】：如果您已经设置了密码允许的最小位数(例如四位)，则您在此处输入的密码位数要不小于 4 位，否则系统将不会接受该密码。 + +单击头像区域打开头像修改功能，系统预设了各种类型的头像供用户选择，用户也可以自己添加头像，点击“确认”后记得保存： + +![图22-修改头像](figures/kiran-22.png) + +#### 4.5.2.删除用户 + +首先在左侧信息栏里的欲删除的用户上单击，选中该用户，然后在右侧工具栏上点击“删除”按钮，如下图所示： + +![图23-删除用户](figures/kiran-23.png) + +![图24-删除确认提示](figures/kiran-24.png) + +在弹出上图所示的对话框中单击“否”撤消删除，单击“是”确认删除。 + +#### 4.5.3.高级设置 + +选择“创建新用户”>“输入账号密码”>“高级设置”，打开一个对话框，如下图所示，可以设置用户的登录shell、指定用户ID和指定用户目录。 + +![图25-高级设置](figures/kiran-25.png) + +### 4.6.外观 + +定制显示属性是每个桌面系统所必备的，Kiran桌面为您提供了强大的显示属性定制工具。外观是一个对系统的桌面背景，主题，字体三个方面提供统一配置和管理的工具。 +选择“开始菜单”>“控制中心”>“外观”，显示的界面如下图所示： + +![图26-外观设置](figures/kiran-26.png) + +#### 4.6.1.主题 + +主题可以对系统的对话框风格，菜单风格，系统面板风格，图标风格进行统一设置或者也可以根据用户的喜好定制。 + +1)主题设置 +系统中默认已提供了多套主题，可以在主题浏览对话框中浏览主题的相关信息。点击主题浏览对话框中的主题，即可设置系统主题，如图所示： +![图27-主题设置](figures/kiran-27.png) + +2)自定义主题 +用户可以通过点击“自定义”按钮，来根据用户的喜好定制系统主题，如下图所示：自定义主题包括： +a.控制； +b.色彩； +c.窗口边框； +d.图标； +e.指针； + +![图28-自定义主题](figures/kiran-28.png) + +#### 4.6.2.背景 + +用户可以对桌面背景进行设置，可以修改颜色、样式。 + +1)背景图片设置 +如下图所示，点击壁纸文件浏览对话框中的壁纸，即可将桌面设置为此壁纸。 + +![图29-背景设置](figures/kiran-29.png) + +2)样式 +用户可以根据自己的喜好通过样式下拉式选择框来调整壁纸填充桌面背景时的方式。填充方式有以下五种方式： + +a.平铺； +b.缩放； +c.居中； +d.比例放大； +e.伸展； +f.适合宽度。 + +3)壁纸的添加与删除 +用户可以通过“添加”按钮添加自己喜欢的壁纸，如下图所示： + +![图30-添加壁纸](figures/kiran-30.png) + +点击“打开”即可添加壁纸。 +同时可以点击“删除”按钮来删除用户不喜欢的壁纸。具体步骤：选择壁纸，点击“删除”。 + +4)桌面背景色彩填充设置 +用户如果不喜欢用壁纸来设置桌面背景，也可以用色彩来设置背景，在壁纸选择对话框中选择无壁纸选项，即可使用色彩来填充桌面背景。 +填充色彩的方式有三种： + +a.纯色； +b.水平梯度； +c.垂直梯度。 + +![图31-背景图片色彩填充](figures/kiran-31.png) + +#### 4.6.3.字体 + +1)字体设置 +用户可以通过字体设置来设置系统图形界面的各种类型的字体，字体类型包括以下五种类型： + +a.应用程序字体； +b.文档字体； +c.桌面字体； +d.窗口标题字体； +e.等宽字体。 + +![图32-字体设置](figures/kiran-32.png) + +2)字体效果设置与详情设置 +字体渲染效果设置 +用户可以通过字体渲染效果设置来设置系统图形界面的以下四种类型的字体效果： + +a.单色； +b.最佳形状； +c.最佳对比； +d.次像素平滑； +系统默认使用的最佳形状的字体渲染效果，如下图所示： + +![图33-字体渲染设置](figures/kiran-33.png) + +3)字体细节设置 +字体效果的一些详情设置可以通过“细节”按钮进行设置。详情设置包括： + +a.字体分辨率； +b.字体平滑度； +c.字体微调； +d.字体次像素排序。 + +![图34-字体细节设置](figures/kiran-34.png) + +4)用户可以设置界面，选择是否在菜单显示图标和在按钮中显示图标： + +![图35-显示图标与否设置](figures/kiran-35.png) + +## 5.桌面应用 + +### 5.1.文本编辑器 + +要启动文本编辑器，点击“开始菜单”>“所有应用”>“工具”>“pluma”。也可以在shell提示符下键入pluma启动文本编辑器。 +文本编辑器是所有计算机系统中最常用的一种工具。用户在使用计算机时，往往需要创建自己的文件，无论是一般的文字文件、资料文件，还是编写源程序，这些工作都离不开编辑器。它用于查看和修改纯文本文件，纯文本文件是不包含应用字体或风格格式的普通文本文件，如系统日志和配置文件： + +![图36-文本编辑器](figures/kiran-36.png) + +### 5.2.终端 + +在桌面环境下，可以利用终端程序进入传统的命令操作界面，启动命令行终端的方法是：选择“开始菜单”>“所有应用”>“工具”>“终端”或者桌面面板上的图标： + +![图37-终端](figures/kiran-37.png) + +### 5.3.Firefox火狐浏览器 + +要启动Firefox火狐浏览器，点击“开始菜单”>“所有应用”>“互联网”>“Firefox火狐浏览器”。 +Firefox火狐浏览器，是一个自由及开放源代码网页浏览器，使用Gecko排版引擎，支持多种操作系统，如Windows、Mac OS X及GNU/Linux等。它体积小速度快，还有其他一些高级特征，主要特性有：标签式浏览、使用网上冲浪更快、可以禁止弹出式窗口、自定制工具栏、扩展管理、更好的搜索特性、快速而方便的侧栏： + +![图38-firefox浏览器](figures/kiran-38.png) + +### 5.4.截图工具 + +选择“开始菜单”>“所有应用”>“图像”>“截图工具”，可以启动截图工具。 +截图工具是kiranz桌面的一款小巧灵活的屏幕捕捉软件，操作界面简洁、使用极为方便。该软件启动时会在托盘处添加截图工具图标，如下图所示： + +![图39-托盘区截图图标](figures/kiran-39.png) + +点击该图标后，直接弹出屏幕捕捉界面，可自行选择截图范围。可通过有击该图标打开“打开启动器”，可选择需要抓取的范围是整个桌面，或者方形区域，可设置截图延迟时间，如下图所示： + +![图40-截图界面](figures/kiran-40.png) + +![图41-启动器界面](figures/kiran-41.png) + +在弹出的对话框中，点击“√”，即可保存至桌面，如想自定义保存位置，点击“选项”>勾选“自定义保存位置”即可。如下图所示： + +![图42-截图过程](figures/kiran-42.png) + +### 5.5.网络设置 + +Kiran桌面采用了NetworkManager作为网络配置工具，NetworkManager是用来设定、配置和管理各种网络类型的桌面工具，NetworkManager提供了对移动宽带设备、蓝牙、IPv6 提供改进的支持。通过点击“开始菜单-控制中心-网络连接”打开，或者通过点击桌面右下角网络图标选择编辑连接打开，如图所示： + +![图43-网络连接工具](figures/kiran-43.png) + +设置有线连接： +设备选择当前的网卡，如“ens160”是当前系统的网卡，选中该网卡，点击“编辑”按钮，弹出网卡编辑对话框： + +![图44-编辑网络](figures/kiran-44.png) + +“IPv4设置”是用户常用到的设置，这里选择了DHCP的方式获取IP和DNS服务器，系统会自动给用户分配IP地址。 +有些时候用户会碰到需要手动填写IP地址的情况，这就需要在IPv4设置的上方“方法”下拉菜单中选择“手动”，如下图所示： + +![图45-设置IPV4](figures/kiran-45.png) + +接下来点击“添加”按钮依次输入IP地址、子网掩码和网关，并填写DNS服务器，如下图： + +![图46-设置网络ip和dns等](figures/kiran-46.png) + +填写ip地址、子网掩码、网关和DNS后保存，点击桌面右下角网络图标断开网络后重新连接。 + +### 5.6.时间和日期管理 + +要对系统的日期和时间进行设置，您可以在控制中心中选择“时间和日期管理”选项，也可以通过点击桌面右下角日期区域，系统将弹出如图所示的界面： + +![图47-时间和日期管理工具](figures/kiran-47.png) + +自动同步日期和时间：打开“自动同步”并连接外网可以自动同步时间。 +设置时区：点击“更改时区”按钮，右侧显示如下图所示时区设置对话框，点击需要更改的时区后保存即可修改时区。 + +![图48-修改时区](figures/kiran-48.png) + +手动设置时间：关闭自动同步按钮，点击手动设置时间，可以手动调整年份、月份、日以及时间，修改完成后保存。 + +![图49-手动设置时间](figures/kiran-49.png) + +修改日期格式：点击日期时间格式设置可以修改显示的日期格式，可以设置长日期显示格式、短日期显示格式、时间格式、以及是否显示秒： + +![图50-修改日期格式](figures/kiran-50.png) diff --git a/include/wireless-network-manager.h b/include/wireless-network-manager.h index ea51ea2fa1eafa2347616f87fa553ebeaf87944b..7aa6c12e6d5462ba2bda7a2443f02e6cbfd63361 100644 --- a/include/wireless-network-manager.h +++ b/include/wireless-network-manager.h @@ -54,15 +54,15 @@ public: WifiSecurityTypeList networkSupportSecurityTypeList(const QString &ssid); // 激活网络,使用已有的网络配置 - void activateNetowrk(const QString &ssid); + QDBusPendingCall activateNetowrk(const QString &ssid); // 添加密码形式激活网络配置并尝试激活隐藏网络 // 适用于WpaPsk/Wpa2Psk/Wpa3 Person/WpaNone - void addAndActivateHiddenNetwork(const QString &ssid, const QString &password, WifiSecurityType securityType); + QDBusPendingCall addAndActivateHiddenNetwork(const QString &ssid, const QString &password, WifiSecurityType securityType); // 添加密码形式激活网的配置并尝试激活网络 // 适用于WpaPsk/Wpa2Psk/Wpa3 Person/WpaNone - void addAndActivateNetwork(const QString &ssid, const QString &password); + QDBusPendingCall addAndActivateNetwork(const QString &ssid, const QString &password); // 添加EAP形式激活网的配置并尝试激活网络 // 适用于Wpa/Wpa2 Enterprise @@ -72,7 +72,7 @@ public: void removeNetworkConnection(const QString &ssid); // 断开该无线网卡上已激活的连接 - void deactivateConnection(); + QDBusPendingCall deactivateConnection(); signals: // 设备状态改变信号 diff --git a/lib/network/wireless-network-manager-private.h b/lib/network/wireless-network-manager-private.h index 40e9fe9a26c68d6679701c7afa04ce924a53d2a1..39f11860de16ea6e1bf4c60120d42a93ed52e60f 100644 --- a/lib/network/wireless-network-manager-private.h +++ b/lib/network/wireless-network-manager-private.h @@ -39,7 +39,6 @@ private slots: void onNetworkDisappeared(const QString &ssid); void onStateChanged(Device::State newstate, Device::State oldstate, Device::StateChangeReason reason); void onActiveAccessPointChanged(const QString &ap); - void onActivateConnectionFinished(QDBusPendingCallWatcher *watcher); void onDeviceActiveConnectionChanged(); private: diff --git a/lib/network/wireless-network-manager.cpp b/lib/network/wireless-network-manager.cpp index 615d629a9c8ad0e01452f6d509279903580ef5d7..0c5599d78cfb3a0ff1e7bd34d1e157c7ca0b62cb 100644 --- a/lib/network/wireless-network-manager.cpp +++ b/lib/network/wireless-network-manager.cpp @@ -137,31 +137,36 @@ void WirelessNetworkManager::removeNetworkConnection(const QString &ssid) } } -void WirelessNetworkManager::deactivateConnection() +QDBusPendingCall WirelessNetworkManager::deactivateConnection() { auto activeConnection = d_ptr->m_device->activeConnection(); if (activeConnection.isNull()) { + auto successReply = QDBusPendingCall::fromError(QDBusError(QDBusError::NoError, "")); KLOG_WARNING(qLcNetwork) << interfaceName() << "deactivate connecion failed, no active connection"; - return; + return successReply; } KLOG_INFO(qLcNetwork) << "deactivate" << interfaceName() << activeConnection->id() << activeConnection->path(); - NetworkManager::deactivateConnection(activeConnection->path()); + auto pendingReply = NetworkManager::deactivateConnection(activeConnection->path()); + return pendingReply; } -void WirelessNetworkManager::activateNetowrk(const QString &ssid) +QDBusPendingCall WirelessNetworkManager::activateNetowrk(const QString &ssid) { - RETURN_IF_FALSE_WITH_WARNNING(d_ptr->m_networkInfoMap.contains(ssid), - QString("network %1 not exists").arg(ssid)); + auto errorReply = QDBusPendingCall::fromError(QDBusError(QDBusError::InternalError, "")); + + RETURN_VAL_IF_FALSE_WITH_WARNNING(d_ptr->m_networkInfoMap.contains(ssid), + errorReply, + QString("network %1 not exists").arg(ssid)); auto networkInfo = d_ptr->m_networkInfoMap[ssid]; auto connectionList = d_ptr->getWirelessNetworkConnection(ssid); if (connectionList.isEmpty()) - return; + return errorReply; auto connection = connectionList.first(); KLOG_INFO(qLcNetwork).nospace() << "activate " << d_ptr->m_device->interfaceName() @@ -171,18 +176,14 @@ void WirelessNetworkManager::activateNetowrk(const QString &ssid) auto pendingReply = NetworkManager::activateConnection(connection->path(), d_ptr->m_device->uni(), networkInfo.referencePointPath); - - auto pendingCallWatcher = new QDBusPendingCallWatcher(pendingReply, this); - pendingCallWatcher->setProperty(DBUS_WATCHER_PROPERTY_SSID, ssid); - connect(pendingCallWatcher, &QDBusPendingCallWatcher::finished, - d_ptr, &WirelessNetworkManagerPrivate::onActivateConnectionFinished); - return; + return pendingReply; } -void WirelessNetworkManager::addAndActivateHiddenNetwork(const QString &ssid, - const QString &password, - WifiSecurityType securityType) +QDBusPendingCall WirelessNetworkManager::addAndActivateHiddenNetwork(const QString &ssid, + const QString &password, + WifiSecurityType securityType) { + auto errorReply = QDBusPendingCall::fromError(QDBusError(QDBusError::InternalError, "")); KLOG_INFO(qLcNetwork).nospace() << "activate " << d_ptr->m_device->interfaceName() << " network(" << ssid << ")"; @@ -191,30 +192,28 @@ void WirelessNetworkManager::addAndActivateHiddenNetwork(const QString &ssid, { KLOG_WARNING(qLcNetwork) << "create connection settings for" << ssid << "failed, unsupported security type"; - return; + return errorReply; } auto pendingReply = addAndActivateConnection(connectionSettings->toMap(), d_ptr->m_device->uni(), ""); - - auto pendingCallWatcher = new QDBusPendingCallWatcher(pendingReply, this); - pendingCallWatcher->setProperty(DBUS_WATCHER_PROPERTY_SSID, ssid); - connect(pendingCallWatcher, &QDBusPendingCallWatcher::finished, - d_ptr, &WirelessNetworkManagerPrivate::onActivateConnectionFinished); + return pendingReply; } -void WirelessNetworkManager::addAndActivateNetwork(const QString &ssid, const QString &password) +QDBusPendingCall WirelessNetworkManager::addAndActivateNetwork(const QString &ssid, const QString &password) { ConnectionSettings::Ptr connectionSettings; + auto errorReply = QDBusPendingCall::fromError(QDBusError(QDBusError::InternalError, "")); static QList recommendSecurityList = { SECURITY_TYPE_WPA3_PERSON, SECURITY_TYPE_WPA_AND_WPA2_PERSON, SECURITY_TYPE_NONE, }; - RETURN_IF_FALSE_WITH_WARNNING(d_ptr->m_networkInfoMap.contains(ssid), - QString("network %1 not exists").arg(ssid)); + RETURN_VAL_IF_FALSE_WITH_WARNNING(d_ptr->m_networkInfoMap.contains(ssid), + errorReply, + QString("network %1 not exists").arg(ssid)); auto networkInfo = d_ptr->m_networkInfoMap[ssid]; auto supportedSecurityTypes = d_ptr->getSupportedNetworkSecuritys(ssid); @@ -230,17 +229,13 @@ void WirelessNetworkManager::addAndActivateNetwork(const QString &ssid, const QS { KLOG_WARNING(qLcNetwork) << "create connection settings for" << ssid << "failed," << "unsupported security type"; - return; + return errorReply; } auto pendingReply = addAndActivateConnection(connectionSettings->toMap(), d_ptr->m_device->uni(), networkInfo.referencePointPath); - auto pendingCallWatcher = new QDBusPendingCallWatcher(pendingReply, this); - pendingCallWatcher->setProperty(DBUS_WATCHER_PROPERTY_SSID, ssid); - connect(pendingCallWatcher, &QDBusPendingCallWatcher::finished, - d_ptr, &WirelessNetworkManagerPrivate::onActivateConnectionFinished); - return; + return pendingReply; } WirelessNetworkManagerPrivate::WirelessNetworkManagerPrivate( @@ -310,13 +305,6 @@ void WirelessNetworkManagerPrivate::onActiveAccessPointChanged(const QString &ap KLOG_DEBUG(qLcNetwork) << "active ap changed:" << ap; } -void WirelessNetworkManagerPrivate::onActivateConnectionFinished(QDBusPendingCallWatcher *watcher) -{ - auto reply = watcher->reply(); - auto ssid = watcher->property(DBUS_WATCHER_PROPERTY_SSID).toString(); - KLOG_DEBUG(qLcNetwork) << ssid << "activate connection pending call finished" << reply; -} - /** * 设备ActiveConnection改变处理方法： * 通过激活连接，拿到连接信息，再拿到连接配置