Port SDDM theme to Qt 6

debian/changelog

@@ -1,3 +1,9 @@
+lubuntu-artwork (24.10.1) UNRELEASED; urgency=medium
+
+  * Welcome to Oracular!
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Sat, 06 Jul 2024 11:01:51 -0500
+
 lubuntu-artwork (24.04.6) noble; urgency=medium
 
   * Update Plymouth text for LTS. 

src/usr/share/plymouth/themes/lubuntu-text/lubuntu-text.plymouth

@@ -4,7 +4,7 @@ Description=Text mode theme based on kubuntu-logo theme
 ModuleName=ubuntu-text
 
 [ubuntu-text]
-title=Lubuntu 24.04 LTS
+title=Lubuntu 24.10
 black=0x0078C2
 white=0xffffff
 brown=0x009DFD

src/usr/share/sddm/themes/lubuntu/Main.qml

@@ -1,6 +1,6 @@
 /***************************************************************************
 * Copyright (c) 2013 Abdurrahman AVCI <abdurrahmanavci@gmail.com
-* Copyright (c) 2015-2018 Lubuntu Artwork Team
+* Copyright (c) 2015-2024 Lubuntu Artwork Team
 *
 * Permission is hereby granted, free of charge, to any person
 * obtaining a copy of this software and associated documentation
@@ -35,6 +35,17 @@ Rectangle {
 
     TextConstants { id: textConstants }
 
+    Background {
+        anchors.fill: parent
+        source: Qt.resolvedUrl(config.background)
+        onStatusChanged: {
+            var defaultBackground = Qt.resolvedUrl(config.defaultBackground)
+            if (status == Image.Error && source != defaultBackground) {
+                source = defaultBackground
+            }
+        }
+    }
+
     Connections {
         target: sddm
         onLoginSucceeded: {
@@ -49,7 +60,7 @@ Rectangle {
     Repeater {
         model: screenModel
         Background {
-            x: geometry.x; y: geometry.y; width: geometry.width; height:geometry.height
+            x: geometry.x; y: geometry.y; width: geometry.width; height: geometry.height
             source: config.background
             fillMode: Image.PreserveAspectCrop
             onStatusChanged: {
@@ -90,166 +101,171 @@ Rectangle {
         Row {
             anchors.fill: parent
 
-                Text {
+            Text {
-                    id: txtMessage
+                id: txtMessage
-                    anchors.top: usersContainer.bottom;
+                anchors.top: usersContainer.bottom
-                    anchors.margins: 20
+                anchors.margins: 20
-                    anchors.horizontalCenter: parent.horizontalCenter
+                anchors.horizontalCenter: parent.horizontalCenter
-                    color: "white"
+                color: "white"
-                    text: textConstants.promptSelectUser
+                text: textConstants.promptSelectUser
-                    font.pixelSize: 16
+                font.pixelSize: 16
-                    font.family: "Ubuntu"
+                font.family: "Ubuntu"
+            }
+
+            Item {
+                id: usersContainer
+                width: parent.width
+                height: 300
+                anchors.verticalCenter: parent.verticalCenter
+
+                ImageButton {
+                    id: prevUser
+                    anchors.left: parent.left
+                    anchors.verticalCenter: parent.verticalCenter
+                    anchors.margins: 10
+                    source: Qt.resolvedUrl("angle-left.png")
+                    onClicked: listView.decrementCurrentIndex()
+
+                    KeyNavigation.backtab: btnShutdown
+                    KeyNavigation.tab: listView
                 }
 
-		Item {
+                ListView {
-			id: usersContainer
+                    id: listView
-			width: parent.width; height: 300
+                    height: parent.height
-			anchors.verticalCenter: parent.verticalCenter
+                    anchors.left: prevUser.right
+                    anchors.right: nextUser.left
+                    anchors.verticalCenter: parent.verticalCenter
+                    anchors.margins: 10
 
-                    ImageButton {
+                    clip: true
-                        id: prevUser
+                    focus: true
-                        anchors.left: parent.left
-                        anchors.verticalCenter: parent.verticalCenter
-                        anchors.margins: 10
-                        source: "angle-left.png"
-                        onClicked: listView.decrementCurrentIndex()
 
-                        KeyNavigation.backtab: btnShutdown; KeyNavigation.tab: listView
+                    spacing: 5
-                    }
 
+                    model: userModel
+                    delegate: userDelegate
+                    orientation: ListView.Horizontal
+                    currentIndex: userModel.lastIndex
 
-
+                    KeyNavigation.backtab: prevUser
-                    ListView {
+                    KeyNavigation.tab: nextUser
-                        id: listView
-                        height: parent.height
-                        anchors.left: prevUser.right; anchors.right: nextUser.left
-                        anchors.verticalCenter: parent.verticalCenter
-                        anchors.margins: 10
-
-                        clip: true
-                        focus: true
-
-                        spacing: 5
-
-                        model: userModel
-                        delegate: userDelegate
-                        orientation: ListView.Horizontal
-                        currentIndex: userModel.lastIndex
-
-                        KeyNavigation.backtab: prevUser; KeyNavigation.tab: nextUser
-                    }
-
-                    ImageButton {
-                        id: nextUser
-                        anchors.right: parent.right
-                        anchors.verticalCenter: parent.verticalCenter
-                        anchors.margins: 10
-                        source: "angle-right.png"
-                        onClicked: listView.incrementCurrentIndex()
-                        KeyNavigation.backtab: listView; KeyNavigation.tab: session
-                    }
                 }
 
+                ImageButton {
+                    id: nextUser
+                    anchors.right: parent.right
+                    anchors.verticalCenter: parent.verticalCenter
+                    anchors.margins: 10
+                    source: Qt.resolvedUrl("angle-right.png")
+                    onClicked: listView.incrementCurrentIndex()
+                    KeyNavigation.backtab: listView
+                    KeyNavigation.tab: session
+                }
+            }
+        }
+    }
+
+    Rectangle {
+        id: actionBar
+        anchors.top: parent.top
+        anchors.horizontalCenter: parent.horizontalCenter
+        width: parent.width
+        height: 64
+        color: "#44ffffff"
+
+        Row {
+            anchors.left: parent.left
+            anchors.margins: 5
+            height: parent.height
+            spacing: 5
+
+            Text {
+                height: parent.height
+                anchors.verticalCenter: parent.verticalCenter
+                text: textConstants.session
+                font.pixelSize: 14
+                color: "white"
+                verticalAlignment: Text.AlignVCenter
+            }
+
+            ComboBox {
+                id: session
+                width: 245
+                anchors.verticalCenter: parent.verticalCenter
+                arrowIcon: Qt.resolvedUrl("angle-down.png")
+                model: sessionModel
+                index: sessionModel.lastIndex
+                font.pixelSize: 14
+                color: "#44ffffff"
+                KeyNavigation.backtab: nextUser
+                KeyNavigation.tab: layoutBox
+            }
+
+            Text {
+                height: parent.height
+                anchors.verticalCenter: parent.verticalCenter
+                text: textConstants.layout
+                font.pixelSize: 14
+                color: "white"
+                verticalAlignment: Text.AlignVCenter
+            }
+
+            LayoutBox {
+                id: layoutBox
+                width: 90
+                anchors.verticalCenter: parent.verticalCenter
+                font.pixelSize: 14
+                arrowIcon: Qt.resolvedUrl("angle-down.png")
+                KeyNavigation.backtab: session
+                KeyNavigation.tab: btnShutdown
             }
         }
 
-        Rectangle {
+        Row {
-            id: actionBar
+            height: parent.height
-            anchors.top: parent.top;
+            anchors.right: parent.right
-            anchors.horizontalCenter: parent.horizontalCenter
+            anchors.margins: 5
-            width: parent.width; height: 64
+            spacing: 5
-            color: "#44ffffff"
-
-            Row {
-                anchors.left: parent.left
-                anchors.margins: 5
-                height: parent.height
-                spacing: 5
-
-                Text {
-			height: parent.height
-			anchors.verticalCenter: parent.verticalCenter
-			text: textConstants.session
-			font.pixelSize: 14
-			color: "white"
-			verticalAlignment: Text.AlignVCenter
-                }
-
-                ComboBox {
-			id: session
-			width: 245
-			anchors.verticalCenter: parent.verticalCenter
-			arrowIcon: "angle-down.png"
-			model: sessionModel
-			index: sessionModel.lastIndex
-			font.pixelSize: 14
-			color: "#44ffffff"
-			KeyNavigation.backtab: nextUser; KeyNavigation.tab: layoutBox
-                }
-
-                Text {
-                    height: parent.height
-                    anchors.verticalCenter: parent.verticalCenter
-                    text: textConstants.layout
-                    font.pixelSize: 14
-                    color: "white"
-                    verticalAlignment: Text.AlignVCenter
-                }
-
-                LayoutBox {
-                    id: layoutBox
-                    width: 90
-                    anchors.verticalCenter: parent.verticalCenter
-                    font.pixelSize: 14
-                    arrowIcon: "angle-down.png"
-                    KeyNavigation.backtab: session; KeyNavigation.tab: btnShutdown
-                }
-            }
-
-            Row {
-                height: parent.height
-                anchors.right: parent.right
-                anchors.margins: 5
-                spacing: 5
 
             Clock {
-			id: clock
+                id: clock
-			color: "white"
+                color: "white"
-			timeFont.family: "Ubuntu"
+                timeFont.family: "Ubuntu"
-			timeFont.bold: true
+                timeFont.bold: true
-			timeFont.pixelSize: 28
+                timeFont.pixelSize: 28
-			dateFont.pixelSize: 12
+                dateFont.pixelSize: 12
-        	}
+            }
 
-			ImageButton {
+            ImageButton {
-			id: btnSuspend
+                id: btnSuspend
-			height: parent.height
+                height: parent.height
-			source: "suspend.png"
+                source: Qt.resolvedUrl("suspend.png")
-			visible: sddm.canSuspend
+                visible: sddm.canSuspend
-			onClicked: sddm.suspend()
+                onClicked: sddm.suspend()
-			KeyNavigation.backtab: layoutBox; KeyNavigation.tab: btnReboot
+                KeyNavigation.backtab: layoutBox
-			}
+                KeyNavigation.tab: btnReboot
-
+            }
-			ImageButton {
-			id: btnReboot
-			height: parent.height
-			source: "reboot.png"
-			visible: sddm.canReboot
-			onClicked: sddm.reboot()
-			KeyNavigation.backtab: btnSuspend; KeyNavigation.tab: btnShutdown
-			}
-
-			ImageButton {
-			id: btnShutdown
-			height: parent.height
-			source: "shutdown.png"
-			visible: sddm.canPowerOff
-			onClicked: sddm.powerOff()
-			KeyNavigation.backtab: btnReboot; KeyNavigation.tab: prevUser
-			}
-
-	}
 
+            ImageButton {
+                id: btnReboot
+                height: parent.height
+                source: Qt.resolvedUrl("reboot.png")
+                visible: sddm.canReboot
+                onClicked: sddm.reboot()
+                KeyNavigation.backtab: btnSuspend
+                KeyNavigation.tab: btnShutdown
+            }
 
+            ImageButton {
+                id: btnShutdown
+                height: parent.height
+                source: Qt.resolvedUrl("shutdown.png")
+                visible: sddm.canPowerOff
+                onClicked: sddm.powerOff()
+                KeyNavigation.backtab: btnReboot
+                KeyNavigation.tab: prevUser
+            }
+        }
     }
 }

src/usr/share/sddm/themes/lubuntu/metadata.desktop

@@ -13,3 +13,4 @@ ConfigFile=theme.conf
 TranslationsDirectory=translations
 Theme-Id=lubuntu
 Theme-API=2.0
+QtVersion=6