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

Manual user login mode

Browse source
This commit is contained in:
Eric Kotato 2019-06-30 21:05:28 +03:00
parent 152e2f6eac
commit 3506526e3b
4 changed files with 212 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -21,6 +21,7 @@ Create file `theme.conf.user` in theme folder. See `slice/theme.conf` for refere
* `background` - path to background image. If not set, falls back to `color_bg`. Not set by default.
* `bg_mode` - background image fill mode. Can be either `aspect`, `fill`, `tile` or `none`. Defaults to `aspect`.
* `parallax_bg_shift` - shifting of parallax background on tab change in pixels. `0` disables parallax motion. Negative values will scroll background in opposite direction. Default is `20`.
* `manual` - enables manual login mode and disables user selection. You can use "0/1", "true/false" and "yes/no" on this option. Disabled by default.
### Color scheme

9
slice/FontScheme.qml
View file

@ -157,6 +157,15 @@ Item
capitalization: not_null(config.font_input_capitalize) ? cap(config.font_input_capitalize) : inputGroup.capitalization
});
property font loginInput: Qt.font({
family: config.font_login_input ? config.font_login_input : inputGroup.family,
pointSize: config.font_login_input_size ? Number(config.font_login_input_size) : inputGroup.pointSize,
bold: not_null(config.font_login_input_bold) ? bool(config.font_login_input_bold) : true,
italic: not_null(config.font_login_input_italic) ? bool(config.font_login_input_italic) : inputGroup.italic,
underline: not_null(config.font_login_input_underline) ? bool(config.font_login_input_underline) : inputGroup.underline,
capitalization: not_null(config.font_login_input_capitalize) ? cap(config.font_login_input_capitalize) : inputGroup.capitalization
});
property font placeholder: Qt.font({
family: config.font_placeholder ? config.font_placeholder : inputGroup.family,
pointSize: config.font_placeholder_size ? Number(config.font_placeholder_size) : inputGroup.pointSize,

309
slice/PageUsers.qml
View file

@ -10,6 +10,7 @@ Item
property int scrollRepeat: 0
property string currentUserLogin: get_login(0)
property bool hasLoginShown: true
property bool manual: bool(config.manual)
signal lockNav()
signal unlockNav()
@ -67,8 +68,12 @@ Item
onFocusChanged:
{
if (focus && hasLoginShown)
passwordField.forceActiveFocus()
if (focus && hasLoginShown) {
if (manual)
loginField.forceActiveFocus()
else
passwordField.forceActiveFocus()
}
}
Item
@ -191,6 +196,7 @@ Item
userName: get_name(0)
userLogin: get_login(0)
userAvatar: get_avatar(0)
visible: !manual
}
LoopListUserItem
@ -223,124 +229,179 @@ Item
userAvatar: get_avatar(3)
}
Rectangle
{
id: passwordFieldBg
y: middleItem.y + middleItem.height + 2
Item {
id: loginControls
y: manual ? middleItem.y : middleItem.y + middleItem.height + 2
width: parent.width
height: Math.max(fonts.input.pointSize, fonts.placeholder.pointSize) + 20
opacity: hasLoginShown ? 1 : 0
color: colors.inputBg
}
TextInput
{
id: passwordField
x: 10
y: (passwordFieldBg.height - height) / 2 + passwordFieldBg.y
width: parent.width - 20
opacity: hasLoginShown ? 1 : 0
color: colors.inputText
selectionColor: colors.inputSelectionBg
selectedTextColor: colors.inputSelectionText
Rectangle
{
id: loginFieldBg
y: 0
width: parent.width
height: Math.max(fonts.input.pointSize, fonts.placeholder.pointSize) + 20
opacity: hasLoginShown && manual ? 1 : 0
color: colors.inputBg
}
echoMode: TextInput.Password
clip: true
selectByMouse: true
font: fonts.input
TextInput
{
id: loginField
x: 10
y: (loginFieldBg.height - height) / 2 + loginFieldBg.y
width: parent.width - 20
opacity: hasLoginShown && manual ? 1 : 0
color: colors.inputText
selectionColor: colors.inputSelectionBg
selectedTextColor: colors.inputSelectionText
Component.onCompleted: forceActiveFocus()
clip: true
selectByMouse: true
font: fonts.loginInput
}
Component.onCompleted: if (manual) forceActiveFocus()
Keys.onTabPressed: passwordField.forceActiveFocus()
}
Text
{
id: passwordFieldPlaceholder
x: passwordField.x
y: (passwordFieldBg.height - height) / 2 + passwordFieldBg.y
width: passwordField.width
opacity: hasLoginShown ? 1 : 0
visible: passwordField.text.length <= 0
Text
{
id: loginFieldPlaceholder
x: loginField.x
y: (loginFieldBg.height - height) / 2 + loginFieldBg.y
width: loginField.width
opacity: hasLoginShown && manual ? 1 : 0
visible: loginField.text.length <= 0
color: colors.inputPlaceholderText
color: colors.inputPlaceholderText
font: fonts.placeholder
font: fonts.placeholder
text: localeText.password
}
text: localeText.userName
}
Rectangle
{
id: progressBar
y: passwordFieldBg.y + passwordFieldBg.height
width: parent.width
height: 2
opacity: hasLoginShown ? 1 : 0
color: colors.progressBar
}
Rectangle
{
id: passwordFieldBg
y: manual ? loginFieldBg.y + loginFieldBg.height + 2 : 0
width: parent.width
height: Math.max(fonts.input.pointSize, fonts.placeholder.pointSize) + 20
opacity: hasLoginShown ? 1 : 0
color: colors.inputBg
}
Rectangle
{
id: progressBarBg
y: progressBar.y
width: parent.width
height: 2
opacity: 0
color: colors.progressBarBg
}
TextInput
{
id: passwordField
x: 10
y: (passwordFieldBg.height - height) / 2 + passwordFieldBg.y
width: parent.width - 20
opacity: hasLoginShown ? 1 : 0
color: colors.inputText
selectionColor: colors.inputSelectionBg
selectedTextColor: colors.inputSelectionText
Rectangle
{
id: progressBarSlider1
x: 0
y: progressBar.y
width: parent.width / 5
height: 2
opacity: 0
color: colors.progressBarSlider
}
echoMode: TextInput.Password
clip: true
selectByMouse: true
font: fonts.input
Rectangle
{
id: progressBarSlider2
x: parent.width
y: progressBar.y
width: 0
height: 2
opacity: 0
color: colors.progressBarSlider
}
Component.onCompleted: forceActiveFocus()
Keys.onBacktabPressed: { if (manual) loginField.forceActiveFocus(); else event.accepted = false; }
SlicedButton
{
id: buttonUserLogin
x: userListContainer.width - widthFull
y: progressBar.y + progressBar.height + 2
paddingTop: 2
highlighted: true
opacity: hasLoginShown ? 1 : 0
}
text: localeText.login
Text
{
id: passwordFieldPlaceholder
x: passwordField.x
y: (passwordFieldBg.height - height) / 2 + passwordFieldBg.y
width: passwordField.width
opacity: hasLoginShown ? 1 : 0
visible: passwordField.text.length <= 0
onClicked: select_or_login()
color: colors.inputPlaceholderText
font: fonts.slicesLoginButtons
}
font: fonts.placeholder
SlicedButton
{
id: buttonUserBack
x: userListContainer.width - widthFull - buttonUserLogin.widthPartial - 3
y: buttonUserLogin.y
paddingTop: 2
opacity: hasLoginShown ? 1 : 0
text: localeText.password
}
text: qsTr("Back")
Rectangle
{
id: progressBar
y: passwordFieldBg.y + passwordFieldBg.height
width: parent.width
height: 2
opacity: hasLoginShown ? 1 : 0
color: colors.progressBar
}
onClicked: back_to_selection()
Rectangle
{
id: progressBarBg
y: progressBar.y
width: parent.width
height: 2
opacity: 0
color: colors.progressBarBg
}
Rectangle
{
id: progressBarSlider1
x: 0
y: progressBar.y
width: parent.width / 5
height: 2
opacity: 0
color: colors.progressBarSlider
}
Rectangle
{
id: progressBarSlider2
x: parent.width
y: progressBar.y
width: 0
height: 2
opacity: 0
color: colors.progressBarSlider
}
SlicedButton
{
id: buttonUserLogin
x: userListContainer.width - widthFull
y: progressBar.y + progressBar.height + 2
paddingTop: 2
highlighted: true
opacity: hasLoginShown ? 1 : 0
text: localeText.login
onClicked: select_or_login()
font: fonts.slicesLoginButtons
}
SlicedButton
{
id: buttonUserBack
x: userListContainer.width - widthFull - buttonUserLogin.widthPartial - 3
y: buttonUserLogin.y
paddingTop: 2
opacity: hasLoginShown ? 1 : 0
visible: !manual
text: qsTr("Back")
onClicked: back_to_selection()
font: fonts.slicesLoginButtons
}
font: fonts.slicesLoginButtons
}
Rectangle
@ -419,6 +480,9 @@ Item
NumberAnimation { target: middleItem; property: "y"; to: pageRoot.height / 2.3 - (middleItem.height / 2 + passwordFieldBg.height + progressBar.height + 2 + buttonUserLogin.height) / 2; duration: userListContainer.scrollDuration }
NumberAnimation { target: loginField; property: "opacity"; to: 1; duration: userListContainer.scrollDuration }
NumberAnimation { target: loginFieldPlaceholder; property: "opacity"; to: 1; duration: userListContainer.scrollDuration }
NumberAnimation { target: loginFieldBg; property: "opacity"; to: 1; duration: userListContainer.scrollDuration }
NumberAnimation { target: passwordField; property: "opacity"; to: 1; duration: userListContainer.scrollDuration }
NumberAnimation { target: passwordFieldPlaceholder; property: "opacity"; to: 1; duration: userListContainer.scrollDuration }
NumberAnimation { target: passwordFieldBg; property: "opacity"; to: 1; duration: userListContainer.scrollDuration }
@ -443,6 +507,9 @@ Item
NumberAnimation { target: middleItem; property: "y"; to: pageRoot.height / 2.3; duration: userListContainer.scrollDuration }
NumberAnimation { target: loginField; property: "opacity"; to: 0; duration: userListContainer.scrollDuration }
NumberAnimation { target: loginFieldPlaceholder; property: "opacity"; to: 0; duration: userListContainer.scrollDuration }
NumberAnimation { target: loginFieldBg; property: "opacity"; to: 0; duration: userListContainer.scrollDuration }
NumberAnimation { target: passwordField; property: "opacity"; to: 0; duration: userListContainer.scrollDuration }
NumberAnimation { target: passwordFieldPlaceholder; property: "opacity"; to: 0; duration: userListContainer.scrollDuration }
NumberAnimation { target: passwordFieldBg; property: "opacity"; to: 0; duration: userListContainer.scrollDuration }
@ -538,7 +605,7 @@ Item
id: loginEnterAnimation
NumberAnimation { target: passwordField; property: "opacity"; to: 0; duration: userListContainer.scrollDuration }
NumberAnimation { target: passwordFieldBg; property: "height"; to: 0; duration: userListContainer.scrollDuration }
NumberAnimation { target: passwordFieldBg; property: "y"; to: pageRoot.height / 2.3 - (middleItem.height / 2 + progressBar.height + 2) / 2; duration: userListContainer.scrollDuration }
NumberAnimation { target: loginControls; property: "y"; to: pageRoot.height / 2.3 - (middleItem.height / 2 + progressBar.height + 2) / 2; duration: userListContainer.scrollDuration }
NumberAnimation { target: passwordFieldPlaceholder; property: "opacity"; to: 0; duration: userListContainer.scrollDuration }
NumberAnimation { target: buttonUserBack; property: "opacity"; to: 0; duration: userListContainer.scrollDuration }
NumberAnimation { target: buttonUserLogin; property: "opacity"; to: 0; duration: userListContainer.scrollDuration }
@ -555,7 +622,7 @@ Item
id: loginExitAnimation
NumberAnimation { target: passwordField; property: "opacity"; to: 1; duration: userListContainer.scrollDuration }
NumberAnimation { target: passwordFieldBg; property: "height"; to: 40; duration: userListContainer.scrollDuration }
NumberAnimation { target: passwordFieldBg; property: "y"; to: pageRoot.height / 2.3 - (middleItem.height / 2 + passwordFieldBg.height + progressBar.height + 2 + buttonUserLogin.height) / 2; duration: userListContainer.scrollDuration }
NumberAnimation { target: loginControls; property: "y"; to: pageRoot.height / 2.3 - (middleItem.height / 2 + passwordFieldBg.height + progressBar.height + 2 + buttonUserLogin.height) / 2; duration: userListContainer.scrollDuration }
NumberAnimation { target: passwordFieldPlaceholder; property: "opacity"; to: 1; duration: userListContainer.scrollDuration }
NumberAnimation { target: buttonUserBack; property: "opacity"; to: 1; duration: userListContainer.scrollDuration }
NumberAnimation { target: buttonUserLogin; property: "opacity"; to: 1; duration: userListContainer.scrollDuration }
@ -621,10 +688,14 @@ Item
loginEnterAnimation.start()
if (debug.loginError)
loginTimeoutTimer.start()
else
sddm.login(currentUserLogin, passwordField.text, selectedSessionIndex)
else {
if (manual)
sddm.login(loginField.text, passwordField.text, selectedSessionIndex)
else
sddm.login(currentUserLogin, passwordField.text, selectedSessionIndex)
}
}
else
else if (!manual)
{
topFarItem.hoverEnabled = false
topMidItem.hoverEnabled = false
@ -637,7 +708,7 @@ Item
function back_to_selection()
{
if (hasLoginShown)
if (hasLoginShown && !manual)
{
topFarItem.hoverEnabled = true
topMidItem.hoverEnabled = true
@ -657,10 +728,30 @@ Item
onTriggered: sddm.onLoginFailed()
}
Keys.onUpPressed: scroll_down()
Keys.onDownPressed: scroll_up()
Keys.onEnterPressed: select_or_login()
Keys.onReturnPressed: select_or_login()
Keys.onUpPressed: {
if (manual && hasLoginShown && passwordField.activeFocus) {
loginField.forceActiveFocus()
} else
scroll_down()
}
Keys.onDownPressed: {
if (manual && hasLoginShown && loginField.activeFocus) {
passwordField.forceActiveFocus()
} else
scroll_up()
}
Keys.onEnterPressed: {
if (hasLoginShown && !passwordField.activeFocus)
passwordField.forceActiveFocus()
else
select_or_login()
}
Keys.onReturnPressed: {
if (hasLoginShown && !passwordField.activeFocus)
passwordField.forceActiveFocus()
else
select_or_login()
}
Keys.onEscapePressed: back_to_selection()
}

3
slice/theme.conf
View file

@ -6,4 +6,5 @@ parallax_bg_shift=20
color_bg=#222222
color_main=#dddddd
color_dimmed=#888888
color_contrast=#1f1f1f
color_contrast=#1f1f1f
manual=false