You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
54 lines
5.5 KiB
54 lines
5.5 KiB
5 months ago
|
diff --git a/src/common/Configuration.h b/src/common/Configuration.h
|
||
|
|
index 54bcace..9b8fa22 100644
|
||
|
|
--- a/src/common/Configuration.h
|
||
|
|
+++ b/src/common/Configuration.h
|
||
|
|
@@ -37,9 +37,8 @@ namespace SDDM {
|
||
|
|
enum NumState { NUM_NONE, NUM_SET_ON, NUM_SET_OFF };
|
||
|
|
|
||
|
|
// Name Type Default value Description
|
||
|
|
- // TODO: Change default to x11-user in a future release
|
||
|
|
- Entry(DisplayServer, QString, _S("x11"), _S("Which display server should be used.\n"
|
||
|
|
- "Valid values are: x11, x11-user, wayland. Wayland support is experimental"));
|
||
|
|
+ Entry(DisplayServer, QString, _S("wayland"), _S("Which display server should be used.\n"
|
||
|
|
+ "Valid values are: x11, x11-user, wayland."));
|
||
|
|
Entry(HaltCommand, QString, _S(HALT_COMMAND), _S("Halt command"));
|
||
|
|
Entry(RebootCommand, QString, _S(REBOOT_COMMAND), _S("Reboot command"));
|
||
|
|
Entry(Numlock, NumState, NUM_NONE, _S("Initial NumLock state. Can be on, off or none.\n"
|
||
|
|
@@ -51,7 +50,7 @@ namespace SDDM {
|
||
|
|
// Name Entries (but it's a regular class again)
|
||
|
|
Section(Theme,
|
||
|
|
Entry(ThemeDir, QString, _S(DATA_INSTALL_DIR "/themes"), _S("Theme directory path"));
|
||
|
|
- Entry(Current, QString, _S(""), _S("Current theme name"));
|
||
|
|
+ Entry(Current, QString, _S("01-breeze-fedora"), _S("Current theme name"));
|
||
|
|
Entry(FacesDir, QString, _S(DATA_INSTALL_DIR "/faces"), _S("Global directory for user avatars\n"
|
||
|
|
"The files should be named <username>.face.icon"));
|
||
|
|
Entry(CursorTheme, QString, QString(), _S("Cursor theme used in the greeter"));
|
||
|
|
@@ -71,9 +70,9 @@ namespace SDDM {
|
||
|
|
Entry(SessionDir, QStringList, {_S("/usr/local/share/xsessions"),
|
||
|
|
_S("/usr/share/xsessions")}, _S("Comma-separated list of directories containing available X sessions"));
|
||
|
|
Entry(SessionCommand, QString, _S(SESSION_COMMAND), _S("Path to a script to execute when starting the desktop session"));
|
||
|
|
- Entry(SessionLogFile, QString, _S(".local/share/sddm/xorg-session.log"), _S("Path to the user session log file"));
|
||
|
|
- Entry(DisplayCommand, QString, _S(DATA_INSTALL_DIR "/scripts/Xsetup"), _S("Path to a script to execute when starting the display server"));
|
||
|
|
- Entry(DisplayStopCommand, QString, _S(DATA_INSTALL_DIR "/scripts/Xstop"), _S("Path to a script to execute when stopping the display server"));
|
||
|
|
+ Entry(SessionLogFile, QString, _S(".cache/xsession-errors"), _S("Path to the user session log file"));
|
||
|
|
+ Entry(DisplayCommand, QString, _S(SYS_CONFIG_DIR "/sddm/Xsetup"), _S("Path to a script to execute when starting the display server"));
|
||
|
|
+ Entry(DisplayStopCommand, QString, _S(SYS_CONFIG_DIR "/sddm/Xstop"), _S("Path to a script to execute when stopping the display server"));
|
||
|
|
Entry(EnableHiDPI, bool, true, _S("Enable Qt's automatic high-DPI scaling"));
|
||
|
|
);
|
||
|
|
|
||
|
|
@@ -82,12 +81,12 @@ namespace SDDM {
|
||
|
|
Entry(SessionDir, QStringList, {_S("/usr/local/share/wayland-sessions"),
|
||
|
|
_S("/usr/share/wayland-sessions")}, _S("Comma-separated list of directories containing available Wayland sessions"));
|
||
|
|
Entry(SessionCommand, QString, _S(WAYLAND_SESSION_COMMAND), _S("Path to a script to execute when starting the desktop session"));
|
||
|
|
- Entry(SessionLogFile, QString, _S(".local/share/sddm/wayland-session.log"),_S("Path to the user session log file"));
|
||
|
|
+ Entry(SessionLogFile, QString, _S(".cache/wayland-errors"), _S("Path to the user session log file"));
|
||
|
|
Entry(EnableHiDPI, bool, true, _S("Enable Qt's automatic high-DPI scaling"));
|
||
|
|
);
|
||
|
|
|
||
|
|
Section(Users,
|
||
|
|
- Entry(DefaultPath, QString, _S("/usr/local/bin:/usr/bin:/bin"), _S("Default $PATH for logged in users"));
|
||
|
|
+ Entry(DefaultPath, QString, _S("/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin"), _S("Default $PATH for logged in users"));
|
||
|
|
Entry(MinimumUid, int, UID_MIN, _S("Minimum user id for displayed users"));
|
||
|
|
Entry(MaximumUid, int, UID_MAX, _S("Maximum user id for displayed users"));
|
||
|
|
Entry(HideUsers, QStringList, QStringList(), _S("Comma-separated list of users that should not be listed"));
|