From 158428e63e8420032874b159a01482e4bfbb6c61 Mon Sep 17 00:00:00 2001 From: end-4 <97237370+end-4@users.noreply.github.com> Date: Thu, 17 Jul 2025 15:28:31 +0700 Subject: [PATCH] not attempt to show translated globalshortcut description cuz they can't be changed --- .config/quickshell/ii/GlobalStates.qml | 2 +- .config/quickshell/ii/ReloadPopup.qml | 1 + .config/quickshell/ii/modules/bar/Bar.qml | 6 +++--- .../ii/modules/cheatsheet/Cheatsheet.qml | 6 +++--- .../ii/modules/mediaControls/MediaControls.qml | 6 +++--- .../OnScreenDisplayBrightness.qml | 4 ++-- .../onScreenDisplay/OnScreenDisplayVolume.qml | 4 ++-- .../onScreenKeyboard/OnScreenKeyboard.qml | 6 +++--- .../quickshell/ii/modules/overview/Overview.qml | 16 ++++++++-------- .../quickshell/ii/modules/session/Session.qml | 4 ++-- .../ii/modules/sidebarLeft/SidebarLeft.qml | 8 ++++---- .../ii/modules/sidebarRight/SidebarRight.qml | 6 +++--- .../sidebarRight/quickToggles/CloudflareWarp.qml | 2 +- .config/quickshell/ii/services/Brightness.qml | 4 ++-- 14 files changed, 38 insertions(+), 37 deletions(-) diff --git a/.config/quickshell/ii/GlobalStates.qml b/.config/quickshell/ii/GlobalStates.qml index d473af35d..d114d9a50 100644 --- a/.config/quickshell/ii/GlobalStates.qml +++ b/.config/quickshell/ii/GlobalStates.qml @@ -41,7 +41,7 @@ Singleton { GlobalShortcut { name: "workspaceNumber" - description: Translation.tr("Hold to show workspace numbers, release to show icons") + description: "Hold to show workspace numbers, release to show icons" onPressed: { workspaceShowNumbersTimer.start() diff --git a/.config/quickshell/ii/ReloadPopup.qml b/.config/quickshell/ii/ReloadPopup.qml index 03abed423..4b0ecd884 100644 --- a/.config/quickshell/ii/ReloadPopup.qml +++ b/.config/quickshell/ii/ReloadPopup.qml @@ -34,6 +34,7 @@ Scope { PanelWindow { id: popup + exclusiveZone: 0 anchors.top: true margins.top: 0 diff --git a/.config/quickshell/ii/modules/bar/Bar.qml b/.config/quickshell/ii/modules/bar/Bar.qml index 23948029d..4824bea8c 100644 --- a/.config/quickshell/ii/modules/bar/Bar.qml +++ b/.config/quickshell/ii/modules/bar/Bar.qml @@ -586,7 +586,7 @@ Scope { GlobalShortcut { name: "barToggle" - description: Translation.tr("Toggles bar on press") + description: "Toggles bar on press" onPressed: { GlobalStates.barOpen = !GlobalStates.barOpen; @@ -595,7 +595,7 @@ Scope { GlobalShortcut { name: "barOpen" - description: Translation.tr("Opens bar on press") + description: "Opens bar on press" onPressed: { GlobalStates.barOpen = true; @@ -604,7 +604,7 @@ Scope { GlobalShortcut { name: "barClose" - description: Translation.tr("Closes bar on press") + description: "Closes bar on press" onPressed: { GlobalStates.barOpen = false; diff --git a/.config/quickshell/ii/modules/cheatsheet/Cheatsheet.qml b/.config/quickshell/ii/modules/cheatsheet/Cheatsheet.qml index bc6b67ac9..5b956841f 100644 --- a/.config/quickshell/ii/modules/cheatsheet/Cheatsheet.qml +++ b/.config/quickshell/ii/modules/cheatsheet/Cheatsheet.qml @@ -212,7 +212,7 @@ Scope { // Scope GlobalShortcut { name: "cheatsheetToggle" - description: Translation.tr("Toggles cheatsheet on press") + description: "Toggles cheatsheet on press" onPressed: { cheatsheetLoader.active = !cheatsheetLoader.active; @@ -221,7 +221,7 @@ Scope { // Scope GlobalShortcut { name: "cheatsheetOpen" - description: Translation.tr("Opens cheatsheet on press") + description: "Opens cheatsheet on press" onPressed: { cheatsheetLoader.active = true; @@ -230,7 +230,7 @@ Scope { // Scope GlobalShortcut { name: "cheatsheetClose" - description: Translation.tr("Closes cheatsheet on press") + description: "Closes cheatsheet on press" onPressed: { cheatsheetLoader.active = false; diff --git a/.config/quickshell/ii/modules/mediaControls/MediaControls.qml b/.config/quickshell/ii/modules/mediaControls/MediaControls.qml index f918ff70a..d9507265e 100644 --- a/.config/quickshell/ii/modules/mediaControls/MediaControls.qml +++ b/.config/quickshell/ii/modules/mediaControls/MediaControls.qml @@ -161,7 +161,7 @@ Scope { GlobalShortcut { name: "mediaControlsToggle" - description: Translation.tr("Toggles media controls on press") + description: "Toggles media controls on press" onPressed: { if (!mediaControlsLoader.active && Mpris.players.values.filter(player => isRealPlayer(player)).length === 0) { @@ -173,7 +173,7 @@ Scope { } GlobalShortcut { name: "mediaControlsOpen" - description: Translation.tr("Opens media controls on press") + description: "Opens media controls on press" onPressed: { mediaControlsLoader.active = true; @@ -182,7 +182,7 @@ Scope { } GlobalShortcut { name: "mediaControlsClose" - description: Translation.tr("Closes media controls on press") + description: "Closes media controls on press" onPressed: { mediaControlsLoader.active = false; diff --git a/.config/quickshell/ii/modules/onScreenDisplay/OnScreenDisplayBrightness.qml b/.config/quickshell/ii/modules/onScreenDisplay/OnScreenDisplayBrightness.qml index 00f9e68e9..51f809e88 100644 --- a/.config/quickshell/ii/modules/onScreenDisplay/OnScreenDisplayBrightness.qml +++ b/.config/quickshell/ii/modules/onScreenDisplay/OnScreenDisplayBrightness.qml @@ -135,7 +135,7 @@ Scope { GlobalShortcut { name: "osdBrightnessTrigger" - description: Translation.tr("Triggers brightness OSD on press") + description: "Triggers brightness OSD on press" onPressed: { root.triggerOsd() @@ -143,7 +143,7 @@ Scope { } GlobalShortcut { name: "osdBrightnessHide" - description: Translation.tr("Hides brightness OSD on press") + description: "Hides brightness OSD on press" onPressed: { root.showOsdValues = false diff --git a/.config/quickshell/ii/modules/onScreenDisplay/OnScreenDisplayVolume.qml b/.config/quickshell/ii/modules/onScreenDisplay/OnScreenDisplayVolume.qml index 5ae1575e2..db29eee3c 100644 --- a/.config/quickshell/ii/modules/onScreenDisplay/OnScreenDisplayVolume.qml +++ b/.config/quickshell/ii/modules/onScreenDisplay/OnScreenDisplayVolume.qml @@ -186,7 +186,7 @@ Scope { } GlobalShortcut { name: "osdVolumeTrigger" - description: Translation.tr("Triggers volume OSD on press") + description: "Triggers volume OSD on press" onPressed: { root.triggerOsd() @@ -194,7 +194,7 @@ Scope { } GlobalShortcut { name: "osdVolumeHide" - description: Translation.tr("Hides volume OSD on press") + description: "Hides volume OSD on press" onPressed: { root.showOsdValues = false diff --git a/.config/quickshell/ii/modules/onScreenKeyboard/OnScreenKeyboard.qml b/.config/quickshell/ii/modules/onScreenKeyboard/OnScreenKeyboard.qml index bebf6e71f..199cde639 100644 --- a/.config/quickshell/ii/modules/onScreenKeyboard/OnScreenKeyboard.qml +++ b/.config/quickshell/ii/modules/onScreenKeyboard/OnScreenKeyboard.qml @@ -141,7 +141,7 @@ Scope { // Scope GlobalShortcut { name: "oskToggle" - description: Translation.tr("Toggles on screen keyboard on press") + description: "Toggles on screen keyboard on press" onPressed: { oskLoader.active = !oskLoader.active; @@ -150,7 +150,7 @@ Scope { // Scope GlobalShortcut { name: "oskOpen" - description: Translation.tr("Opens on screen keyboard on press") + description: "Opens on screen keyboard on press" onPressed: { oskLoader.active = true; @@ -159,7 +159,7 @@ Scope { // Scope GlobalShortcut { name: "oskClose" - description: Translation.tr("Closes on screen keyboard on press") + description: "Closes on screen keyboard on press" onPressed: { oskLoader.active = false; diff --git a/.config/quickshell/ii/modules/overview/Overview.qml b/.config/quickshell/ii/modules/overview/Overview.qml index b11d35646..50a4f57be 100644 --- a/.config/quickshell/ii/modules/overview/Overview.qml +++ b/.config/quickshell/ii/modules/overview/Overview.qml @@ -148,7 +148,7 @@ Scope { GlobalShortcut { name: "overviewToggle" - description: Translation.tr("Toggles overview on press") + description: "Toggles overview on press" onPressed: { GlobalStates.overviewOpen = !GlobalStates.overviewOpen @@ -156,7 +156,7 @@ Scope { } GlobalShortcut { name: "overviewClose" - description: Translation.tr("Closes overview") + description: "Closes overview" onPressed: { GlobalStates.overviewOpen = false @@ -164,7 +164,7 @@ Scope { } GlobalShortcut { name: "overviewToggleRelease" - description: Translation.tr("Toggles overview on release") + description: "Toggles overview on release" onPressed: { GlobalStates.superReleaseMightTrigger = true @@ -180,9 +180,9 @@ Scope { } GlobalShortcut { name: "overviewToggleReleaseInterrupt" - description: Translation.tr("Interrupts possibility of overview being toggled on release. ") + - Translation.tr("This is necessary because GlobalShortcut.onReleased in quickshell triggers whether or not you press something else while holding the key. ") + - Translation.tr("To make sure this works consistently, use binditn = MODKEYS, catchall in an automatically triggered submap that includes everything.") + description: "Interrupts possibility of overview being toggled on release. " + + "This is necessary because GlobalShortcut.onReleased in quickshell triggers whether or not you press something else while holding the key. " + + "To make sure this works consistently, use binditn = MODKEYS, catchall in an automatically triggered submap that includes everything." onPressed: { GlobalStates.superReleaseMightTrigger = false @@ -190,7 +190,7 @@ Scope { } GlobalShortcut { name: "overviewClipboardToggle" - description: Translation.tr("Toggle clipboard query on overview widget") + description: "Toggle clipboard query on overview widget" onPressed: { if (GlobalStates.overviewOpen && overviewScope.dontAutoCancelSearch) { @@ -213,7 +213,7 @@ Scope { GlobalShortcut { name: "overviewEmojiToggle" - description: Translation.tr("Toggle emoji query on overview widget") + description: "Toggle emoji query on overview widget" onPressed: { if (GlobalStates.overviewOpen && overviewScope.dontAutoCancelSearch) { diff --git a/.config/quickshell/ii/modules/session/Session.qml b/.config/quickshell/ii/modules/session/Session.qml index b1ce1e426..b6f030f9a 100644 --- a/.config/quickshell/ii/modules/session/Session.qml +++ b/.config/quickshell/ii/modules/session/Session.qml @@ -210,7 +210,7 @@ Scope { GlobalShortcut { name: "sessionToggle" - description: Translation.tr("Toggles session screen on press") + description: "Toggles session screen on press" onPressed: { sessionLoader.active = !sessionLoader.active; @@ -219,7 +219,7 @@ Scope { GlobalShortcut { name: "sessionOpen" - description: Translation.tr("Opens session screen on press") + description: "Opens session screen on press" onPressed: { sessionLoader.active = true; diff --git a/.config/quickshell/ii/modules/sidebarLeft/SidebarLeft.qml b/.config/quickshell/ii/modules/sidebarLeft/SidebarLeft.qml index 751287f1e..0bc00c24b 100644 --- a/.config/quickshell/ii/modules/sidebarLeft/SidebarLeft.qml +++ b/.config/quickshell/ii/modules/sidebarLeft/SidebarLeft.qml @@ -170,7 +170,7 @@ Scope { // Scope GlobalShortcut { name: "sidebarLeftToggle" - description: Translation.tr("Toggles left sidebar on press") + description: "Toggles left sidebar on press" onPressed: { GlobalStates.sidebarLeftOpen = !GlobalStates.sidebarLeftOpen; @@ -179,7 +179,7 @@ Scope { // Scope GlobalShortcut { name: "sidebarLeftOpen" - description: Translation.tr("Opens left sidebar on press") + description: "Opens left sidebar on press" onPressed: { GlobalStates.sidebarLeftOpen = true; @@ -188,7 +188,7 @@ Scope { // Scope GlobalShortcut { name: "sidebarLeftClose" - description: Translation.tr("Closes left sidebar on press") + description: "Closes left sidebar on press" onPressed: { GlobalStates.sidebarLeftOpen = false; @@ -197,7 +197,7 @@ Scope { // Scope GlobalShortcut { name: "sidebarLeftToggleDetach" - description: Translation.tr("Detach left sidebar into a window/Attach it back") + description: "Detach left sidebar into a window/Attach it back" onPressed: { root.detach = !root.detach; diff --git a/.config/quickshell/ii/modules/sidebarRight/SidebarRight.qml b/.config/quickshell/ii/modules/sidebarRight/SidebarRight.qml index 9c9af649a..d733ae447 100644 --- a/.config/quickshell/ii/modules/sidebarRight/SidebarRight.qml +++ b/.config/quickshell/ii/modules/sidebarRight/SidebarRight.qml @@ -224,7 +224,7 @@ Scope { GlobalShortcut { name: "sidebarRightToggle" - description: Translation.tr("Toggles right sidebar on press") + description: "Toggles right sidebar on press" onPressed: { GlobalStates.sidebarRightOpen = !GlobalStates.sidebarRightOpen; @@ -233,7 +233,7 @@ Scope { } GlobalShortcut { name: "sidebarRightOpen" - description: Translation.tr("Opens right sidebar on press") + description: "Opens right sidebar on press" onPressed: { GlobalStates.sidebarRightOpen = true; @@ -242,7 +242,7 @@ Scope { } GlobalShortcut { name: "sidebarRightClose" - description: Translation.tr("Closes right sidebar on press") + description: "Closes right sidebar on press" onPressed: { GlobalStates.sidebarRightOpen = false; diff --git a/.config/quickshell/ii/modules/sidebarRight/quickToggles/CloudflareWarp.qml b/.config/quickshell/ii/modules/sidebarRight/quickToggles/CloudflareWarp.qml index d9cf0fa6a..eaa0c79ff 100644 --- a/.config/quickshell/ii/modules/sidebarRight/quickToggles/CloudflareWarp.qml +++ b/.config/quickshell/ii/modules/sidebarRight/quickToggles/CloudflareWarp.qml @@ -1,6 +1,6 @@ import "root:/modules/common" import "root:/modules/common/widgets" -import "../" +import "root:/" import QtQuick import Quickshell.Io import Quickshell diff --git a/.config/quickshell/ii/services/Brightness.qml b/.config/quickshell/ii/services/Brightness.qml index 129da7b23..6a36f7130 100644 --- a/.config/quickshell/ii/services/Brightness.qml +++ b/.config/quickshell/ii/services/Brightness.qml @@ -141,13 +141,13 @@ Singleton { GlobalShortcut { name: "brightnessIncrease" - description: Translation.tr("Increase brightness") + description: "Increase brightness" onPressed: root.increaseBrightness() } GlobalShortcut { name: "brightnessDecrease" - description: Translation.tr("Decrease brightness") + description: "Decrease brightness" onPressed: root.decreaseBrightness() } }