-
Notifications
You must be signed in to change notification settings - Fork 25
迁移配置至 dconfig #109
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
glyvut
wants to merge
2
commits into
linuxdeepin:master
Choose a base branch
from
glyvut:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
迁移配置至 dconfig #109
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,237 @@ | ||
| { | ||
| "magic": "dsg.config.meta", | ||
| "version": "1.0", | ||
| "contents": { | ||
| "haltCommand": { | ||
| "value": "@HALT_COMMAND@", | ||
| "serial": 0, | ||
| "flags": [], | ||
| "name": "Halt Command", | ||
| "name[zh_CN]": "关机命令", | ||
| "description": "Halt command.", | ||
| "description[zh_CN]": "关机命令。", | ||
| "permissions": "read", | ||
| "visibility": "private" | ||
| }, | ||
| "rebootCommand": { | ||
| "value": "@REBOOT_COMMAND@", | ||
| "serial": 0, | ||
| "flags": [], | ||
| "name": "Reboot Command", | ||
| "name[zh_CN]": "重启命令", | ||
| "description": "Reboot command.", | ||
| "description[zh_CN]": "重启命令。", | ||
| "permissions": "read", | ||
| "visibility": "private" | ||
| }, | ||
| "namespaces": { | ||
| "value": [], | ||
| "serial": 0, | ||
| "flags": [], | ||
| "name": "Namespaces", | ||
| "name[zh_CN]": "命名空间", | ||
| "description": "Comma-separated list of paths bound to Linux namespaces to enter with setns() before starting the user session.", | ||
| "description[zh_CN]": "启动用户会话前通过 setns() 进入的 Linux 命名空间路径列表。", | ||
| "permissions": "read", | ||
| "visibility": "private" | ||
| }, | ||
| "cursorTheme": { | ||
| "value": "", | ||
| "serial": 0, | ||
| "flags": [], | ||
| "name": "Cursor Theme", | ||
| "name[zh_CN]": "光标主题", | ||
| "description": "Cursor theme used in the greeter.", | ||
| "description[zh_CN]": "登录界面使用的光标主题。", | ||
| "permissions": "read", | ||
| "visibility": "private" | ||
| }, | ||
| "cursorSize": { | ||
| "value": "", | ||
| "serial": 0, | ||
| "flags": [], | ||
| "name": "Cursor Size", | ||
| "name[zh_CN]": "光标大小", | ||
| "description": "Cursor size used in the greeter.", | ||
| "description[zh_CN]": "登录界面使用的光标大小。", | ||
| "permissions": "read", | ||
| "visibility": "private" | ||
| }, | ||
| "x11ServerPath": { | ||
| "value": "/usr/bin/X", | ||
| "serial": 0, | ||
| "flags": [], | ||
| "name": "X11 Server Path", | ||
| "name[zh_CN]": "X11 Server 路径", | ||
| "description": "Path to the X server binary.", | ||
| "description[zh_CN]": "X server 可执行文件路径。", | ||
| "permissions": "read", | ||
| "visibility": "private" | ||
| }, | ||
| "x11ServerArguments": { | ||
| "value": "-nolisten tcp", | ||
| "serial": 0, | ||
| "flags": [], | ||
| "name": "X11 Server Arguments", | ||
| "name[zh_CN]": "X11 Server 参数", | ||
| "description": "Arguments passed to the X server invocation.", | ||
| "description[zh_CN]": "传递给 X server 的启动参数。", | ||
| "permissions": "read", | ||
| "visibility": "private" | ||
| }, | ||
| "x11SessionDir": { | ||
| "value": ["/usr/local/share/xsessions", "/usr/share/xsessions"], | ||
| "serial": 0, | ||
| "flags": [], | ||
| "name": "X11 Session Directories", | ||
| "name[zh_CN]": "X11 会话目录", | ||
| "description": "Comma-separated list of directories containing available X sessions.", | ||
| "description[zh_CN]": "包含可用 X 会话的目录列表。", | ||
| "permissions": "read", | ||
| "visibility": "private" | ||
| }, | ||
| "x11SessionCommand": { | ||
| "value": "@SESSION_COMMAND@", | ||
| "serial": 0, | ||
| "flags": [], | ||
| "name": "X11 Session Command", | ||
| "name[zh_CN]": "X11 会话命令", | ||
| "description": "Path to a script to execute when starting the desktop session.", | ||
| "description[zh_CN]": "启动桌面会话时执行的脚本路径。", | ||
| "permissions": "read", | ||
| "visibility": "private" | ||
| }, | ||
| "x11SessionLogFile": { | ||
| "value": ".local/share/ddm/xorg-session.log", | ||
| "serial": 0, | ||
| "flags": [], | ||
| "name": "X11 Session Log File", | ||
| "name[zh_CN]": "X11 会话日志文件", | ||
| "description": "Path to the user session log file, relative to the home directory.", | ||
| "description[zh_CN]": "用户会话日志文件路径，相对于用户主目录。", | ||
| "permissions": "read", | ||
| "visibility": "private" | ||
| }, | ||
| "x11DisplayCommand": { | ||
| "value": "@DATA_INSTALL_DIR@/scripts/Xsetup", | ||
| "serial": 0, | ||
| "flags": [], | ||
| "name": "X11 Display Command", | ||
| "name[zh_CN]": "X11 显示启动命令", | ||
| "description": "Path to a script to execute when starting the display server.", | ||
| "description[zh_CN]": "启动显示服务器时执行的脚本路径。", | ||
| "permissions": "read", | ||
| "visibility": "private" | ||
| }, | ||
| "x11DisplayStopCommand": { | ||
| "value": "@DATA_INSTALL_DIR@/scripts/Xstop", | ||
| "serial": 0, | ||
| "flags": [], | ||
| "name": "X11 Display Stop Command", | ||
| "name[zh_CN]": "X11 显示停止命令", | ||
| "description": "Path to a script to execute when stopping the display server.", | ||
| "description[zh_CN]": "停止显示服务器时执行的脚本路径。", | ||
| "permissions": "read", | ||
| "visibility": "private" | ||
| }, | ||
| "waylandSessionDir": { | ||
| "value": ["/usr/local/share/wayland-sessions", "/usr/share/wayland-sessions"], | ||
| "serial": 0, | ||
| "flags": [], | ||
| "name": "Wayland Session Directories", | ||
| "name[zh_CN]": "Wayland 会话目录", | ||
| "description": "Comma-separated list of directories containing available Wayland sessions.", | ||
| "description[zh_CN]": "包含可用 Wayland 会话的目录列表。", | ||
| "permissions": "read", | ||
| "visibility": "private" | ||
| }, | ||
| "waylandSessionCommand": { | ||
| "value": "@WAYLAND_SESSION_COMMAND@", | ||
| "serial": 0, | ||
| "flags": [], | ||
| "name": "Wayland Session Command", | ||
| "name[zh_CN]": "Wayland 会话命令", | ||
| "description": "Path to a script to execute when starting the desktop session.", | ||
| "description[zh_CN]": "启动桌面会话时执行的脚本路径。", | ||
| "permissions": "read", | ||
| "visibility": "private" | ||
| }, | ||
| "waylandSessionLogFile": { | ||
| "value": ".local/share/ddm/wayland-session.log", | ||
| "serial": 0, | ||
| "flags": [], | ||
| "name": "Wayland Session Log File", | ||
| "name[zh_CN]": "Wayland 会话日志文件", | ||
| "description": "Path to the user session log file, relative to the home directory.", | ||
| "description[zh_CN]": "用户会话日志文件路径，相对于用户主目录。", | ||
| "permissions": "read", | ||
| "visibility": "private" | ||
| }, | ||
| "singleSessionCommand": { | ||
| "value": "@WAYLAND_SESSION_COMMAND@", | ||
| "serial": 0, | ||
| "flags": [], | ||
| "name": "Single Session Command", | ||
| "name[zh_CN]": "单例会话命令", | ||
| "description": "Path to a script to execute when starting the Treeland user session.", | ||
| "description[zh_CN]": "启动 Treeland 用户会话时执行的脚本路径。", | ||
| "permissions": "read", | ||
| "visibility": "private" | ||
| }, | ||
| "usersDefaultPath": { | ||
| "value": "/usr/local/bin:/usr/bin:/bin", | ||
| "serial": 0, | ||
| "flags": [], | ||
| "name": "Users Default Path", | ||
| "name[zh_CN]": "用户默认 PATH", | ||
| "description": "Default $PATH for logged in users.", | ||
| "description[zh_CN]": "已登录用户的默认 $PATH。", | ||
| "permissions": "read", | ||
| "visibility": "private" | ||
| }, | ||
| "rememberLastUser": { | ||
| "value": true, | ||
| "serial": 0, | ||
| "flags": [], | ||
| "name": "Remember Last User", | ||
| "name[zh_CN]": "记住上次用户", | ||
| "description": "Remember the last successfully logged in user.", | ||
| "description[zh_CN]": "记住上次成功登录的用户。", | ||
| "permissions": "read", | ||
| "visibility": "private" | ||
| }, | ||
| "rememberLastSession": { | ||
| "value": true, | ||
| "serial": 0, | ||
| "flags": [], | ||
| "name": "Remember Last Session", | ||
| "name[zh_CN]": "记住上次会话", | ||
| "description": "Remember the session of the last successfully logged in user.", | ||
| "description[zh_CN]": "记住上次成功登录用户的会话。", | ||
| "permissions": "read", | ||
| "visibility": "private" | ||
| }, | ||
| "autologinUser": { | ||
| "value": "", | ||
| "serial": 0, | ||
| "flags": [], | ||
| "name": "Autologin User", | ||
| "name[zh_CN]": "自动登录用户", | ||
| "description": "User to log in automatically (empty disables autologin).", | ||
| "description[zh_CN]": "自动登录的用户（为空则禁用自动登录）。", | ||
| "permissions": "readwrite", | ||
| "visibility": "public" | ||
| }, | ||
| "autologinSession": { | ||
| "value": "", | ||
| "serial": 0, | ||
| "flags": [], | ||
| "name": "Autologin Session", | ||
| "name[zh_CN]": "自动登录会话", | ||
| "description": "Session to load for automatic login (overrides the last used session).", | ||
| "description[zh_CN]": "自动登录时加载的会话（覆盖上次使用的会话）。", | ||
| "permissions": "readwrite", | ||
| "visibility": "public" | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| { | ||
| "magic": "dsg.config.meta", | ||
| "version": "1.0", | ||
| "contents": { | ||
| "lastUser": { | ||
| "value": "", | ||
| "serial": 0, | ||
| "flags": [], | ||
| "name": "Last User", | ||
| "name[zh_CN]": "上次用户", | ||
| "description": "Name of the last logged-in user. This user will be preselected when the login screen appears.", | ||
| "description[zh_CN]": "上次登录的用户名，登录界面将预选该用户。", | ||
| "permissions": "readwrite", | ||
| "visibility": "private" | ||
| }, | ||
| "lastSession": { | ||
| "value": "", | ||
| "serial": 0, | ||
| "flags": [], | ||
| "name": "Last Session", | ||
| "name[zh_CN]": "上次会话", | ||
| "description": "Name of the session for the last logged-in user. This session will be preselected when the login screen appears.", | ||
| "description[zh_CN]": "上次登录用户的会话名称，登录界面将预选该会话。", | ||
| "permissions": "readwrite", | ||
| "visibility": "private" | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
issue: The CMake cache variables
CONFIG_FILE,CONFIG_DIR, andSYSTEM_CONFIG_DIRare removed while the man-page templates still reference them during configuration. The generatedddm(1),ddm.conf(5), andddm-state.conf(5)documentation therefore contains empty configuration paths instead of describing the DConfig storage locations.Triggers: When
BUILD_MAN_PAGESis enabled.Suggested fix: Update the man-page templates and their configure inputs to document the DConfig schema and state locations, or retain suitable path variables for the generated documentation.