Merge branch 'Plasma/6.6' into 'Plasma/6.7'

Added Aridan's new apps to README.md

See merge request aeroshell/atp/aerothemeplasma!74

README.md

@@ -87,19 +87,29 @@ Huge thanks to everyone who helped out along the way by contributing, testing, p
 Initially I wanted to make a Vista variant of AeroThemePlasma but [catpswin56](https://gitgud.io/catpswin56) beat me to it, use [VistaThemePlasma](https://gitgud.io/aeroshell/vtp/vistathemeplasma) if you want a Vista theme.
 
 ## Aero apps for AeroThemePlasma
+To install most of these, the commands to run after cloning are: `mkdir build; cd build; cmake .. -DCMAKE_INSTALL_PREFIX=/usr; sudo make install`.
+
+### Complete re-creations
+- [Linux Explorer](https://github.com/actuallyaridan/linux-explorer) by ActuallyAridan
+- [Control Panel](https://github.com/actuallyaridan/linux-control) by ActuallyAridan
+- [Device Manager](https://github.com/actuallyaridan/linux-devmgmt) by ActuallyAridan
+- [Windows 7 Minesweeper](https://github.com/actuallyaridan/linux-minesweeper) by ActuallyAridan
+- [TuxManager](https://github.com/benapetr/TuxManager) (task manager) by benapetr
+- [Gadgets](https://gitgud.io/catpswin56/win-gadgets) by catpswin56
+- [execbin](https://gitgud.io/catpswin56/execbin) (run dialog) by catpswin56
+- [LinVer](https://gitgud.io/wackyideas/linver) (version dialog) by WackyIdeas
+
+### KDE app forks
 - [Aero Dolphin](https://gitgud.io/atmk/dolphin-aero) by Albert Tomanek
 - [Aero GwenView](https://gitgud.io/atmk/gwenview-aero) by Albert Tomanek
 - [Aero KolourPaint](https://invent.kde.org/albert-tomanek/kolourpaint/-/tree/saribbon-aero) by Albert Tomanek
-- [Control Panel](https://github.com/actuallyaridan/linux-control) by ActuallyAridan
-- [Device Manager](https://github.com/actuallyaridan/linux-devmgmt) by ActuallyAridan
-- [TuxManager](https://github.com/benapetr/TuxManager) by benapetr
-- [Gadgets](https://gitgud.io/catpswin56/win-gadgets) by catpswin56
-- [WinXplorer](https://gitgud.io/catpswin56/winxplorer) by catpswin56
-- [execbin](https://gitgud.io/catpswin56/execbin) (run dialog) by catpswin56
-- [LinVer](https://gitgud.io/wackyideas/linver) (version dialog) by WackyIdeas
-- ~~[Sevulet](https://gitgud.io/snailatte/sevulet) by [snailatte](https://gitgud.io/snailatte)~~
 
-To install most of these, the commands to run after cloning are: `mkdir build; cd build; cmake .. -DCMAKE_INSTALL_PREFIX=/usr; sudo make install`.
+### Other Aero Apps
+- _Watch this space_
+
+### Development Libraries
+- [libAeroQt](https://gitgud.io/atmk/libaero-qt) -- Re-usable QtWidgets and QML components for writing Aero apps. Also contains function to make glassy window headers.
+- [SARibbon](https://github.com/czyt1988/SARibbon) -- Ribbon control for Qt. Gets styled by libAeroQt.
 
 ## Screenshots
 

plasma/shells/io.gitgud.wackyideas.desktop/contents/lockscreen/AuthUI.qml

@@ -29,8 +29,8 @@ Item {
 
     signal switchUserClicked()
 
-    property string notification
-    property string notificationIcon
+    property list<string> notification: []
+    property list<string> notificationIcon: []
 
     property alias switchUserVisible: switchUser.visible
     property bool  capsLockOn: false
@@ -48,12 +48,17 @@ Item {
     }
 
     function showMessage(message: string, icon: string) {
+        if(icon == "dialog-error") {
+            root.notificationIcon = [icon, ...root.notificationIcon];
+            root.notification = [message, ...root.notification];
+        } else {
+            root.notificationIcon.push(icon);
+            root.notification.push(message);
+        }
         if(!statusPage.visible) {
             pageView.replaceCurrentItem(statusPage);
             k.forceActiveFocus();
         }
-        root.notification = message;
-        root.notificationIcon = icon;
     }
 
     component CorrectedLabel: Text {
@@ -104,10 +109,10 @@ Item {
             showMessage(i18nd("kscreenlocker_greet", "The user name or password is incorrect."), "dialog-error");
         }
         function onBusyChanged() {
-            if(!authenticator.busy) {
+            /*if(!authenticator.busy && !statusPage.visible) {
                 root.notification = "";
                 root.notificationIcon = "";
-            }
+            }*/
         }
         function onInfoMessageChanged() {
             showMessage(authenticator.infoMessage, "dialog-information");
@@ -421,7 +426,9 @@ Item {
                 id: statusPage
 
                 visible: pageView.currentItem == statusPage
-                onVisibleChanged: k.forceActiveFocus();
+                onVisibleChanged: {
+                    k.forceActiveFocus();
+                }
 
                 ColumnLayout {
                     anchors.centerIn: parent
@@ -430,17 +437,19 @@ Item {
                     spacing: 40
 
                     RowLayout {
+                        id: statusLabel
+                        Layout.fillWidth: true
                         Kirigami.Icon {
                             implicitHeight: 32
                             implicitWidth: 32
 
-                            source: root.notificationIcon
+                            source: root.notificationIcon.length > 0 ? root.notificationIcon[0] : ""
                         }
 
                         CorrectedLabel {
                             Layout.alignment: Qt.AlignVCenter
                             color: "white"
-                            text: root.notification
+                            text: root.notification.length > 0 ? root.notification[0] : ""
                         }
                     }
 
@@ -449,8 +458,14 @@ Item {
 
                         signal accepted()
                         onAccepted: {
-                            pageView.replaceCurrentItem(mainPage);
-                            root.resetFocus(true);
+                            root.notification.shift();
+                            root.notificationIcon.shift();
+
+                            if(root.notification.length == 0) {
+                                pageView.replaceCurrentItem(mainPage);
+                                root.resetFocus(true);
+                            }
+
                         }
 
                         Layout.alignment: Qt.AlignHCenter