fix: rebuild image, support upstream changes to desktop image

.github/workflows/vib-build.yml

@@ -3,9 +3,10 @@ name: Vib Build
 on:
   push:
     branches:
-      - 'main'
+      - "main"
+      - "dev"
     tags:
-      - '*'
+      - "*"
   workflow_dispatch:
   pull_request:
 
@@ -49,14 +50,14 @@ jobs:
       run: |
         REPO_OWNER_LOWERCASE="$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]')"
         echo "REPO_OWNER_LOWERCASE=$REPO_OWNER_LOWERCASE" >> "$GITHUB_ENV"
-        echo "IMAGE_NAME=ghcr.io/$REPO_OWNER_LOWERCASE/plasma" >> "$GITHUB_ENV"
+        echo "IMAGE_URL=ghcr.io/$REPO_OWNER_LOWERCASE/plasma" >> "$GITHUB_ENV"
 
     - name: Docker meta
       id: docker_meta
       uses: docker/metadata-action@v5
       with:
         images: |
-          ${{ env. IMAGE_NAME }}
+          ${{ env. IMAGE_URL }}
         tags: |
           type=semver,pattern={{version}}
           type=semver,pattern={{major}}.{{minor}}
@@ -92,8 +93,8 @@ jobs:
     - name: Attest pushed image
       uses: actions/attest-build-provenance@v1
       id: attest
-      if: github.repository == 'Vanilla-Kattleya/plasma-image' && github.event_name != 'pull_request'
+      if: ${{ github.event_name != 'pull_request' }}
       with:
-        subject-name: ${{ env.IMAGE_NAME }}
+        subject-name: ${{ env.IMAGE_URL }}
         subject-digest: ${{ steps.push.outputs.digest }}
         push-to-registry: false

README.md

@@ -1,3 +1,5 @@
+# **THIS IMAGE IS OUT OF DATE. THE UP TO DATE IMAGE IS LOCATED AT https://github.com/Kanola-Images/Kanola**
+
 # Kattleya Plasma Image
 
 Containerfile for building Kattleya, an unofficial Vanilla OS Plasma image.

includes.container/etc/kattleya-theming/sddm/faces/put-face-icons-here

@@ -0,0 +1 @@
+

includes.container/etc/kattleya-theming/sddm/themes/Dracula/DropdownMenuStyle.qml

@@ -0,0 +1,26 @@
+import QtQuick 2.2
+
+import org.kde.plasma.core 2.0 as PlasmaCore
+
+import QtQuick.Controls.Styles 1.4 as QQCS
+import QtQuick.Controls 1.3 as QQC
+
+QQCS.MenuStyle {
+    frame: Rectangle {
+        color: "#21232D"
+        border.color: "#232831"
+        border.width: 1
+    }
+    itemDelegate.label: QQC.Label {
+        height: contentHeight * 2
+        verticalAlignment: Text.AlignVCenter
+        color: config.highlight_color
+        font.pointSize: config.fontSize
+        font.family: config.font
+        text: styleData.text
+    }
+    itemDelegate.background: Rectangle {
+        visible: styleData.selected
+        color: config.selected_color
+    }
+}

includes.container/etc/kattleya-theming/sddm/themes/Dracula/KeyboardButton.qml

@@ -0,0 +1,38 @@
+import QtQuick 2.2
+
+import org.kde.plasma.core 2.0 as PlasmaCore
+import org.kde.plasma.components 2.0 as PlasmaComponents
+
+import QtQuick.Controls 1.3 as QQC
+
+PlasmaComponents.ToolButton {
+    id: keyboardButton
+
+    property int currentIndex: -1
+
+    text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Keyboard Layout: %1", instantiator.objectAt(currentIndex).shortName)
+    implicitWidth: minimumWidth
+    font.pointSize: config.fontSize
+
+    visible: menu.items.length > 1
+
+    Component.onCompleted: currentIndex = Qt.binding(function() {return keyboard.currentLayout});
+
+    menu: QQC.Menu {
+        id: keyboardMenu
+        style: DropdownMenuStyle {}
+        Instantiator {
+            id: instantiator
+            model: keyboard.layouts
+            onObjectAdded: keyboardMenu.insertItem(index, object)
+            onObjectRemoved: keyboardMenu.removeItem( object )
+            delegate: QQC.MenuItem {
+                text: modelData.longName
+                property string shortName: modelData.shortName
+                onTriggered: {
+                    keyboard.currentLayout = model.index
+                }
+            }
+        }
+    }
+}

includes.container/etc/kattleya-theming/sddm/themes/Dracula/Login.qml

@@ -0,0 +1,137 @@
+import "components"
+
+import QtQuick 2.2
+import QtQuick.Layouts 1.2
+import QtQuick.Controls 2.4
+import QtQuick.Controls.Styles 1.4
+
+import org.kde.plasma.core 2.0 as PlasmaCore
+import org.kde.plasma.components 2.0 as PlasmaComponents
+
+SessionManagementScreen {
+    id: root
+    property Item mainPasswordBox: passwordBox
+
+    property bool showUsernamePrompt: !showUserList
+
+    property string lastUserName
+    property bool loginScreenUiVisible: false
+
+    //the y position that should be ensured visible when the on screen keyboard is visible
+    property int visibleBoundary: mapFromItem(loginButton, 0, 0).y
+    onHeightChanged: visibleBoundary = mapFromItem(loginButton, 0, 0).y + loginButton.height + units.smallSpacing
+
+    signal loginRequest(string username, string password)
+
+    onShowUsernamePromptChanged: {
+        if (!showUsernamePrompt) {
+            lastUserName = ""
+        }
+    }
+
+    /*
+    * Login has been requested with the following username and password
+    * If username field is visible, it will be taken from that, otherwise from the "name" property of the currentIndex
+    */
+    function startLogin() {
+        var username = showUsernamePrompt ? userNameInput.text : userList.selectedUser
+        var password = passwordBox.text
+
+        //this is partly because it looks nicer
+        //but more importantly it works round a Qt bug that can trigger if the app is closed with a TextField focused
+        //DAVE REPORT THE FRICKING THING AND PUT A LINK
+        loginButton.forceActiveFocus();
+        loginRequest(username, password);
+    }
+
+    Input {
+        id: userNameInput
+        Layout.fillWidth: true
+        Layout.topMargin: 10
+        Layout.bottomMargin: 10
+        text: lastUserName
+        visible: showUsernamePrompt
+        focus: showUsernamePrompt && !lastUserName //if there's a username prompt it gets focus first, otherwise password does
+        placeholderText: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Username")
+
+        onAccepted:
+            if (root.loginScreenUiVisible) {
+                passwordBox.forceActiveFocus()
+            }
+    }
+
+    Input {
+        id: passwordBox
+        placeholderText: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Password")
+        focus: !showUsernamePrompt || lastUserName
+        echoMode: TextInput.Password
+
+        Layout.fillWidth: true
+
+        onAccepted: {
+            if (root.loginScreenUiVisible) {
+                startLogin();
+            }
+        }
+
+        Keys.onEscapePressed: {
+            mainStack.currentItem.forceActiveFocus();
+        }
+
+        //if empty and left or right is pressed change selection in user switch
+        //this cannot be in keys.onLeftPressed as then it doesn't reach the password box
+        Keys.onPressed: {
+            if (event.key == Qt.Key_Left && !text) {
+                userList.decrementCurrentIndex();
+                event.accepted = true
+            }
+            if (event.key == Qt.Key_Right && !text) {
+                userList.incrementCurrentIndex();
+                event.accepted = true
+            }
+        }
+
+        Connections {
+            target: sddm
+            onLoginFailed: {
+                passwordBox.selectAll()
+                passwordBox.forceActiveFocus()
+            }
+        }
+    }
+    Button {
+        id: loginButton
+        text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Log In")
+        enabled: passwordBox.text != ""
+
+        Layout.topMargin: 10
+        Layout.bottomMargin: 10
+        Layout.preferredWidth: 150
+        Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
+
+        font.pointSize: config.fontSize
+        font.family: config.font
+
+        contentItem: Text {
+            text: loginButton.text
+            font: loginButton.font
+            opacity: enabled ? 1.0 : 0.3
+            color: config.highlight_color
+            horizontalAlignment: Text.AlignHCenter
+            verticalAlignment: Text.AlignVCenter
+            elide: Text.ElideRight
+        }
+
+        background: Rectangle {
+            id: buttonBackground
+            width: parent.width
+            height: 30
+            radius: width / 2
+            color: "#9B79CC"
+            opacity: enabled ? 1.0 : 0.3
+        }
+
+        onClicked: startLogin();
+    }
+
+}