kenji/illogical-impulse
1
0
Fork 0
forked from Shinonome/dots-hyprland
Code Pull Requests Activity

Merge branch 'main' into hefty-hype

Browse Source
This commit is contained in:
end-4
2026-05-24 23:37:13 +02:00
parent 21689e1d51 a15f2a8a39
commit ad7a7fe566
15 changed files with 260 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dots/.config/quickshell/ii/modules/common/models/quickToggles/AntiFlashbangToggle.qml
+4 -4
View File
@@ -5,13 +5,13 @@ import qs.modules.common.functions
import qs.modules.common.widgets
QuickToggleModel {
name: Translation.tr("Anti-flashbang")
tooltipText: Translation.tr("Anti-flashbang")
icon: "flash_off"
name: HyprlandAntiFlashbangShader.enabled ? (HyprlandAntiFlashbangShader.weak ? Translation.tr("Anti-flash: Weak") : Translation.tr("Anti-flash: Strong")) : Translation.tr("Anti-flashbang")
tooltipText: `${Translation.tr("Anti-flashbang")}: ${HyprlandAntiFlashbangShader.enabled ? (HyprlandAntiFlashbangShader.weak ? Translation.tr("Weak") : Translation.tr("Strong")) : Translation.tr("Off")}`
icon: HyprlandAntiFlashbangShader.enabled ? (!HyprlandAntiFlashbangShader.weak ? "flash_off" : "sunny_snowing") : "flash_on"
toggled: HyprlandAntiFlashbangShader.enabled
mainAction: () => {
HyprlandAntiFlashbangShader.toggle()
HyprlandAntiFlashbangShader.cycle()
}
hasMenu: true
}
dots/.config/quickshell/ii/modules/common/widgets/NotificationItem.qml
+1 -1
View File
@@ -153,7 +153,7 @@ Item { // Notification item area
implicitHeight: summaryText.implicitHeight
StyledText {
id: summaryText
Layout.fillWidth: summaryTextMetrics.width >= summaryRow.implicitWidth * root.summaryElideRatio
Layout.fillWidth: summaryTextMetrics.width >= root.width * root.summaryElideRatio
visible: !root.onlyNotification
font.pixelSize: root.fontSize
color: Appearance.colors.colOnLayer3
dots/.config/quickshell/ii/modules/ii/cheatsheet/CheatsheetKeybinds.qml
+7
View File
@@ -16,6 +16,7 @@ Item {
StyledFlickable {
id: flickable
clip: true
anchors.fill: parent
anchors.margins: Appearance.rounding.small
contentHeight: height
@@ -34,4 +35,10 @@ Item {
}
}
}
ScrollEdgeFade {
target: flickable
vertical: false
color: Appearance.colors.colLayer0Base
}
}
dots/.config/quickshell/ii/modules/ii/cheatsheet/CheatsheetKeybindsCategory.qml
+58 -16
View File
@@ -8,6 +8,8 @@ import QtQuick
import QtQuick.Layouts
import Quickshell
// Notes:
// We deal with keybinds being numbered 1, 2, etc by discarding 2+, keeping 1 and replacing it with a generic "<Number>"
Column {
id: root
required property string categoryName
@@ -61,11 +63,11 @@ Column {
property var keyBlacklist: ["SUPER_L", "SUPER_R"]
property var keySubstitutions: Object.assign({
"Super": "",
"Mouse_up": "Scroll ↓", // ikr, weird
"Mouse_down": "Scroll ↑", // trust me bro
"Mouse:272": "LMB",
"Mouse:273": "RMB",
"Mouse:275": "MouseBack",
"mouse_up": "Scroll ↓", // ikr, weird
"mouse_down": "Scroll ↑", // trust me bro
"mouse:272": "LMB",
"mouse:273": "RMB",
"mouse:275": "MouseBack",
"Slash": "/",
"Hash": "#",
"Return": "Enter",
@@ -93,6 +95,7 @@ Column {
return list;
}
visible: repeater.model.length > 0
spacing: titleSpacing
StyledText {
@@ -100,14 +103,59 @@ Column {
font.pixelSize: Appearance.font.pixelSize.title
}
function hasDescription(bind) {
return bind.description?.length > 0;
}
function isCategory(bind, categoryName) {
return bind.description.substring(0, bind.description.indexOf(":")) === categoryName;
}
function isUncategorized(bind) {
return bind.description.indexOf(":") === -1;
}
function containsNonFirstRepetitive(bind) {
const key = bind.key;
if (key.includes("mouse") || key.includes("page")) return false;
// Contains non-1 number
if (/\d/.test(key) && !key.includes("1")) return true;
// Contains non-left direction
if (/^(right|up|down)\b/i.test(key)) return true;
return false;
}
function containsFirstRepetitive(bind) {
const key = bind.key;
return key.includes("1") || /left/i.test(key);
}
function transformKey(key) {
const replaced = root.keySubstitutions[key] || key;
const denumbered = replaced.replace("1", "<Number>");
const dedirectioned = denumbered.replace("Left", "<Direction>");
return dedirectioned;
}
function transformDescription(bind, categoryName) {
const description = bind.description
const regex = new RegExp("\\s*" + categoryName + "\\s*:\\s*");
const decategorized = description.replace(regex, "");
if (!containsFirstRepetitive(bind)) return decategorized;
const denumbered = decategorized.replace("1", "<Number>");
const dedirectioned = denumbered.replace(/ \b(left|right|up|down)\b/i, " <Direction>");
return dedirectioned;
}
Column {
spacing: 4
Repeater {
id: repeater
model: {
if (!root.isCategorized) {
return HyprlandKeybinds.keybinds.filter(bind => bind.description?.length > 0 && bind.description.indexOf(":") === -1);
return HyprlandKeybinds.keybinds.filter(bind => root.hasDescription(bind) && root.isUncategorized(bind) && !root.containsNonFirstRepetitive(bind));
}
return HyprlandKeybinds.keybinds.filter(bind => bind.description?.length > 0 && bind.description.substring(0, bind.description.indexOf(":")) === root.categoryName);
return HyprlandKeybinds.keybinds.filter(bind => root.hasDescription(bind) && root.isCategory(bind, root.categoryName) && !root.containsNonFirstRepetitive(bind));
}
delegate: BindLine {
required property var modelData
@@ -138,7 +186,7 @@ Column {
}
delegate: KeyboardKey {
required property var modelData
key: modelData
key: root.transformKey(modelData)
pixelSize: Config.options.cheatsheet.fontSize.key
}
}
@@ -152,10 +200,7 @@ Column {
id: keybindKey
anchors.verticalCenter: parent.verticalCenter
visible: !keyBlacklist.includes(bindLine.keyData.key)
key: {
const k = StringUtils.toTitleCase(bindLine.keyData.key)
return root.keySubstitutions[k] || k
}
key: root.transformKey(bindLine.keyData.key)
pixelSize: Config.options.cheatsheet.fontSize.key
color: Appearance.colors.colOnLayer0
}
@@ -169,10 +214,7 @@ Column {
anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left
font.pixelSize: Config.options.cheatsheet.fontSize.comment || Appearance.font.pixelSize.smaller
text: {
const regex = new RegExp("\\s*" + bindLine.categoryName + "\\s*:\\s*");
return bindLine.keyData.description.replace(regex, "");
}
text: root.transformDescription(bindLine.keyData, bindLine.categoryName)
}
}
}
dots/.config/quickshell/ii/modules/ii/overview/SearchItem.qml
+1 -1
View File
@@ -226,7 +226,7 @@ RippleButton {
color: root.colForeground
horizontalAlignment: Text.AlignLeft
elide: Text.ElideRight
text: root.selected ? root.itemName : root.displayContent
text: root.selected ? StringUtils.escapeHtml(root.itemName) : root.displayContent
}
}
Loader { // Clipboard image preview
dots/.config/quickshell/ii/modules/ii/screenCorners/ScreenCorners.qml
-1
View File
@@ -21,7 +21,6 @@ Scope {
component CornerPanelWindow: PanelWindow {
id: cornerPanelWindow
property var screen: QsWindow.window?.screen
property var brightnessMonitor: Brightness.getMonitorForScreen(screen)
property bool fullscreen
visible: (Config.options.appearance.fakeScreenRounding === 1 || (Config.options.appearance.fakeScreenRounding === 2 && !fullscreen))
dots/.config/quickshell/ii/modules/ii/sidebarRight/quickToggles/androidStyle/AndroidQuickToggleButton.qml
+1 -1
View File
@@ -24,7 +24,7 @@ GroupButton {
// Declared in specific toggles
property QuickToggleModel toggleModel
property string name: toggleModel?.name ?? ""
property string statusText: (toggleModel?.hasStatusText) ? (toggleModel?.statusText || (toggled ? Translation.tr("Active") : Translation.tr("Inactive"))) : ""
property string statusText: (toggleModel?.hasStatusText) ? (toggleModel?.statusText || (toggled ? Translation.tr("On") : Translation.tr("Off"))) : ""
property string tooltipText: toggleModel?.tooltipText ?? ""
property string buttonIcon: toggleModel?.icon ?? "close"
property bool available: toggleModel?.available ?? true