zach/z-bar-qt
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Cli tool #9

Merged
Zacharias-Brohn merged 33 commits from cli-tool into main 2026-02-22 21:43:51 +01:00
Conversation 2 Commits 33 Files Changed 100
+39 -26
6 changed files with 39 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b701badbc7 - Show all commits
Config/Config.qml
+5 -2
View File
@@ -122,8 +122,11 @@ Singleton {
return { return {
logo: general.logo, logo: general.logo,
wallpaperPath: general.wallpaperPath, wallpaperPath: general.wallpaperPath,
wallust: general.wallust, color: {
schemeGeneration: general.schemeGeneration, wallust: general.color.wallust,
mode: general.color.mode,
schemeGeneration: general.color.schemeGeneration,
},
apps: { apps: {
terminal: general.apps.terminal, terminal: general.apps.terminal,
audio: general.apps.audio, audio: general.apps.audio,
Config/General.qml
+7 -2
View File
@@ -4,11 +4,16 @@ import Quickshell
JsonObject { JsonObject {
property string logo: "" property string logo: ""
property string wallpaperPath: Quickshell.env("HOME") + "/Pictures/Wallpapers" property string wallpaperPath: Quickshell.env("HOME") + "/Pictures/Wallpapers"
property bool wallust: false property Color color: Color {}
property bool schemeGeneration: true
property Apps apps: Apps {} property Apps apps: Apps {}
property Idle idle: Idle {} property Idle idle: Idle {}
component Color: JsonObject {
property bool wallust: false
property bool schemeGeneration: true
property string mode: "dark"
}
component Apps: JsonObject { component Apps: JsonObject {
property list<string> terminal: ["kitty"] property list<string> terminal: ["kitty"]
property list<string> audio: ["pavucontrol"] property list<string> audio: ["pavucontrol"]
Helpers/Wallpapers.qml
+2 -2
View File
@@ -27,14 +27,14 @@ Searcher {
function preview(path: string): void { function preview(path: string): void {
previewPath = path; previewPath = path;
if ( Config.general.schemeGeneration ) if ( Config.general.schemeGeneration )
Quickshell.execDetached(["sh", "-c", `zshell-cli scheme generate --image-path=${previewPath} --thumbnail-path=${Paths.cache}/imagecache/thumbnail.jpg --output=${Paths.state}/scheme.json --scheme=${Config.colors.schemeType}`]); Quickshell.execDetached(["sh", "-c", `zshell-cli scheme generate --image-path ${previewPath} --thumbnail-path ${Paths.cache}/imagecache/thumbnail.jpg --output ${Paths.state}/scheme.json --scheme ${Config.colors.schemeType} --mode ${Config.general.color.mode}`]);
showPreview = true; showPreview = true;
} }
function stopPreview(): void { function stopPreview(): void {
showPreview = false; showPreview = false;
if ( Config.general.schemeGeneration ) if ( Config.general.schemeGeneration )
Quickshell.execDetached(["sh", "-c", `zshell-cli scheme generate --image-path=${root.actualCurrent} --thumbnail-path=${Paths.cache}/imagecache/thumbnail.jpg --output=${Paths.state}/scheme.json --scheme=${Config.colors.schemeType}`]); Quickshell.execDetached(["sh", "-c", `zshell-cli scheme generate --image-path ${root.actualCurrent} --thumbnail-path ${Paths.cache}/imagecache/thumbnail.jpg --output ${Paths.state}/scheme.json --scheme ${Config.colors.schemeType} --mode ${Config.general.color.mode}`]);
} }
list: wallpapers.entries list: wallpapers.entries
Modules/TrayItem.qml
+25 -15
View File
@@ -39,21 +39,31 @@ Item {
} }
} }
Image { ColoredIcon {
id: icon id: icon
property bool batteryHDPI: root.bar.screen.x < 0 && root.item.icon.includes("battery") anchors.centerIn: parent
property bool nmHDPI: root.bar.screen.x < 0 && root.item.icon.includes("nm-") source: root.item.icon
implicitSize: 22
color: DynamicColors.palette.m3onSurface
layer.enabled: DynamicColors.light
}
anchors.centerIn: parent // Image {
width: batteryHDPI ? 26 : ( nmHDPI ? 25 : 22 ) // id: icon
height: batteryHDPI ? 26 : ( nmHDPI ? 25 : 22 ) //
source: root.item.icon // property bool batteryHDPI: root.bar.screen.x < 0 && root.item.icon.includes("battery")
mipmap: true // property bool nmHDPI: root.bar.screen.x < 0 && root.item.icon.includes("nm-")
smooth: ( batteryHDPI || nmHDPI ) ? false : true //
asynchronous: true // anchors.centerIn: parent
sourceSize.width: ( batteryHDPI || nmHDPI ) ? 16 : 22 // width: batteryHDPI ? 26 : ( nmHDPI ? 25 : 22 )
sourceSize.height: ( batteryHDPI || nmHDPI ) ? 16 : 22 // height: batteryHDPI ? 26 : ( nmHDPI ? 25 : 22 )
fillMode: Image.PreserveAspectFit // source: root.item.icon
} // mipmap: true
// smooth: ( batteryHDPI || nmHDPI ) ? false : true
// asynchronous: true
// sourceSize.width: ( batteryHDPI || nmHDPI ) ? 16 : 22
// sourceSize.height: ( batteryHDPI || nmHDPI ) ? 16 : 22
// fillMode: Image.PreserveAspectFit
// }
} }
cli/src/zshell/subcommands/__pycache__/scheme.cpython-313.pyc
BIN
View File
Binary file not shown.
cli/src/zshell/subcommands/scheme.py
-5
View File
@@ -92,11 +92,6 @@ def generate(
is_dark = mode.lower() == "dark" is_dark = mode.lower() == "dark"
if is_dark:
seed = Hct.from_hct(seed.hue, seed.chroma, min(seed.tone, 20))
else:
seed = Hct.from_hct(seed.hue, seed.chroma, max(seed.tone, 70))
scheme = Scheme( scheme = Scheme(
seed, seed,
is_dark, is_dark,