never/noctalia-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add temporary reload button to applauncher

Browse source
This commit is contained in:
lysec 2025-07-25 13:19:21 +02:00
parent b6a0adac56
commit f2df117732
1 changed files with 108 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

143
Bar/Modules/Applauncher.qml
View file

@ -11,23 +11,6 @@ import "../../Helpers/Fuzzysort.js" as Fuzzysort
PanelWithOverlay { PanelWithOverlay {
id: appLauncherPanel id: appLauncherPanel
WlrLayershell.keyboardFocus: WlrKeyboardFocus.OnDemand WlrLayershell.keyboardFocus: WlrKeyboardFocus.OnDemand
function isPinned(app) {
return app && app.execString && Settings.settings.pinnedExecs.indexOf(app.execString) !== -1;
}
function togglePin(app) {
if (!app || !app.execString) return;
var arr = Settings.settings.pinnedExecs ? Settings.settings.pinnedExecs.slice() : [];
var idx = arr.indexOf(app.execString);
if (idx === -1) {
arr.push(app.execString);
} else {
arr.splice(idx, 1);
}
Settings.settings.pinnedExecs = arr;
root.updateFilter();
}
function showAt() { function showAt() {
appLauncherPanelRect.showAt(); appLauncherPanelRect.showAt();
} }
@ -143,22 +126,7 @@ PanelWithOverlay {
return r.obj; return r.obj;
})); }));
} }
// Pinning logic: split into pinned and unpinned root.filteredApps = results;
var pinned = [];
var unpinned = [];
for (var i = 0; i < results.length; ++i) {
var app = results[i];
if (app.execString && Settings.settings.pinnedExecs.indexOf(app.execString) !== -1) {
pinned.push(app);
} else {
unpinned.push(app);
}
}
// Sort pinned alphabetically
pinned.sort(function(a, b) {
return a.name.toLowerCase().localeCompare(b.name.toLowerCase());
});
root.filteredApps = pinned.concat(unpinned);
root.selectedIndex = 0; root.selectedIndex = 0;
} }
function selectNext() { function selectNext() {
@ -175,15 +143,12 @@ PanelWithOverlay {
return; return;
var modelData = filteredApps[selectedIndex]; var modelData = filteredApps[selectedIndex];
const termEmu = Quickshell.env("TERMINAL") || Quickshell.env("TERM_PROGRAM") || "";
if (modelData.isCalculator) { if (modelData.isCalculator) {
Qt.callLater(function () { Qt.callLater(function () {
Quickshell.clipboardText = String(modelData.result); Quickshell.clipboardText = String(modelData.result);
Quickshell.execDetached(["notify-send", "Calculator Result", `${modelData.expr} = ${modelData.result} (copied to clipboard)`]); Quickshell.execDetached(["notify-send", "Calculator Result", `${modelData.expr} = ${modelData.result} (copied to clipboard)`]);
}); });
} else if (modelData.runInTerminal && termEmu){
Quickshell.execDetached([termEmu, "-e", modelData.execString.trim()]);
} else if (modelData.execute) { } else if (modelData.execute) {
modelData.execute(); modelData.execute();
} else { } else {
@ -208,6 +173,11 @@ PanelWithOverlay {
anchors.margins: 32 anchors.margins: 32
spacing: 18 spacing: 18
// Search Bar Row
RowLayout {
spacing: 12
Layout.fillWidth: true
// Search Bar // Search Bar
Rectangle { Rectangle {
id: searchBar id: searchBar
@ -215,6 +185,7 @@ PanelWithOverlay {
radius: 22 radius: 22
height: 48 height: 48
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredWidth: 320 // Made the search bar narrower
border.color: searchField.activeFocus ? Theme.accentPrimary : Theme.outline border.color: searchField.activeFocus ? Theme.accentPrimary : Theme.outline
border.width: searchField.activeFocus ? 2 : 1 border.width: searchField.activeFocus ? 2 : 1
@ -275,6 +246,47 @@ PanelWithOverlay {
} }
} }
// Added rectangle with onClick
Rectangle {
id: actionButton
width: 48
height: 48
radius: 20
color: mouseArea.containsPress ? Theme.accentPrimary : Theme.surfaceVariant
border.color: mouseArea.containsMouse ? Theme.accentPrimary : Theme.outline
border.width: 2
Text {
text: "refresh"
font.family: "Material Symbols Outlined"
font.pixelSize: Theme.fontSizeHeader
color: mouseArea.containsMouse ? Theme.accentPrimary : Theme.textPrimary
anchors.centerIn: parent
}
MouseArea {
id: mouseArea
anchors.fill: parent
hoverEnabled: true
onClicked: {
Quickshell.reload(true);
}
cursorShape: Qt.PointingHandCursor
}
Behavior on color {
ColorAnimation {
duration: 120
}
}
Behavior on border.color {
ColorAnimation {
duration: 120
}
}
}
}
// App List Card // App List Card
Rectangle { Rectangle {
color: Theme.surface color: Theme.surface
@ -308,14 +320,10 @@ PanelWithOverlay {
Rectangle { Rectangle {
anchors.fill: parent anchors.fill: parent
color: (hovered || isSelected) color: hovered || isSelected ? Theme.accentPrimary : "transparent"
? Theme.accentPrimary
: (appLauncherPanel.isPinned(modelData) ? Theme.surfaceVariant : "transparent")
radius: 12 radius: 12
border.color: appLauncherPanel.isPinned(modelData) border.color: hovered || isSelected ? Theme.accentPrimary : "transparent"
? "transparent" border.width: hovered || isSelected ? 2 : 0
: (hovered || isSelected ? Theme.accentPrimary : "transparent")
border.width: appLauncherPanel.isPinned(modelData) ? 0 : (hovered || isSelected ? 2 : 0)
Behavior on color { Behavior on color {
ColorAnimation { ColorAnimation {
duration: 120 duration: 120
@ -367,7 +375,7 @@ PanelWithOverlay {
spacing: 1 spacing: 1
Text { Text {
text: modelData.name text: modelData.name
color: (hovered || isSelected) ? Theme.onAccent : (appLauncherPanel.isPinned(modelData) ? Theme.textPrimary : Theme.textPrimary) color: hovered || isSelected ? Theme.onAccent : Theme.textPrimary
font.family: Theme.fontFamily font.family: Theme.fontFamily
font.pixelSize: Theme.fontSizeSmall font.pixelSize: Theme.fontSizeSmall
font.bold: hovered || isSelected font.bold: hovered || isSelected
@ -377,7 +385,7 @@ PanelWithOverlay {
} }
Text { Text {
text: modelData.isCalculator ? (modelData.expr + " = " + modelData.result) : (modelData.comment || modelData.genericName || "No description available") text: modelData.isCalculator ? (modelData.expr + " = " + modelData.result) : (modelData.comment || modelData.genericName || "No description available")
color: (hovered || isSelected) ? Theme.onAccent : (appLauncherPanel.isPinned(modelData) ? Theme.textSecondary : Theme.textSecondary) color: hovered || isSelected ? Theme.onAccent : Theme.textSecondary
font.family: Theme.fontFamily font.family: Theme.fontFamily
font.pixelSize: Theme.fontSizeCaption font.pixelSize: Theme.fontSizeCaption
font.italic: !(modelData.comment || modelData.genericName) font.italic: !(modelData.comment || modelData.genericName)
@ -394,14 +402,9 @@ PanelWithOverlay {
text: modelData.isCalculator ? "content_copy" : "chevron_right" text: modelData.isCalculator ? "content_copy" : "chevron_right"
font.family: "Material Symbols Outlined" font.family: "Material Symbols Outlined"
font.pixelSize: Theme.fontSizeBody font.pixelSize: Theme.fontSizeBody
color: (hovered || isSelected) color: hovered || isSelected ? Theme.onAccent : Theme.textSecondary
? Theme.onAccent
: (appLauncherPanel.isPinned(modelData) ? Theme.textPrimary : Theme.textSecondary)
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
Layout.rightMargin: 8 // Add margin to separate from star
} }
// Add a spacing item between chevron and star
Item { width: 8; height: 1 }
} }
Rectangle { Rectangle {
@ -415,14 +418,7 @@ PanelWithOverlay {
id: mouseArea id: mouseArea
anchors.fill: parent anchors.fill: parent
hoverEnabled: true hoverEnabled: true
acceptedButtons: Qt.LeftButton | Qt.RightButton
onClicked: { onClicked: {
// Prevent app launch if click is inside pinArea
if (pinArea.containsMouse) return;
if (mouse.button === Qt.RightButton) {
appLauncherPanel.togglePin(modelData);
return;
}
ripple.opacity = 0.18; ripple.opacity = 0.18;
rippleNumberAnimation.start(); rippleNumberAnimation.start();
root.selectedIndex = index; root.selectedIndex = index;
@ -449,37 +445,6 @@ PanelWithOverlay {
color: Theme.outline color: Theme.outline
opacity: index === appList.count - 1 ? 0 : 0.10 opacity: index === appList.count - 1 ? 0 : 0.10
} }
// Pin/Unpin button (move to last child for stacking)
Item {
id: pinArea
width: 28; height: 28
z: 100 // Ensure above everything else
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
MouseArea {
anchors.fill: parent
preventStealing: true
z: 100
hoverEnabled: true
cursorShape: Qt.PointingHandCursor
acceptedButtons: Qt.LeftButton | Qt.RightButton
propagateComposedEvents: false
onClicked: {
appLauncherPanel.togglePin(modelData);
event.accepted = true;
}
}
Text {
anchors.centerIn: parent
text: "star"
font.family: "Material Symbols Outlined"
font.pixelSize: Theme.fontSizeSmall
color: (parent.MouseArea.containsMouse || hovered || isSelected)
? Theme.onAccent
: (appLauncherPanel.isPinned(modelData) ? Theme.textPrimary : Theme.textDisabled)
verticalAlignment: Text.AlignVCenter
}
}
} }
} }
} }