EricKotato/sddm-slice
1
0
Fork 0
Code Issues Releases 7 Wiki Activity

Merge branch 'master' into dev

Browse source
This commit is contained in:
Eric Kotato 2018-09-09 23:43:11 +03:00
commit b8aff863c8
3 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
README.md
View file

@ -25,7 +25,7 @@ Create file `theme.conf.user` in theme folder. See `slice/theme.conf` for refere
### Debug mode options ### Debug mode options
Since "Power" screen can't be viewed in greeter because it depends on `sddm.*` properties, there is a debug mode. There are some things that can't be tested well in greeter (e.g. shutdown options or login error). So there is a debug mode.
#### Boolean options #### Boolean options
@ -37,6 +37,12 @@ Since "Power" screen can't be viewed in greeter because it depends on `sddm.*` p
* `debug_can_suspend` - sets `sddm.canSuspend` (shows "Suspend"). * `debug_can_suspend` - sets `sddm.canSuspend` (shows "Suspend").
* `debug_can_hibernate` - sets `sddm.canHibernate` (shows "Hibernate"). * `debug_can_hibernate` - sets `sddm.canHibernate` (shows "Hibernate").
* `debug_can_hybrid_sleep` - sets `sddm.canHybridSleep` (shows "Hybrid Sleep"). * `debug_can_hybrid_sleep` - sets `sddm.canHybridSleep` (shows "Hybrid Sleep").
* `debug_login_error` - forces login error.
#### Number options
* `debug_login_timeout` - time between pressing "Login" and login error in seconds. Not effective if `debug_login_error` is disabled.
#### String options #### String options

3
slice/Debug.qml
View file

@ -31,7 +31,8 @@ Item
readonly property bool canSuspend: debugbool(config.debug_can_suspend, sddm.canSuspend) readonly property bool canSuspend: debugbool(config.debug_can_suspend, sddm.canSuspend)
readonly property bool canHibernate: debugbool(config.debug_can_hibernate, sddm.canHibernate) readonly property bool canHibernate: debugbool(config.debug_can_hibernate, sddm.canHibernate)
readonly property bool canHybridSleep: debugbool(config.debug_can_hybrid_sleep, sddm.canHybridSleep) readonly property bool canHybridSleep: debugbool(config.debug_can_hybrid_sleep, sddm.canHybridSleep)
readonly property bool loginError: debugbool(config.debug_login_error, false)
readonly property int loginTimeout: debugnum(config.debug_login_timeout, 0)
readonly property string hostName: debugstr(config.debug_hostname, sddm.hostName) readonly property string hostName: debugstr(config.debug_hostname, sddm.hostName)
} }

12
slice/PageUsers.qml
View file

@ -631,7 +631,10 @@ Item
pageRoot.enabled = false pageRoot.enabled = false
progressBarLoop.start() progressBarLoop.start()
loginEnterAnimation.start() loginEnterAnimation.start()
sddm.login(currentUserLogin, passwordField.text, selectedSessionIndex) if (debug.loginError)
loginTimeoutTimer.start()
else
sddm.login(currentUserLogin, passwordField.text, selectedSessionIndex)
} }
else else
{ {
@ -659,6 +662,13 @@ Item
} }
} }
Timer
{
id: loginTimeoutTimer
interval: debug.loginTimeout * 1000
onTriggered: sddm.onLoginFailed()
}
Keys.onUpPressed: scroll_down() Keys.onUpPressed: scroll_down()
Keys.onDownPressed: scroll_up() Keys.onDownPressed: scroll_up()
Keys.onEnterPressed: select_or_login() Keys.onEnterPressed: select_or_login()