giovannino/sway-config-fedora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'upstream' into fedora

Browse source
This commit is contained in:
Aleksei Bavshin 2024-03-01 07:36:11 -08:00
commit 6faab374ee
No known key found for this signature in database
GPG key ID: 4F071603387A382A
2 changed files with 38 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

47
sddm/03-sway-fedora/Main.qml
View file

@ -41,17 +41,16 @@ Rectangle {
Connections {
target: sddm
onLoginSucceeded: {
function onLoginSucceeded() {
errorMessage.color = "steelblue"
errorMessage.text = textConstants.loginSucceeded
}
onLoginFailed: {
function onLoginFailed() {
password.text = ""
errorMessage.color = "red"
errorMessage.text = textConstants.loginFailed
}
onInformationMessage: {
function onInformationMessage(message) {
errorMessage.color = "red"
errorMessage.text = message
}
@ -127,7 +126,7 @@ Rectangle {
KeyNavigation.backtab: rebootButton; KeyNavigation.tab: password
Keys.onPressed: {
Keys.onPressed: function (event) {
if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter) {
sddm.login(name.text, password.text, sessionIndex)
event.accepted = true
@ -154,7 +153,7 @@ Rectangle {
KeyNavigation.backtab: name; KeyNavigation.tab: session
Keys.onPressed: {
Keys.onPressed: function (event) {
if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter) {
sddm.login(name.text, password.text, sessionIndex)
event.accepted = true
@ -165,12 +164,12 @@ Rectangle {
Row {
spacing: 4
width: parent.width
width: parent.width / 2
z: 100
Column {
z: 100
width: parent.width
width: parent.width * (layoutBox.visible ? 1.3 : 2)
spacing : 4
anchors.bottom: parent.bottom
@ -193,7 +192,35 @@ Rectangle {
model: sessionModel
index: sessionModel.lastIndex
KeyNavigation.backtab: password; KeyNavigation.tab: loginButton
KeyNavigation.backtab: password; KeyNavigation.tab: layoutBox
}
}
Column {
z: 101
width: parent.width * 0.7
spacing : 4
anchors.bottom: parent.bottom
visible: keyboard.enabled && keyboard.layouts.length > 0
Text {
id: lblLayout
width: parent.width
text: textConstants.layout
wrapMode: TextEdit.WordWrap
font.bold: true
font.pixelSize: 12
}
LayoutBox {
id: layoutBox
width: parent.width; height: 30
font.pixelSize: 14
arrowIcon: Qt.resolvedUrl("angle-down.png")
KeyNavigation.backtab: session; KeyNavigation.tab: loginButton
}
}
}
@ -221,7 +248,7 @@ Rectangle {
onClicked: sddm.login(name.text, password.text, sessionIndex)
KeyNavigation.backtab: session; KeyNavigation.tab: shutdownButton
KeyNavigation.backtab: layoutBox; KeyNavigation.tab: shutdownButton
}
Button {

1
sddm/03-sway-fedora/metadata.desktop
View file

@ -14,3 +14,4 @@ TranslationsDirectory=translations
Email=sway@lists.fedoraproject.org
Theme-Id=03-sway-fedora
Theme-API=2.0
QtVersion=6