Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-01-24 13:32:50 -05:00
Code Packages Releases Activity

launcher v2: sort order preference for plugin results

Browse Source
This commit is contained in:
bbedward
2026-01-21 14:08:40 -05:00
parent 3507c6cec3
commit 6ac2a305f7
4 changed files with 265 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
quickshell/Common/SettingsData.qml
View File

@@ -96,6 +96,28 @@ Singleton {
saveSettings(); saveSettings();
} }
property var launcherPluginOrder: []
onLauncherPluginOrderChanged: saveSettings()
function setLauncherPluginOrder(order) {
launcherPluginOrder = order;
}
function getOrderedLauncherPlugins(allPlugins) {
if (!launcherPluginOrder || launcherPluginOrder.length === 0)
return allPlugins;
const orderMap = {};
for (let i = 0; i < launcherPluginOrder.length; i++)
orderMap[launcherPluginOrder[i]] = i;
return allPlugins.slice().sort((a, b) => {
const aOrder = orderMap[a.id] ?? 9999;
const bOrder = orderMap[b.id] ?? 9999;
if (aOrder !== bOrder)
return aOrder - bOrder;
return a.name.localeCompare(b.name);
});
}
property alias dankBarLeftWidgetsModel: leftWidgetsModel property alias dankBarLeftWidgetsModel: leftWidgetsModel
property alias dankBarCenterWidgetsModel: centerWidgetsModel property alias dankBarCenterWidgetsModel: centerWidgetsModel
property alias dankBarRightWidgetsModel: rightWidgetsModel property alias dankBarRightWidgetsModel: rightWidgetsModel

3
quickshell/Common/settings/SettingsSpec.js
View File

@@ -416,7 +416,8 @@ var SPEC = {
desktopWidgetGroups: { def: [] }, desktopWidgetGroups: { def: [] },
builtInPluginSettings: { def: {} }, builtInPluginSettings: { def: {} },
launcherPluginVisibility: { def: {} } launcherPluginVisibility: { def: {} },
launcherPluginOrder: { def: [] }
}; };
function getValidKeys() { function getValidKeys() {

136
quickshell/Modals/DankLauncherV2/Controller.qml
View File

@@ -431,35 +431,29 @@ Item {
if (searchMode === "all") { if (searchMode === "all") {
if (searchQuery) { if (searchQuery) {
var allPluginIds = getVisibleLauncherPluginIds(); var allPluginsOrdered = getAllVisiblePluginsOrdered();
for (var i = 0; i < allPluginIds.length; i++) { for (var i = 0; i < allPluginsOrdered.length; i++) {
var pluginId = allPluginIds[i]; var plugin = allPluginsOrdered[i];
var pItems = getPluginItems(pluginId, searchQuery); if (plugin.isBuiltIn) {
allItems = allItems.concat(pItems); var blItems = AppSearchService.getBuiltInLauncherItems(plugin.id, searchQuery);
} for (var j = 0; j < blItems.length; j++)
allItems.push(transformBuiltInLauncherItem(blItems[j], plugin.id));
var allBuiltInIds = getVisibleBuiltInLauncherIds(); } else {
for (var i = 0; i < allBuiltInIds.length; i++) { var pItems = getPluginItems(plugin.id, searchQuery);
var pluginId = allBuiltInIds[i]; allItems = allItems.concat(pItems);
var blItems = AppSearchService.getBuiltInLauncherItems(pluginId, searchQuery);
for (var j = 0; j < blItems.length; j++) {
allItems.push(transformBuiltInLauncherItem(blItems[j], pluginId));
} }
} }
} else { } else {
var emptyTriggerPlugins = getEmptyTriggerPlugins(); var emptyTriggerOrdered = getEmptyTriggerPluginsOrdered();
for (var i = 0; i < emptyTriggerPlugins.length; i++) { for (var i = 0; i < emptyTriggerOrdered.length; i++) {
var pluginId = emptyTriggerPlugins[i]; var plugin = emptyTriggerOrdered[i];
var pItems = getPluginItems(pluginId, searchQuery); if (plugin.isBuiltIn) {
allItems = allItems.concat(pItems); var blItems = AppSearchService.getBuiltInLauncherItems(plugin.id, searchQuery);
} for (var j = 0; j < blItems.length; j++)
allItems.push(transformBuiltInLauncherItem(blItems[j], plugin.id));
var builtInLauncherPlugins = getBuiltInEmptyTriggerLaunchers(); } else {
for (var i = 0; i < builtInLauncherPlugins.length; i++) { var pItems = getPluginItems(plugin.id, searchQuery);
var pluginId = builtInLauncherPlugins[i]; allItems = allItems.concat(pItems);
var blItems = AppSearchService.getBuiltInLauncherItems(pluginId, searchQuery);
for (var j = 0; j < blItems.length; j++) {
allItems.push(transformBuiltInLauncherItem(blItems[j], pluginId));
} }
} }
@@ -859,9 +853,10 @@ Item {
function getEmptyTriggerPlugins() { function getEmptyTriggerPlugins() {
var plugins = PluginService.getPluginsWithEmptyTrigger(); var plugins = PluginService.getPluginsWithEmptyTrigger();
return plugins.filter(function (pluginId) { var visible = plugins.filter(function (pluginId) {
return SettingsData.getPluginAllowWithoutTrigger(pluginId); return SettingsData.getPluginAllowWithoutTrigger(pluginId);
}); });
return sortPluginIdsByOrder(visible);
} }
function getAllLauncherPluginIds() { function getAllLauncherPluginIds() {
@@ -871,9 +866,10 @@ Item {
function getVisibleLauncherPluginIds() { function getVisibleLauncherPluginIds() {
var launchers = PluginService.getLauncherPlugins(); var launchers = PluginService.getLauncherPlugins();
return Object.keys(launchers).filter(function (pluginId) { var visible = Object.keys(launchers).filter(function (pluginId) {
return SettingsData.getPluginAllowWithoutTrigger(pluginId); return SettingsData.getPluginAllowWithoutTrigger(pluginId);
}); });
return sortPluginIdsByOrder(visible);
} }
function getAllBuiltInLauncherIds() { function getAllBuiltInLauncherIds() {
@@ -883,9 +879,88 @@ Item {
function getVisibleBuiltInLauncherIds() { function getVisibleBuiltInLauncherIds() {
var launchers = AppSearchService.getBuiltInLauncherPlugins(); var launchers = AppSearchService.getBuiltInLauncherPlugins();
return Object.keys(launchers).filter(function (pluginId) { var visible = Object.keys(launchers).filter(function (pluginId) {
return SettingsData.getPluginAllowWithoutTrigger(pluginId); return SettingsData.getPluginAllowWithoutTrigger(pluginId);
}); });
return sortPluginIdsByOrder(visible);
}
function sortPluginIdsByOrder(pluginIds) {
var order = SettingsData.launcherPluginOrder || [];
if (order.length === 0)
return pluginIds;
var orderMap = {};
for (var i = 0; i < order.length; i++)
orderMap[order[i]] = i;
return pluginIds.slice().sort(function (a, b) {
var aOrder = orderMap[a] !== undefined ? orderMap[a] : 9999;
var bOrder = orderMap[b] !== undefined ? orderMap[b] : 9999;
return aOrder - bOrder;
});
}
function getAllVisiblePluginsOrdered() {
var thirdPartyLaunchers = PluginService.getLauncherPlugins() || {};
var builtInLaunchers = AppSearchService.getBuiltInLauncherPlugins() || {};
var all = [];
for (var id in thirdPartyLaunchers) {
if (SettingsData.getPluginAllowWithoutTrigger(id))
all.push({
id: id,
isBuiltIn: false
});
}
for (var id in builtInLaunchers) {
if (SettingsData.getPluginAllowWithoutTrigger(id))
all.push({
id: id,
isBuiltIn: true
});
}
var order = SettingsData.launcherPluginOrder || [];
if (order.length === 0)
return all;
var orderMap = {};
for (var i = 0; i < order.length; i++)
orderMap[order[i]] = i;
return all.sort(function (a, b) {
var aOrder = orderMap[a.id] !== undefined ? orderMap[a.id] : 9999;
var bOrder = orderMap[b.id] !== undefined ? orderMap[b.id] : 9999;
return aOrder - bOrder;
});
}
function getEmptyTriggerPluginsOrdered() {
var thirdParty = PluginService.getPluginsWithEmptyTrigger() || [];
var builtIn = AppSearchService.getBuiltInLauncherPluginsWithEmptyTrigger() || [];
var all = [];
for (var i = 0; i < thirdParty.length; i++) {
var id = thirdParty[i];
if (SettingsData.getPluginAllowWithoutTrigger(id))
all.push({
id: id,
isBuiltIn: false
});
}
for (var i = 0; i < builtIn.length; i++) {
var id = builtIn[i];
if (SettingsData.getPluginAllowWithoutTrigger(id))
all.push({
id: id,
isBuiltIn: true
});
}
var order = SettingsData.launcherPluginOrder || [];
if (order.length === 0)
return all;
var orderMap = {};
for (var i = 0; i < order.length; i++)
orderMap[order[i]] = i;
return all.sort(function (a, b) {
var aOrder = orderMap[a.id] !== undefined ? orderMap[a.id] : 9999;
var bOrder = orderMap[b.id] !== undefined ? orderMap[b.id] : 9999;
return aOrder - bOrder;
});
} }
function getPluginBrowseItems() { function getPluginBrowseItems() {
@@ -948,9 +1023,10 @@ Item {
function getBuiltInEmptyTriggerLaunchers() { function getBuiltInEmptyTriggerLaunchers() {
var plugins = AppSearchService.getBuiltInLauncherPluginsWithEmptyTrigger(); var plugins = AppSearchService.getBuiltInLauncherPluginsWithEmptyTrigger();
return plugins.filter(function (pluginId) { var visible = plugins.filter(function (pluginId) {
return SettingsData.getPluginAllowWithoutTrigger(pluginId); return SettingsData.getPluginAllowWithoutTrigger(pluginId);
}); });
return sortPluginIdsByOrder(visible);
} }
function getPluginItems(pluginId, query) { function getPluginItems(pluginId, query) {

203
quickshell/Modules/Settings/LauncherTab.qml
View File

@@ -581,6 +581,7 @@ Item {
property var allLauncherPlugins: { property var allLauncherPlugins: {
SettingsData.launcherPluginVisibility; SettingsData.launcherPluginVisibility;
SettingsData.launcherPluginOrder;
var plugins = []; var plugins = [];
var builtIn = AppSearchService.getBuiltInLauncherPlugins() || {}; var builtIn = AppSearchService.getBuiltInLauncherPlugins() || {};
for (var pluginId in builtIn) { for (var pluginId in builtIn) {
@@ -607,109 +608,175 @@ Item {
trigger: PluginService.getPluginTrigger(pluginId) || "" trigger: PluginService.getPluginTrigger(pluginId) || ""
}); });
} }
return plugins.sort((a, b) => a.name.localeCompare(b.name)); return SettingsData.getOrderedLauncherPlugins(plugins);
}
function reorderPlugin(fromIndex, toIndex) {
if (fromIndex === toIndex)
return;
var currentOrder = allLauncherPlugins.map(p => p.id);
var item = currentOrder.splice(fromIndex, 1)[0];
currentOrder.splice(toIndex, 0, item);
SettingsData.setLauncherPluginOrder(currentOrder);
} }
StyledText { StyledText {
width: parent.width width: parent.width
text: I18n.tr("Control which plugins appear in 'All' mode without requiring a trigger prefix. Disabled plugins will only show when using their trigger.") text: I18n.tr("Control which plugins appear in 'All' mode without requiring a trigger prefix. Drag to reorder.")
font.pixelSize: Theme.fontSizeSmall font.pixelSize: Theme.fontSizeSmall
color: Theme.surfaceVariantText color: Theme.surfaceVariantText
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
} }
Column { Column {
id: pluginVisibilityColumn
width: parent.width width: parent.width
spacing: Theme.spacingS spacing: Theme.spacingS
Repeater { Repeater {
model: pluginVisibilityCard.allLauncherPlugins model: pluginVisibilityCard.allLauncherPlugins
delegate: Rectangle { delegate: Item {
id: visibilityDelegate id: visibilityDelegateItem
required property var modelData required property var modelData
required property int index required property int index
width: parent.width property bool held: pluginDragArea.pressed
property real originalY: y
width: pluginVisibilityColumn.width
height: 52 height: 52
radius: Theme.cornerRadius z: held ? 2 : 1
color: Qt.rgba(Theme.surfaceContainer.r, Theme.surfaceContainer.g, Theme.surfaceContainer.b, 0.3)
Row { Rectangle {
anchors.left: parent.left id: visibilityDelegate
anchors.leftMargin: Theme.spacingM width: parent.width
anchors.verticalCenter: parent.verticalCenter height: 52
spacing: Theme.spacingM radius: Theme.cornerRadius
color: visibilityDelegateItem.held ? Theme.surfaceHover : Qt.rgba(Theme.surfaceContainer.r, Theme.surfaceContainer.g, Theme.surfaceContainer.b, 0.3)
Item { Row {
width: Theme.iconSize anchors.left: parent.left
height: Theme.iconSize anchors.leftMargin: 28
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
spacing: Theme.spacingM
DankIcon { Item {
anchors.centerIn: parent width: Theme.iconSize
visible: visibilityDelegate.modelData.iconType !== "unicode" height: Theme.iconSize
name: visibilityDelegate.modelData.icon anchors.verticalCenter: parent.verticalCenter
size: Theme.iconSize
color: Theme.primary DankIcon {
anchors.centerIn: parent
visible: visibilityDelegateItem.modelData.iconType !== "unicode"
name: visibilityDelegateItem.modelData.icon
size: Theme.iconSize
color: Theme.primary
}
StyledText {
anchors.centerIn: parent
visible: visibilityDelegateItem.modelData.iconType === "unicode"
text: visibilityDelegateItem.modelData.icon
font.pixelSize: Theme.iconSize
color: Theme.primary
}
} }
StyledText { Column {
anchors.centerIn: parent anchors.verticalCenter: parent.verticalCenter
visible: visibilityDelegate.modelData.iconType === "unicode" spacing: 2
text: visibilityDelegate.modelData.icon
font.pixelSize: Theme.iconSize Row {
color: Theme.primary spacing: Theme.spacingS
StyledText {
text: visibilityDelegateItem.modelData.name
font.pixelSize: Theme.fontSizeMedium
color: Theme.surfaceText
}
Rectangle {
visible: visibilityDelegateItem.modelData.isBuiltIn
width: dmsBadgeLabel.implicitWidth + Theme.spacingS
height: 16
radius: 8
color: Theme.primaryContainer
anchors.verticalCenter: parent.verticalCenter
StyledText {
id: dmsBadgeLabel
anchors.centerIn: parent
text: "DMS"
font.pixelSize: Theme.fontSizeSmall - 2
color: Theme.primaryText
}
}
}
StyledText {
text: visibilityDelegateItem.modelData.trigger ? I18n.tr("Trigger: %1").arg(visibilityDelegateItem.modelData.trigger) : I18n.tr("No trigger")
font.pixelSize: Theme.fontSizeSmall
color: Theme.surfaceVariantText
}
} }
} }
Column { DankToggle {
anchors.right: parent.right
anchors.rightMargin: Theme.spacingM
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
spacing: 2 checked: SettingsData.getPluginAllowWithoutTrigger(visibilityDelegateItem.modelData.id)
onToggled: function (isChecked) {
Row { SettingsData.setPluginAllowWithoutTrigger(visibilityDelegateItem.modelData.id, isChecked);
spacing: Theme.spacingS
StyledText {
text: visibilityDelegate.modelData.name
font.pixelSize: Theme.fontSizeMedium
color: Theme.surfaceText
}
Rectangle {
visible: visibilityDelegate.modelData.isBuiltIn
width: dmsLabel.implicitWidth + Theme.spacingS
height: 16
radius: 8
color: Theme.primaryContainer
anchors.verticalCenter: parent.verticalCenter
StyledText {
id: dmsLabel
anchors.centerIn: parent
text: "DMS"
font.pixelSize: Theme.fontSizeSmall - 2
color: Theme.primaryText
}
}
}
StyledText {
text: visibilityDelegate.modelData.trigger ? I18n.tr("Trigger: %1").arg(visibilityDelegate.modelData.trigger) : I18n.tr("No trigger")
font.pixelSize: Theme.fontSizeSmall
color: Theme.surfaceVariantText
} }
} }
} }
DankToggle { MouseArea {
id: visibilityToggle id: pluginDragArea
anchors.right: parent.right anchors.left: parent.left
anchors.rightMargin: Theme.spacingM anchors.top: parent.top
width: 28
height: parent.height
hoverEnabled: true
cursorShape: Qt.SizeVerCursor
drag.target: visibilityDelegateItem.held ? visibilityDelegateItem : undefined
drag.axis: Drag.YAxis
preventStealing: true
onPressed: {
visibilityDelegateItem.originalY = visibilityDelegateItem.y;
}
onReleased: {
if (!drag.active) {
visibilityDelegateItem.y = visibilityDelegateItem.originalY;
return;
}
const spacing = Theme.spacingS;
const itemH = visibilityDelegateItem.height + spacing;
var newIndex = Math.round(visibilityDelegateItem.y / itemH);
newIndex = Math.max(0, Math.min(newIndex, pluginVisibilityCard.allLauncherPlugins.length - 1));
pluginVisibilityCard.reorderPlugin(visibilityDelegateItem.index, newIndex);
visibilityDelegateItem.y = visibilityDelegateItem.originalY;
}
}
DankIcon {
x: Theme.spacingXS
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
checked: SettingsData.getPluginAllowWithoutTrigger(visibilityDelegate.modelData.id) name: "drag_indicator"
onToggled: function (isChecked) { size: 18
SettingsData.setPluginAllowWithoutTrigger(visibilityDelegate.modelData.id, isChecked); color: Theme.outline
opacity: pluginDragArea.containsMouse || pluginDragArea.pressed ? 1 : 0.5
}
Behavior on y {
enabled: !pluginDragArea.pressed && !pluginDragArea.drag.active
NumberAnimation {
duration: Theme.shortDuration
easing.type: Theme.standardEasing
} }
} }
} }