Skip to content

Commit 2544f04

Browse files
authored
Merge branch 'end-4:main' into main
2 parents 8fcf722 + 1ad99b4 commit 2544f04

File tree

268 files changed

+1582
-1223
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

268 files changed

+1582
-1223
lines changed

.github/ISSUE_TEMPLATE/1-issue.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ body:
1818
required: false # Not required cuz user may have failed to do so
1919
- label: I've ticked the checkboxes without reading their contents
2020
required: false # Obviously
21-
21+
# TODO: Use GitHub Action to auto add folding tag if the log contains more than 15 lines, instead of tell user to "paste here" cuz many users actually does not know its meaning (It's also not convenient anyway).
2222
- type: textarea
2323
attributes:
2424
label: "Step 2. Quick diagnose info"

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@ __pycache__/
66
dots/.config/quickshell/ii/.qmlls.ini
77
.update-lock
88
/os-release
9+
#emacs backup
10+
*~
File renamed without changes.

dots/.config/hypr/hyprland/execs.conf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,5 @@ exec-once = wl-paste --type image --watch bash -c 'cliphist store && qs -c $qsCo
2424
exec-once = hyprctl setcursor Bibata-Modern-Ice 24
2525

2626
# Fix dock pinned apps not launching properly (https://github.com/end-4/dots-hyprland/issues/2200)
27-
exec-once = sleep 3.5 && hyprctl reload && sleep 0.5 && touch ~/.config/quickshell/ii/shell.qml
27+
# This causes https://github.com/end-4/dots-hyprland/issues/2427
28+
# exec-once = sleep 3.5 && hyprctl reload && sleep 0.5 && touch ~/.config/quickshell/ii/shell.qml

dots/.config/quickshell/ii/modules/common/Config.qml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,11 @@ Singleton {
7676

7777
JsonAdapter {
7878
id: configOptionsJsonAdapter
79+
80+
property list<string> enabledPanels: [
81+
"iiBar", "iiBackground", "iiCheatsheet", "iiDock", "iiLock", "iiMediaControls", "iiNotificationPopup", "iiOnScreenDisplay", "iiOnScreenKeyboard", "iiOverlay", "iiOverview", "iiPolkit", "iiRegionSelector", "iiReloadPopup", "iiScreenCorners", "iiSessionScreen", "iiSidebarLeft", "iiSidebarRight", "iiVerticalBar", "iiWallpaperSelector"
82+
]
83+
7984
property JsonObject policies: JsonObject {
8085
property int ai: 1 // 0: No | 1: Yes | 2: Local
8186
property int weeb: 1 // 0: No | 1: Open | 2: Closet
@@ -148,6 +153,7 @@ Singleton {
148153
property JsonObject widgets: JsonObject {
149154
property JsonObject clock: JsonObject {
150155
property bool enable: true
156+
property bool showOnlyWhenLocked: false
151157
property string placementStrategy: "leastBusy" // "free", "leastBusy", "mostBusy"
152158
property real x: 100
153159
property real y: 100
@@ -274,7 +280,7 @@ Singleton {
274280
// 10:  | 11:  | 12:  | 13:  | 14: 󱄛
275281
property string superKey: ""
276282
property bool useMacSymbol: false
277-
property bool splitButtons: true
283+
property bool splitButtons: false
278284
property bool useMouseSymbol: false
279285
property bool useFnSymbol: false
280286
property JsonObject fontSize: JsonObject {
@@ -380,7 +386,11 @@ Singleton {
380386
property JsonObject overlay: JsonObject {
381387
property bool openingZoomAnimation: true
382388
property bool darkenScreen: true
383-
property real clickthroughOpacity: 0.7
389+
property real clickthroughOpacity: 0.8
390+
property JsonObject floatingImage: JsonObject {
391+
property string imageSource: "https://cdn.discordapp.com/attachments/961693710968557598/1369635662390759434/image.gif?ex=6911cb1c&is=6910799c&hm=4450244066c0a7a6e5d2bdd195f47388eb5e7f9dd53d3931e99ad9642c638a00&"
392+
property real scale: 0.5
393+
}
384394
}
385395

386396
property JsonObject overview: JsonObject {

dots/.config/quickshell/ii/modules/common/Directories.qml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ Singleton {
2424
property string scriptPath: Quickshell.shellPath("scripts")
2525
property string favicons: FileUtils.trimFileProtocol(`${Directories.cache}/media/favicons`)
2626
property string coverArt: FileUtils.trimFileProtocol(`${Directories.cache}/media/coverart`)
27+
property string tempImages: "/tmp/quickshell/media/images"
2728
property string booruPreviews: FileUtils.trimFileProtocol(`${Directories.cache}/media/boorus`)
2829
property string booruDownloads: FileUtils.trimFileProtocol(Directories.pictures + "/homework")
2930
property string booruDownloadsNsfw: FileUtils.trimFileProtocol(Directories.pictures + "/homework/🌶️")
@@ -52,5 +53,6 @@ Singleton {
5253
Quickshell.execDetached(["bash", "-c", `rm -rf '${latexOutput}'; mkdir -p '${latexOutput}'`])
5354
Quickshell.execDetached(["bash", "-c", `rm -rf '${cliphistDecode}'; mkdir -p '${cliphistDecode}'`])
5455
Quickshell.execDetached(["mkdir", "-p", `${aiChats}`])
56+
Quickshell.execDetached(["rm", "-rf", `${tempImages}`])
5557
}
5658
}

dots/.config/quickshell/ii/modules/common/Persistent.qml

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,22 @@ Singleton {
8989
property real width: 250
9090
property real height: 100
9191
}
92+
property JsonObject floatingImage: JsonObject {
93+
property bool pinned: false
94+
property bool clickthrough: false
95+
property real x: 1650
96+
property real y: 390
97+
property real width: 0
98+
property real height: 0
99+
}
100+
property JsonObject fpsLimiter: JsonObject {
101+
property bool pinned: false
102+
property bool clickthrough: false
103+
property real x: 1570
104+
property real y: 615
105+
property real width: 280
106+
property real height: 80
107+
}
92108
property JsonObject recorder: JsonObject {
93109
property bool pinned: false
94110
property bool clickthrough: false
@@ -115,14 +131,6 @@ Singleton {
115131
property real height: 600
116132
property int tabIndex: 0
117133
}
118-
property JsonObject fpsLimiter: JsonObject {
119-
property bool pinned: false
120-
property bool clickthrough: false
121-
property real x: 1576
122-
property real y: 630
123-
property real width: 280
124-
property real height: 80
125-
}
126134
}
127135

128136
property JsonObject timer: JsonObject {
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
import QtQuick
2+
import Quickshell
3+
import Quickshell.Io
4+
import qs.modules.common
5+
import qs.modules.common.functions
6+
7+
Process {
8+
id: root
9+
10+
signal done(string path, int width, int height);
11+
required property string filePath;
12+
required property string sourceUrl;
13+
property string downloadUserAgent: Config.options?.networking.userAgent ?? ""
14+
15+
function processFilePath() {
16+
return StringUtils.shellSingleQuoteEscape(FileUtils.trimFileProtocol(filePath));
17+
}
18+
19+
running: true
20+
command: ["bash", "-c",
21+
`mkdir -p $(dirname '${processFilePath(filePath)}'); [ -f '${processFilePath(filePath)}' ] || curl -sSL '${sourceUrl}' -o '${processFilePath(filePath)}' && magick identify -format '%w %h' '${processFilePath(filePath)}'[0]`
22+
]
23+
stdout: StdioCollector {
24+
id: imageSizeOutputCollector
25+
onStreamFinished: {
26+
const output = imageSizeOutputCollector.text.trim();
27+
const [width, height] = output.split(" ").map(Number);
28+
root.done(root.filePath, width, height);
29+
}
30+
}
31+
}

dots/.config/quickshell/ii/modules/background/Background.qml renamed to dots/.config/quickshell/ii/modules/ii/background/Background.qml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import Quickshell.Io
1414
import Quickshell.Wayland
1515
import Quickshell.Hyprland
1616

17-
import qs.modules.background.widgets
18-
import qs.modules.background.widgets.clock
19-
import qs.modules.background.widgets.weather
17+
import qs.modules.ii.background.widgets
18+
import qs.modules.ii.background.widgets.clock
19+
import qs.modules.ii.background.widgets.weather
2020

2121
Variants {
2222
id: root

0 commit comments

Comments
 (0)