Cynosphere/aerothemeplasma
1
0
Fork 0
mirror of https://gitgud.io/wackyideas/aerothemeplasma.git synced 2026-10-20 22:04:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: Cynosphere:06123737a2f085389ae59c9a084cf270aece0ae3
Branches Tags
Cynosphere:master
Cynosphere:Plasma/6.8
Cynosphere:Plasma/6.7
Cynosphere:Plasma/6.6
Cynosphere:x11session
Cynosphere:6.5.5
Cynosphere:6.4.4
Cynosphere:6.3.4
Cynosphere:6.2.5
Cynosphere:5.27.11
...
compare: Cynosphere:957c3434b740d3128a9c3f3bc4a93e809707f112
Branches Tags
Cynosphere:Plasma/6.8
Cynosphere:Plasma/6.7
Cynosphere:master
Cynosphere:Plasma/6.6
Cynosphere:x11session
Cynosphere:6.5.5
Cynosphere:6.4.4
Cynosphere:6.3.4
Cynosphere:6.2.5
Cynosphere:5.27.11

3 commits
06123737a2 ... 957c3434b7

Author SHA1 Message Date
2Epik4u
957c3434b7 Merge branch 'Plasma/6.7' into 'Plasma/6.7' 
Fix aero style highlighted text

See merge request aeroshell/atp/aerothemeplasma!75
 2026-08-20 21:25:33 +00:00
wackyideas
0d166f8ba2 lockscreen: fix status messages not showing [skip ci] 
This fixes the bug where status messages won't show up. It also allows
for multiple messages to be displayed in order, with error messages
having higher priority.
 2026-08-20 16:24:14 +02:00
2Epik4u
84a8eb8b50 Fix aero style highlighted text 2026-08-18 23:49:54 -04:00
2 changed files with 27 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plasma/color_scheme/Aero.colors
View file

@ -56,7 +56,7 @@ ForegroundInactive=143,199,255
ForegroundLink=0,0,255 ForegroundLink=0,0,255
ForegroundNegative=176,55,69 ForegroundNegative=176,55,69
ForegroundNeutral=246,116,0 ForegroundNeutral=246,116,0
ForegroundNormal=255,255,255 ForegroundNormal=0,0,0
ForegroundPositive=23,104,57 ForegroundPositive=23,104,57
ForegroundVisited=128,0,128 ForegroundVisited=128,0,128

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

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