mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-01-30 00:12:50 -05:00
Compare commits
48 Commits
v1.2.3
...
13dededcc9
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
13dededcc9 | ||
|
|
3bed2d9feb | ||
|
|
7241877995 | ||
|
|
340d79000c | ||
|
|
162ec909da | ||
|
|
53f5240d41 | ||
|
|
27f0df07af | ||
|
|
ad940b5884 | ||
|
|
ec8ab47462 | ||
|
|
35cbfeb008 | ||
|
|
7036362b9b | ||
|
|
2bcb33e85c | ||
|
|
76ac036f85 | ||
|
|
581073394a | ||
|
|
d7b7086b21 | ||
|
|
59be179821 | ||
|
|
1cf2f6b946 | ||
|
|
a57a9c2121 | ||
|
|
67568c3746 | ||
|
|
afce792b80 | ||
|
|
f5c7493dbb | ||
|
|
f9b9d98638 | ||
|
|
2a97e03fa6 | ||
|
|
d6dacc2975 | ||
|
|
aab4b6765d | ||
|
|
3539aca1f7 | ||
|
|
81fbe9eaba | ||
|
|
f9dc6de485 | ||
|
|
012022d370 | ||
|
|
993216e157 | ||
|
|
c992f2b582 | ||
|
|
3243adebca | ||
|
|
baccef57d4 | ||
|
|
a823095372 | ||
|
|
172a743de4 | ||
|
|
623eec3689 | ||
|
|
53a033fe35 | ||
|
|
c490ee24f4 | ||
|
|
cc1e49294e | ||
|
|
e6fa46ae26 | ||
|
|
35fe774a1b | ||
|
|
1e6a0f9423 | ||
|
|
cc1877aadb | ||
|
|
f1eb1fa9ba | ||
|
|
bdd01e335d | ||
|
|
4b7baf82cd | ||
|
|
15c88ce1d2 | ||
|
|
8891c388d0 |
78
.github/workflows/run-obs.yml
vendored
78
.github/workflows/run-obs.yml
vendored
@@ -4,13 +4,14 @@ on:
|
|||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
inputs:
|
inputs:
|
||||||
package:
|
package:
|
||||||
description: "Package to update (dms, dms-git, or all)"
|
description: "Package to update"
|
||||||
required: false
|
required: true
|
||||||
default: "all"
|
type: choice
|
||||||
tag_version:
|
options:
|
||||||
description: "Specific tag version for dms stable (e.g., v1.0.2). Leave empty to auto-detect latest release."
|
- dms
|
||||||
required: false
|
- dms-git
|
||||||
default: ""
|
- all
|
||||||
|
default: "dms"
|
||||||
rebuild_release:
|
rebuild_release:
|
||||||
description: "Release number for rebuilds (e.g., 2, 3, 4 to increment spec Release)"
|
description: "Release number for rebuilds (e.g., 2, 3, 4 to increment spec Release)"
|
||||||
required: false
|
required: false
|
||||||
@@ -56,8 +57,9 @@ jobs:
|
|||||||
}
|
}
|
||||||
|
|
||||||
# Helper function to check dms stable tag
|
# Helper function to check dms stable tag
|
||||||
|
# Sets LATEST_TAG variable in parent scope if update needed
|
||||||
check_dms_stable() {
|
check_dms_stable() {
|
||||||
local LATEST_TAG=$(curl -s https://api.github.com/repos/AvengeMedia/DankMaterialShell/releases/latest | grep '"tag_name"' | sed 's/.*"tag_name": "v\?\([^"]*\)".*/\1/' || echo "")
|
LATEST_TAG=$(curl -s https://api.github.com/repos/AvengeMedia/DankMaterialShell/releases/latest | grep '"tag_name"' | sed 's/.*"tag_name": "\([^"]*\)".*/\1/' || echo "")
|
||||||
local OBS_SPEC=$(curl -s -u "$OBS_USERNAME:$OBS_PASSWORD" "https://api.opensuse.org/source/home:AvengeMedia:dms/dms/dms.spec" 2>/dev/null || echo "")
|
local OBS_SPEC=$(curl -s -u "$OBS_USERNAME:$OBS_PASSWORD" "https://api.opensuse.org/source/home:AvengeMedia:dms/dms/dms.spec" 2>/dev/null || echo "")
|
||||||
local OBS_VERSION=$(echo "$OBS_SPEC" | grep "^Version:" | awk '{print $2}' | xargs || echo "")
|
local OBS_VERSION=$(echo "$OBS_SPEC" | grep "^Version:" | awk '{print $2}' | xargs || echo "")
|
||||||
|
|
||||||
@@ -73,8 +75,8 @@ jobs:
|
|||||||
# Main logic
|
# Main logic
|
||||||
REBUILD="${{ github.event.inputs.rebuild_release }}"
|
REBUILD="${{ github.event.inputs.rebuild_release }}"
|
||||||
|
|
||||||
if [[ "${{ github.event_name }}" == "push" && "${{ github.ref }}" =~ ^refs/tags/ ]]; then
|
if [[ "${{ github.ref }}" =~ ^refs/tags/ ]]; then
|
||||||
# Tag push - always update stable package
|
# Tag selected or pushed - always update stable package
|
||||||
echo "packages=dms" >> $GITHUB_OUTPUT
|
echo "packages=dms" >> $GITHUB_OUTPUT
|
||||||
VERSION="${GITHUB_REF#refs/tags/}"
|
VERSION="${GITHUB_REF#refs/tags/}"
|
||||||
echo "version=$VERSION" >> $GITHUB_OUTPUT
|
echo "version=$VERSION" >> $GITHUB_OUTPUT
|
||||||
@@ -104,7 +106,12 @@ jobs:
|
|||||||
# Check each package and build list of those needing updates
|
# Check each package and build list of those needing updates
|
||||||
PACKAGES_TO_UPDATE=()
|
PACKAGES_TO_UPDATE=()
|
||||||
check_dms_git && PACKAGES_TO_UPDATE+=("dms-git")
|
check_dms_git && PACKAGES_TO_UPDATE+=("dms-git")
|
||||||
check_dms_stable && PACKAGES_TO_UPDATE+=("dms")
|
if check_dms_stable; then
|
||||||
|
PACKAGES_TO_UPDATE+=("dms")
|
||||||
|
if [[ -n "$LATEST_TAG" ]]; then
|
||||||
|
echo "version=$LATEST_TAG" >> $GITHUB_OUTPUT
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
if [[ ${#PACKAGES_TO_UPDATE[@]} -gt 0 ]]; then
|
if [[ ${#PACKAGES_TO_UPDATE[@]} -gt 0 ]]; then
|
||||||
echo "packages=${PACKAGES_TO_UPDATE[*]}" >> $GITHUB_OUTPUT
|
echo "packages=${PACKAGES_TO_UPDATE[*]}" >> $GITHUB_OUTPUT
|
||||||
@@ -129,6 +136,9 @@ jobs:
|
|||||||
if check_dms_stable; then
|
if check_dms_stable; then
|
||||||
echo "packages=$PKG" >> $GITHUB_OUTPUT
|
echo "packages=$PKG" >> $GITHUB_OUTPUT
|
||||||
echo "has_updates=true" >> $GITHUB_OUTPUT
|
echo "has_updates=true" >> $GITHUB_OUTPUT
|
||||||
|
if [[ -n "$LATEST_TAG" ]]; then
|
||||||
|
echo "version=$LATEST_TAG" >> $GITHUB_OUTPUT
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
echo "packages=" >> $GITHUB_OUTPUT
|
echo "packages=" >> $GITHUB_OUTPUT
|
||||||
echo "has_updates=false" >> $GITHUB_OUTPUT
|
echo "has_updates=false" >> $GITHUB_OUTPUT
|
||||||
@@ -161,12 +171,19 @@ jobs:
|
|||||||
- name: Determine packages to update
|
- name: Determine packages to update
|
||||||
id: packages
|
id: packages
|
||||||
run: |
|
run: |
|
||||||
if [[ "${{ github.event_name }}" == "push" && "${{ github.ref }}" =~ ^refs/tags/ ]]; then
|
# Check if GITHUB_REF points to a tag (works for both push events and workflow_dispatch with tag selected)
|
||||||
# Tag push event - use the pushed tag
|
if [[ "${{ github.ref }}" =~ ^refs/tags/ ]]; then
|
||||||
|
# Tag selected or pushed - use the tag from GITHUB_REF
|
||||||
echo "packages=dms" >> $GITHUB_OUTPUT
|
echo "packages=dms" >> $GITHUB_OUTPUT
|
||||||
VERSION="${GITHUB_REF#refs/tags/}"
|
VERSION="${GITHUB_REF#refs/tags/}"
|
||||||
echo "version=$VERSION" >> $GITHUB_OUTPUT
|
echo "version=$VERSION" >> $GITHUB_OUTPUT
|
||||||
echo "Triggered by tag: $VERSION"
|
echo "Using tag from GITHUB_REF: $VERSION"
|
||||||
|
# Check if check-updates already determined a version (from auto-detection)
|
||||||
|
elif [[ -n "${{ needs.check-updates.outputs.version }}" ]]; then
|
||||||
|
# Use version from check-updates job
|
||||||
|
echo "packages=${{ needs.check-updates.outputs.packages }}" >> $GITHUB_OUTPUT
|
||||||
|
echo "version=${{ needs.check-updates.outputs.version }}" >> $GITHUB_OUTPUT
|
||||||
|
echo "Using version from check-updates: ${{ needs.check-updates.outputs.version }}"
|
||||||
elif [[ "${{ github.event_name }}" == "schedule" ]]; then
|
elif [[ "${{ github.event_name }}" == "schedule" ]]; then
|
||||||
# Scheduled run - dms-git only
|
# Scheduled run - dms-git only
|
||||||
echo "packages=${{ needs.check-updates.outputs.packages }}" >> $GITHUB_OUTPUT
|
echo "packages=${{ needs.check-updates.outputs.packages }}" >> $GITHUB_OUTPUT
|
||||||
@@ -176,22 +193,28 @@ jobs:
|
|||||||
|
|
||||||
# Determine version for dms stable
|
# Determine version for dms stable
|
||||||
if [[ "${{ github.event.inputs.package }}" == "dms" ]]; then
|
if [[ "${{ github.event.inputs.package }}" == "dms" ]]; then
|
||||||
# For explicit dms selection, require tag_version
|
# Use github.ref if tag selected, otherwise auto-detect latest
|
||||||
if [[ -n "${{ github.event.inputs.tag_version }}" ]]; then
|
if [[ "${{ github.ref }}" =~ ^refs/tags/ ]]; then
|
||||||
VERSION="${{ github.event.inputs.tag_version }}"
|
VERSION="${GITHUB_REF#refs/tags/}"
|
||||||
echo "version=$VERSION" >> $GITHUB_OUTPUT
|
echo "version=$VERSION" >> $GITHUB_OUTPUT
|
||||||
echo "Using specified tag: $VERSION"
|
echo "Using tag from GITHUB_REF: $VERSION"
|
||||||
else
|
else
|
||||||
echo "ERROR: tag_version is required when package=dms"
|
# Auto-detect latest release for dms
|
||||||
echo "Please specify a tag version (e.g., v1.0.2) or use package=all for auto-detection"
|
LATEST_TAG=$(curl -s https://api.github.com/repos/AvengeMedia/DankMaterialShell/releases/latest | grep '"tag_name"' | sed 's/.*"tag_name": "\([^"]*\)".*/\1/' || echo "")
|
||||||
exit 1
|
if [[ -n "$LATEST_TAG" ]]; then
|
||||||
|
echo "version=$LATEST_TAG" >> $GITHUB_OUTPUT
|
||||||
|
echo "Auto-detected latest release: $LATEST_TAG"
|
||||||
|
else
|
||||||
|
echo "ERROR: Could not auto-detect latest release"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
elif [[ "${{ github.event.inputs.package }}" == "all" ]]; then
|
elif [[ "${{ github.event.inputs.package }}" == "all" ]]; then
|
||||||
# For "all", auto-detect if tag_version not specified
|
# Use github.ref if tag selected, otherwise auto-detect latest
|
||||||
if [[ -n "${{ github.event.inputs.tag_version }}" ]]; then
|
if [[ "${{ github.ref }}" =~ ^refs/tags/ ]]; then
|
||||||
VERSION="${{ github.event.inputs.tag_version }}"
|
VERSION="${GITHUB_REF#refs/tags/}"
|
||||||
echo "version=$VERSION" >> $GITHUB_OUTPUT
|
echo "version=$VERSION" >> $GITHUB_OUTPUT
|
||||||
echo "Using specified tag: $VERSION"
|
echo "Using tag from GITHUB_REF: $VERSION"
|
||||||
else
|
else
|
||||||
# Auto-detect latest release for "all"
|
# Auto-detect latest release for "all"
|
||||||
LATEST_TAG=$(curl -s https://api.github.com/repos/AvengeMedia/DankMaterialShell/releases/latest | grep '"tag_name"' | sed 's/.*"tag_name": "\([^"]*\)".*/\1/' || echo "")
|
LATEST_TAG=$(curl -s https://api.github.com/repos/AvengeMedia/DankMaterialShell/releases/latest | grep '"tag_name"' | sed 's/.*"tag_name": "\([^"]*\)".*/\1/' || echo "")
|
||||||
@@ -206,7 +229,7 @@ jobs:
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Use filtered packages from check-updates when package="all" and no rebuild/tag specified
|
# Use filtered packages from check-updates when package="all" and no rebuild/tag specified
|
||||||
if [[ "${{ github.event.inputs.package }}" == "all" ]] && [[ -z "${{ github.event.inputs.rebuild_release }}" ]] && [[ -z "${{ github.event.inputs.tag_version }}" ]]; then
|
if [[ "${{ github.event.inputs.package }}" == "all" ]] && [[ -z "${{ github.event.inputs.rebuild_release }}" ]] && [[ ! "${{ github.ref }}" =~ ^refs/tags/ ]]; then
|
||||||
echo "packages=${{ needs.check-updates.outputs.packages }}" >> $GITHUB_OUTPUT
|
echo "packages=${{ needs.check-updates.outputs.packages }}" >> $GITHUB_OUTPUT
|
||||||
echo "Manual trigger: all (filtered to: ${{ needs.check-updates.outputs.packages }})"
|
echo "Manual trigger: all (filtered to: ${{ needs.check-updates.outputs.packages }})"
|
||||||
else
|
else
|
||||||
@@ -215,6 +238,9 @@ jobs:
|
|||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
echo "packages=${{ needs.check-updates.outputs.packages }}" >> $GITHUB_OUTPUT
|
echo "packages=${{ needs.check-updates.outputs.packages }}" >> $GITHUB_OUTPUT
|
||||||
|
if [[ -n "${{ needs.check-updates.outputs.version }}" ]]; then
|
||||||
|
echo "version=${{ needs.check-updates.outputs.version }}" >> $GITHUB_OUTPUT
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Update dms-git spec version
|
- name: Update dms-git spec version
|
||||||
|
|||||||
1
Makefile
1
Makefile
@@ -43,7 +43,6 @@ install-shell:
|
|||||||
@mkdir -p $(SHELL_INSTALL_DIR)
|
@mkdir -p $(SHELL_INSTALL_DIR)
|
||||||
@cp -r $(SHELL_DIR)/* $(SHELL_INSTALL_DIR)/
|
@cp -r $(SHELL_DIR)/* $(SHELL_INSTALL_DIR)/
|
||||||
@rm -rf $(SHELL_INSTALL_DIR)/.git* $(SHELL_INSTALL_DIR)/.github
|
@rm -rf $(SHELL_INSTALL_DIR)/.git* $(SHELL_INSTALL_DIR)/.github
|
||||||
@$(MAKE) --no-print-directory -C $(CORE_DIR) print-version > $(SHELL_INSTALL_DIR)/VERSION
|
|
||||||
@echo "Shell files installed"
|
@echo "Shell files installed"
|
||||||
|
|
||||||
install-completions:
|
install-completions:
|
||||||
|
|||||||
@@ -511,6 +511,8 @@ func getCommonCommands() []*cobra.Command {
|
|||||||
colorCmd,
|
colorCmd,
|
||||||
screenshotCmd,
|
screenshotCmd,
|
||||||
notifyActionCmd,
|
notifyActionCmd,
|
||||||
|
notifyCmd,
|
||||||
|
genericNotifyActionCmd,
|
||||||
matugenCmd,
|
matugenCmd,
|
||||||
clipboardCmd,
|
clipboardCmd,
|
||||||
doctorCmd,
|
doctorCmd,
|
||||||
|
|||||||
68
core/cmd/dms/commands_notify.go
Normal file
68
core/cmd/dms/commands_notify.go
Normal file
@@ -0,0 +1,68 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
|
||||||
|
"github.com/AvengeMedia/DankMaterialShell/core/internal/notify"
|
||||||
|
"github.com/spf13/cobra"
|
||||||
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
notifyAppName string
|
||||||
|
notifyIcon string
|
||||||
|
notifyFile string
|
||||||
|
notifyTimeout int
|
||||||
|
)
|
||||||
|
|
||||||
|
var notifyCmd = &cobra.Command{
|
||||||
|
Use: "notify <summary> [body]",
|
||||||
|
Short: "Send a desktop notification",
|
||||||
|
Long: `Send a desktop notification with optional actions.
|
||||||
|
|
||||||
|
If --file is provided, the notification will have "Open" and "Open Folder" actions.
|
||||||
|
|
||||||
|
Examples:
|
||||||
|
dms notify "Hello" "World"
|
||||||
|
dms notify "File received" "photo.jpg" --file ~/Downloads/photo.jpg --icon smartphone
|
||||||
|
dms notify "Download complete" --file ~/Downloads/file.zip --app "My App"`,
|
||||||
|
Args: cobra.MinimumNArgs(1),
|
||||||
|
Run: runNotify,
|
||||||
|
}
|
||||||
|
|
||||||
|
var genericNotifyActionCmd = &cobra.Command{
|
||||||
|
Use: "notify-action-generic",
|
||||||
|
Hidden: true,
|
||||||
|
Run: func(cmd *cobra.Command, args []string) {
|
||||||
|
notify.RunActionListener(args)
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
notifyCmd.Flags().StringVar(¬ifyAppName, "app", "DMS", "Application name")
|
||||||
|
notifyCmd.Flags().StringVar(¬ifyIcon, "icon", "", "Icon name or path")
|
||||||
|
notifyCmd.Flags().StringVar(¬ifyFile, "file", "", "File path (enables Open/Open Folder actions)")
|
||||||
|
notifyCmd.Flags().IntVar(¬ifyTimeout, "timeout", 5000, "Timeout in milliseconds")
|
||||||
|
}
|
||||||
|
|
||||||
|
func runNotify(cmd *cobra.Command, args []string) {
|
||||||
|
summary := args[0]
|
||||||
|
body := ""
|
||||||
|
if len(args) > 1 {
|
||||||
|
body = args[1]
|
||||||
|
}
|
||||||
|
|
||||||
|
n := notify.Notification{
|
||||||
|
AppName: notifyAppName,
|
||||||
|
Icon: notifyIcon,
|
||||||
|
Summary: summary,
|
||||||
|
Body: body,
|
||||||
|
FilePath: notifyFile,
|
||||||
|
Timeout: int32(notifyTimeout),
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := notify.Send(n); err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, "Error: %v\n", err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
}
|
||||||
20
core/go.mod
20
core/go.mod
@@ -16,21 +16,21 @@ require (
|
|||||||
github.com/spf13/cobra v1.10.2
|
github.com/spf13/cobra v1.10.2
|
||||||
github.com/stretchr/testify v1.11.1
|
github.com/stretchr/testify v1.11.1
|
||||||
go.etcd.io/bbolt v1.4.3
|
go.etcd.io/bbolt v1.4.3
|
||||||
golang.org/x/exp v0.0.0-20251219203646-944ab1f22d93
|
golang.org/x/exp v0.0.0-20260112195511-716be5621a96
|
||||||
golang.org/x/image v0.34.0
|
golang.org/x/image v0.35.0
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/Microsoft/go-winio v0.6.2 // indirect
|
github.com/Microsoft/go-winio v0.6.2 // indirect
|
||||||
github.com/ProtonMail/go-crypto v1.3.0 // indirect
|
github.com/ProtonMail/go-crypto v1.3.0 // indirect
|
||||||
github.com/clipperhouse/displaywidth v0.6.2 // indirect
|
github.com/clipperhouse/displaywidth v0.7.0 // indirect
|
||||||
github.com/clipperhouse/stringish v0.1.1 // indirect
|
github.com/clipperhouse/stringish v0.1.1 // indirect
|
||||||
github.com/clipperhouse/uax29/v2 v2.3.0 // indirect
|
github.com/clipperhouse/uax29/v2 v2.3.0 // indirect
|
||||||
github.com/cloudflare/circl v1.6.2 // indirect
|
github.com/cloudflare/circl v1.6.2 // indirect
|
||||||
github.com/cyphar/filepath-securejoin v0.6.1 // indirect
|
github.com/cyphar/filepath-securejoin v0.6.1 // indirect
|
||||||
github.com/emirpasic/gods v1.18.1 // indirect
|
github.com/emirpasic/gods v1.18.1 // indirect
|
||||||
github.com/go-git/gcfg/v2 v2.0.2 // indirect
|
github.com/go-git/gcfg/v2 v2.0.2 // indirect
|
||||||
github.com/go-git/go-billy/v6 v6.0.0-20251217170237-e9738f50a3cd // indirect
|
github.com/go-git/go-billy/v6 v6.0.0-20260114122816-19306b749ecc // indirect
|
||||||
github.com/go-logfmt/logfmt v0.6.1 // indirect
|
github.com/go-logfmt/logfmt v0.6.1 // indirect
|
||||||
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
|
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
|
||||||
github.com/kevinburke/ssh_config v1.4.0 // indirect
|
github.com/kevinburke/ssh_config v1.4.0 // indirect
|
||||||
@@ -38,8 +38,8 @@ require (
|
|||||||
github.com/pjbgf/sha1cd v0.5.0 // indirect
|
github.com/pjbgf/sha1cd v0.5.0 // indirect
|
||||||
github.com/sergi/go-diff v1.4.0 // indirect
|
github.com/sergi/go-diff v1.4.0 // indirect
|
||||||
github.com/stretchr/objx v0.5.3 // indirect
|
github.com/stretchr/objx v0.5.3 // indirect
|
||||||
golang.org/x/crypto v0.46.0 // indirect
|
golang.org/x/crypto v0.47.0 // indirect
|
||||||
golang.org/x/net v0.48.0 // indirect
|
golang.org/x/net v0.49.0 // indirect
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
@@ -47,12 +47,12 @@ require (
|
|||||||
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
|
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
|
||||||
github.com/charmbracelet/colorprofile v0.4.1 // indirect
|
github.com/charmbracelet/colorprofile v0.4.1 // indirect
|
||||||
github.com/charmbracelet/harmonica v0.2.0 // indirect
|
github.com/charmbracelet/harmonica v0.2.0 // indirect
|
||||||
github.com/charmbracelet/x/ansi v0.11.3 // indirect
|
github.com/charmbracelet/x/ansi v0.11.4 // indirect
|
||||||
github.com/charmbracelet/x/cellbuf v0.0.14 // indirect
|
github.com/charmbracelet/x/cellbuf v0.0.14 // indirect
|
||||||
github.com/charmbracelet/x/term v0.2.2 // indirect
|
github.com/charmbracelet/x/term v0.2.2 // indirect
|
||||||
github.com/davecgh/go-spew v1.1.1 // indirect
|
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||||
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
|
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
|
||||||
github.com/go-git/go-git/v6 v6.0.0-20251231065035-29ae690a9f19
|
github.com/go-git/go-git/v6 v6.0.0-20260114124804-a8db3a6585a6
|
||||||
github.com/inconshreveable/mousetrap v1.1.0 // indirect
|
github.com/inconshreveable/mousetrap v1.1.0 // indirect
|
||||||
github.com/lucasb-eyer/go-colorful v1.3.0
|
github.com/lucasb-eyer/go-colorful v1.3.0
|
||||||
github.com/mattn/go-isatty v0.0.20 // indirect
|
github.com/mattn/go-isatty v0.0.20 // indirect
|
||||||
@@ -66,7 +66,7 @@ require (
|
|||||||
github.com/spf13/afero v1.15.0
|
github.com/spf13/afero v1.15.0
|
||||||
github.com/spf13/pflag v1.0.10 // indirect
|
github.com/spf13/pflag v1.0.10 // indirect
|
||||||
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
|
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
|
||||||
golang.org/x/sys v0.39.0
|
golang.org/x/sys v0.40.0
|
||||||
golang.org/x/text v0.32.0
|
golang.org/x/text v0.33.0
|
||||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||||
)
|
)
|
||||||
|
|||||||
55
core/go.sum
55
core/go.sum
@@ -16,8 +16,6 @@ github.com/charmbracelet/bubbles v0.21.0 h1:9TdC97SdRVg/1aaXNVWfFH3nnLAwOXr8Fn6u
|
|||||||
github.com/charmbracelet/bubbles v0.21.0/go.mod h1:HF+v6QUR4HkEpz62dx7ym2xc71/KBHg+zKwJtMw+qtg=
|
github.com/charmbracelet/bubbles v0.21.0/go.mod h1:HF+v6QUR4HkEpz62dx7ym2xc71/KBHg+zKwJtMw+qtg=
|
||||||
github.com/charmbracelet/bubbletea v1.3.10 h1:otUDHWMMzQSB0Pkc87rm691KZ3SWa4KUlvF9nRvCICw=
|
github.com/charmbracelet/bubbletea v1.3.10 h1:otUDHWMMzQSB0Pkc87rm691KZ3SWa4KUlvF9nRvCICw=
|
||||||
github.com/charmbracelet/bubbletea v1.3.10/go.mod h1:ORQfo0fk8U+po9VaNvnV95UPWA1BitP1E0N6xJPlHr4=
|
github.com/charmbracelet/bubbletea v1.3.10/go.mod h1:ORQfo0fk8U+po9VaNvnV95UPWA1BitP1E0N6xJPlHr4=
|
||||||
github.com/charmbracelet/colorprofile v0.3.3 h1:DjJzJtLP6/NZ8p7Cgjno0CKGr7wwRJGxWUwh2IyhfAI=
|
|
||||||
github.com/charmbracelet/colorprofile v0.3.3/go.mod h1:nB1FugsAbzq284eJcjfah2nhdSLppN2NqvfotkfRYP4=
|
|
||||||
github.com/charmbracelet/colorprofile v0.4.1 h1:a1lO03qTrSIRaK8c3JRxJDZOvhvIeSco3ej+ngLk1kk=
|
github.com/charmbracelet/colorprofile v0.4.1 h1:a1lO03qTrSIRaK8c3JRxJDZOvhvIeSco3ej+ngLk1kk=
|
||||||
github.com/charmbracelet/colorprofile v0.4.1/go.mod h1:U1d9Dljmdf9DLegaJ0nGZNJvoXAhayhmidOdcBwAvKk=
|
github.com/charmbracelet/colorprofile v0.4.1/go.mod h1:U1d9Dljmdf9DLegaJ0nGZNJvoXAhayhmidOdcBwAvKk=
|
||||||
github.com/charmbracelet/harmonica v0.2.0 h1:8NxJWRWg/bzKqqEaaeFNipOu77YR5t8aSwG4pgaUBiQ=
|
github.com/charmbracelet/harmonica v0.2.0 h1:8NxJWRWg/bzKqqEaaeFNipOu77YR5t8aSwG4pgaUBiQ=
|
||||||
@@ -26,24 +24,22 @@ github.com/charmbracelet/lipgloss v1.1.0 h1:vYXsiLHVkK7fp74RkV7b2kq9+zDLoEU4MZoF
|
|||||||
github.com/charmbracelet/lipgloss v1.1.0/go.mod h1:/6Q8FR2o+kj8rz4Dq0zQc3vYf7X+B0binUUBwA0aL30=
|
github.com/charmbracelet/lipgloss v1.1.0/go.mod h1:/6Q8FR2o+kj8rz4Dq0zQc3vYf7X+B0binUUBwA0aL30=
|
||||||
github.com/charmbracelet/log v0.4.2 h1:hYt8Qj6a8yLnvR+h7MwsJv/XvmBJXiueUcI3cIxsyig=
|
github.com/charmbracelet/log v0.4.2 h1:hYt8Qj6a8yLnvR+h7MwsJv/XvmBJXiueUcI3cIxsyig=
|
||||||
github.com/charmbracelet/log v0.4.2/go.mod h1:qifHGX/tc7eluv2R6pWIpyHDDrrb/AG71Pf2ysQu5nw=
|
github.com/charmbracelet/log v0.4.2/go.mod h1:qifHGX/tc7eluv2R6pWIpyHDDrrb/AG71Pf2ysQu5nw=
|
||||||
github.com/charmbracelet/x/ansi v0.11.2 h1:XAG3FSjiVtFvgEgGrNBkCNNYrsucAt8c6bfxHyROLLs=
|
|
||||||
github.com/charmbracelet/x/ansi v0.11.2/go.mod h1:9tY2bzX5SiJCU0iWyskjBeI2BRQfvPqI+J760Mjf+Rg=
|
|
||||||
github.com/charmbracelet/x/ansi v0.11.3 h1:6DcVaqWI82BBVM/atTyq6yBoRLZFBsnoDoX9GCu2YOI=
|
github.com/charmbracelet/x/ansi v0.11.3 h1:6DcVaqWI82BBVM/atTyq6yBoRLZFBsnoDoX9GCu2YOI=
|
||||||
github.com/charmbracelet/x/ansi v0.11.3/go.mod h1:yI7Zslym9tCJcedxz5+WBq+eUGMJT0bM06Fqy1/Y4dI=
|
github.com/charmbracelet/x/ansi v0.11.3/go.mod h1:yI7Zslym9tCJcedxz5+WBq+eUGMJT0bM06Fqy1/Y4dI=
|
||||||
|
github.com/charmbracelet/x/ansi v0.11.4 h1:6G65PLu6HjmE858CnTUQY1LXT3ZUWwfvqEROLF8vqHI=
|
||||||
|
github.com/charmbracelet/x/ansi v0.11.4/go.mod h1:/5AZ+UfWExW3int5H5ugnsG/PWjNcSQcwYsHBlPFQN4=
|
||||||
github.com/charmbracelet/x/cellbuf v0.0.14 h1:iUEMryGyFTelKW3THW4+FfPgi4fkmKnnaLOXuc+/Kj4=
|
github.com/charmbracelet/x/cellbuf v0.0.14 h1:iUEMryGyFTelKW3THW4+FfPgi4fkmKnnaLOXuc+/Kj4=
|
||||||
github.com/charmbracelet/x/cellbuf v0.0.14/go.mod h1:P447lJl49ywBbil/KjCk2HexGh4tEY9LH0/1QrZZ9rA=
|
github.com/charmbracelet/x/cellbuf v0.0.14/go.mod h1:P447lJl49ywBbil/KjCk2HexGh4tEY9LH0/1QrZZ9rA=
|
||||||
github.com/charmbracelet/x/term v0.2.2 h1:xVRT/S2ZcKdhhOuSP4t5cLi5o+JxklsoEObBSgfgZRk=
|
github.com/charmbracelet/x/term v0.2.2 h1:xVRT/S2ZcKdhhOuSP4t5cLi5o+JxklsoEObBSgfgZRk=
|
||||||
github.com/charmbracelet/x/term v0.2.2/go.mod h1:kF8CY5RddLWrsgVwpw4kAa6TESp6EB5y3uxGLeCqzAI=
|
github.com/charmbracelet/x/term v0.2.2/go.mod h1:kF8CY5RddLWrsgVwpw4kAa6TESp6EB5y3uxGLeCqzAI=
|
||||||
github.com/clipperhouse/displaywidth v0.6.0 h1:k32vueaksef9WIKCNcoqRNyKbyvkvkysNYnAWz2fN4s=
|
|
||||||
github.com/clipperhouse/displaywidth v0.6.0/go.mod h1:R+kHuzaYWFkTm7xoMmK1lFydbci4X2CicfbGstSGg0o=
|
|
||||||
github.com/clipperhouse/displaywidth v0.6.2 h1:ZDpTkFfpHOKte4RG5O/BOyf3ysnvFswpyYrV7z2uAKo=
|
github.com/clipperhouse/displaywidth v0.6.2 h1:ZDpTkFfpHOKte4RG5O/BOyf3ysnvFswpyYrV7z2uAKo=
|
||||||
github.com/clipperhouse/displaywidth v0.6.2/go.mod h1:R+kHuzaYWFkTm7xoMmK1lFydbci4X2CicfbGstSGg0o=
|
github.com/clipperhouse/displaywidth v0.6.2/go.mod h1:R+kHuzaYWFkTm7xoMmK1lFydbci4X2CicfbGstSGg0o=
|
||||||
|
github.com/clipperhouse/displaywidth v0.7.0 h1:QNv1GYsnLX9QBrcWUtMlogpTXuM5FVnBwKWp1O5NwmE=
|
||||||
|
github.com/clipperhouse/displaywidth v0.7.0/go.mod h1:R+kHuzaYWFkTm7xoMmK1lFydbci4X2CicfbGstSGg0o=
|
||||||
github.com/clipperhouse/stringish v0.1.1 h1:+NSqMOr3GR6k1FdRhhnXrLfztGzuG+VuFDfatpWHKCs=
|
github.com/clipperhouse/stringish v0.1.1 h1:+NSqMOr3GR6k1FdRhhnXrLfztGzuG+VuFDfatpWHKCs=
|
||||||
github.com/clipperhouse/stringish v0.1.1/go.mod h1:v/WhFtE1q0ovMta2+m+UbpZ+2/HEXNWYXQgCt4hdOzA=
|
github.com/clipperhouse/stringish v0.1.1/go.mod h1:v/WhFtE1q0ovMta2+m+UbpZ+2/HEXNWYXQgCt4hdOzA=
|
||||||
github.com/clipperhouse/uax29/v2 v2.3.0 h1:SNdx9DVUqMoBuBoW3iLOj4FQv3dN5mDtuqwuhIGpJy4=
|
github.com/clipperhouse/uax29/v2 v2.3.0 h1:SNdx9DVUqMoBuBoW3iLOj4FQv3dN5mDtuqwuhIGpJy4=
|
||||||
github.com/clipperhouse/uax29/v2 v2.3.0/go.mod h1:Wn1g7MK6OoeDT0vL+Q0SQLDz/KpfsVRgg6W7ihQeh4g=
|
github.com/clipperhouse/uax29/v2 v2.3.0/go.mod h1:Wn1g7MK6OoeDT0vL+Q0SQLDz/KpfsVRgg6W7ihQeh4g=
|
||||||
github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0=
|
|
||||||
github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
|
|
||||||
github.com/cloudflare/circl v1.6.2 h1:hL7VBpHHKzrV5WTfHCaBsgx/HGbBYlgrwvNXEVDYYsQ=
|
github.com/cloudflare/circl v1.6.2 h1:hL7VBpHHKzrV5WTfHCaBsgx/HGbBYlgrwvNXEVDYYsQ=
|
||||||
github.com/cloudflare/circl v1.6.2/go.mod h1:2eXP6Qfat4O/Yhh8BznvKnJ+uzEoTQ6jVKJRn81BiS4=
|
github.com/cloudflare/circl v1.6.2/go.mod h1:2eXP6Qfat4O/Yhh8BznvKnJ+uzEoTQ6jVKJRn81BiS4=
|
||||||
github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
|
github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
|
||||||
@@ -52,8 +48,6 @@ github.com/cyphar/filepath-securejoin v0.6.1/go.mod h1:A8hd4EnAeyujCJRrICiOWqjS1
|
|||||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
github.com/elazarl/goproxy v1.7.2 h1:Y2o6urb7Eule09PjlhQRGNsqRfPmYI3KKQLFpCAV3+o=
|
|
||||||
github.com/elazarl/goproxy v1.7.2/go.mod h1:82vkLNir0ALaW14Rc399OTTjyNREgmdL2cVoIbS6XaE=
|
|
||||||
github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
|
github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
|
||||||
github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
|
github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
|
||||||
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4=
|
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4=
|
||||||
@@ -64,22 +58,19 @@ github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c=
|
|||||||
github.com/gliderlabs/ssh v0.3.8/go.mod h1:xYoytBv1sV0aL3CavoDuJIQNURXkkfPA/wxQ1pL1fAU=
|
github.com/gliderlabs/ssh v0.3.8/go.mod h1:xYoytBv1sV0aL3CavoDuJIQNURXkkfPA/wxQ1pL1fAU=
|
||||||
github.com/go-git/gcfg/v2 v2.0.2 h1:MY5SIIfTGGEMhdA7d7JePuVVxtKL7Hp+ApGDJAJ7dpo=
|
github.com/go-git/gcfg/v2 v2.0.2 h1:MY5SIIfTGGEMhdA7d7JePuVVxtKL7Hp+ApGDJAJ7dpo=
|
||||||
github.com/go-git/gcfg/v2 v2.0.2/go.mod h1:/lv2NsxvhepuMrldsFilrgct6pxzpGdSRC13ydTLSLs=
|
github.com/go-git/gcfg/v2 v2.0.2/go.mod h1:/lv2NsxvhepuMrldsFilrgct6pxzpGdSRC13ydTLSLs=
|
||||||
github.com/go-git/go-billy/v6 v6.0.0-20251126203821-7f9c95185ee0 h1:eY5aB2GXiVdgTueBcqsBt53WuJTRZAuCdIS/86Pcq5c=
|
|
||||||
github.com/go-git/go-billy/v6 v6.0.0-20251126203821-7f9c95185ee0/go.mod h1:0NjwVNrwtVFZBReAp5OoGklGJIgJFEbVyHneAr4lc8k=
|
|
||||||
github.com/go-git/go-billy/v6 v6.0.0-20251217170237-e9738f50a3cd h1:Gd/f9cGi/3h1JOPaa6er+CkKUGyGX2DBJdFbDKVO+R0=
|
github.com/go-git/go-billy/v6 v6.0.0-20251217170237-e9738f50a3cd h1:Gd/f9cGi/3h1JOPaa6er+CkKUGyGX2DBJdFbDKVO+R0=
|
||||||
github.com/go-git/go-billy/v6 v6.0.0-20251217170237-e9738f50a3cd/go.mod h1:d3XQcsHu1idnquxt48kAv+h+1MUiYKLH/e7LAzjP+pI=
|
github.com/go-git/go-billy/v6 v6.0.0-20251217170237-e9738f50a3cd/go.mod h1:d3XQcsHu1idnquxt48kAv+h+1MUiYKLH/e7LAzjP+pI=
|
||||||
github.com/go-git/go-git-fixtures/v5 v5.1.1 h1:OH8i1ojV9bWfr0ZfasfpgtUXQHQyVS8HXik/V1C099w=
|
github.com/go-git/go-billy/v6 v6.0.0-20260114122816-19306b749ecc h1:rhkjrnRkamkRC7woapp425E4CAH6RPcqsS9X8LA93IY=
|
||||||
github.com/go-git/go-git-fixtures/v5 v5.1.1/go.mod h1:Altk43lx3b1ks+dVoAG2300o5WWUnktvfY3VI6bcaXU=
|
github.com/go-git/go-billy/v6 v6.0.0-20260114122816-19306b749ecc/go.mod h1:X1oe0Z2qMsa9hkar3AAPuL9hu4Mi3ztXEjdqRhr6fcc=
|
||||||
github.com/go-git/go-git-fixtures/v5 v5.1.2-0.20251229094738-4b14af179146 h1:xYfxAopYyL44ot6dMBIb1Z1njFM0ZBQ99HdIB99KxLs=
|
github.com/go-git/go-git-fixtures/v5 v5.1.2-0.20251229094738-4b14af179146 h1:xYfxAopYyL44ot6dMBIb1Z1njFM0ZBQ99HdIB99KxLs=
|
||||||
github.com/go-git/go-git/v6 v6.0.0-20251128074608-48f817f57805 h1:jxQ3BzYeErNRvlI/4+0mpwqMzvB4g97U+ksfgvrUEbY=
|
github.com/go-git/go-git-fixtures/v5 v5.1.2-0.20251229094738-4b14af179146/go.mod h1:QE/75B8tBSLNGyUUbA9tw3EGHoFtYOtypa2h8YJxsWI=
|
||||||
github.com/go-git/go-git/v6 v6.0.0-20251128074608-48f817f57805/go.mod h1:dIwT3uWK1ooHInyVnK2JS5VfQ3peVGYaw2QPqX7uFvs=
|
|
||||||
github.com/go-git/go-git/v6 v6.0.0-20251231065035-29ae690a9f19 h1:0lz2eJScP8v5YZQsrEw+ggWC5jNySjg4bIZo5BIh6iI=
|
github.com/go-git/go-git/v6 v6.0.0-20251231065035-29ae690a9f19 h1:0lz2eJScP8v5YZQsrEw+ggWC5jNySjg4bIZo5BIh6iI=
|
||||||
github.com/go-git/go-git/v6 v6.0.0-20251231065035-29ae690a9f19/go.mod h1:L+Evfcs7EdTqxwv854354cb6+++7TFL3hJn3Wy4g+3w=
|
github.com/go-git/go-git/v6 v6.0.0-20251231065035-29ae690a9f19/go.mod h1:L+Evfcs7EdTqxwv854354cb6+++7TFL3hJn3Wy4g+3w=
|
||||||
|
github.com/go-git/go-git/v6 v6.0.0-20260114124804-a8db3a6585a6 h1:Yo1MlE8LpvD0pr7mZ04b6hKZKQcPvLrQFgyY1jNMEyU=
|
||||||
|
github.com/go-git/go-git/v6 v6.0.0-20260114124804-a8db3a6585a6/go.mod h1:enMzPHv+9hL4B7tH7OJGQKNzCkMzXovUoaiXfsLF7Xs=
|
||||||
github.com/go-logfmt/logfmt v0.6.1 h1:4hvbpePJKnIzH1B+8OR/JPbTx37NktoI9LE2QZBBkvE=
|
github.com/go-logfmt/logfmt v0.6.1 h1:4hvbpePJKnIzH1B+8OR/JPbTx37NktoI9LE2QZBBkvE=
|
||||||
github.com/go-logfmt/logfmt v0.6.1/go.mod h1:EV2pOAQoZaT1ZXZbqDl5hrymndi4SY9ED9/z6CO0XAk=
|
github.com/go-logfmt/logfmt v0.6.1/go.mod h1:EV2pOAQoZaT1ZXZbqDl5hrymndi4SY9ED9/z6CO0XAk=
|
||||||
github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
|
github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
|
||||||
github.com/godbus/dbus/v5 v5.2.0 h1:3WexO+U+yg9T70v9FdHr9kCxYlazaAXUhx2VMkbfax8=
|
|
||||||
github.com/godbus/dbus/v5 v5.2.0/go.mod h1:3AAv2+hPq5rdnr5txxxRwiGjPXamgoIHgz9FPBfOp3c=
|
|
||||||
github.com/godbus/dbus/v5 v5.2.2 h1:TUR3TgtSVDmjiXOgAAyaZbYmIeP3DPkld3jgKGV8mXQ=
|
github.com/godbus/dbus/v5 v5.2.2 h1:TUR3TgtSVDmjiXOgAAyaZbYmIeP3DPkld3jgKGV8mXQ=
|
||||||
github.com/godbus/dbus/v5 v5.2.2/go.mod h1:3AAv2+hPq5rdnr5txxxRwiGjPXamgoIHgz9FPBfOp3c=
|
github.com/godbus/dbus/v5 v5.2.2/go.mod h1:3AAv2+hPq5rdnr5txxxRwiGjPXamgoIHgz9FPBfOp3c=
|
||||||
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ=
|
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ=
|
||||||
@@ -127,16 +118,12 @@ github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUc
|
|||||||
github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
|
github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
|
||||||
github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
|
github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
|
||||||
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
|
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
|
||||||
github.com/sblinch/kdl-go v0.0.0-20250930225324-bf4099d4614a h1:8ZZwZWIQKC0YVMyaCkbrdeI8faTjD1QBrRAAWc1TjMI=
|
|
||||||
github.com/sblinch/kdl-go v0.0.0-20250930225324-bf4099d4614a/go.mod h1:b3oNGuAKOQzhsCKmuLc/urEOPzgHj6fB8vl8bwTBh28=
|
|
||||||
github.com/sblinch/kdl-go v0.0.0-20251203232544-981d4ecc17c3 h1:msKaIZrrNpvofLPDzNBW3152PJBsnPZsoNNosOCS+C0=
|
github.com/sblinch/kdl-go v0.0.0-20251203232544-981d4ecc17c3 h1:msKaIZrrNpvofLPDzNBW3152PJBsnPZsoNNosOCS+C0=
|
||||||
github.com/sblinch/kdl-go v0.0.0-20251203232544-981d4ecc17c3/go.mod h1:b3oNGuAKOQzhsCKmuLc/urEOPzgHj6fB8vl8bwTBh28=
|
github.com/sblinch/kdl-go v0.0.0-20251203232544-981d4ecc17c3/go.mod h1:b3oNGuAKOQzhsCKmuLc/urEOPzgHj6fB8vl8bwTBh28=
|
||||||
github.com/sergi/go-diff v1.4.0 h1:n/SP9D5ad1fORl+llWyN+D6qoUETXNZARKjyY2/KVCw=
|
github.com/sergi/go-diff v1.4.0 h1:n/SP9D5ad1fORl+llWyN+D6qoUETXNZARKjyY2/KVCw=
|
||||||
github.com/sergi/go-diff v1.4.0/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
|
github.com/sergi/go-diff v1.4.0/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
|
||||||
github.com/spf13/afero v1.15.0 h1:b/YBCLWAJdFWJTN9cLhiXXcD7mzKn9Dm86dNnfyQw1I=
|
github.com/spf13/afero v1.15.0 h1:b/YBCLWAJdFWJTN9cLhiXXcD7mzKn9Dm86dNnfyQw1I=
|
||||||
github.com/spf13/afero v1.15.0/go.mod h1:NC2ByUVxtQs4b3sIUphxK0NioZnmxgyCrfzeuq8lxMg=
|
github.com/spf13/afero v1.15.0/go.mod h1:NC2ByUVxtQs4b3sIUphxK0NioZnmxgyCrfzeuq8lxMg=
|
||||||
github.com/spf13/cobra v1.10.1 h1:lJeBwCfmrnXthfAupyUTzJ/J4Nc1RsHC/mSRU2dll/s=
|
|
||||||
github.com/spf13/cobra v1.10.1/go.mod h1:7SmJGaTHFVBY0jW4NXGluQoLvhqFQM+6XSKD+P4XaB0=
|
|
||||||
github.com/spf13/cobra v1.10.2 h1:DMTTonx5m65Ic0GOoRY2c16WCbHxOOw6xxezuLaBpcU=
|
github.com/spf13/cobra v1.10.2 h1:DMTTonx5m65Ic0GOoRY2c16WCbHxOOw6xxezuLaBpcU=
|
||||||
github.com/spf13/cobra v1.10.2/go.mod h1:7C1pvHqHw5A4vrJfjNwvOdzYu0Gml16OCs2GRiTUUS4=
|
github.com/spf13/cobra v1.10.2/go.mod h1:7C1pvHqHw5A4vrJfjNwvOdzYu0Gml16OCs2GRiTUUS4=
|
||||||
github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
|
github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
|
||||||
@@ -153,33 +140,37 @@ github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJu
|
|||||||
go.etcd.io/bbolt v1.4.3 h1:dEadXpI6G79deX5prL3QRNP6JB8UxVkqo4UPnHaNXJo=
|
go.etcd.io/bbolt v1.4.3 h1:dEadXpI6G79deX5prL3QRNP6JB8UxVkqo4UPnHaNXJo=
|
||||||
go.etcd.io/bbolt v1.4.3/go.mod h1:tKQlpPaYCVFctUIgFKFnAlvbmB3tpy1vkTnDWohtc0E=
|
go.etcd.io/bbolt v1.4.3/go.mod h1:tKQlpPaYCVFctUIgFKFnAlvbmB3tpy1vkTnDWohtc0E=
|
||||||
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
|
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
|
||||||
golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
|
|
||||||
golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
|
|
||||||
golang.org/x/crypto v0.46.0 h1:cKRW/pmt1pKAfetfu+RCEvjvZkA9RimPbh7bhFjGVBU=
|
golang.org/x/crypto v0.46.0 h1:cKRW/pmt1pKAfetfu+RCEvjvZkA9RimPbh7bhFjGVBU=
|
||||||
golang.org/x/crypto v0.46.0/go.mod h1:Evb/oLKmMraqjZ2iQTwDwvCtJkczlDuTmdJXoZVzqU0=
|
golang.org/x/crypto v0.46.0/go.mod h1:Evb/oLKmMraqjZ2iQTwDwvCtJkczlDuTmdJXoZVzqU0=
|
||||||
golang.org/x/exp v0.0.0-20251125195548-87e1e737ad39 h1:DHNhtq3sNNzrvduZZIiFyXWOL9IWaDPHqTnLJp+rCBY=
|
golang.org/x/crypto v0.47.0 h1:V6e3FRj+n4dbpw86FJ8Fv7XVOql7TEwpHapKoMJ/GO8=
|
||||||
golang.org/x/exp v0.0.0-20251125195548-87e1e737ad39/go.mod h1:46edojNIoXTNOhySWIWdix628clX9ODXwPsQuG6hsK0=
|
golang.org/x/crypto v0.47.0/go.mod h1:ff3Y9VzzKbwSSEzWqJsJVBnWmRwRSHt/6Op5n9bQc4A=
|
||||||
golang.org/x/exp v0.0.0-20251219203646-944ab1f22d93 h1:fQsdNF2N+/YewlRZiricy4P1iimyPKZ/xwniHj8Q2a0=
|
golang.org/x/exp v0.0.0-20251219203646-944ab1f22d93 h1:fQsdNF2N+/YewlRZiricy4P1iimyPKZ/xwniHj8Q2a0=
|
||||||
golang.org/x/exp v0.0.0-20251219203646-944ab1f22d93/go.mod h1:EPRbTFwzwjXj9NpYyyrvenVh9Y+GFeEvMNh7Xuz7xgU=
|
golang.org/x/exp v0.0.0-20251219203646-944ab1f22d93/go.mod h1:EPRbTFwzwjXj9NpYyyrvenVh9Y+GFeEvMNh7Xuz7xgU=
|
||||||
|
golang.org/x/exp v0.0.0-20260112195511-716be5621a96 h1:Z/6YuSHTLOHfNFdb8zVZomZr7cqNgTJvA8+Qz75D8gU=
|
||||||
|
golang.org/x/exp v0.0.0-20260112195511-716be5621a96/go.mod h1:nzimsREAkjBCIEFtHiYkrJyT+2uy9YZJB7H1k68CXZU=
|
||||||
golang.org/x/image v0.34.0 h1:33gCkyw9hmwbZJeZkct8XyR11yH889EQt/QH4VmXMn8=
|
golang.org/x/image v0.34.0 h1:33gCkyw9hmwbZJeZkct8XyR11yH889EQt/QH4VmXMn8=
|
||||||
golang.org/x/image v0.34.0/go.mod h1:2RNFBZRB+vnwwFil8GkMdRvrJOFd1AzdZI6vOY+eJVU=
|
golang.org/x/image v0.34.0/go.mod h1:2RNFBZRB+vnwwFil8GkMdRvrJOFd1AzdZI6vOY+eJVU=
|
||||||
golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
|
golang.org/x/image v0.35.0 h1:LKjiHdgMtO8z7Fh18nGY6KDcoEtVfsgLDPeLyguqb7I=
|
||||||
golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
|
golang.org/x/image v0.35.0/go.mod h1:MwPLTVgvxSASsxdLzKrl8BRFuyqMyGhLwmC+TO1Sybk=
|
||||||
golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU=
|
golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU=
|
||||||
golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY=
|
golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY=
|
||||||
|
golang.org/x/net v0.49.0 h1:eeHFmOGUTtaaPSGNmjBKpbng9MulQsJURQUAfUwY++o=
|
||||||
|
golang.org/x/net v0.49.0/go.mod h1:/ysNB2EvaqvesRkuLAyjI1ycPZlQHM3q01F02UY/MV8=
|
||||||
golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
|
golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
|
||||||
golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
|
golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
|
||||||
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
|
|
||||||
golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
|
|
||||||
golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
|
golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
|
||||||
golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
|
golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
|
||||||
golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU=
|
golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ=
|
||||||
golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254=
|
golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
|
||||||
golang.org/x/term v0.38.0 h1:PQ5pkm/rLO6HnxFR7N2lJHOZX6Kez5Y1gDSJla6jo7Q=
|
golang.org/x/term v0.38.0 h1:PQ5pkm/rLO6HnxFR7N2lJHOZX6Kez5Y1gDSJla6jo7Q=
|
||||||
|
golang.org/x/term v0.38.0/go.mod h1:bSEAKrOT1W+VSu9TSCMtoGEOUcKxOKgl3LE5QEF/xVg=
|
||||||
|
golang.org/x/term v0.39.0 h1:RclSuaJf32jOqZz74CkPA9qFuVTX7vhLlpfj/IGWlqY=
|
||||||
golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
|
golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
|
||||||
golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
|
golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
|
||||||
|
golang.org/x/text v0.33.0 h1:B3njUFyqtHDUI5jMn1YIr5B0IE2U0qck04r6d4KPAxE=
|
||||||
|
golang.org/x/text v0.33.0/go.mod h1:LuMebE6+rBincTi9+xWTY8TztLzKHc/9C1uBCG27+q8=
|
||||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
|
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
|
||||||
|
|||||||
@@ -199,31 +199,6 @@ func labToHex(L, a, b float64) string {
|
|||||||
return fmt.Sprintf("#%02x%02x%02x", r, g, b2)
|
return fmt.Sprintf("#%02x%02x%02x", r, g, b2)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Adjust brightness while keeping the same hue
|
|
||||||
func retoneToL(hex string, Ltarget float64) string {
|
|
||||||
rgb := HexToRGB(hex)
|
|
||||||
col := colorful.Color{R: rgb.R, G: rgb.G, B: rgb.B}
|
|
||||||
L, a, b := col.Lab()
|
|
||||||
L100 := L * 100.0
|
|
||||||
|
|
||||||
scale := 1.0
|
|
||||||
if L100 != 0 {
|
|
||||||
scale = Ltarget / L100
|
|
||||||
}
|
|
||||||
|
|
||||||
a2, b2 := a*scale, b*scale
|
|
||||||
|
|
||||||
// Don't let it get too saturated
|
|
||||||
maxChroma := 0.4
|
|
||||||
if math.Hypot(a2, b2) > maxChroma {
|
|
||||||
k := maxChroma / math.Hypot(a2, b2)
|
|
||||||
a2 *= k
|
|
||||||
b2 *= k
|
|
||||||
}
|
|
||||||
|
|
||||||
return labToHex(Ltarget, a2, b2)
|
|
||||||
}
|
|
||||||
|
|
||||||
func DeltaPhiStar(hexFg, hexBg string, negativePolarity bool) float64 {
|
func DeltaPhiStar(hexFg, hexBg string, negativePolarity bool) float64 {
|
||||||
Lf := getLstar(hexFg)
|
Lf := getLstar(hexFg)
|
||||||
Lb := getLstar(hexBg)
|
Lb := getLstar(hexBg)
|
||||||
@@ -356,6 +331,59 @@ func EnsureContrastDPSLstar(hexColor, hexBg string, minLc float64, isLightMode b
|
|||||||
return hexColor
|
return hexColor
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Bidirectional contrast - tries both lighter and darker, picks closest to original
|
||||||
|
func EnsureContrastDPSBidirectional(hexColor, hexBg string, minLc float64, isLightMode bool) string {
|
||||||
|
current := DeltaPhiStarContrast(hexColor, hexBg, isLightMode)
|
||||||
|
if current >= minLc {
|
||||||
|
return hexColor
|
||||||
|
}
|
||||||
|
|
||||||
|
fg := HexToRGB(hexColor)
|
||||||
|
cf := colorful.Color{R: fg.R, G: fg.G, B: fg.B}
|
||||||
|
origL, af, bf := cf.Lab()
|
||||||
|
|
||||||
|
var darkerResult, lighterResult string
|
||||||
|
darkerL, lighterL := origL, origL
|
||||||
|
darkerFound, lighterFound := false, false
|
||||||
|
|
||||||
|
step := 0.5
|
||||||
|
for i := range 120 {
|
||||||
|
if !darkerFound {
|
||||||
|
darkerL = math.Max(0, origL-float64(i)*step)
|
||||||
|
cand := labToHex(darkerL, af, bf)
|
||||||
|
if DeltaPhiStarContrast(cand, hexBg, isLightMode) >= minLc {
|
||||||
|
darkerResult = cand
|
||||||
|
darkerFound = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !lighterFound {
|
||||||
|
lighterL = math.Min(100, origL+float64(i)*step)
|
||||||
|
cand := labToHex(lighterL, af, bf)
|
||||||
|
if DeltaPhiStarContrast(cand, hexBg, isLightMode) >= minLc {
|
||||||
|
lighterResult = cand
|
||||||
|
lighterFound = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if darkerFound && lighterFound {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if darkerFound && lighterFound {
|
||||||
|
if math.Abs(darkerL-origL) <= math.Abs(lighterL-origL) {
|
||||||
|
return darkerResult
|
||||||
|
}
|
||||||
|
return lighterResult
|
||||||
|
}
|
||||||
|
if darkerFound {
|
||||||
|
return darkerResult
|
||||||
|
}
|
||||||
|
if lighterFound {
|
||||||
|
return lighterResult
|
||||||
|
}
|
||||||
|
return hexColor
|
||||||
|
}
|
||||||
|
|
||||||
type PaletteOptions struct {
|
type PaletteOptions struct {
|
||||||
IsLight bool
|
IsLight bool
|
||||||
Background string
|
Background string
|
||||||
@@ -369,6 +397,29 @@ func ensureContrastAuto(hexColor, hexBg string, target float64, opts PaletteOpti
|
|||||||
return EnsureContrast(hexColor, hexBg, target, opts.IsLight)
|
return EnsureContrast(hexColor, hexBg, target, opts.IsLight)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func ensureContrastBidirectional(hexColor, hexBg string, target float64, opts PaletteOptions) string {
|
||||||
|
if opts.UseDPS {
|
||||||
|
return EnsureContrastDPSBidirectional(hexColor, hexBg, target, opts.IsLight)
|
||||||
|
}
|
||||||
|
return EnsureContrast(hexColor, hexBg, target, opts.IsLight)
|
||||||
|
}
|
||||||
|
|
||||||
|
func blendHue(base, target, factor float64) float64 {
|
||||||
|
diff := target - base
|
||||||
|
if diff > 0.5 {
|
||||||
|
diff -= 1.0
|
||||||
|
} else if diff < -0.5 {
|
||||||
|
diff += 1.0
|
||||||
|
}
|
||||||
|
result := base + diff*factor
|
||||||
|
if result < 0 {
|
||||||
|
result += 1.0
|
||||||
|
} else if result >= 1.0 {
|
||||||
|
result -= 1.0
|
||||||
|
}
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
||||||
func DeriveContainer(primary string, isLight bool) string {
|
func DeriveContainer(primary string, isLight bool) string {
|
||||||
rgb := HexToRGB(primary)
|
rgb := HexToRGB(primary)
|
||||||
hsv := RGBToHSV(rgb)
|
hsv := RGBToHSV(rgb)
|
||||||
@@ -389,6 +440,9 @@ func GeneratePalette(primaryColor string, opts PaletteOptions) Palette {
|
|||||||
rgb := HexToRGB(baseColor)
|
rgb := HexToRGB(baseColor)
|
||||||
hsv := RGBToHSV(rgb)
|
hsv := RGBToHSV(rgb)
|
||||||
|
|
||||||
|
pr := HexToRGB(primaryColor)
|
||||||
|
ph := RGBToHSV(pr)
|
||||||
|
|
||||||
var palette Palette
|
var palette Palette
|
||||||
|
|
||||||
var normalTextTarget, secondaryTarget float64
|
var normalTextTarget, secondaryTarget float64
|
||||||
@@ -410,115 +464,136 @@ func GeneratePalette(primaryColor string, opts PaletteOptions) Palette {
|
|||||||
}
|
}
|
||||||
palette.Color0 = NewColorInfo(bgColor)
|
palette.Color0 = NewColorInfo(bgColor)
|
||||||
|
|
||||||
hueShift := (hsv.H - 0.6) * 0.12
|
baseSat := math.Max(ph.S, 0.5)
|
||||||
satBoost := 1.15
|
baseVal := math.Max(ph.V, 0.5)
|
||||||
|
|
||||||
redH := math.Mod(0.0+hueShift+1.0, 1.0)
|
redH := blendHue(0.0, ph.H, 0.12)
|
||||||
var redColor string
|
greenH := blendHue(0.33, ph.H, 0.10)
|
||||||
if opts.IsLight {
|
yellowH := blendHue(0.14, ph.H, 0.04)
|
||||||
redColor = RGBToHex(HSVToRGB(HSV{H: redH, S: math.Min(0.80*satBoost, 1.0), V: 0.55}))
|
|
||||||
palette.Color1 = NewColorInfo(ensureContrastAuto(redColor, bgColor, normalTextTarget, opts))
|
|
||||||
} else {
|
|
||||||
redColor = RGBToHex(HSVToRGB(HSV{H: redH, S: math.Min(0.65*satBoost, 1.0), V: 0.80}))
|
|
||||||
palette.Color1 = NewColorInfo(ensureContrastAuto(redColor, bgColor, normalTextTarget, opts))
|
|
||||||
}
|
|
||||||
|
|
||||||
greenH := math.Mod(0.33+hueShift+1.0, 1.0)
|
accentTarget := secondaryTarget * 0.7
|
||||||
var greenColor string
|
|
||||||
if opts.IsLight {
|
|
||||||
greenColor = RGBToHex(HSVToRGB(HSV{H: greenH, S: math.Min(math.Max(hsv.S*0.9, 0.80)*satBoost, 1.0), V: 0.45}))
|
|
||||||
palette.Color2 = NewColorInfo(ensureContrastAuto(greenColor, bgColor, normalTextTarget, opts))
|
|
||||||
} else {
|
|
||||||
greenColor = RGBToHex(HSVToRGB(HSV{H: greenH, S: math.Min(0.42*satBoost, 1.0), V: 0.84}))
|
|
||||||
palette.Color2 = NewColorInfo(ensureContrastAuto(greenColor, bgColor, normalTextTarget, opts))
|
|
||||||
}
|
|
||||||
|
|
||||||
yellowH := math.Mod(0.15+hueShift+1.0, 1.0)
|
|
||||||
var yellowColor string
|
|
||||||
if opts.IsLight {
|
|
||||||
yellowColor = RGBToHex(HSVToRGB(HSV{H: yellowH, S: math.Min(0.75*satBoost, 1.0), V: 0.50}))
|
|
||||||
palette.Color3 = NewColorInfo(ensureContrastAuto(yellowColor, bgColor, normalTextTarget, opts))
|
|
||||||
} else {
|
|
||||||
yellowColor = RGBToHex(HSVToRGB(HSV{H: yellowH, S: math.Min(0.38*satBoost, 1.0), V: 0.86}))
|
|
||||||
palette.Color3 = NewColorInfo(ensureContrastAuto(yellowColor, bgColor, normalTextTarget, opts))
|
|
||||||
}
|
|
||||||
|
|
||||||
var blueColor string
|
|
||||||
if opts.IsLight {
|
|
||||||
blueColor = RGBToHex(HSVToRGB(HSV{H: hsv.H, S: math.Max(hsv.S*0.9, 0.7), V: hsv.V * 1.1}))
|
|
||||||
palette.Color4 = NewColorInfo(ensureContrastAuto(blueColor, bgColor, normalTextTarget, opts))
|
|
||||||
} else {
|
|
||||||
blueColor = RGBToHex(HSVToRGB(HSV{H: hsv.H, S: math.Max(hsv.S*0.8, 0.6), V: math.Min(hsv.V*1.6, 1.0)}))
|
|
||||||
palette.Color4 = NewColorInfo(ensureContrastAuto(blueColor, bgColor, normalTextTarget, opts))
|
|
||||||
}
|
|
||||||
|
|
||||||
magH := hsv.H - 0.03
|
|
||||||
if magH < 0 {
|
|
||||||
magH += 1.0
|
|
||||||
}
|
|
||||||
var magColor string
|
|
||||||
hr := HexToRGB(primaryColor)
|
|
||||||
hh := RGBToHSV(hr)
|
|
||||||
if opts.IsLight {
|
|
||||||
magColor = RGBToHex(HSVToRGB(HSV{H: hh.H, S: math.Max(hh.S*0.9, 0.7), V: hh.V * 0.85}))
|
|
||||||
palette.Color5 = NewColorInfo(ensureContrastAuto(magColor, bgColor, normalTextTarget, opts))
|
|
||||||
} else {
|
|
||||||
magColor = RGBToHex(HSVToRGB(HSV{H: hh.H, S: hh.S * 0.8, V: hh.V * 0.75}))
|
|
||||||
palette.Color5 = NewColorInfo(ensureContrastAuto(magColor, bgColor, normalTextTarget, opts))
|
|
||||||
}
|
|
||||||
|
|
||||||
cyanH := hsv.H + 0.08
|
|
||||||
if cyanH > 1.0 {
|
|
||||||
cyanH -= 1.0
|
|
||||||
}
|
|
||||||
palette.Color6 = NewColorInfo(ensureContrastAuto(primaryColor, bgColor, normalTextTarget, opts))
|
|
||||||
|
|
||||||
if opts.IsLight {
|
if opts.IsLight {
|
||||||
palette.Color7 = NewColorInfo("#1a1a1a")
|
redS := math.Min(baseSat*1.2, 1.0)
|
||||||
palette.Color8 = NewColorInfo("#2e2e2e")
|
redV := baseVal * 0.95
|
||||||
} else {
|
palette.Color1 = NewColorInfo(ensureContrastAuto(RGBToHex(HSVToRGB(HSV{H: redH, S: redS, V: redV})), bgColor, normalTextTarget, opts))
|
||||||
palette.Color7 = NewColorInfo("#abb2bf")
|
|
||||||
palette.Color8 = NewColorInfo("#5c6370")
|
|
||||||
}
|
|
||||||
|
|
||||||
if opts.IsLight {
|
greenS := math.Min(baseSat*1.3, 1.0)
|
||||||
brightRed := RGBToHex(HSVToRGB(HSV{H: redH, S: math.Min(0.70*satBoost, 1.0), V: 0.65}))
|
greenV := baseVal * 0.75
|
||||||
palette.Color9 = NewColorInfo(ensureContrastAuto(brightRed, bgColor, secondaryTarget, opts))
|
palette.Color2 = NewColorInfo(ensureContrastAuto(RGBToHex(HSVToRGB(HSV{H: greenH, S: greenS, V: greenV})), bgColor, normalTextTarget, opts))
|
||||||
brightGreen := RGBToHex(HSVToRGB(HSV{H: greenH, S: math.Min(math.Max(hsv.S*0.85, 0.75)*satBoost, 1.0), V: 0.55}))
|
|
||||||
palette.Color10 = NewColorInfo(ensureContrastAuto(brightGreen, bgColor, secondaryTarget, opts))
|
|
||||||
brightYellow := RGBToHex(HSVToRGB(HSV{H: yellowH, S: math.Min(0.68*satBoost, 1.0), V: 0.60}))
|
|
||||||
palette.Color11 = NewColorInfo(ensureContrastAuto(brightYellow, bgColor, secondaryTarget, opts))
|
|
||||||
hr := HexToRGB(primaryColor)
|
|
||||||
hh := RGBToHSV(hr)
|
|
||||||
brightBlue := RGBToHex(HSVToRGB(HSV{H: hh.H, S: math.Min(hh.S*1.1, 1.0), V: math.Min(hh.V*1.2, 1.0)}))
|
|
||||||
palette.Color12 = NewColorInfo(ensureContrastAuto(brightBlue, bgColor, secondaryTarget, opts))
|
|
||||||
brightMag := RGBToHex(HSVToRGB(HSV{H: magH, S: math.Max(hsv.S*0.9, 0.75), V: math.Min(hsv.V*1.25, 1.0)}))
|
|
||||||
palette.Color13 = NewColorInfo(ensureContrastAuto(brightMag, bgColor, secondaryTarget, opts))
|
|
||||||
brightCyan := RGBToHex(HSVToRGB(HSV{H: cyanH, S: math.Max(hsv.S*0.75, 0.65), V: math.Min(hsv.V*1.25, 1.0)}))
|
|
||||||
palette.Color14 = NewColorInfo(ensureContrastAuto(brightCyan, bgColor, secondaryTarget, opts))
|
|
||||||
} else {
|
|
||||||
brightRed := RGBToHex(HSVToRGB(HSV{H: redH, S: math.Min(0.50*satBoost, 1.0), V: 0.88}))
|
|
||||||
palette.Color9 = NewColorInfo(ensureContrastAuto(brightRed, bgColor, secondaryTarget, opts))
|
|
||||||
brightGreen := RGBToHex(HSVToRGB(HSV{H: greenH, S: math.Min(0.35*satBoost, 1.0), V: 0.88}))
|
|
||||||
palette.Color10 = NewColorInfo(ensureContrastAuto(brightGreen, bgColor, secondaryTarget, opts))
|
|
||||||
brightYellow := RGBToHex(HSVToRGB(HSV{H: yellowH, S: math.Min(0.30*satBoost, 1.0), V: 0.91}))
|
|
||||||
palette.Color11 = NewColorInfo(ensureContrastAuto(brightYellow, bgColor, secondaryTarget, opts))
|
|
||||||
brightBlue := retoneToL(primaryColor, 85.0)
|
|
||||||
palette.Color12 = NewColorInfo(brightBlue)
|
|
||||||
brightMag := RGBToHex(HSVToRGB(HSV{H: magH, S: math.Max(hsv.S*0.7, 0.6), V: math.Min(hsv.V*1.3, 0.9)}))
|
|
||||||
palette.Color13 = NewColorInfo(ensureContrastAuto(brightMag, bgColor, secondaryTarget, opts))
|
|
||||||
brightCyanH := hsv.H + 0.02
|
|
||||||
if brightCyanH > 1.0 {
|
|
||||||
brightCyanH -= 1.0
|
|
||||||
}
|
|
||||||
brightCyan := RGBToHex(HSVToRGB(HSV{H: brightCyanH, S: math.Max(hsv.S*0.6, 0.5), V: math.Min(hsv.V*1.2, 0.85)}))
|
|
||||||
palette.Color14 = NewColorInfo(ensureContrastAuto(brightCyan, bgColor, secondaryTarget, opts))
|
|
||||||
}
|
|
||||||
|
|
||||||
if opts.IsLight {
|
yellowS := math.Min(baseSat*1.5, 1.0)
|
||||||
palette.Color15 = NewColorInfo("#1a1a1a")
|
yellowV := math.Min(baseVal*1.2, 1.0)
|
||||||
|
palette.Color3 = NewColorInfo(ensureContrastBidirectional(RGBToHex(HSVToRGB(HSV{H: yellowH, S: yellowS, V: yellowV})), bgColor, accentTarget, opts))
|
||||||
|
|
||||||
|
blueS := math.Min(ph.S*1.05, 1.0)
|
||||||
|
blueV := math.Min(ph.V*1.05, 1.0)
|
||||||
|
palette.Color4 = NewColorInfo(ensureContrastAuto(RGBToHex(HSVToRGB(HSV{H: ph.H, S: blueS, V: blueV})), bgColor, normalTextTarget, opts))
|
||||||
|
|
||||||
|
// Color5 matches primary_container exactly (light container in light mode)
|
||||||
|
container5 := DeriveContainer(primaryColor, true)
|
||||||
|
palette.Color5 = NewColorInfo(container5)
|
||||||
|
|
||||||
|
palette.Color6 = NewColorInfo(primaryColor)
|
||||||
|
|
||||||
|
gray7S := baseSat * 0.08
|
||||||
|
gray7V := baseVal * 0.28
|
||||||
|
palette.Color7 = NewColorInfo(ensureContrastAuto(RGBToHex(HSVToRGB(HSV{H: hsv.H, S: gray7S, V: gray7V})), bgColor, normalTextTarget, opts))
|
||||||
|
|
||||||
|
gray8S := baseSat * 0.05
|
||||||
|
gray8V := baseVal * 0.85
|
||||||
|
dimTarget := secondaryTarget * 0.5
|
||||||
|
palette.Color8 = NewColorInfo(ensureContrastBidirectional(RGBToHex(HSVToRGB(HSV{H: hsv.H, S: gray8S, V: gray8V})), bgColor, dimTarget, opts))
|
||||||
|
|
||||||
|
brightRedS := math.Min(baseSat*1.0, 1.0)
|
||||||
|
brightRedV := math.Min(baseVal*1.2, 1.0)
|
||||||
|
palette.Color9 = NewColorInfo(ensureContrastBidirectional(RGBToHex(HSVToRGB(HSV{H: redH, S: brightRedS, V: brightRedV})), bgColor, accentTarget, opts))
|
||||||
|
|
||||||
|
brightGreenS := math.Min(baseSat*1.1, 1.0)
|
||||||
|
brightGreenV := math.Min(baseVal*1.1, 1.0)
|
||||||
|
palette.Color10 = NewColorInfo(ensureContrastBidirectional(RGBToHex(HSVToRGB(HSV{H: greenH, S: brightGreenS, V: brightGreenV})), bgColor, accentTarget, opts))
|
||||||
|
|
||||||
|
brightYellowS := math.Min(baseSat*1.4, 1.0)
|
||||||
|
brightYellowV := math.Min(baseVal*1.3, 1.0)
|
||||||
|
palette.Color11 = NewColorInfo(ensureContrastBidirectional(RGBToHex(HSVToRGB(HSV{H: yellowH, S: brightYellowS, V: brightYellowV})), bgColor, accentTarget, opts))
|
||||||
|
|
||||||
|
brightBlueS := math.Min(ph.S*1.1, 1.0)
|
||||||
|
brightBlueV := math.Min(ph.V*1.15, 1.0)
|
||||||
|
palette.Color12 = NewColorInfo(ensureContrastBidirectional(RGBToHex(HSVToRGB(HSV{H: ph.H, S: brightBlueS, V: brightBlueV})), bgColor, accentTarget, opts))
|
||||||
|
|
||||||
|
lightContainer := DeriveContainer(primaryColor, true)
|
||||||
|
palette.Color13 = NewColorInfo(lightContainer)
|
||||||
|
|
||||||
|
brightCyanS := ph.S * 0.5
|
||||||
|
brightCyanV := math.Min(ph.V*1.3, 1.0)
|
||||||
|
palette.Color14 = NewColorInfo(RGBToHex(HSVToRGB(HSV{H: ph.H, S: brightCyanS, V: brightCyanV})))
|
||||||
|
|
||||||
|
white15S := baseSat * 0.04
|
||||||
|
white15V := math.Min(baseVal*1.5, 1.0)
|
||||||
|
palette.Color15 = NewColorInfo(RGBToHex(HSVToRGB(HSV{H: hsv.H, S: white15S, V: white15V})))
|
||||||
} else {
|
} else {
|
||||||
palette.Color15 = NewColorInfo("#ffffff")
|
redS := math.Min(baseSat*1.1, 1.0)
|
||||||
|
redV := math.Min(baseVal*1.15, 1.0)
|
||||||
|
palette.Color1 = NewColorInfo(ensureContrastAuto(RGBToHex(HSVToRGB(HSV{H: redH, S: redS, V: redV})), bgColor, normalTextTarget, opts))
|
||||||
|
|
||||||
|
greenS := math.Min(baseSat*1.0, 1.0)
|
||||||
|
greenV := math.Min(baseVal*1.0, 1.0)
|
||||||
|
palette.Color2 = NewColorInfo(ensureContrastAuto(RGBToHex(HSVToRGB(HSV{H: greenH, S: greenS, V: greenV})), bgColor, normalTextTarget, opts))
|
||||||
|
|
||||||
|
yellowS := math.Min(baseSat*1.1, 1.0)
|
||||||
|
yellowV := math.Min(baseVal*1.25, 1.0)
|
||||||
|
palette.Color3 = NewColorInfo(ensureContrastAuto(RGBToHex(HSVToRGB(HSV{H: yellowH, S: yellowS, V: yellowV})), bgColor, normalTextTarget, opts))
|
||||||
|
|
||||||
|
// Slightly more saturated variant of primary
|
||||||
|
blueS := math.Min(ph.S*1.2, 1.0)
|
||||||
|
blueV := ph.V * 0.95
|
||||||
|
palette.Color4 = NewColorInfo(ensureContrastAuto(RGBToHex(HSVToRGB(HSV{H: ph.H, S: blueS, V: blueV})), bgColor, normalTextTarget, opts))
|
||||||
|
|
||||||
|
// Color5 matches primary_container exactly (dark container in dark mode)
|
||||||
|
darkContainer := DeriveContainer(primaryColor, false)
|
||||||
|
palette.Color5 = NewColorInfo(darkContainer)
|
||||||
|
|
||||||
|
palette.Color6 = NewColorInfo(primaryColor)
|
||||||
|
|
||||||
|
gray7S := baseSat * 0.12
|
||||||
|
gray7V := math.Min(baseVal*1.05, 1.0)
|
||||||
|
palette.Color7 = NewColorInfo(ensureContrastAuto(RGBToHex(HSVToRGB(HSV{H: hsv.H, S: gray7S, V: gray7V})), bgColor, normalTextTarget, opts))
|
||||||
|
|
||||||
|
gray8S := baseSat * 0.15
|
||||||
|
gray8V := baseVal * 0.65
|
||||||
|
palette.Color8 = NewColorInfo(ensureContrastAuto(RGBToHex(HSVToRGB(HSV{H: hsv.H, S: gray8S, V: gray8V})), bgColor, secondaryTarget, opts))
|
||||||
|
|
||||||
|
brightRedS := math.Min(baseSat*0.75, 1.0)
|
||||||
|
brightRedV := math.Min(baseVal*1.35, 1.0)
|
||||||
|
palette.Color9 = NewColorInfo(ensureContrastBidirectional(RGBToHex(HSVToRGB(HSV{H: redH, S: brightRedS, V: brightRedV})), bgColor, accentTarget, opts))
|
||||||
|
|
||||||
|
brightGreenS := math.Min(baseSat*0.7, 1.0)
|
||||||
|
brightGreenV := math.Min(baseVal*1.2, 1.0)
|
||||||
|
palette.Color10 = NewColorInfo(ensureContrastBidirectional(RGBToHex(HSVToRGB(HSV{H: greenH, S: brightGreenS, V: brightGreenV})), bgColor, accentTarget, opts))
|
||||||
|
|
||||||
|
brightYellowS := math.Min(baseSat*0.7, 1.0)
|
||||||
|
brightYellowV := math.Min(baseVal*1.5, 1.0)
|
||||||
|
palette.Color11 = NewColorInfo(ensureContrastBidirectional(RGBToHex(HSVToRGB(HSV{H: yellowH, S: brightYellowS, V: brightYellowV})), bgColor, accentTarget, opts))
|
||||||
|
|
||||||
|
// Create a gradient of primary variants: Color12 -> Color13 -> Color14 -> Color15 (near white)
|
||||||
|
// Color12: Start of the lighter gradient - slightly desaturated
|
||||||
|
brightBlueS := ph.S * 0.85
|
||||||
|
brightBlueV := math.Min(ph.V*1.1, 1.0)
|
||||||
|
palette.Color12 = NewColorInfo(ensureContrastBidirectional(RGBToHex(HSVToRGB(HSV{H: ph.H, S: brightBlueS, V: brightBlueV})), bgColor, accentTarget, opts))
|
||||||
|
|
||||||
|
// Medium-high saturation pastel primary
|
||||||
|
color13S := ph.S * 0.7
|
||||||
|
color13V := math.Min(ph.V*1.3, 1.0)
|
||||||
|
palette.Color13 = NewColorInfo(RGBToHex(HSVToRGB(HSV{H: ph.H, S: color13S, V: color13V})))
|
||||||
|
|
||||||
|
// Lower saturation, lighter variant
|
||||||
|
color14S := ph.S * 0.45
|
||||||
|
color14V := math.Min(ph.V*1.4, 1.0)
|
||||||
|
palette.Color14 = NewColorInfo(RGBToHex(HSVToRGB(HSV{H: ph.H, S: color14S, V: color14V})))
|
||||||
|
|
||||||
|
white15S := baseSat * 0.05
|
||||||
|
white15V := math.Min(baseVal*1.45, 1.0)
|
||||||
|
palette.Color15 = NewColorInfo(ensureContrastAuto(RGBToHex(HSVToRGB(HSV{H: hsv.H, S: white15S, V: white15V})), bgColor, normalTextTarget, opts))
|
||||||
}
|
}
|
||||||
|
|
||||||
return palette
|
return palette
|
||||||
|
|||||||
@@ -366,10 +366,19 @@ func TestGeneratePalette(t *testing.T) {
|
|||||||
t.Errorf("Light mode background = %s, expected #f8f8f8", result.Color0.Hex)
|
t.Errorf("Light mode background = %s, expected #f8f8f8", result.Color0.Hex)
|
||||||
}
|
}
|
||||||
|
|
||||||
if tt.opts.IsLight && result.Color15.Hex != "#1a1a1a" {
|
// Color15 is now derived from primary, so just verify it's a valid color
|
||||||
t.Errorf("Light mode foreground = %s, expected #1a1a1a", result.Color15.Hex)
|
// and has appropriate luminance for the mode (now theme-tinted, not pure white/black)
|
||||||
} else if !tt.opts.IsLight && result.Color15.Hex != "#ffffff" {
|
color15Lum := Luminance(result.Color15.Hex)
|
||||||
t.Errorf("Dark mode foreground = %s, expected #ffffff", result.Color15.Hex)
|
if tt.opts.IsLight {
|
||||||
|
// Light mode: Color15 should still be relatively light
|
||||||
|
if color15Lum < 0.5 {
|
||||||
|
t.Errorf("Light mode Color15 = %s (lum %.2f) is too dark", result.Color15.Hex, color15Lum)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Dark mode: Color15 should be light (but may have theme tint, so lower threshold)
|
||||||
|
if color15Lum < 0.5 {
|
||||||
|
t.Errorf("Dark mode Color15 = %s (lum %.2f) is too dark", result.Color15.Hex, color15Lum)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -579,6 +588,10 @@ func TestGeneratePaletteWithDPS(t *testing.T) {
|
|||||||
|
|
||||||
bgColor := result.Color0.Hex
|
bgColor := result.Color0.Hex
|
||||||
for i := 1; i < 8; i++ {
|
for i := 1; i < 8; i++ {
|
||||||
|
// Skip Color5 (container) and Color6 (exact primary) - intentionally not contrast-adjusted
|
||||||
|
if i == 5 || i == 6 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
lc := DeltaPhiStarContrast(colors[i].Hex, bgColor, tt.opts.IsLight)
|
lc := DeltaPhiStarContrast(colors[i].Hex, bgColor, tt.opts.IsLight)
|
||||||
minLc := 30.0
|
minLc := 30.0
|
||||||
if lc < minLc && lc > 0 {
|
if lc < minLc && lc > 0 {
|
||||||
|
|||||||
170
core/internal/notify/notify.go
Normal file
170
core/internal/notify/notify.go
Normal file
@@ -0,0 +1,170 @@
|
|||||||
|
package notify
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"os/exec"
|
||||||
|
"path/filepath"
|
||||||
|
"strconv"
|
||||||
|
"syscall"
|
||||||
|
|
||||||
|
"github.com/godbus/dbus/v5"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
notifyDest = "org.freedesktop.Notifications"
|
||||||
|
notifyPath = "/org/freedesktop/Notifications"
|
||||||
|
notifyInterface = "org.freedesktop.Notifications"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Notification struct {
|
||||||
|
AppName string
|
||||||
|
Icon string
|
||||||
|
Summary string
|
||||||
|
Body string
|
||||||
|
FilePath string
|
||||||
|
Timeout int32
|
||||||
|
}
|
||||||
|
|
||||||
|
func Send(n Notification) error {
|
||||||
|
conn, err := dbus.SessionBus()
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("dbus session failed: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if n.AppName == "" {
|
||||||
|
n.AppName = "DMS"
|
||||||
|
}
|
||||||
|
if n.Timeout == 0 {
|
||||||
|
n.Timeout = 5000
|
||||||
|
}
|
||||||
|
|
||||||
|
var actions []string
|
||||||
|
if n.FilePath != "" {
|
||||||
|
actions = []string{
|
||||||
|
"open", "Open",
|
||||||
|
"folder", "Open Folder",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
hints := map[string]dbus.Variant{}
|
||||||
|
if n.FilePath != "" {
|
||||||
|
hints["image_path"] = dbus.MakeVariant(n.FilePath)
|
||||||
|
}
|
||||||
|
|
||||||
|
obj := conn.Object(notifyDest, notifyPath)
|
||||||
|
call := obj.Call(
|
||||||
|
notifyInterface+".Notify",
|
||||||
|
0,
|
||||||
|
n.AppName,
|
||||||
|
uint32(0),
|
||||||
|
n.Icon,
|
||||||
|
n.Summary,
|
||||||
|
n.Body,
|
||||||
|
actions,
|
||||||
|
hints,
|
||||||
|
n.Timeout,
|
||||||
|
)
|
||||||
|
|
||||||
|
if call.Err != nil {
|
||||||
|
return fmt.Errorf("notify call failed: %w", call.Err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var notificationID uint32
|
||||||
|
if err := call.Store(¬ificationID); err != nil {
|
||||||
|
return fmt.Errorf("failed to get notification id: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(actions) > 0 && n.FilePath != "" {
|
||||||
|
spawnActionListener(notificationID, n.FilePath)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func spawnActionListener(notificationID uint32, filePath string) {
|
||||||
|
exe, err := os.Executable()
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
cmd := exec.Command(exe, "notify-action-generic", fmt.Sprintf("%d", notificationID), filePath)
|
||||||
|
cmd.SysProcAttr = &syscall.SysProcAttr{
|
||||||
|
Setsid: true,
|
||||||
|
}
|
||||||
|
cmd.Start()
|
||||||
|
}
|
||||||
|
|
||||||
|
func RunActionListener(args []string) {
|
||||||
|
if len(args) < 2 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
notificationID, err := strconv.ParseUint(args[0], 10, 32)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
filePath := args[1]
|
||||||
|
|
||||||
|
conn, err := dbus.SessionBus()
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := conn.AddMatchSignal(
|
||||||
|
dbus.WithMatchObjectPath(notifyPath),
|
||||||
|
dbus.WithMatchInterface(notifyInterface),
|
||||||
|
); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
signals := make(chan *dbus.Signal, 10)
|
||||||
|
conn.Signal(signals)
|
||||||
|
|
||||||
|
for sig := range signals {
|
||||||
|
switch sig.Name {
|
||||||
|
case notifyInterface + ".ActionInvoked":
|
||||||
|
if len(sig.Body) < 2 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
id, ok := sig.Body[0].(uint32)
|
||||||
|
if !ok || id != uint32(notificationID) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
action, ok := sig.Body[1].(string)
|
||||||
|
if !ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
handleAction(action, filePath)
|
||||||
|
return
|
||||||
|
|
||||||
|
case notifyInterface + ".NotificationClosed":
|
||||||
|
if len(sig.Body) < 1 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
id, ok := sig.Body[0].(uint32)
|
||||||
|
if !ok || id != uint32(notificationID) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func handleAction(action, filePath string) {
|
||||||
|
switch action {
|
||||||
|
case "open", "default":
|
||||||
|
openPath(filePath)
|
||||||
|
case "folder":
|
||||||
|
openPath(filepath.Dir(filePath))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func openPath(path string) {
|
||||||
|
cmd := exec.Command("xdg-open", path)
|
||||||
|
cmd.SysProcAttr = &syscall.SysProcAttr{
|
||||||
|
Setsid: true,
|
||||||
|
}
|
||||||
|
cmd.Start()
|
||||||
|
}
|
||||||
@@ -7,6 +7,7 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
|
"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
|
||||||
|
"github.com/AvengeMedia/DankMaterialShell/core/pkg/dbusutil"
|
||||||
"github.com/godbus/dbus/v5"
|
"github.com/godbus/dbus/v5"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -110,17 +111,15 @@ func (m *Manager) updateAdapterState() error {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
powered, _ := poweredVar.Value().(bool)
|
|
||||||
|
|
||||||
discoveringVar, err := obj.GetProperty(adapter1Iface + ".Discovering")
|
discoveringVar, err := obj.GetProperty(adapter1Iface + ".Discovering")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
discovering, _ := discoveringVar.Value().(bool)
|
|
||||||
|
|
||||||
m.stateMutex.Lock()
|
m.stateMutex.Lock()
|
||||||
m.state.Powered = powered
|
m.state.Powered = dbusutil.AsOr(poweredVar, false)
|
||||||
m.state.Discovering = discovering
|
m.state.Discovering = dbusutil.AsOr(discoveringVar, false)
|
||||||
m.stateMutex.Unlock()
|
m.stateMutex.Unlock()
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
@@ -169,65 +168,20 @@ func (m *Manager) updateDevices() error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (m *Manager) deviceFromProps(path string, props map[string]dbus.Variant) Device {
|
func (m *Manager) deviceFromProps(path string, props map[string]dbus.Variant) Device {
|
||||||
dev := Device{Path: path}
|
return Device{
|
||||||
|
Path: path,
|
||||||
if v, ok := props["Address"]; ok {
|
Address: dbusutil.GetOr(props, "Address", ""),
|
||||||
if addr, ok := v.Value().(string); ok {
|
Name: dbusutil.GetOr(props, "Name", ""),
|
||||||
dev.Address = addr
|
Alias: dbusutil.GetOr(props, "Alias", ""),
|
||||||
}
|
Paired: dbusutil.GetOr(props, "Paired", false),
|
||||||
|
Trusted: dbusutil.GetOr(props, "Trusted", false),
|
||||||
|
Blocked: dbusutil.GetOr(props, "Blocked", false),
|
||||||
|
Connected: dbusutil.GetOr(props, "Connected", false),
|
||||||
|
Class: dbusutil.GetOr(props, "Class", uint32(0)),
|
||||||
|
Icon: dbusutil.GetOr(props, "Icon", ""),
|
||||||
|
RSSI: dbusutil.GetOr(props, "RSSI", int16(0)),
|
||||||
|
LegacyPairing: dbusutil.GetOr(props, "LegacyPairing", false),
|
||||||
}
|
}
|
||||||
if v, ok := props["Name"]; ok {
|
|
||||||
if name, ok := v.Value().(string); ok {
|
|
||||||
dev.Name = name
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if v, ok := props["Alias"]; ok {
|
|
||||||
if alias, ok := v.Value().(string); ok {
|
|
||||||
dev.Alias = alias
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if v, ok := props["Paired"]; ok {
|
|
||||||
if paired, ok := v.Value().(bool); ok {
|
|
||||||
dev.Paired = paired
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if v, ok := props["Trusted"]; ok {
|
|
||||||
if trusted, ok := v.Value().(bool); ok {
|
|
||||||
dev.Trusted = trusted
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if v, ok := props["Blocked"]; ok {
|
|
||||||
if blocked, ok := v.Value().(bool); ok {
|
|
||||||
dev.Blocked = blocked
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if v, ok := props["Connected"]; ok {
|
|
||||||
if connected, ok := v.Value().(bool); ok {
|
|
||||||
dev.Connected = connected
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if v, ok := props["Class"]; ok {
|
|
||||||
if class, ok := v.Value().(uint32); ok {
|
|
||||||
dev.Class = class
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if v, ok := props["Icon"]; ok {
|
|
||||||
if icon, ok := v.Value().(string); ok {
|
|
||||||
dev.Icon = icon
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if v, ok := props["RSSI"]; ok {
|
|
||||||
if rssi, ok := v.Value().(int16); ok {
|
|
||||||
dev.RSSI = rssi
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if v, ok := props["LegacyPairing"]; ok {
|
|
||||||
if legacy, ok := v.Value().(bool); ok {
|
|
||||||
dev.LegacyPairing = legacy
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return dev
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *Manager) startAgent() error {
|
func (m *Manager) startAgent() error {
|
||||||
@@ -328,17 +282,13 @@ func (m *Manager) handleAdapterPropertiesChanged(changed map[string]dbus.Variant
|
|||||||
m.stateMutex.Lock()
|
m.stateMutex.Lock()
|
||||||
dirty := false
|
dirty := false
|
||||||
|
|
||||||
if v, ok := changed["Powered"]; ok {
|
if powered, ok := dbusutil.Get[bool](changed, "Powered"); ok {
|
||||||
if powered, ok := v.Value().(bool); ok {
|
m.state.Powered = powered
|
||||||
m.state.Powered = powered
|
dirty = true
|
||||||
dirty = true
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if v, ok := changed["Discovering"]; ok {
|
if discovering, ok := dbusutil.Get[bool](changed, "Discovering"); ok {
|
||||||
if discovering, ok := v.Value().(bool); ok {
|
m.state.Discovering = discovering
|
||||||
m.state.Discovering = discovering
|
dirty = true
|
||||||
dirty = true
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
m.stateMutex.Unlock()
|
m.stateMutex.Unlock()
|
||||||
@@ -349,31 +299,28 @@ func (m *Manager) handleAdapterPropertiesChanged(changed map[string]dbus.Variant
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (m *Manager) handleDevicePropertiesChanged(path dbus.ObjectPath, changed map[string]dbus.Variant) {
|
func (m *Manager) handleDevicePropertiesChanged(path dbus.ObjectPath, changed map[string]dbus.Variant) {
|
||||||
pairedVar, hasPaired := changed["Paired"]
|
paired, hasPaired := dbusutil.Get[bool](changed, "Paired")
|
||||||
_, hasConnected := changed["Connected"]
|
_, hasConnected := changed["Connected"]
|
||||||
_, hasTrusted := changed["Trusted"]
|
_, hasTrusted := changed["Trusted"]
|
||||||
|
|
||||||
if hasPaired {
|
if hasPaired {
|
||||||
devicePath := string(path)
|
devicePath := string(path)
|
||||||
if paired, ok := pairedVar.Value().(bool); ok {
|
if paired {
|
||||||
if paired {
|
_, wasPending := m.pendingPairings.LoadAndDelete(devicePath)
|
||||||
_, wasPending := m.pendingPairings.LoadAndDelete(devicePath)
|
if wasPending {
|
||||||
|
select {
|
||||||
if wasPending {
|
case m.eventQueue <- func() {
|
||||||
select {
|
time.Sleep(300 * time.Millisecond)
|
||||||
case m.eventQueue <- func() {
|
log.Infof("[Bluetooth] Auto-connecting newly paired device: %s", devicePath)
|
||||||
time.Sleep(300 * time.Millisecond)
|
if err := m.ConnectDevice(devicePath); err != nil {
|
||||||
log.Infof("[Bluetooth] Auto-connecting newly paired device: %s", devicePath)
|
log.Warnf("[Bluetooth] Auto-connect failed: %v", err)
|
||||||
if err := m.ConnectDevice(devicePath); err != nil {
|
|
||||||
log.Warnf("[Bluetooth] Auto-connect failed: %v", err)
|
|
||||||
}
|
|
||||||
}:
|
|
||||||
default:
|
|
||||||
}
|
}
|
||||||
|
}:
|
||||||
|
default:
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
m.pendingPairings.Delete(devicePath)
|
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
m.pendingPairings.Delete(devicePath)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -37,6 +37,14 @@ func HandleRequest(conn net.Conn, req models.Request, m *Manager) {
|
|||||||
handleSetConfig(conn, req, m)
|
handleSetConfig(conn, req, m)
|
||||||
case "clipboard.store":
|
case "clipboard.store":
|
||||||
handleStore(conn, req, m)
|
handleStore(conn, req, m)
|
||||||
|
case "clipboard.pinEntry":
|
||||||
|
handlePinEntry(conn, req, m)
|
||||||
|
case "clipboard.unpinEntry":
|
||||||
|
handleUnpinEntry(conn, req, m)
|
||||||
|
case "clipboard.getPinnedEntries":
|
||||||
|
handleGetPinnedEntries(conn, req, m)
|
||||||
|
case "clipboard.getPinnedCount":
|
||||||
|
handleGetPinnedCount(conn, req, m)
|
||||||
default:
|
default:
|
||||||
models.RespondError(conn, req.ID, "unknown method: "+req.Method)
|
models.RespondError(conn, req.ID, "unknown method: "+req.Method)
|
||||||
}
|
}
|
||||||
@@ -205,6 +213,9 @@ func handleSetConfig(conn net.Conn, req models.Request, m *Manager) {
|
|||||||
if v, ok := models.Get[bool](req, "disabled"); ok {
|
if v, ok := models.Get[bool](req, "disabled"); ok {
|
||||||
cfg.Disabled = v
|
cfg.Disabled = v
|
||||||
}
|
}
|
||||||
|
if v, ok := models.Get[float64](req, "maxPinned"); ok {
|
||||||
|
cfg.MaxPinned = int(v)
|
||||||
|
}
|
||||||
|
|
||||||
if err := m.SetConfig(cfg); err != nil {
|
if err := m.SetConfig(cfg); err != nil {
|
||||||
models.RespondError(conn, req.ID, err.Error())
|
models.RespondError(conn, req.ID, err.Error())
|
||||||
@@ -230,3 +241,43 @@ func handleStore(conn net.Conn, req models.Request, m *Manager) {
|
|||||||
|
|
||||||
models.Respond(conn, req.ID, models.SuccessResult{Success: true, Message: "stored"})
|
models.Respond(conn, req.ID, models.SuccessResult{Success: true, Message: "stored"})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func handlePinEntry(conn net.Conn, req models.Request, m *Manager) {
|
||||||
|
id, err := params.Int(req.Params, "id")
|
||||||
|
if err != nil {
|
||||||
|
models.RespondError(conn, req.ID, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := m.PinEntry(uint64(id)); err != nil {
|
||||||
|
models.RespondError(conn, req.ID, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
models.Respond(conn, req.ID, models.SuccessResult{Success: true, Message: "entry pinned"})
|
||||||
|
}
|
||||||
|
|
||||||
|
func handleUnpinEntry(conn net.Conn, req models.Request, m *Manager) {
|
||||||
|
id, err := params.Int(req.Params, "id")
|
||||||
|
if err != nil {
|
||||||
|
models.RespondError(conn, req.ID, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := m.UnpinEntry(uint64(id)); err != nil {
|
||||||
|
models.RespondError(conn, req.ID, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
models.Respond(conn, req.ID, models.SuccessResult{Success: true, Message: "entry unpinned"})
|
||||||
|
}
|
||||||
|
|
||||||
|
func handleGetPinnedEntries(conn net.Conn, req models.Request, m *Manager) {
|
||||||
|
pinned := m.GetPinnedEntries()
|
||||||
|
models.Respond(conn, req.ID, pinned)
|
||||||
|
}
|
||||||
|
|
||||||
|
func handleGetPinnedCount(conn net.Conn, req models.Request, m *Manager) {
|
||||||
|
count := m.GetPinnedCount()
|
||||||
|
models.Respond(conn, req.ID, map[string]int{"count": count})
|
||||||
|
}
|
||||||
|
|||||||
@@ -389,7 +389,11 @@ func (m *Manager) trimLengthInTx(b *bolt.Bucket) error {
|
|||||||
}
|
}
|
||||||
c := b.Cursor()
|
c := b.Cursor()
|
||||||
var count int
|
var count int
|
||||||
for k, _ := c.Last(); k != nil; k, _ = c.Prev() {
|
for k, v := c.Last(); k != nil; k, v = c.Prev() {
|
||||||
|
entry, err := decodeEntry(v)
|
||||||
|
if err == nil && entry.Pinned {
|
||||||
|
continue
|
||||||
|
}
|
||||||
if count < m.config.MaxHistory {
|
if count < m.config.MaxHistory {
|
||||||
count++
|
count++
|
||||||
continue
|
continue
|
||||||
@@ -419,6 +423,11 @@ func encodeEntry(e Entry) ([]byte, error) {
|
|||||||
buf.WriteByte(0)
|
buf.WriteByte(0)
|
||||||
}
|
}
|
||||||
binary.Write(buf, binary.BigEndian, e.Hash)
|
binary.Write(buf, binary.BigEndian, e.Hash)
|
||||||
|
if e.Pinned {
|
||||||
|
buf.WriteByte(1)
|
||||||
|
} else {
|
||||||
|
buf.WriteByte(0)
|
||||||
|
}
|
||||||
|
|
||||||
return buf.Bytes(), nil
|
return buf.Bytes(), nil
|
||||||
}
|
}
|
||||||
@@ -462,6 +471,12 @@ func decodeEntry(data []byte) (Entry, error) {
|
|||||||
binary.Read(buf, binary.BigEndian, &e.Hash)
|
binary.Read(buf, binary.BigEndian, &e.Hash)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if buf.Len() >= 1 {
|
||||||
|
var pinnedByte byte
|
||||||
|
binary.Read(buf, binary.BigEndian, &pinnedByte)
|
||||||
|
e.Pinned = pinnedByte == 1
|
||||||
|
}
|
||||||
|
|
||||||
return e, nil
|
return e, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -735,19 +750,54 @@ func (m *Manager) ClearHistory() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Delete only non-pinned entries
|
||||||
if err := m.db.Update(func(tx *bolt.Tx) error {
|
if err := m.db.Update(func(tx *bolt.Tx) error {
|
||||||
if err := tx.DeleteBucket([]byte("clipboard")); err != nil {
|
b := tx.Bucket([]byte("clipboard"))
|
||||||
return err
|
if b == nil {
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
_, err := tx.CreateBucket([]byte("clipboard"))
|
|
||||||
return err
|
var toDelete [][]byte
|
||||||
|
c := b.Cursor()
|
||||||
|
for k, v := c.First(); k != nil; k, v = c.Next() {
|
||||||
|
entry, err := decodeEntry(v)
|
||||||
|
if err != nil || !entry.Pinned {
|
||||||
|
toDelete = append(toDelete, k)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, k := range toDelete {
|
||||||
|
if err := b.Delete(k); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
}); err != nil {
|
}); err != nil {
|
||||||
log.Errorf("Failed to clear clipboard history: %v", err)
|
log.Errorf("Failed to clear clipboard history: %v", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := m.compactDB(); err != nil {
|
pinnedCount := 0
|
||||||
log.Errorf("Failed to compact database: %v", err)
|
if err := m.db.View(func(tx *bolt.Tx) error {
|
||||||
|
b := tx.Bucket([]byte("clipboard"))
|
||||||
|
if b != nil {
|
||||||
|
c := b.Cursor()
|
||||||
|
for k, v := c.First(); k != nil; k, v = c.Next() {
|
||||||
|
entry, _ := decodeEntry(v)
|
||||||
|
if entry.Pinned {
|
||||||
|
pinnedCount++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}); err != nil {
|
||||||
|
log.Errorf("Failed to count pinned entries: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if pinnedCount == 0 {
|
||||||
|
if err := m.compactDB(); err != nil {
|
||||||
|
log.Errorf("Failed to compact database: %v", err)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
m.updateState()
|
m.updateState()
|
||||||
@@ -960,6 +1010,10 @@ func (m *Manager) clearOldEntries(days int) error {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
// Skip pinned entries
|
||||||
|
if entry.Pinned {
|
||||||
|
continue
|
||||||
|
}
|
||||||
if entry.Timestamp.Before(cutoff) {
|
if entry.Timestamp.Before(cutoff) {
|
||||||
toDelete = append(toDelete, k)
|
toDelete = append(toDelete, k)
|
||||||
}
|
}
|
||||||
@@ -1250,3 +1304,153 @@ func (m *Manager) StoreData(data []byte, mimeType string) error {
|
|||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (m *Manager) PinEntry(id uint64) error {
|
||||||
|
if m.db == nil {
|
||||||
|
return fmt.Errorf("database not available")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check pinned count
|
||||||
|
cfg := m.getConfig()
|
||||||
|
pinnedCount := 0
|
||||||
|
if err := m.db.View(func(tx *bolt.Tx) error {
|
||||||
|
b := tx.Bucket([]byte("clipboard"))
|
||||||
|
if b == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
c := b.Cursor()
|
||||||
|
for k, v := c.First(); k != nil; k, v = c.Next() {
|
||||||
|
entry, err := decodeEntry(v)
|
||||||
|
if err == nil && entry.Pinned {
|
||||||
|
pinnedCount++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}); err != nil {
|
||||||
|
log.Errorf("Failed to count pinned entries: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if pinnedCount >= cfg.MaxPinned {
|
||||||
|
return fmt.Errorf("maximum pinned entries reached (%d)", cfg.MaxPinned)
|
||||||
|
}
|
||||||
|
|
||||||
|
err := m.db.Update(func(tx *bolt.Tx) error {
|
||||||
|
b := tx.Bucket([]byte("clipboard"))
|
||||||
|
v := b.Get(itob(id))
|
||||||
|
if v == nil {
|
||||||
|
return fmt.Errorf("entry not found")
|
||||||
|
}
|
||||||
|
|
||||||
|
entry, err := decodeEntry(v)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
entry.Pinned = true
|
||||||
|
encoded, err := encodeEntry(entry)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
return b.Put(itob(id), encoded)
|
||||||
|
})
|
||||||
|
|
||||||
|
if err == nil {
|
||||||
|
m.updateState()
|
||||||
|
m.notifySubscribers()
|
||||||
|
}
|
||||||
|
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *Manager) UnpinEntry(id uint64) error {
|
||||||
|
if m.db == nil {
|
||||||
|
return fmt.Errorf("database not available")
|
||||||
|
}
|
||||||
|
|
||||||
|
err := m.db.Update(func(tx *bolt.Tx) error {
|
||||||
|
b := tx.Bucket([]byte("clipboard"))
|
||||||
|
v := b.Get(itob(id))
|
||||||
|
if v == nil {
|
||||||
|
return fmt.Errorf("entry not found")
|
||||||
|
}
|
||||||
|
|
||||||
|
entry, err := decodeEntry(v)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
entry.Pinned = false
|
||||||
|
encoded, err := encodeEntry(entry)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
return b.Put(itob(id), encoded)
|
||||||
|
})
|
||||||
|
|
||||||
|
if err == nil {
|
||||||
|
m.updateState()
|
||||||
|
m.notifySubscribers()
|
||||||
|
}
|
||||||
|
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *Manager) GetPinnedEntries() []Entry {
|
||||||
|
if m.db == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
var pinned []Entry
|
||||||
|
if err := m.db.View(func(tx *bolt.Tx) error {
|
||||||
|
b := tx.Bucket([]byte("clipboard"))
|
||||||
|
if b == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
c := b.Cursor()
|
||||||
|
for k, v := c.Last(); k != nil; k, v = c.Prev() {
|
||||||
|
entry, err := decodeEntry(v)
|
||||||
|
if err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if entry.Pinned {
|
||||||
|
entry.Data = nil
|
||||||
|
pinned = append(pinned, entry)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}); err != nil {
|
||||||
|
log.Errorf("Failed to get pinned entries: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return pinned
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *Manager) GetPinnedCount() int {
|
||||||
|
if m.db == nil {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
count := 0
|
||||||
|
if err := m.db.View(func(tx *bolt.Tx) error {
|
||||||
|
b := tx.Bucket([]byte("clipboard"))
|
||||||
|
if b == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
c := b.Cursor()
|
||||||
|
for k, v := c.First(); k != nil; k, v = c.Next() {
|
||||||
|
entry, err := decodeEntry(v)
|
||||||
|
if err == nil && entry.Pinned {
|
||||||
|
count++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}); err != nil {
|
||||||
|
log.Errorf("Failed to count pinned entries: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return count
|
||||||
|
}
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ type Config struct {
|
|||||||
AutoClearDays int `json:"autoClearDays"`
|
AutoClearDays int `json:"autoClearDays"`
|
||||||
ClearAtStartup bool `json:"clearAtStartup"`
|
ClearAtStartup bool `json:"clearAtStartup"`
|
||||||
Disabled bool `json:"disabled"`
|
Disabled bool `json:"disabled"`
|
||||||
|
MaxPinned int `json:"maxPinned"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func DefaultConfig() Config {
|
func DefaultConfig() Config {
|
||||||
@@ -27,6 +28,7 @@ func DefaultConfig() Config {
|
|||||||
MaxEntrySize: 5 * 1024 * 1024,
|
MaxEntrySize: 5 * 1024 * 1024,
|
||||||
AutoClearDays: 0,
|
AutoClearDays: 0,
|
||||||
ClearAtStartup: false,
|
ClearAtStartup: false,
|
||||||
|
MaxPinned: 25,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -100,6 +102,7 @@ type Entry struct {
|
|||||||
Timestamp time.Time `json:"timestamp"`
|
Timestamp time.Time `json:"timestamp"`
|
||||||
IsImage bool `json:"isImage"`
|
IsImage bool `json:"isImage"`
|
||||||
Hash uint64 `json:"hash,omitempty"`
|
Hash uint64 `json:"hash,omitempty"`
|
||||||
|
Pinned bool `json:"pinned"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type State struct {
|
type State struct {
|
||||||
|
|||||||
237
core/internal/server/dbus/handlers.go
Normal file
237
core/internal/server/dbus/handlers.go
Normal file
@@ -0,0 +1,237 @@
|
|||||||
|
package dbus
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"net"
|
||||||
|
|
||||||
|
"github.com/AvengeMedia/DankMaterialShell/core/internal/server/models"
|
||||||
|
"github.com/AvengeMedia/DankMaterialShell/core/internal/server/params"
|
||||||
|
)
|
||||||
|
|
||||||
|
type objectParams struct {
|
||||||
|
bus string
|
||||||
|
dest string
|
||||||
|
path string
|
||||||
|
iface string
|
||||||
|
}
|
||||||
|
|
||||||
|
func extractObjectParams(p map[string]any, requirePath bool) (objectParams, error) {
|
||||||
|
bus, err := params.String(p, "bus")
|
||||||
|
if err != nil {
|
||||||
|
return objectParams{}, err
|
||||||
|
}
|
||||||
|
dest, err := params.String(p, "dest")
|
||||||
|
if err != nil {
|
||||||
|
return objectParams{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
var path string
|
||||||
|
if requirePath {
|
||||||
|
path, err = params.String(p, "path")
|
||||||
|
if err != nil {
|
||||||
|
return objectParams{}, err
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
path = params.StringOpt(p, "path", "/")
|
||||||
|
}
|
||||||
|
|
||||||
|
iface, err := params.String(p, "interface")
|
||||||
|
if err != nil {
|
||||||
|
return objectParams{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return objectParams{bus: bus, dest: dest, path: path, iface: iface}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func HandleRequest(conn net.Conn, req models.Request, m *Manager, clientID string) {
|
||||||
|
switch req.Method {
|
||||||
|
case "dbus.call":
|
||||||
|
handleCall(conn, req, m)
|
||||||
|
case "dbus.getProperty":
|
||||||
|
handleGetProperty(conn, req, m)
|
||||||
|
case "dbus.setProperty":
|
||||||
|
handleSetProperty(conn, req, m)
|
||||||
|
case "dbus.getAllProperties":
|
||||||
|
handleGetAllProperties(conn, req, m)
|
||||||
|
case "dbus.introspect":
|
||||||
|
handleIntrospect(conn, req, m)
|
||||||
|
case "dbus.listNames":
|
||||||
|
handleListNames(conn, req, m)
|
||||||
|
case "dbus.subscribe":
|
||||||
|
handleSubscribe(conn, req, m, clientID)
|
||||||
|
case "dbus.unsubscribe":
|
||||||
|
handleUnsubscribe(conn, req, m)
|
||||||
|
default:
|
||||||
|
models.RespondError(conn, req.ID, fmt.Sprintf("unknown method: %s", req.Method))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func handleCall(conn net.Conn, req models.Request, m *Manager) {
|
||||||
|
op, err := extractObjectParams(req.Params, true)
|
||||||
|
if err != nil {
|
||||||
|
models.RespondError(conn, req.ID, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
method, err := params.String(req.Params, "method")
|
||||||
|
if err != nil {
|
||||||
|
models.RespondError(conn, req.ID, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var args []any
|
||||||
|
if argsRaw, ok := params.Any(req.Params, "args"); ok {
|
||||||
|
if argsSlice, ok := argsRaw.([]any); ok {
|
||||||
|
args = argsSlice
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
result, err := m.Call(op.bus, op.dest, op.path, op.iface, method, args)
|
||||||
|
if err != nil {
|
||||||
|
models.RespondError(conn, req.ID, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
models.Respond(conn, req.ID, result)
|
||||||
|
}
|
||||||
|
|
||||||
|
func handleGetProperty(conn net.Conn, req models.Request, m *Manager) {
|
||||||
|
op, err := extractObjectParams(req.Params, true)
|
||||||
|
if err != nil {
|
||||||
|
models.RespondError(conn, req.ID, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
property, err := params.String(req.Params, "property")
|
||||||
|
if err != nil {
|
||||||
|
models.RespondError(conn, req.ID, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
result, err := m.GetProperty(op.bus, op.dest, op.path, op.iface, property)
|
||||||
|
if err != nil {
|
||||||
|
models.RespondError(conn, req.ID, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
models.Respond(conn, req.ID, result)
|
||||||
|
}
|
||||||
|
|
||||||
|
func handleSetProperty(conn net.Conn, req models.Request, m *Manager) {
|
||||||
|
op, err := extractObjectParams(req.Params, true)
|
||||||
|
if err != nil {
|
||||||
|
models.RespondError(conn, req.ID, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
property, err := params.String(req.Params, "property")
|
||||||
|
if err != nil {
|
||||||
|
models.RespondError(conn, req.ID, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
value, ok := params.Any(req.Params, "value")
|
||||||
|
if !ok {
|
||||||
|
models.RespondError(conn, req.ID, "missing 'value' parameter")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := m.SetProperty(op.bus, op.dest, op.path, op.iface, property, value); err != nil {
|
||||||
|
models.RespondError(conn, req.ID, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
models.Respond(conn, req.ID, models.SuccessResult{Success: true})
|
||||||
|
}
|
||||||
|
|
||||||
|
func handleGetAllProperties(conn net.Conn, req models.Request, m *Manager) {
|
||||||
|
op, err := extractObjectParams(req.Params, true)
|
||||||
|
if err != nil {
|
||||||
|
models.RespondError(conn, req.ID, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
result, err := m.GetAllProperties(op.bus, op.dest, op.path, op.iface)
|
||||||
|
if err != nil {
|
||||||
|
models.RespondError(conn, req.ID, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
models.Respond(conn, req.ID, result)
|
||||||
|
}
|
||||||
|
|
||||||
|
func handleIntrospect(conn net.Conn, req models.Request, m *Manager) {
|
||||||
|
bus, err := params.String(req.Params, "bus")
|
||||||
|
if err != nil {
|
||||||
|
models.RespondError(conn, req.ID, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
dest, err := params.String(req.Params, "dest")
|
||||||
|
if err != nil {
|
||||||
|
models.RespondError(conn, req.ID, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
path := params.StringOpt(req.Params, "path", "/")
|
||||||
|
|
||||||
|
result, err := m.Introspect(bus, dest, path)
|
||||||
|
if err != nil {
|
||||||
|
models.RespondError(conn, req.ID, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
models.Respond(conn, req.ID, result)
|
||||||
|
}
|
||||||
|
|
||||||
|
func handleListNames(conn net.Conn, req models.Request, m *Manager) {
|
||||||
|
bus, err := params.String(req.Params, "bus")
|
||||||
|
if err != nil {
|
||||||
|
models.RespondError(conn, req.ID, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
result, err := m.ListNames(bus)
|
||||||
|
if err != nil {
|
||||||
|
models.RespondError(conn, req.ID, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
models.Respond(conn, req.ID, result)
|
||||||
|
}
|
||||||
|
|
||||||
|
func handleSubscribe(conn net.Conn, req models.Request, m *Manager, clientID string) {
|
||||||
|
bus, err := params.String(req.Params, "bus")
|
||||||
|
if err != nil {
|
||||||
|
models.RespondError(conn, req.ID, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
sender := params.StringOpt(req.Params, "sender", "")
|
||||||
|
path := params.StringOpt(req.Params, "path", "")
|
||||||
|
iface := params.StringOpt(req.Params, "interface", "")
|
||||||
|
member := params.StringOpt(req.Params, "member", "")
|
||||||
|
|
||||||
|
result, err := m.Subscribe(clientID, bus, sender, path, iface, member)
|
||||||
|
if err != nil {
|
||||||
|
models.RespondError(conn, req.ID, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
models.Respond(conn, req.ID, result)
|
||||||
|
}
|
||||||
|
|
||||||
|
func handleUnsubscribe(conn net.Conn, req models.Request, m *Manager) {
|
||||||
|
subID, err := params.String(req.Params, "subscriptionId")
|
||||||
|
if err != nil {
|
||||||
|
models.RespondError(conn, req.ID, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := m.Unsubscribe(subID); err != nil {
|
||||||
|
models.RespondError(conn, req.ID, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
models.Respond(conn, req.ID, models.SuccessResult{Success: true})
|
||||||
|
}
|
||||||
362
core/internal/server/dbus/manager.go
Normal file
362
core/internal/server/dbus/manager.go
Normal file
@@ -0,0 +1,362 @@
|
|||||||
|
package dbus
|
||||||
|
|
||||||
|
import (
|
||||||
|
"crypto/rand"
|
||||||
|
"encoding/hex"
|
||||||
|
"fmt"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
|
||||||
|
"github.com/AvengeMedia/DankMaterialShell/core/pkg/dbusutil"
|
||||||
|
"github.com/godbus/dbus/v5"
|
||||||
|
)
|
||||||
|
|
||||||
|
func NewManager() (*Manager, error) {
|
||||||
|
systemConn, err := dbus.ConnectSystemBus()
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("failed to connect to system bus: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
sessionConn, err := dbus.ConnectSessionBus()
|
||||||
|
if err != nil {
|
||||||
|
systemConn.Close()
|
||||||
|
return nil, fmt.Errorf("failed to connect to session bus: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
m := &Manager{
|
||||||
|
systemConn: systemConn,
|
||||||
|
sessionConn: sessionConn,
|
||||||
|
}
|
||||||
|
|
||||||
|
go m.processSystemSignals()
|
||||||
|
go m.processSessionSignals()
|
||||||
|
|
||||||
|
return m, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *Manager) getConn(bus string) (*dbus.Conn, error) {
|
||||||
|
switch bus {
|
||||||
|
case "system":
|
||||||
|
if m.systemConn == nil {
|
||||||
|
return nil, fmt.Errorf("system bus not connected")
|
||||||
|
}
|
||||||
|
return m.systemConn, nil
|
||||||
|
case "session":
|
||||||
|
if m.sessionConn == nil {
|
||||||
|
return nil, fmt.Errorf("session bus not connected")
|
||||||
|
}
|
||||||
|
return m.sessionConn, nil
|
||||||
|
default:
|
||||||
|
return nil, fmt.Errorf("invalid bus: %s (must be 'system' or 'session')", bus)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *Manager) Call(bus, dest, path, iface, method string, args []any) (*CallResult, error) {
|
||||||
|
conn, err := m.getConn(bus)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
obj := conn.Object(dest, dbus.ObjectPath(path))
|
||||||
|
fullMethod := iface + "." + method
|
||||||
|
|
||||||
|
call := obj.Call(fullMethod, 0, args...)
|
||||||
|
if call.Err != nil {
|
||||||
|
return nil, fmt.Errorf("dbus call failed: %w", call.Err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return &CallResult{Values: call.Body}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *Manager) GetProperty(bus, dest, path, iface, property string) (*PropertyResult, error) {
|
||||||
|
conn, err := m.getConn(bus)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
obj := conn.Object(dest, dbus.ObjectPath(path))
|
||||||
|
|
||||||
|
var variant dbus.Variant
|
||||||
|
err = obj.Call("org.freedesktop.DBus.Properties.Get", 0, iface, property).Store(&variant)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("failed to get property: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return &PropertyResult{Value: dbusutil.Normalize(variant.Value())}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *Manager) SetProperty(bus, dest, path, iface, property string, value any) error {
|
||||||
|
conn, err := m.getConn(bus)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
obj := conn.Object(dest, dbus.ObjectPath(path))
|
||||||
|
|
||||||
|
call := obj.Call("org.freedesktop.DBus.Properties.Set", 0, iface, property, dbus.MakeVariant(value))
|
||||||
|
if call.Err != nil {
|
||||||
|
return fmt.Errorf("failed to set property: %w", call.Err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *Manager) GetAllProperties(bus, dest, path, iface string) (map[string]any, error) {
|
||||||
|
conn, err := m.getConn(bus)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
obj := conn.Object(dest, dbus.ObjectPath(path))
|
||||||
|
|
||||||
|
var props map[string]dbus.Variant
|
||||||
|
err = obj.Call("org.freedesktop.DBus.Properties.GetAll", 0, iface).Store(&props)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("failed to get properties: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
result := make(map[string]any)
|
||||||
|
for k, v := range props {
|
||||||
|
result[k] = dbusutil.Normalize(v.Value())
|
||||||
|
}
|
||||||
|
|
||||||
|
return result, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *Manager) Introspect(bus, dest, path string) (*IntrospectResult, error) {
|
||||||
|
conn, err := m.getConn(bus)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
obj := conn.Object(dest, dbus.ObjectPath(path))
|
||||||
|
|
||||||
|
var xml string
|
||||||
|
err = obj.Call("org.freedesktop.DBus.Introspectable.Introspect", 0).Store(&xml)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("failed to introspect: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return &IntrospectResult{XML: xml}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *Manager) ListNames(bus string) (*ListNamesResult, error) {
|
||||||
|
conn, err := m.getConn(bus)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
var names []string
|
||||||
|
err = conn.BusObject().Call("org.freedesktop.DBus.ListNames", 0).Store(&names)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("failed to list names: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return &ListNamesResult{Names: names}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *Manager) Subscribe(clientID, bus, sender, path, iface, member string) (*SubscribeResult, error) {
|
||||||
|
conn, err := m.getConn(bus)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
subID := generateSubscriptionID()
|
||||||
|
|
||||||
|
parts := []string{"type='signal'"}
|
||||||
|
if sender != "" {
|
||||||
|
parts = append(parts, fmt.Sprintf("sender='%s'", sender))
|
||||||
|
}
|
||||||
|
if path != "" {
|
||||||
|
parts = append(parts, fmt.Sprintf("path='%s'", path))
|
||||||
|
}
|
||||||
|
if iface != "" {
|
||||||
|
parts = append(parts, fmt.Sprintf("interface='%s'", iface))
|
||||||
|
}
|
||||||
|
if member != "" {
|
||||||
|
parts = append(parts, fmt.Sprintf("member='%s'", member))
|
||||||
|
}
|
||||||
|
matchRule := strings.Join(parts, ",")
|
||||||
|
|
||||||
|
call := conn.BusObject().Call("org.freedesktop.DBus.AddMatch", 0, matchRule)
|
||||||
|
if call.Err != nil {
|
||||||
|
return nil, fmt.Errorf("failed to add match rule: %w", call.Err)
|
||||||
|
}
|
||||||
|
|
||||||
|
sub := &signalSubscription{
|
||||||
|
Bus: bus,
|
||||||
|
Sender: sender,
|
||||||
|
Path: path,
|
||||||
|
Interface: iface,
|
||||||
|
Member: member,
|
||||||
|
ClientID: clientID,
|
||||||
|
}
|
||||||
|
m.subscriptions.Store(subID, sub)
|
||||||
|
|
||||||
|
log.Debugf("dbus: subscribed %s to %s", subID, matchRule)
|
||||||
|
|
||||||
|
return &SubscribeResult{SubscriptionID: subID}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *Manager) Unsubscribe(subID string) error {
|
||||||
|
sub, ok := m.subscriptions.LoadAndDelete(subID)
|
||||||
|
if !ok {
|
||||||
|
return fmt.Errorf("subscription not found: %s", subID)
|
||||||
|
}
|
||||||
|
|
||||||
|
conn, err := m.getConn(sub.Bus)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
parts := []string{"type='signal'"}
|
||||||
|
if sub.Sender != "" {
|
||||||
|
parts = append(parts, fmt.Sprintf("sender='%s'", sub.Sender))
|
||||||
|
}
|
||||||
|
if sub.Path != "" {
|
||||||
|
parts = append(parts, fmt.Sprintf("path='%s'", sub.Path))
|
||||||
|
}
|
||||||
|
if sub.Interface != "" {
|
||||||
|
parts = append(parts, fmt.Sprintf("interface='%s'", sub.Interface))
|
||||||
|
}
|
||||||
|
if sub.Member != "" {
|
||||||
|
parts = append(parts, fmt.Sprintf("member='%s'", sub.Member))
|
||||||
|
}
|
||||||
|
matchRule := strings.Join(parts, ",")
|
||||||
|
|
||||||
|
call := conn.BusObject().Call("org.freedesktop.DBus.RemoveMatch", 0, matchRule)
|
||||||
|
if call.Err != nil {
|
||||||
|
log.Warnf("dbus: failed to remove match rule: %v", call.Err)
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Debugf("dbus: unsubscribed %s", subID)
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *Manager) UnsubscribeClient(clientID string) {
|
||||||
|
var toDelete []string
|
||||||
|
m.subscriptions.Range(func(subID string, sub *signalSubscription) bool {
|
||||||
|
if sub.ClientID == clientID {
|
||||||
|
toDelete = append(toDelete, subID)
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
})
|
||||||
|
|
||||||
|
for _, subID := range toDelete {
|
||||||
|
if err := m.Unsubscribe(subID); err != nil {
|
||||||
|
log.Warnf("dbus: failed to unsubscribe %s: %v", subID, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *Manager) SubscribeSignals(clientID string) chan SignalEvent {
|
||||||
|
ch := make(chan SignalEvent, 64)
|
||||||
|
existing, loaded := m.signalSubscribers.LoadOrStore(clientID, ch)
|
||||||
|
if loaded {
|
||||||
|
return existing
|
||||||
|
}
|
||||||
|
return ch
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *Manager) UnsubscribeSignals(clientID string) {
|
||||||
|
if ch, ok := m.signalSubscribers.LoadAndDelete(clientID); ok {
|
||||||
|
close(ch)
|
||||||
|
}
|
||||||
|
m.UnsubscribeClient(clientID)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *Manager) processSystemSignals() {
|
||||||
|
if m.systemConn == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
ch := make(chan *dbus.Signal, 256)
|
||||||
|
m.systemConn.Signal(ch)
|
||||||
|
|
||||||
|
for sig := range ch {
|
||||||
|
m.dispatchSignal("system", sig)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *Manager) processSessionSignals() {
|
||||||
|
if m.sessionConn == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
ch := make(chan *dbus.Signal, 256)
|
||||||
|
m.sessionConn.Signal(ch)
|
||||||
|
|
||||||
|
for sig := range ch {
|
||||||
|
m.dispatchSignal("session", sig)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *Manager) dispatchSignal(bus string, sig *dbus.Signal) {
|
||||||
|
path := string(sig.Path)
|
||||||
|
iface := ""
|
||||||
|
member := sig.Name
|
||||||
|
|
||||||
|
if idx := strings.LastIndex(sig.Name, "."); idx != -1 {
|
||||||
|
iface = sig.Name[:idx]
|
||||||
|
member = sig.Name[idx+1:]
|
||||||
|
}
|
||||||
|
|
||||||
|
m.subscriptions.Range(func(subID string, sub *signalSubscription) bool {
|
||||||
|
if sub.Bus != bus {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
if sub.Path != "" && sub.Path != path && !strings.HasPrefix(path, sub.Path) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
if sub.Interface != "" && sub.Interface != iface {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
if sub.Member != "" && sub.Member != member {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
event := SignalEvent{
|
||||||
|
SubscriptionID: subID,
|
||||||
|
Sender: sig.Sender,
|
||||||
|
Path: path,
|
||||||
|
Interface: iface,
|
||||||
|
Member: member,
|
||||||
|
Body: dbusutil.NormalizeSlice(sig.Body),
|
||||||
|
}
|
||||||
|
|
||||||
|
ch, ok := m.signalSubscribers.Load(sub.ClientID)
|
||||||
|
if !ok {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
select {
|
||||||
|
case ch <- event:
|
||||||
|
default:
|
||||||
|
log.Warnf("dbus: channel full for %s, dropping signal", subID)
|
||||||
|
}
|
||||||
|
|
||||||
|
return true
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *Manager) Close() {
|
||||||
|
m.signalSubscribers.Range(func(clientID string, ch chan SignalEvent) bool {
|
||||||
|
close(ch)
|
||||||
|
m.signalSubscribers.Delete(clientID)
|
||||||
|
return true
|
||||||
|
})
|
||||||
|
|
||||||
|
if m.systemConn != nil {
|
||||||
|
m.systemConn.Close()
|
||||||
|
}
|
||||||
|
if m.sessionConn != nil {
|
||||||
|
m.sessionConn.Close()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func generateSubscriptionID() string {
|
||||||
|
b := make([]byte, 8)
|
||||||
|
if _, err := rand.Read(b); err != nil {
|
||||||
|
log.Warnf("dbus: failed to generate random subscription ID: %v", err)
|
||||||
|
}
|
||||||
|
return hex.EncodeToString(b)
|
||||||
|
}
|
||||||
52
core/internal/server/dbus/types.go
Normal file
52
core/internal/server/dbus/types.go
Normal file
@@ -0,0 +1,52 @@
|
|||||||
|
package dbus
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/AvengeMedia/DankMaterialShell/core/pkg/syncmap"
|
||||||
|
"github.com/godbus/dbus/v5"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Manager struct {
|
||||||
|
systemConn *dbus.Conn
|
||||||
|
sessionConn *dbus.Conn
|
||||||
|
|
||||||
|
subscriptions syncmap.Map[string, *signalSubscription]
|
||||||
|
signalSubscribers syncmap.Map[string, chan SignalEvent]
|
||||||
|
}
|
||||||
|
|
||||||
|
type signalSubscription struct {
|
||||||
|
Bus string
|
||||||
|
Sender string
|
||||||
|
Path string
|
||||||
|
Interface string
|
||||||
|
Member string
|
||||||
|
ClientID string
|
||||||
|
}
|
||||||
|
|
||||||
|
type SignalEvent struct {
|
||||||
|
SubscriptionID string `json:"subscriptionId"`
|
||||||
|
Sender string `json:"sender"`
|
||||||
|
Path string `json:"path"`
|
||||||
|
Interface string `json:"interface"`
|
||||||
|
Member string `json:"member"`
|
||||||
|
Body []any `json:"body"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type CallResult struct {
|
||||||
|
Values []any `json:"values"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type PropertyResult struct {
|
||||||
|
Value any `json:"value"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type IntrospectResult struct {
|
||||||
|
XML string `json:"xml"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type ListNamesResult struct {
|
||||||
|
Names []string `json:"names"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type SubscribeResult struct {
|
||||||
|
SubscriptionID string `json:"subscriptionId"`
|
||||||
|
}
|
||||||
@@ -6,6 +6,7 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
|
"github.com/AvengeMedia/DankMaterialShell/core/pkg/dbusutil"
|
||||||
"github.com/godbus/dbus/v5"
|
"github.com/godbus/dbus/v5"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -110,61 +111,17 @@ func (m *Manager) updateAccountsState() error {
|
|||||||
m.stateMutex.Lock()
|
m.stateMutex.Lock()
|
||||||
defer m.stateMutex.Unlock()
|
defer m.stateMutex.Unlock()
|
||||||
|
|
||||||
if v, ok := props["IconFile"]; ok {
|
m.state.Accounts.IconFile = dbusutil.GetOr(props, "IconFile", "")
|
||||||
if val, ok := v.Value().(string); ok {
|
m.state.Accounts.RealName = dbusutil.GetOr(props, "RealName", "")
|
||||||
m.state.Accounts.IconFile = val
|
m.state.Accounts.UserName = dbusutil.GetOr(props, "UserName", "")
|
||||||
}
|
m.state.Accounts.AccountType = dbusutil.GetOr(props, "AccountType", int32(0))
|
||||||
}
|
m.state.Accounts.HomeDirectory = dbusutil.GetOr(props, "HomeDirectory", "")
|
||||||
if v, ok := props["RealName"]; ok {
|
m.state.Accounts.Shell = dbusutil.GetOr(props, "Shell", "")
|
||||||
if val, ok := v.Value().(string); ok {
|
m.state.Accounts.Email = dbusutil.GetOr(props, "Email", "")
|
||||||
m.state.Accounts.RealName = val
|
m.state.Accounts.Language = dbusutil.GetOr(props, "Language", "")
|
||||||
}
|
m.state.Accounts.Location = dbusutil.GetOr(props, "Location", "")
|
||||||
}
|
m.state.Accounts.Locked = dbusutil.GetOr(props, "Locked", false)
|
||||||
if v, ok := props["UserName"]; ok {
|
m.state.Accounts.PasswordMode = dbusutil.GetOr(props, "PasswordMode", int32(0))
|
||||||
if val, ok := v.Value().(string); ok {
|
|
||||||
m.state.Accounts.UserName = val
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if v, ok := props["AccountType"]; ok {
|
|
||||||
if val, ok := v.Value().(int32); ok {
|
|
||||||
m.state.Accounts.AccountType = val
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if v, ok := props["HomeDirectory"]; ok {
|
|
||||||
if val, ok := v.Value().(string); ok {
|
|
||||||
m.state.Accounts.HomeDirectory = val
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if v, ok := props["Shell"]; ok {
|
|
||||||
if val, ok := v.Value().(string); ok {
|
|
||||||
m.state.Accounts.Shell = val
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if v, ok := props["Email"]; ok {
|
|
||||||
if val, ok := v.Value().(string); ok {
|
|
||||||
m.state.Accounts.Email = val
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if v, ok := props["Language"]; ok {
|
|
||||||
if val, ok := v.Value().(string); ok {
|
|
||||||
m.state.Accounts.Language = val
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if v, ok := props["Location"]; ok {
|
|
||||||
if val, ok := v.Value().(string); ok {
|
|
||||||
m.state.Accounts.Location = val
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if v, ok := props["Locked"]; ok {
|
|
||||||
if val, ok := v.Value().(bool); ok {
|
|
||||||
m.state.Accounts.Locked = val
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if v, ok := props["PasswordMode"]; ok {
|
|
||||||
if val, ok := v.Value().(int32); ok {
|
|
||||||
m.state.Accounts.PasswordMode = val
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
@@ -180,7 +137,7 @@ func (m *Manager) updateSettingsState() error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
if colorScheme, ok := variant.Value().(uint32); ok {
|
if colorScheme, ok := dbusutil.As[uint32](variant); ok {
|
||||||
m.stateMutex.Lock()
|
m.stateMutex.Lock()
|
||||||
m.state.Settings.ColorScheme = colorScheme
|
m.state.Settings.ColorScheme = colorScheme
|
||||||
m.stateMutex.Unlock()
|
m.stateMutex.Unlock()
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import (
|
|||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"github.com/AvengeMedia/DankMaterialShell/core/pkg/dbusutil"
|
||||||
"github.com/godbus/dbus/v5"
|
"github.com/godbus/dbus/v5"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -132,37 +133,15 @@ func (m *Manager) updateSessionState() error {
|
|||||||
m.stateMutex.Lock()
|
m.stateMutex.Lock()
|
||||||
defer m.stateMutex.Unlock()
|
defer m.stateMutex.Unlock()
|
||||||
|
|
||||||
if v, ok := props["Active"]; ok {
|
m.state.Active = dbusutil.GetOr(props, "Active", m.state.Active)
|
||||||
if val, ok := v.Value().(bool); ok {
|
m.state.IdleHint = dbusutil.GetOr(props, "IdleHint", m.state.IdleHint)
|
||||||
m.state.Active = val
|
m.state.IdleSinceHint = dbusutil.GetOr(props, "IdleSinceHint", m.state.IdleSinceHint)
|
||||||
}
|
if lockedHint, ok := dbusutil.Get[bool](props, "LockedHint"); ok {
|
||||||
}
|
m.state.LockedHint = lockedHint
|
||||||
if v, ok := props["IdleHint"]; ok {
|
m.state.Locked = lockedHint
|
||||||
if val, ok := v.Value().(bool); ok {
|
|
||||||
m.state.IdleHint = val
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if v, ok := props["IdleSinceHint"]; ok {
|
|
||||||
if val, ok := v.Value().(uint64); ok {
|
|
||||||
m.state.IdleSinceHint = val
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if v, ok := props["LockedHint"]; ok {
|
|
||||||
if val, ok := v.Value().(bool); ok {
|
|
||||||
m.state.LockedHint = val
|
|
||||||
m.state.Locked = val
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if v, ok := props["Type"]; ok {
|
|
||||||
if val, ok := v.Value().(string); ok {
|
|
||||||
m.state.SessionType = val
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if v, ok := props["Class"]; ok {
|
|
||||||
if val, ok := v.Value().(string); ok {
|
|
||||||
m.state.SessionClass = val
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
m.state.SessionType = dbusutil.GetOr(props, "Type", m.state.SessionType)
|
||||||
|
m.state.SessionClass = dbusutil.GetOr(props, "Class", m.state.SessionClass)
|
||||||
if v, ok := props["User"]; ok {
|
if v, ok := props["User"]; ok {
|
||||||
if userArr, ok := v.Value().([]any); ok && len(userArr) >= 1 {
|
if userArr, ok := v.Value().([]any); ok && len(userArr) >= 1 {
|
||||||
if uid, ok := userArr[0].(uint32); ok {
|
if uid, ok := userArr[0].(uint32); ok {
|
||||||
@@ -170,36 +149,12 @@ func (m *Manager) updateSessionState() error {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if v, ok := props["Name"]; ok {
|
m.state.UserName = dbusutil.GetOr(props, "Name", m.state.UserName)
|
||||||
if val, ok := v.Value().(string); ok {
|
m.state.RemoteHost = dbusutil.GetOr(props, "RemoteHost", m.state.RemoteHost)
|
||||||
m.state.UserName = val
|
m.state.Service = dbusutil.GetOr(props, "Service", m.state.Service)
|
||||||
}
|
m.state.TTY = dbusutil.GetOr(props, "TTY", m.state.TTY)
|
||||||
}
|
m.state.Display = dbusutil.GetOr(props, "Display", m.state.Display)
|
||||||
if v, ok := props["RemoteHost"]; ok {
|
m.state.Remote = dbusutil.GetOr(props, "Remote", m.state.Remote)
|
||||||
if val, ok := v.Value().(string); ok {
|
|
||||||
m.state.RemoteHost = val
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if v, ok := props["Service"]; ok {
|
|
||||||
if val, ok := v.Value().(string); ok {
|
|
||||||
m.state.Service = val
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if v, ok := props["TTY"]; ok {
|
|
||||||
if val, ok := v.Value().(string); ok {
|
|
||||||
m.state.TTY = val
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if v, ok := props["Display"]; ok {
|
|
||||||
if val, ok := v.Value().(string); ok {
|
|
||||||
m.state.Display = val
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if v, ok := props["Remote"]; ok {
|
|
||||||
if val, ok := v.Value().(bool); ok {
|
|
||||||
m.state.Remote = val
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if v, ok := props["Seat"]; ok {
|
if v, ok := props["Seat"]; ok {
|
||||||
if seatArr, ok := v.Value().([]any); ok && len(seatArr) >= 1 {
|
if seatArr, ok := v.Value().([]any); ok && len(seatArr) >= 1 {
|
||||||
if seatID, ok := seatArr[0].(string); ok {
|
if seatID, ok := seatArr[0].(string); ok {
|
||||||
@@ -207,11 +162,7 @@ func (m *Manager) updateSessionState() error {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if v, ok := props["VTNr"]; ok {
|
m.state.VTNr = dbusutil.GetOr(props, "VTNr", m.state.VTNr)
|
||||||
if val, ok := v.Value().(uint32); ok {
|
|
||||||
m.state.VTNr = val
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package loginctl
|
|||||||
import (
|
import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"github.com/AvengeMedia/DankMaterialShell/core/pkg/dbusutil"
|
||||||
"github.com/godbus/dbus/v5"
|
"github.com/godbus/dbus/v5"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -117,31 +118,28 @@ func (m *Manager) handlePropertiesChanged(sig *dbus.Signal) {
|
|||||||
for key, variant := range changes {
|
for key, variant := range changes {
|
||||||
switch key {
|
switch key {
|
||||||
case "Active":
|
case "Active":
|
||||||
if val, ok := variant.Value().(bool); ok {
|
if val, ok := dbusutil.As[bool](variant); ok {
|
||||||
m.stateMutex.Lock()
|
m.stateMutex.Lock()
|
||||||
m.state.Active = val
|
m.state.Active = val
|
||||||
m.stateMutex.Unlock()
|
m.stateMutex.Unlock()
|
||||||
needsUpdate = true
|
needsUpdate = true
|
||||||
}
|
}
|
||||||
|
|
||||||
case "IdleHint":
|
case "IdleHint":
|
||||||
if val, ok := variant.Value().(bool); ok {
|
if val, ok := dbusutil.As[bool](variant); ok {
|
||||||
m.stateMutex.Lock()
|
m.stateMutex.Lock()
|
||||||
m.state.IdleHint = val
|
m.state.IdleHint = val
|
||||||
m.stateMutex.Unlock()
|
m.stateMutex.Unlock()
|
||||||
needsUpdate = true
|
needsUpdate = true
|
||||||
}
|
}
|
||||||
|
|
||||||
case "IdleSinceHint":
|
case "IdleSinceHint":
|
||||||
if val, ok := variant.Value().(uint64); ok {
|
if val, ok := dbusutil.As[uint64](variant); ok {
|
||||||
m.stateMutex.Lock()
|
m.stateMutex.Lock()
|
||||||
m.state.IdleSinceHint = val
|
m.state.IdleSinceHint = val
|
||||||
m.stateMutex.Unlock()
|
m.stateMutex.Unlock()
|
||||||
needsUpdate = true
|
needsUpdate = true
|
||||||
}
|
}
|
||||||
|
|
||||||
case "LockedHint":
|
case "LockedHint":
|
||||||
if val, ok := variant.Value().(bool); ok {
|
if val, ok := dbusutil.As[bool](variant); ok {
|
||||||
m.stateMutex.Lock()
|
m.stateMutex.Lock()
|
||||||
m.state.LockedHint = val
|
m.state.LockedHint = val
|
||||||
m.state.Locked = val
|
m.state.Locked = val
|
||||||
|
|||||||
@@ -150,19 +150,11 @@ func (m *Manager) setConnectionPriority(connType string, autoconnectPriority int
|
|||||||
}
|
}
|
||||||
|
|
||||||
if err := exec.Command("nmcli", "con", "mod", connName,
|
if err := exec.Command("nmcli", "con", "mod", connName,
|
||||||
"connection.autoconnect-priority", fmt.Sprintf("%d", autoconnectPriority)).Run(); err != nil {
|
"connection.autoconnect-priority", fmt.Sprintf("%d", autoconnectPriority),
|
||||||
log.Warnf("Failed to set autoconnect-priority for %v: %v", connName, err)
|
"ipv4.route-metric", fmt.Sprintf("%d", routeMetric),
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := exec.Command("nmcli", "con", "mod", connName,
|
|
||||||
"ipv4.route-metric", fmt.Sprintf("%d", routeMetric)).Run(); err != nil {
|
|
||||||
log.Warnf("Failed to set ipv4.route-metric for %v: %v", connName, err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := exec.Command("nmcli", "con", "mod", connName,
|
|
||||||
"ipv6.route-metric", fmt.Sprintf("%d", routeMetric)).Run(); err != nil {
|
"ipv6.route-metric", fmt.Sprintf("%d", routeMetric)).Run(); err != nil {
|
||||||
log.Warnf("Failed to set ipv6.route-metric for %v: %v", connName, err)
|
log.Warnf("Failed to set priority for %s: %v", connName, err)
|
||||||
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
log.Infof("Updated %v: autoconnect-priority=%d, route-metric=%d", connName, autoconnectPriority, routeMetric)
|
log.Infof("Updated %v: autoconnect-priority=%d, route-metric=%d", connName, autoconnectPriority, routeMetric)
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import (
|
|||||||
"github.com/AvengeMedia/DankMaterialShell/core/internal/server/brightness"
|
"github.com/AvengeMedia/DankMaterialShell/core/internal/server/brightness"
|
||||||
"github.com/AvengeMedia/DankMaterialShell/core/internal/server/clipboard"
|
"github.com/AvengeMedia/DankMaterialShell/core/internal/server/clipboard"
|
||||||
"github.com/AvengeMedia/DankMaterialShell/core/internal/server/cups"
|
"github.com/AvengeMedia/DankMaterialShell/core/internal/server/cups"
|
||||||
|
serverDbus "github.com/AvengeMedia/DankMaterialShell/core/internal/server/dbus"
|
||||||
"github.com/AvengeMedia/DankMaterialShell/core/internal/server/dwl"
|
"github.com/AvengeMedia/DankMaterialShell/core/internal/server/dwl"
|
||||||
"github.com/AvengeMedia/DankMaterialShell/core/internal/server/evdev"
|
"github.com/AvengeMedia/DankMaterialShell/core/internal/server/evdev"
|
||||||
"github.com/AvengeMedia/DankMaterialShell/core/internal/server/extworkspace"
|
"github.com/AvengeMedia/DankMaterialShell/core/internal/server/extworkspace"
|
||||||
@@ -154,6 +155,15 @@ func RouteRequest(conn net.Conn, req models.Request) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if strings.HasPrefix(req.Method, "dbus.") {
|
||||||
|
if dbusManager == nil {
|
||||||
|
models.RespondError(conn, req.ID, "dbus manager not initialized")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
serverDbus.HandleRequest(conn, req, dbusManager, dbusClientID)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
if strings.HasPrefix(req.Method, "clipboard.") {
|
if strings.HasPrefix(req.Method, "clipboard.") {
|
||||||
switch req.Method {
|
switch req.Method {
|
||||||
case "clipboard.getConfig":
|
case "clipboard.getConfig":
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ import (
|
|||||||
"github.com/AvengeMedia/DankMaterialShell/core/internal/server/brightness"
|
"github.com/AvengeMedia/DankMaterialShell/core/internal/server/brightness"
|
||||||
"github.com/AvengeMedia/DankMaterialShell/core/internal/server/clipboard"
|
"github.com/AvengeMedia/DankMaterialShell/core/internal/server/clipboard"
|
||||||
"github.com/AvengeMedia/DankMaterialShell/core/internal/server/cups"
|
"github.com/AvengeMedia/DankMaterialShell/core/internal/server/cups"
|
||||||
|
serverDbus "github.com/AvengeMedia/DankMaterialShell/core/internal/server/dbus"
|
||||||
"github.com/AvengeMedia/DankMaterialShell/core/internal/server/dwl"
|
"github.com/AvengeMedia/DankMaterialShell/core/internal/server/dwl"
|
||||||
"github.com/AvengeMedia/DankMaterialShell/core/internal/server/evdev"
|
"github.com/AvengeMedia/DankMaterialShell/core/internal/server/evdev"
|
||||||
"github.com/AvengeMedia/DankMaterialShell/core/internal/server/extworkspace"
|
"github.com/AvengeMedia/DankMaterialShell/core/internal/server/extworkspace"
|
||||||
@@ -65,8 +66,11 @@ var brightnessManager *brightness.Manager
|
|||||||
var wlrOutputManager *wlroutput.Manager
|
var wlrOutputManager *wlroutput.Manager
|
||||||
var evdevManager *evdev.Manager
|
var evdevManager *evdev.Manager
|
||||||
var clipboardManager *clipboard.Manager
|
var clipboardManager *clipboard.Manager
|
||||||
|
var dbusManager *serverDbus.Manager
|
||||||
var wlContext *wlcontext.SharedContext
|
var wlContext *wlcontext.SharedContext
|
||||||
|
|
||||||
|
const dbusClientID = "dms-dbus-client"
|
||||||
|
|
||||||
var capabilitySubscribers syncmap.Map[string, chan ServerInfo]
|
var capabilitySubscribers syncmap.Map[string, chan ServerInfo]
|
||||||
var cupsSubscribers syncmap.Map[string, bool]
|
var cupsSubscribers syncmap.Map[string, bool]
|
||||||
var cupsSubscriberCount atomic.Int32
|
var cupsSubscriberCount atomic.Int32
|
||||||
@@ -363,6 +367,19 @@ func InitializeClipboardManager() error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func InitializeDbusManager() error {
|
||||||
|
manager, err := serverDbus.NewManager()
|
||||||
|
if err != nil {
|
||||||
|
log.Warnf("Failed to initialize dbus manager: %v", err)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
dbusManager = manager
|
||||||
|
|
||||||
|
log.Info("DBus manager initialized")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
func handleConnection(conn net.Conn) {
|
func handleConnection(conn net.Conn) {
|
||||||
defer conn.Close()
|
defer conn.Close()
|
||||||
|
|
||||||
@@ -440,6 +457,10 @@ func getCapabilities() Capabilities {
|
|||||||
caps = append(caps, "clipboard")
|
caps = append(caps, "clipboard")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if dbusManager != nil {
|
||||||
|
caps = append(caps, "dbus")
|
||||||
|
}
|
||||||
|
|
||||||
return Capabilities{Capabilities: caps}
|
return Capabilities{Capabilities: caps}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -498,6 +519,10 @@ func getServerInfo() ServerInfo {
|
|||||||
caps = append(caps, "clipboard")
|
caps = append(caps, "clipboard")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if dbusManager != nil {
|
||||||
|
caps = append(caps, "dbus")
|
||||||
|
}
|
||||||
|
|
||||||
return ServerInfo{
|
return ServerInfo{
|
||||||
APIVersion: APIVersion,
|
APIVersion: APIVersion,
|
||||||
CLIVersion: CLIVersion,
|
CLIVersion: CLIVersion,
|
||||||
@@ -1133,6 +1158,31 @@ func handleSubscribe(conn net.Conn, req models.Request) {
|
|||||||
}()
|
}()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if shouldSubscribe("dbus") && dbusManager != nil {
|
||||||
|
wg.Add(1)
|
||||||
|
dbusChan := dbusManager.SubscribeSignals(dbusClientID)
|
||||||
|
go func() {
|
||||||
|
defer wg.Done()
|
||||||
|
defer dbusManager.UnsubscribeSignals(dbusClientID)
|
||||||
|
|
||||||
|
for {
|
||||||
|
select {
|
||||||
|
case event, ok := <-dbusChan:
|
||||||
|
if !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
select {
|
||||||
|
case eventChan <- ServiceEvent{Service: "dbus", Data: event}:
|
||||||
|
case <-stopChan:
|
||||||
|
return
|
||||||
|
}
|
||||||
|
case <-stopChan:
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
}
|
||||||
|
|
||||||
go func() {
|
go func() {
|
||||||
wg.Wait()
|
wg.Wait()
|
||||||
close(eventChan)
|
close(eventChan)
|
||||||
@@ -1198,6 +1248,9 @@ func cleanupManagers() {
|
|||||||
if clipboardManager != nil {
|
if clipboardManager != nil {
|
||||||
clipboardManager.Close()
|
clipboardManager.Close()
|
||||||
}
|
}
|
||||||
|
if dbusManager != nil {
|
||||||
|
dbusManager.Close()
|
||||||
|
}
|
||||||
if wlContext != nil {
|
if wlContext != nil {
|
||||||
wlContext.Close()
|
wlContext.Close()
|
||||||
}
|
}
|
||||||
@@ -1490,6 +1543,14 @@ func Start(printDocs bool) error {
|
|||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
|
go func() {
|
||||||
|
if err := InitializeDbusManager(); err != nil {
|
||||||
|
log.Warnf("DBus manager unavailable: %v", err)
|
||||||
|
} else {
|
||||||
|
notifyCapabilityChange()
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
log.Info("")
|
log.Info("")
|
||||||
log.Infof("Ready! Capabilities: %v", getCapabilities().Capabilities)
|
log.Infof("Ready! Capabilities: %v", getCapabilities().Capabilities)
|
||||||
|
|
||||||
|
|||||||
69
core/pkg/dbusutil/variant.go
Normal file
69
core/pkg/dbusutil/variant.go
Normal file
@@ -0,0 +1,69 @@
|
|||||||
|
package dbusutil
|
||||||
|
|
||||||
|
import "github.com/godbus/dbus/v5"
|
||||||
|
|
||||||
|
func As[T any](v dbus.Variant) (T, bool) {
|
||||||
|
val, ok := v.Value().(T)
|
||||||
|
return val, ok
|
||||||
|
}
|
||||||
|
|
||||||
|
func AsOr[T any](v dbus.Variant, def T) T {
|
||||||
|
if val, ok := v.Value().(T); ok {
|
||||||
|
return val
|
||||||
|
}
|
||||||
|
return def
|
||||||
|
}
|
||||||
|
|
||||||
|
func Get[T any](m map[string]dbus.Variant, key string) (T, bool) {
|
||||||
|
v, ok := m[key]
|
||||||
|
if !ok {
|
||||||
|
var zero T
|
||||||
|
return zero, false
|
||||||
|
}
|
||||||
|
return As[T](v)
|
||||||
|
}
|
||||||
|
|
||||||
|
func GetOr[T any](m map[string]dbus.Variant, key string, def T) T {
|
||||||
|
v, ok := m[key]
|
||||||
|
if !ok {
|
||||||
|
return def
|
||||||
|
}
|
||||||
|
return AsOr(v, def)
|
||||||
|
}
|
||||||
|
|
||||||
|
func Normalize(v any) any {
|
||||||
|
switch val := v.(type) {
|
||||||
|
case dbus.Variant:
|
||||||
|
return Normalize(val.Value())
|
||||||
|
case dbus.ObjectPath:
|
||||||
|
return string(val)
|
||||||
|
case []dbus.ObjectPath:
|
||||||
|
result := make([]string, len(val))
|
||||||
|
for i, p := range val {
|
||||||
|
result[i] = string(p)
|
||||||
|
}
|
||||||
|
return result
|
||||||
|
case map[string]dbus.Variant:
|
||||||
|
result := make(map[string]any)
|
||||||
|
for k, vv := range val {
|
||||||
|
result[k] = Normalize(vv.Value())
|
||||||
|
}
|
||||||
|
return result
|
||||||
|
case []any:
|
||||||
|
result := make([]any, len(val))
|
||||||
|
for i, item := range val {
|
||||||
|
result[i] = Normalize(item)
|
||||||
|
}
|
||||||
|
return result
|
||||||
|
default:
|
||||||
|
return v
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func NormalizeSlice(values []any) []any {
|
||||||
|
result := make([]any, len(values))
|
||||||
|
for i, v := range values {
|
||||||
|
result[i] = Normalize(v)
|
||||||
|
}
|
||||||
|
return result
|
||||||
|
}
|
||||||
155
core/pkg/dbusutil/variant_test.go
Normal file
155
core/pkg/dbusutil/variant_test.go
Normal file
@@ -0,0 +1,155 @@
|
|||||||
|
package dbusutil
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/godbus/dbus/v5"
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestAs(t *testing.T) {
|
||||||
|
t.Run("string", func(t *testing.T) {
|
||||||
|
v := dbus.MakeVariant("hello")
|
||||||
|
val, ok := As[string](v)
|
||||||
|
assert.True(t, ok)
|
||||||
|
assert.Equal(t, "hello", val)
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("bool", func(t *testing.T) {
|
||||||
|
v := dbus.MakeVariant(true)
|
||||||
|
val, ok := As[bool](v)
|
||||||
|
assert.True(t, ok)
|
||||||
|
assert.True(t, val)
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("int32", func(t *testing.T) {
|
||||||
|
v := dbus.MakeVariant(int32(42))
|
||||||
|
val, ok := As[int32](v)
|
||||||
|
assert.True(t, ok)
|
||||||
|
assert.Equal(t, int32(42), val)
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("wrong type", func(t *testing.T) {
|
||||||
|
v := dbus.MakeVariant("hello")
|
||||||
|
_, ok := As[int](v)
|
||||||
|
assert.False(t, ok)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestAsOr(t *testing.T) {
|
||||||
|
t.Run("exists", func(t *testing.T) {
|
||||||
|
v := dbus.MakeVariant("hello")
|
||||||
|
val := AsOr(v, "default")
|
||||||
|
assert.Equal(t, "hello", val)
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("wrong type uses default", func(t *testing.T) {
|
||||||
|
v := dbus.MakeVariant(123)
|
||||||
|
val := AsOr(v, "default")
|
||||||
|
assert.Equal(t, "default", val)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGet(t *testing.T) {
|
||||||
|
m := map[string]dbus.Variant{
|
||||||
|
"name": dbus.MakeVariant("test"),
|
||||||
|
"enabled": dbus.MakeVariant(true),
|
||||||
|
"count": dbus.MakeVariant(int32(5)),
|
||||||
|
}
|
||||||
|
|
||||||
|
t.Run("exists", func(t *testing.T) {
|
||||||
|
val, ok := Get[string](m, "name")
|
||||||
|
assert.True(t, ok)
|
||||||
|
assert.Equal(t, "test", val)
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("missing key", func(t *testing.T) {
|
||||||
|
_, ok := Get[string](m, "missing")
|
||||||
|
assert.False(t, ok)
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("wrong type", func(t *testing.T) {
|
||||||
|
_, ok := Get[int](m, "name")
|
||||||
|
assert.False(t, ok)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGetOr(t *testing.T) {
|
||||||
|
m := map[string]dbus.Variant{
|
||||||
|
"name": dbus.MakeVariant("test"),
|
||||||
|
}
|
||||||
|
|
||||||
|
t.Run("exists", func(t *testing.T) {
|
||||||
|
val := GetOr(m, "name", "default")
|
||||||
|
assert.Equal(t, "test", val)
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("missing uses default", func(t *testing.T) {
|
||||||
|
val := GetOr(m, "missing", "default")
|
||||||
|
assert.Equal(t, "default", val)
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("wrong type uses default", func(t *testing.T) {
|
||||||
|
val := GetOr(m, "name", 42)
|
||||||
|
assert.Equal(t, 42, val)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestNormalize(t *testing.T) {
|
||||||
|
t.Run("variant unwrap", func(t *testing.T) {
|
||||||
|
v := dbus.MakeVariant("hello")
|
||||||
|
result := Normalize(v)
|
||||||
|
assert.Equal(t, "hello", result)
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("nested variant", func(t *testing.T) {
|
||||||
|
v := dbus.MakeVariant(dbus.MakeVariant("nested"))
|
||||||
|
result := Normalize(v)
|
||||||
|
assert.Equal(t, "nested", result)
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("object path", func(t *testing.T) {
|
||||||
|
v := dbus.ObjectPath("/org/test")
|
||||||
|
result := Normalize(v)
|
||||||
|
assert.Equal(t, "/org/test", result)
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("object path slice", func(t *testing.T) {
|
||||||
|
v := []dbus.ObjectPath{"/org/a", "/org/b"}
|
||||||
|
result := Normalize(v)
|
||||||
|
assert.Equal(t, []string{"/org/a", "/org/b"}, result)
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("variant map", func(t *testing.T) {
|
||||||
|
v := map[string]dbus.Variant{
|
||||||
|
"key": dbus.MakeVariant("value"),
|
||||||
|
}
|
||||||
|
result := Normalize(v)
|
||||||
|
expected := map[string]any{"key": "value"}
|
||||||
|
assert.Equal(t, expected, result)
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("any slice", func(t *testing.T) {
|
||||||
|
v := []any{dbus.MakeVariant("a"), dbus.ObjectPath("/b")}
|
||||||
|
result := Normalize(v)
|
||||||
|
expected := []any{"a", "/b"}
|
||||||
|
assert.Equal(t, expected, result)
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("passthrough primitives", func(t *testing.T) {
|
||||||
|
assert.Equal(t, "hello", Normalize("hello"))
|
||||||
|
assert.Equal(t, 42, Normalize(42))
|
||||||
|
assert.Equal(t, true, Normalize(true))
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestNormalizeSlice(t *testing.T) {
|
||||||
|
input := []any{
|
||||||
|
dbus.MakeVariant("a"),
|
||||||
|
dbus.ObjectPath("/b"),
|
||||||
|
"c",
|
||||||
|
}
|
||||||
|
result := NormalizeSlice(input)
|
||||||
|
expected := []any{"a", "/b", "c"}
|
||||||
|
assert.Equal(t, expected, result)
|
||||||
|
}
|
||||||
@@ -15,7 +15,6 @@ Depends: ${misc:Depends},
|
|||||||
quickshell-git | quickshell,
|
quickshell-git | quickshell,
|
||||||
accountsservice,
|
accountsservice,
|
||||||
cava,
|
cava,
|
||||||
cliphist,
|
|
||||||
danksearch,
|
danksearch,
|
||||||
dgop,
|
dgop,
|
||||||
matugen,
|
matugen,
|
||||||
@@ -29,8 +28,7 @@ Depends: ${misc:Depends},
|
|||||||
qml6-module-qtquick-layouts,
|
qml6-module-qtquick-layouts,
|
||||||
qml6-module-qtquick-templates,
|
qml6-module-qtquick-templates,
|
||||||
qml6-module-qtquick-window,
|
qml6-module-qtquick-window,
|
||||||
qt6ct,
|
qt6ct
|
||||||
wl-clipboard
|
|
||||||
Provides: dms
|
Provides: dms
|
||||||
Conflicts: dms
|
Conflicts: dms
|
||||||
Replaces: dms
|
Replaces: dms
|
||||||
|
|||||||
@@ -14,7 +14,6 @@ Depends: ${misc:Depends},
|
|||||||
quickshell | quickshell-git,
|
quickshell | quickshell-git,
|
||||||
accountsservice,
|
accountsservice,
|
||||||
cava,
|
cava,
|
||||||
cliphist,
|
|
||||||
danksearch,
|
danksearch,
|
||||||
dgop,
|
dgop,
|
||||||
matugen,
|
matugen,
|
||||||
@@ -28,8 +27,7 @@ Depends: ${misc:Depends},
|
|||||||
qml6-module-qtquick-layouts,
|
qml6-module-qtquick-layouts,
|
||||||
qml6-module-qtquick-templates,
|
qml6-module-qtquick-templates,
|
||||||
qml6-module-qtquick-window,
|
qml6-module-qtquick-window,
|
||||||
qt6ct,
|
qt6ct
|
||||||
wl-clipboard
|
|
||||||
Conflicts: dms-git
|
Conflicts: dms-git
|
||||||
Replaces: dms-git
|
Replaces: dms-git
|
||||||
Description: DankMaterialShell - Modern Wayland Desktop Shell
|
Description: DankMaterialShell - Modern Wayland Desktop Shell
|
||||||
|
|||||||
@@ -33,7 +33,6 @@ Recommends: cava
|
|||||||
Recommends: danksearch
|
Recommends: danksearch
|
||||||
Recommends: matugen
|
Recommends: matugen
|
||||||
Recommends: quickshell-git
|
Recommends: quickshell-git
|
||||||
Recommends: wl-clipboard
|
|
||||||
|
|
||||||
# Recommended system packages
|
# Recommended system packages
|
||||||
Recommends: NetworkManager
|
Recommends: NetworkManager
|
||||||
|
|||||||
@@ -24,10 +24,8 @@ Requires: dms-cli = %{version}-%{release}
|
|||||||
Requires: dgop
|
Requires: dgop
|
||||||
|
|
||||||
Recommends: cava
|
Recommends: cava
|
||||||
Recommends: cliphist
|
|
||||||
Recommends: danksearch
|
Recommends: danksearch
|
||||||
Recommends: matugen
|
Recommends: matugen
|
||||||
Recommends: wl-clipboard
|
|
||||||
Recommends: NetworkManager
|
Recommends: NetworkManager
|
||||||
Recommends: qt6-qtmultimedia
|
Recommends: qt6-qtmultimedia
|
||||||
Suggests: qt6ct
|
Suggests: qt6ct
|
||||||
|
|||||||
@@ -20,12 +20,9 @@ Requires: accountsservice
|
|||||||
Requires: dgop
|
Requires: dgop
|
||||||
|
|
||||||
Recommends: cava
|
Recommends: cava
|
||||||
Recommends: cliphist
|
|
||||||
Recommends: danksearch
|
Recommends: danksearch
|
||||||
Recommends: matugen
|
Recommends: matugen
|
||||||
Recommends: quickshell-git
|
Recommends: quickshell-git
|
||||||
Recommends: wl-clipboard
|
|
||||||
|
|
||||||
Recommends: NetworkManager
|
Recommends: NetworkManager
|
||||||
Recommends: qt6-qtmultimedia
|
Recommends: qt6-qtmultimedia
|
||||||
Suggests: qt6ct
|
Suggests: qt6ct
|
||||||
|
|||||||
@@ -23,12 +23,10 @@ Requires: dgop
|
|||||||
|
|
||||||
# Core utilities (Highly recommended for DMS functionality)
|
# Core utilities (Highly recommended for DMS functionality)
|
||||||
Recommends: cava
|
Recommends: cava
|
||||||
Recommends: cliphist
|
|
||||||
Recommends: danksearch
|
Recommends: danksearch
|
||||||
Recommends: matugen
|
Recommends: matugen
|
||||||
Recommends: NetworkManager
|
Recommends: NetworkManager
|
||||||
Recommends: qt6-qtmultimedia
|
Recommends: qt6-qtmultimedia
|
||||||
Recommends: wl-clipboard
|
|
||||||
Suggests: qt6ct
|
Suggests: qt6ct
|
||||||
|
|
||||||
%description
|
%description
|
||||||
|
|||||||
@@ -15,7 +15,6 @@ Depends: ${misc:Depends},
|
|||||||
quickshell-git | quickshell,
|
quickshell-git | quickshell,
|
||||||
accountsservice,
|
accountsservice,
|
||||||
cava,
|
cava,
|
||||||
cliphist,
|
|
||||||
danksearch,
|
danksearch,
|
||||||
dgop,
|
dgop,
|
||||||
matugen,
|
matugen,
|
||||||
@@ -29,8 +28,7 @@ Depends: ${misc:Depends},
|
|||||||
qml6-module-qtquick-layouts,
|
qml6-module-qtquick-layouts,
|
||||||
qml6-module-qtquick-templates,
|
qml6-module-qtquick-templates,
|
||||||
qml6-module-qtquick-window,
|
qml6-module-qtquick-window,
|
||||||
qt6ct,
|
qt6ct
|
||||||
wl-clipboard
|
|
||||||
Provides: dms
|
Provides: dms
|
||||||
Conflicts: dms
|
Conflicts: dms
|
||||||
Replaces: dms
|
Replaces: dms
|
||||||
|
|||||||
@@ -14,7 +14,6 @@ Depends: ${misc:Depends},
|
|||||||
quickshell | quickshell-git,
|
quickshell | quickshell-git,
|
||||||
accountsservice,
|
accountsservice,
|
||||||
cava,
|
cava,
|
||||||
cliphist,
|
|
||||||
danksearch,
|
danksearch,
|
||||||
dgop,
|
dgop,
|
||||||
matugen,
|
matugen,
|
||||||
@@ -28,8 +27,7 @@ Depends: ${misc:Depends},
|
|||||||
qml6-module-qtquick-layouts,
|
qml6-module-qtquick-layouts,
|
||||||
qml6-module-qtquick-templates,
|
qml6-module-qtquick-templates,
|
||||||
qml6-module-qtquick-window,
|
qml6-module-qtquick-window,
|
||||||
qt6ct,
|
qt6ct
|
||||||
wl-clipboard
|
|
||||||
Conflicts: dms-git
|
Conflicts: dms-git
|
||||||
Replaces: dms-git
|
Replaces: dms-git
|
||||||
Description: DankMaterialShell - Modern Wayland Desktop Shell
|
Description: DankMaterialShell - Modern Wayland Desktop Shell
|
||||||
|
|||||||
@@ -78,7 +78,7 @@
|
|||||||
inherit version;
|
inherit version;
|
||||||
pname = "dms-shell";
|
pname = "dms-shell";
|
||||||
src = ./core;
|
src = ./core;
|
||||||
vendorHash = "sha256-9CnZFtjXXWYELRiBX2UbZvWopnl9Y1ILuK+xP6YQZ9U=";
|
vendorHash = "sha256-lXqOJ0yNlOcXuR3vcuVjFI02Hskmavcasb1Ntf3UlPM=";
|
||||||
|
|
||||||
subPackages = [ "cmd/dms" ];
|
subPackages = [ "cmd/dms" ];
|
||||||
|
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
Spicy Miso
|
Saffron Bloom
|
||||||
|
|||||||
@@ -366,6 +366,7 @@ Singleton {
|
|||||||
|
|
||||||
property bool showDock: false
|
property bool showDock: false
|
||||||
property bool dockAutoHide: false
|
property bool dockAutoHide: false
|
||||||
|
property bool dockSmartAutoHide: false
|
||||||
property bool dockGroupByApp: false
|
property bool dockGroupByApp: false
|
||||||
property bool dockOpenOnOverview: false
|
property bool dockOpenOnOverview: false
|
||||||
property int dockPosition: SettingsData.Position.Bottom
|
property int dockPosition: SettingsData.Position.Bottom
|
||||||
|
|||||||
@@ -231,6 +231,7 @@ var SPEC = {
|
|||||||
|
|
||||||
showDock: { def: false },
|
showDock: { def: false },
|
||||||
dockAutoHide: { def: false },
|
dockAutoHide: { def: false },
|
||||||
|
dockSmartAutoHide: { def: false },
|
||||||
dockGroupByApp: { def: false },
|
dockGroupByApp: { def: false },
|
||||||
dockOpenOnOverview: { def: false },
|
dockOpenOnOverview: { def: false },
|
||||||
dockPosition: { def: 1 },
|
dockPosition: { def: 1 },
|
||||||
|
|||||||
@@ -966,6 +966,17 @@ Item {
|
|||||||
return success ? `PLUGIN_DISABLE_SUCCESS: ${pluginId}` : `PLUGIN_DISABLE_FAILED: ${pluginId}`;
|
return success ? `PLUGIN_DISABLE_SUCCESS: ${pluginId}` : `PLUGIN_DISABLE_FAILED: ${pluginId}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function toggle(pluginId: string): string {
|
||||||
|
if (!pluginId)
|
||||||
|
return "ERROR: No plugin ID specified";
|
||||||
|
|
||||||
|
if (!PluginService.availablePlugins[pluginId])
|
||||||
|
return `PLUGIN_NOT_FOUND: ${pluginId}`;
|
||||||
|
|
||||||
|
const success = PluginService.togglePlugin(pluginId);
|
||||||
|
return success ? `PLUGIN_TOGGLE_SUCCESS: ${pluginId}` : `PLUGIN_TOGGLE_FAILED: ${pluginId}`;
|
||||||
|
}
|
||||||
|
|
||||||
function list(): string {
|
function list(): string {
|
||||||
const plugins = PluginService.getAvailablePlugins();
|
const plugins = PluginService.getAvailablePlugins();
|
||||||
if (plugins.length === 0)
|
if (plugins.length === 0)
|
||||||
|
|||||||
@@ -25,7 +25,10 @@ Item {
|
|||||||
width: parent.width
|
width: parent.width
|
||||||
totalCount: modal.totalCount
|
totalCount: modal.totalCount
|
||||||
showKeyboardHints: modal.showKeyboardHints
|
showKeyboardHints: modal.showKeyboardHints
|
||||||
|
activeTab: modal.activeTab
|
||||||
|
pinnedCount: modal.pinnedCount
|
||||||
onKeyboardHintsToggled: modal.showKeyboardHints = !modal.showKeyboardHints
|
onKeyboardHintsToggled: modal.showKeyboardHints = !modal.showKeyboardHints
|
||||||
|
onTabChanged: tabName => modal.activeTab = tabName
|
||||||
onClearAllClicked: {
|
onClearAllClicked: {
|
||||||
clearConfirmDialog.show(I18n.tr("Clear All History?"), I18n.tr("This will permanently delete all clipboard history."), function () {
|
clearConfirmDialog.show(I18n.tr("Clear All History?"), I18n.tr("This will permanently delete all clipboard history."), function () {
|
||||||
modal.clearAll();
|
modal.clearAll();
|
||||||
@@ -70,18 +73,20 @@ Item {
|
|||||||
|
|
||||||
Rectangle {
|
Rectangle {
|
||||||
width: parent.width
|
width: parent.width
|
||||||
height: parent.height - ClipboardConstants.headerHeight - 70
|
height: parent.height - y - keyboardHintsContainer.height - Theme.spacingL
|
||||||
radius: Theme.cornerRadius
|
radius: Theme.cornerRadius
|
||||||
color: "transparent"
|
color: "transparent"
|
||||||
clip: true
|
clip: true
|
||||||
|
|
||||||
|
// Recents Tab
|
||||||
DankListView {
|
DankListView {
|
||||||
id: clipboardListView
|
id: clipboardListView
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
model: ScriptModel {
|
model: ScriptModel {
|
||||||
values: clipboardContent.modal.clipboardEntries
|
values: clipboardContent.modal.unpinnedEntries
|
||||||
objectProp: "id"
|
objectProp: "id"
|
||||||
}
|
}
|
||||||
|
visible: modal.activeTab === "recents"
|
||||||
|
|
||||||
currentIndex: clipboardContent.modal ? clipboardContent.modal.selectedIndex : 0
|
currentIndex: clipboardContent.modal ? clipboardContent.modal.selectedIndex : 0
|
||||||
spacing: Theme.spacingXS
|
spacing: Theme.spacingXS
|
||||||
@@ -114,11 +119,11 @@ Item {
|
|||||||
}
|
}
|
||||||
|
|
||||||
StyledText {
|
StyledText {
|
||||||
text: I18n.tr("No clipboard entries found")
|
text: I18n.tr("No recent clipboard entries found")
|
||||||
anchors.centerIn: parent
|
anchors.centerIn: parent
|
||||||
font.pixelSize: Theme.fontSizeMedium
|
font.pixelSize: Theme.fontSizeMedium
|
||||||
color: Theme.surfaceVariantText
|
color: Theme.surfaceVariantText
|
||||||
visible: clipboardContent.modal.clipboardEntries.length === 0
|
visible: clipboardContent.modal.unpinnedEntries.length === 0
|
||||||
}
|
}
|
||||||
|
|
||||||
delegate: ClipboardEntry {
|
delegate: ClipboardEntry {
|
||||||
@@ -135,11 +140,60 @@ Item {
|
|||||||
listView: clipboardListView
|
listView: clipboardListView
|
||||||
onCopyRequested: clipboardContent.modal.copyEntry(modelData)
|
onCopyRequested: clipboardContent.modal.copyEntry(modelData)
|
||||||
onDeleteRequested: clipboardContent.modal.deleteEntry(modelData)
|
onDeleteRequested: clipboardContent.modal.deleteEntry(modelData)
|
||||||
|
onPinRequested: clipboardContent.modal.pinEntry(modelData)
|
||||||
|
onUnpinRequested: clipboardContent.modal.unpinEntry(modelData)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Saved Tab
|
||||||
|
DankListView {
|
||||||
|
id: savedListView
|
||||||
|
anchors.fill: parent
|
||||||
|
model: ScriptModel {
|
||||||
|
values: clipboardContent.modal.pinnedEntries
|
||||||
|
objectProp: "id"
|
||||||
|
}
|
||||||
|
visible: modal.activeTab === "saved"
|
||||||
|
|
||||||
|
spacing: Theme.spacingXS
|
||||||
|
interactive: true
|
||||||
|
flickDeceleration: 1500
|
||||||
|
maximumFlickVelocity: 2000
|
||||||
|
boundsBehavior: Flickable.DragAndOvershootBounds
|
||||||
|
boundsMovement: Flickable.FollowBoundsBehavior
|
||||||
|
pressDelay: 0
|
||||||
|
flickableDirection: Flickable.VerticalFlick
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: I18n.tr("No saved clipboard entries")
|
||||||
|
anchors.centerIn: parent
|
||||||
|
font.pixelSize: Theme.fontSizeMedium
|
||||||
|
color: Theme.surfaceVariantText
|
||||||
|
visible: clipboardContent.modal.pinnedEntries.length === 0
|
||||||
|
}
|
||||||
|
|
||||||
|
delegate: ClipboardEntry {
|
||||||
|
required property int index
|
||||||
|
required property var modelData
|
||||||
|
|
||||||
|
width: savedListView.width
|
||||||
|
height: ClipboardConstants.itemHeight
|
||||||
|
entry: modelData
|
||||||
|
entryIndex: index + 1
|
||||||
|
itemIndex: index
|
||||||
|
isSelected: false
|
||||||
|
modal: clipboardContent.modal
|
||||||
|
listView: savedListView
|
||||||
|
onCopyRequested: clipboardContent.modal.copyEntry(modelData)
|
||||||
|
onDeleteRequested: clipboardContent.modal.deletePinnedEntry(modelData)
|
||||||
|
onPinRequested: clipboardContent.modal.pinEntry(modelData)
|
||||||
|
onUnpinRequested: clipboardContent.modal.unpinEntry(modelData)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
|
id: keyboardHintsContainer
|
||||||
width: parent.width
|
width: parent.width
|
||||||
height: modal.showKeyboardHints ? ClipboardConstants.keyboardHintsHeight + Theme.spacingL : 0
|
height: modal.showKeyboardHints ? ClipboardConstants.keyboardHintsHeight + Theme.spacingL : 0
|
||||||
|
|
||||||
|
|||||||
@@ -14,6 +14,8 @@ Rectangle {
|
|||||||
|
|
||||||
signal copyRequested
|
signal copyRequested
|
||||||
signal deleteRequested
|
signal deleteRequested
|
||||||
|
signal pinRequested
|
||||||
|
signal unpinRequested
|
||||||
|
|
||||||
readonly property string entryType: modal ? modal.getEntryType(entry) : "text"
|
readonly property string entryType: modal ? modal.getEntryType(entry) : "text"
|
||||||
readonly property string entryPreview: modal ? modal.getEntryPreview(entry) : ""
|
readonly property string entryPreview: modal ? modal.getEntryPreview(entry) : ""
|
||||||
@@ -50,7 +52,7 @@ Rectangle {
|
|||||||
|
|
||||||
Row {
|
Row {
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
width: parent.width - 68
|
width: parent.width - 110
|
||||||
spacing: Theme.spacingM
|
spacing: Theme.spacingM
|
||||||
|
|
||||||
ClipboardThumbnail {
|
ClipboardThumbnail {
|
||||||
@@ -100,20 +102,32 @@ Rectangle {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
DankActionButton {
|
Row {
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
anchors.rightMargin: Theme.spacingM
|
anchors.rightMargin: Theme.spacingM
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
iconName: "close"
|
spacing: Theme.spacingXS
|
||||||
iconSize: Theme.iconSize - 6
|
|
||||||
iconColor: Theme.surfaceText
|
DankActionButton {
|
||||||
onClicked: deleteRequested()
|
iconName: "push_pin"
|
||||||
|
iconSize: Theme.iconSize - 6
|
||||||
|
iconColor: entry.pinned ? Theme.primary : Theme.surfaceText
|
||||||
|
backgroundColor: entry.pinned ? Theme.primarySelected : "transparent"
|
||||||
|
onClicked: entry.pinned ? unpinRequested() : pinRequested()
|
||||||
|
}
|
||||||
|
|
||||||
|
DankActionButton {
|
||||||
|
iconName: "close"
|
||||||
|
iconSize: Theme.iconSize - 6
|
||||||
|
iconColor: Theme.surfaceText
|
||||||
|
onClicked: deleteRequested()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
MouseArea {
|
MouseArea {
|
||||||
id: mouseArea
|
id: mouseArea
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
anchors.rightMargin: 40
|
anchors.rightMargin: 80
|
||||||
hoverEnabled: true
|
hoverEnabled: true
|
||||||
cursorShape: Qt.PointingHandCursor
|
cursorShape: Qt.PointingHandCursor
|
||||||
onClicked: copyRequested()
|
onClicked: copyRequested()
|
||||||
|
|||||||
@@ -8,10 +8,13 @@ Item {
|
|||||||
|
|
||||||
property int totalCount: 0
|
property int totalCount: 0
|
||||||
property bool showKeyboardHints: false
|
property bool showKeyboardHints: false
|
||||||
|
property string activeTab: "recents"
|
||||||
|
property int pinnedCount: 0
|
||||||
|
|
||||||
signal keyboardHintsToggled
|
signal keyboardHintsToggled
|
||||||
signal clearAllClicked
|
signal clearAllClicked
|
||||||
signal closeClicked
|
signal closeClicked
|
||||||
|
signal tabChanged(string tabName)
|
||||||
|
|
||||||
height: ClipboardConstants.headerHeight
|
height: ClipboardConstants.headerHeight
|
||||||
|
|
||||||
@@ -41,6 +44,22 @@ Item {
|
|||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
spacing: Theme.spacingS
|
spacing: Theme.spacingS
|
||||||
|
|
||||||
|
DankActionButton {
|
||||||
|
iconName: "history"
|
||||||
|
iconSize: Theme.iconSize - 4
|
||||||
|
iconColor: header.activeTab === "recents" ? Theme.primary : Theme.surfaceText
|
||||||
|
onClicked: tabChanged("recents")
|
||||||
|
}
|
||||||
|
|
||||||
|
DankActionButton {
|
||||||
|
iconName: "push_pin"
|
||||||
|
iconSize: Theme.iconSize - 4
|
||||||
|
iconColor: header.activeTab === "saved" ? Theme.primary : Theme.surfaceText
|
||||||
|
opacity: header.pinnedCount > 0 ? 1 : 0
|
||||||
|
enabled: header.pinnedCount > 0
|
||||||
|
onClicked: tabChanged("saved")
|
||||||
|
}
|
||||||
|
|
||||||
DankActionButton {
|
DankActionButton {
|
||||||
iconName: "info"
|
iconName: "info"
|
||||||
iconSize: Theme.iconSize - 4
|
iconSize: Theme.iconSize - 4
|
||||||
|
|||||||
@@ -19,6 +19,8 @@ DankModal {
|
|||||||
|
|
||||||
property int totalCount: 0
|
property int totalCount: 0
|
||||||
property var clipboardEntries: []
|
property var clipboardEntries: []
|
||||||
|
property var pinnedEntries: []
|
||||||
|
property int pinnedCount: 0
|
||||||
property string searchText: ""
|
property string searchText: ""
|
||||||
property int selectedIndex: 0
|
property int selectedIndex: 0
|
||||||
property bool keyboardNavigationActive: false
|
property bool keyboardNavigationActive: false
|
||||||
@@ -74,22 +76,37 @@ DankModal {
|
|||||||
|
|
||||||
function updateFilteredModel() {
|
function updateFilteredModel() {
|
||||||
const query = searchText.trim();
|
const query = searchText.trim();
|
||||||
|
let filtered = [];
|
||||||
|
|
||||||
if (query.length === 0) {
|
if (query.length === 0) {
|
||||||
clipboardEntries = internalEntries;
|
filtered = internalEntries;
|
||||||
} else {
|
} else {
|
||||||
const lowerQuery = query.toLowerCase();
|
const lowerQuery = query.toLowerCase();
|
||||||
clipboardEntries = internalEntries.filter(entry => entry.preview.toLowerCase().includes(lowerQuery));
|
filtered = internalEntries.filter(entry =>
|
||||||
|
entry.preview.toLowerCase().includes(lowerQuery)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Sort: pinned first, then by ID descending
|
||||||
|
filtered.sort((a, b) => {
|
||||||
|
if (a.pinned !== b.pinned) return b.pinned ? 1 : -1;
|
||||||
|
return b.id - a.id;
|
||||||
|
});
|
||||||
|
|
||||||
|
clipboardEntries = filtered;
|
||||||
|
unpinnedEntries = filtered.filter(e => !e.pinned);
|
||||||
totalCount = clipboardEntries.length;
|
totalCount = clipboardEntries.length;
|
||||||
if (clipboardEntries.length === 0) {
|
if (unpinnedEntries.length === 0) {
|
||||||
keyboardNavigationActive = false;
|
keyboardNavigationActive = false;
|
||||||
selectedIndex = 0;
|
selectedIndex = 0;
|
||||||
} else if (selectedIndex >= clipboardEntries.length) {
|
} else if (selectedIndex >= unpinnedEntries.length) {
|
||||||
selectedIndex = clipboardEntries.length - 1;
|
selectedIndex = unpinnedEntries.length - 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
property var internalEntries: []
|
property var internalEntries: []
|
||||||
|
property var unpinnedEntries: []
|
||||||
|
property string activeTab: "recents"
|
||||||
|
|
||||||
function toggle() {
|
function toggle() {
|
||||||
if (shouldBeVisible) {
|
if (shouldBeVisible) {
|
||||||
@@ -135,6 +152,10 @@ DankModal {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
internalEntries = response.result || [];
|
internalEntries = response.result || [];
|
||||||
|
|
||||||
|
pinnedEntries = internalEntries.filter(e => e.pinned);
|
||||||
|
pinnedCount = pinnedEntries.length;
|
||||||
|
|
||||||
updateFilteredModel();
|
updateFilteredModel();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -171,18 +192,87 @@ DankModal {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function clearAll() {
|
function deletePinnedEntry(entry) {
|
||||||
DMSService.sendRequest("clipboard.clearHistory", null, function (response) {
|
clearConfirmDialog.show(
|
||||||
if (response.error) {
|
I18n.tr("Delete Saved Item?"),
|
||||||
console.warn("ClipboardHistoryModal: Failed to clear history:", response.error);
|
I18n.tr("This will permanently remove this saved clipboard item. This action cannot be undone."),
|
||||||
|
function () {
|
||||||
|
DMSService.sendRequest("clipboard.deleteEntry", {
|
||||||
|
"id": entry.id
|
||||||
|
}, function (response) {
|
||||||
|
if (response.error) {
|
||||||
|
console.warn("ClipboardHistoryModal: Failed to delete entry:", response.error);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
internalEntries = internalEntries.filter(e => e.id !== entry.id);
|
||||||
|
updateFilteredModel();
|
||||||
|
ToastService.showInfo(I18n.tr("Saved item deleted"));
|
||||||
|
});
|
||||||
|
},
|
||||||
|
function () {}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function pinEntry(entry) {
|
||||||
|
DMSService.sendRequest("clipboard.getPinnedCount", null, function (countResponse) {
|
||||||
|
if (countResponse.error) {
|
||||||
|
ToastService.showError(I18n.tr("Failed to check pin limit"));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
internalEntries = [];
|
|
||||||
clipboardEntries = [];
|
const maxPinned = 25; // TODO: Get from config
|
||||||
totalCount = 0;
|
if (countResponse.result.count >= maxPinned) {
|
||||||
|
ToastService.showError(I18n.tr("Maximum pinned entries reached") + " (" + maxPinned + ")");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
DMSService.sendRequest("clipboard.pinEntry", { "id": entry.id }, function (response) {
|
||||||
|
if (response.error) {
|
||||||
|
ToastService.showError(I18n.tr("Failed to pin entry"));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
ToastService.showInfo(I18n.tr("Entry pinned"));
|
||||||
|
refreshClipboard();
|
||||||
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function unpinEntry(entry) {
|
||||||
|
DMSService.sendRequest("clipboard.unpinEntry", { "id": entry.id }, function (response) {
|
||||||
|
if (response.error) {
|
||||||
|
ToastService.showError(I18n.tr("Failed to unpin entry"));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
ToastService.showInfo(I18n.tr("Entry unpinned"));
|
||||||
|
refreshClipboard();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function clearAll() {
|
||||||
|
const hasPinned = pinnedCount > 0;
|
||||||
|
const message = hasPinned
|
||||||
|
? I18n.tr("This will delete all unpinned entries. %1 pinned entries will be kept.").arg(pinnedCount)
|
||||||
|
: I18n.tr("This will permanently delete all clipboard history.");
|
||||||
|
|
||||||
|
clearConfirmDialog.show(
|
||||||
|
I18n.tr("Clear History?"),
|
||||||
|
message,
|
||||||
|
function () {
|
||||||
|
DMSService.sendRequest("clipboard.clearHistory", null, function (response) {
|
||||||
|
if (response.error) {
|
||||||
|
console.warn("ClipboardHistoryModal: Failed to clear history:", response.error);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
refreshClipboard();
|
||||||
|
if (hasPinned) {
|
||||||
|
ToastService.showInfo(I18n.tr("History cleared. %1 pinned entries kept.").arg(pinnedCount));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
|
function () {}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
function getEntryPreview(entry) {
|
function getEntryPreview(entry) {
|
||||||
return entry.preview || "";
|
return entry.preview || "";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,7 +11,8 @@ FloatingWindow {
|
|||||||
id: processListModal
|
id: processListModal
|
||||||
|
|
||||||
property int currentTab: 0
|
property int currentTab: 0
|
||||||
property var tabNames: ["Processes", "Performance", "System"]
|
property string searchText: ""
|
||||||
|
property string expandedPid: ""
|
||||||
property bool shouldHaveFocus: visible
|
property bool shouldHaveFocus: visible
|
||||||
property alias shouldBeVisible: processListModal.visible
|
property alias shouldBeVisible: processListModal.visible
|
||||||
|
|
||||||
@@ -27,9 +28,8 @@ FloatingWindow {
|
|||||||
|
|
||||||
function hide() {
|
function hide() {
|
||||||
visible = false;
|
visible = false;
|
||||||
if (processContextMenu.visible) {
|
if (processContextMenu.visible)
|
||||||
processContextMenu.close();
|
processContextMenu.close();
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function toggle() {
|
function toggle() {
|
||||||
@@ -61,46 +61,39 @@ FloatingWindow {
|
|||||||
show();
|
show();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function formatBytes(bytes) {
|
||||||
|
if (bytes < 1024)
|
||||||
|
return bytes.toFixed(0) + " B/s";
|
||||||
|
if (bytes < 1024 * 1024)
|
||||||
|
return (bytes / 1024).toFixed(1) + " KB/s";
|
||||||
|
if (bytes < 1024 * 1024 * 1024)
|
||||||
|
return (bytes / (1024 * 1024)).toFixed(1) + " MB/s";
|
||||||
|
return (bytes / (1024 * 1024 * 1024)).toFixed(2) + " GB/s";
|
||||||
|
}
|
||||||
|
|
||||||
objectName: "processListModal"
|
objectName: "processListModal"
|
||||||
title: I18n.tr("System Monitor", "sysmon window title")
|
title: I18n.tr("System Monitor", "sysmon window title")
|
||||||
minimumSize: Qt.size(650, 400)
|
minimumSize: Qt.size(750, 550)
|
||||||
implicitWidth: 900
|
implicitWidth: 1000
|
||||||
implicitHeight: 680
|
implicitHeight: 720
|
||||||
color: Theme.surfaceContainer
|
color: Theme.surfaceContainer
|
||||||
visible: false
|
visible: false
|
||||||
|
|
||||||
onVisibleChanged: {
|
onVisibleChanged: {
|
||||||
if (!visible) {
|
if (!visible) {
|
||||||
closingModal();
|
closingModal();
|
||||||
|
searchText = "";
|
||||||
|
expandedPid = "";
|
||||||
|
DgopService.removeRef(["cpu", "memory", "network", "disk", "system"]);
|
||||||
} else {
|
} else {
|
||||||
|
DgopService.addRef(["cpu", "memory", "network", "disk", "system"]);
|
||||||
Qt.callLater(() => {
|
Qt.callLater(() => {
|
||||||
if (contentFocusScope) {
|
if (contentFocusScope)
|
||||||
contentFocusScope.forceActiveFocus();
|
contentFocusScope.forceActiveFocus();
|
||||||
}
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Component {
|
|
||||||
id: processesTabComponent
|
|
||||||
|
|
||||||
ProcessesTab {
|
|
||||||
contextMenu: processContextMenu
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Component {
|
|
||||||
id: performanceTabComponent
|
|
||||||
|
|
||||||
PerformanceTab {}
|
|
||||||
}
|
|
||||||
|
|
||||||
Component {
|
|
||||||
id: systemTabComponent
|
|
||||||
|
|
||||||
SystemTab {}
|
|
||||||
}
|
|
||||||
|
|
||||||
ProcessContextMenu {
|
ProcessContextMenu {
|
||||||
id: processContextMenu
|
id: processContextMenu
|
||||||
}
|
}
|
||||||
@@ -128,6 +121,26 @@ FloatingWindow {
|
|||||||
currentTab = 2;
|
currentTab = 2;
|
||||||
event.accepted = true;
|
event.accepted = true;
|
||||||
return;
|
return;
|
||||||
|
case Qt.Key_4:
|
||||||
|
currentTab = 3;
|
||||||
|
event.accepted = true;
|
||||||
|
return;
|
||||||
|
case Qt.Key_Escape:
|
||||||
|
if (searchText.length > 0) {
|
||||||
|
searchText = "";
|
||||||
|
event.accepted = true;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
hide();
|
||||||
|
event.accepted = true;
|
||||||
|
return;
|
||||||
|
case Qt.Key_F:
|
||||||
|
if (event.modifiers & Qt.ControlModifier) {
|
||||||
|
searchField.forceActiveFocus();
|
||||||
|
event.accepted = true;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -161,7 +174,7 @@ FloatingWindow {
|
|||||||
}
|
}
|
||||||
|
|
||||||
StyledText {
|
StyledText {
|
||||||
text: I18n.tr("The 'dgop' tool is required for system monitoring.\nPlease install dgop to use this feature.")
|
text: I18n.tr("The 'dgop' tool is required for system monitoring.\nPlease install dgop to use this feature.", "dgop unavailable error message")
|
||||||
font.pixelSize: Theme.fontSizeMedium
|
font.pixelSize: Theme.fontSizeMedium
|
||||||
color: Theme.surfaceText
|
color: Theme.surfaceText
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
@@ -171,14 +184,14 @@ FloatingWindow {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Column {
|
ColumnLayout {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
spacing: 0
|
spacing: 0
|
||||||
visible: DgopService.dgopAvailable
|
visible: DgopService.dgopAvailable
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
width: parent.width
|
Layout.fillWidth: true
|
||||||
height: 48
|
Layout.preferredHeight: 48
|
||||||
|
|
||||||
MouseArea {
|
MouseArea {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
@@ -233,166 +246,276 @@ FloatingWindow {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Item {
|
RowLayout {
|
||||||
width: parent.width
|
Layout.fillWidth: true
|
||||||
height: parent.height - 48
|
Layout.preferredHeight: 52
|
||||||
|
Layout.leftMargin: Theme.spacingL
|
||||||
|
Layout.rightMargin: Theme.spacingL
|
||||||
|
spacing: Theme.spacingL
|
||||||
|
|
||||||
ColumnLayout {
|
Row {
|
||||||
anchors.fill: parent
|
spacing: 2
|
||||||
anchors.leftMargin: Theme.spacingL
|
|
||||||
anchors.rightMargin: Theme.spacingL
|
|
||||||
anchors.bottomMargin: Theme.spacingL
|
|
||||||
anchors.topMargin: 0
|
|
||||||
spacing: Theme.spacingL
|
|
||||||
|
|
||||||
Rectangle {
|
Repeater {
|
||||||
Layout.fillWidth: true
|
model: [
|
||||||
height: 52
|
{
|
||||||
color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
|
text: I18n.tr("Processes"),
|
||||||
radius: Theme.cornerRadius
|
icon: "list_alt"
|
||||||
border.color: Theme.outlineLight
|
},
|
||||||
border.width: 1
|
{
|
||||||
|
text: I18n.tr("Performance"),
|
||||||
|
icon: "analytics"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
text: I18n.tr("Disks"),
|
||||||
|
icon: "storage"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
text: I18n.tr("System"),
|
||||||
|
icon: "computer"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
|
||||||
Row {
|
Rectangle {
|
||||||
anchors.fill: parent
|
width: 120
|
||||||
anchors.margins: 4
|
height: 44
|
||||||
spacing: 2
|
radius: Theme.cornerRadius
|
||||||
|
color: currentTab === index ? Theme.primaryPressed : (tabMouseArea.containsMouse ? Theme.primaryHoverLight : "transparent")
|
||||||
|
border.color: currentTab === index ? Theme.primary : "transparent"
|
||||||
|
border.width: currentTab === index ? 1 : 0
|
||||||
|
|
||||||
Repeater {
|
Row {
|
||||||
model: tabNames
|
anchors.centerIn: parent
|
||||||
|
spacing: Theme.spacingXS
|
||||||
|
|
||||||
Rectangle {
|
DankIcon {
|
||||||
width: (parent.width - (tabNames.length - 1) * 2) / tabNames.length
|
name: modelData.icon
|
||||||
height: 44
|
size: Theme.iconSize - 2
|
||||||
radius: Theme.cornerRadius
|
color: currentTab === index ? Theme.primary : Theme.surfaceText
|
||||||
color: currentTab === index ? Theme.primaryPressed : (tabMouseArea.containsMouse ? Theme.primaryHoverLight : "transparent")
|
opacity: currentTab === index ? 1 : 0.7
|
||||||
border.color: currentTab === index ? Theme.primary : "transparent"
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
border.width: currentTab === index ? 1 : 0
|
}
|
||||||
|
|
||||||
Row {
|
StyledText {
|
||||||
anchors.centerIn: parent
|
text: modelData.text
|
||||||
spacing: Theme.spacingXS
|
font.pixelSize: Theme.fontSizeMedium
|
||||||
|
font.weight: Font.Medium
|
||||||
|
color: currentTab === index ? Theme.primary : Theme.surfaceText
|
||||||
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
DankIcon {
|
MouseArea {
|
||||||
name: {
|
id: tabMouseArea
|
||||||
const tabIcons = ["list_alt", "analytics", "settings"];
|
anchors.fill: parent
|
||||||
return tabIcons[index] || "tab";
|
hoverEnabled: true
|
||||||
}
|
cursorShape: Qt.PointingHandCursor
|
||||||
size: Theme.iconSize - 2
|
onClicked: currentTab = index
|
||||||
color: currentTab === index ? Theme.primary : Theme.surfaceText
|
}
|
||||||
opacity: currentTab === index ? 1 : 0.7
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
|
|
||||||
Behavior on color {
|
Behavior on color {
|
||||||
ColorAnimation {
|
ColorAnimation {
|
||||||
duration: Theme.shortDuration
|
duration: Theme.shortDuration
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: modelData
|
|
||||||
font.pixelSize: Theme.fontSizeLarge
|
|
||||||
font.weight: Font.Medium
|
|
||||||
color: currentTab === index ? Theme.primary : Theme.surfaceText
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
anchors.verticalCenterOffset: -1
|
|
||||||
|
|
||||||
Behavior on color {
|
|
||||||
ColorAnimation {
|
|
||||||
duration: Theme.shortDuration
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
MouseArea {
|
|
||||||
id: tabMouseArea
|
|
||||||
|
|
||||||
anchors.fill: parent
|
|
||||||
hoverEnabled: true
|
|
||||||
cursorShape: Qt.PointingHandCursor
|
|
||||||
onClicked: () => {
|
|
||||||
currentTab = index;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Behavior on color {
|
|
||||||
ColorAnimation {
|
|
||||||
duration: Theme.shortDuration
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Behavior on border.color {
|
|
||||||
ColorAnimation {
|
|
||||||
duration: Theme.shortDuration
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Rectangle {
|
Item {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.fillHeight: true
|
}
|
||||||
radius: Theme.cornerRadius
|
|
||||||
color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
|
|
||||||
border.color: Theme.outlineLight
|
|
||||||
border.width: 1
|
|
||||||
|
|
||||||
Loader {
|
DankTextField {
|
||||||
id: processesTab
|
id: searchField
|
||||||
|
Layout.preferredWidth: 250
|
||||||
|
Layout.preferredHeight: 40
|
||||||
|
placeholderText: I18n.tr("Search processes...", "process search placeholder")
|
||||||
|
leftIconName: "search"
|
||||||
|
showClearButton: true
|
||||||
|
text: searchText
|
||||||
|
visible: currentTab === 0
|
||||||
|
onTextChanged: searchText = text
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
anchors.fill: parent
|
Rectangle {
|
||||||
anchors.margins: Theme.spacingS
|
Layout.fillWidth: true
|
||||||
active: processListModal.visible && currentTab === 0
|
Layout.fillHeight: true
|
||||||
visible: currentTab === 0
|
Layout.margins: Theme.spacingL
|
||||||
opacity: currentTab === 0 ? 1 : 0
|
Layout.topMargin: Theme.spacingM
|
||||||
sourceComponent: processesTabComponent
|
radius: Theme.cornerRadius
|
||||||
|
color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
|
||||||
|
border.color: Theme.outlineLight
|
||||||
|
border.width: 1
|
||||||
|
clip: true
|
||||||
|
|
||||||
Behavior on opacity {
|
Loader {
|
||||||
NumberAnimation {
|
id: processesTabLoader
|
||||||
duration: Theme.mediumDuration
|
anchors.fill: parent
|
||||||
easing.type: Theme.emphasizedEasing
|
anchors.margins: Theme.spacingS
|
||||||
}
|
active: processListModal.visible && currentTab === 0
|
||||||
}
|
visible: currentTab === 0
|
||||||
|
sourceComponent: ProcessesView {
|
||||||
|
searchText: processListModal.searchText
|
||||||
|
expandedPid: processListModal.expandedPid
|
||||||
|
contextMenu: processContextMenu
|
||||||
|
onExpandedPidChanged: processListModal.expandedPid = expandedPid
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Loader {
|
||||||
|
id: performanceTabLoader
|
||||||
|
anchors.fill: parent
|
||||||
|
anchors.margins: Theme.spacingS
|
||||||
|
active: processListModal.visible && currentTab === 1
|
||||||
|
visible: currentTab === 1
|
||||||
|
sourceComponent: PerformanceView {}
|
||||||
|
}
|
||||||
|
|
||||||
|
Loader {
|
||||||
|
id: disksTabLoader
|
||||||
|
anchors.fill: parent
|
||||||
|
anchors.margins: Theme.spacingS
|
||||||
|
active: processListModal.visible && currentTab === 2
|
||||||
|
visible: currentTab === 2
|
||||||
|
sourceComponent: DisksView {}
|
||||||
|
}
|
||||||
|
|
||||||
|
Loader {
|
||||||
|
id: systemTabLoader
|
||||||
|
anchors.fill: parent
|
||||||
|
anchors.margins: Theme.spacingS
|
||||||
|
active: processListModal.visible && currentTab === 3
|
||||||
|
visible: currentTab === 3
|
||||||
|
sourceComponent: SystemView {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Rectangle {
|
||||||
|
Layout.fillWidth: true
|
||||||
|
Layout.preferredHeight: 32
|
||||||
|
Layout.leftMargin: Theme.spacingL
|
||||||
|
Layout.rightMargin: Theme.spacingL
|
||||||
|
Layout.bottomMargin: Theme.spacingM
|
||||||
|
color: "transparent"
|
||||||
|
|
||||||
|
Row {
|
||||||
|
anchors.left: parent.left
|
||||||
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
spacing: Theme.spacingL
|
||||||
|
|
||||||
|
Row {
|
||||||
|
spacing: Theme.spacingXS
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: I18n.tr("Processes:", "process count label in footer")
|
||||||
|
font.pixelSize: Theme.fontSizeSmall
|
||||||
|
color: Theme.surfaceVariantText
|
||||||
}
|
}
|
||||||
|
|
||||||
Loader {
|
StyledText {
|
||||||
id: performanceTab
|
text: DgopService.processCount.toString()
|
||||||
|
font.pixelSize: Theme.fontSizeSmall
|
||||||
|
font.weight: Font.Bold
|
||||||
|
color: Theme.surfaceText
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
anchors.fill: parent
|
Row {
|
||||||
anchors.margins: Theme.spacingS
|
spacing: Theme.spacingXS
|
||||||
active: processListModal.visible && currentTab === 1
|
|
||||||
visible: currentTab === 1
|
|
||||||
opacity: currentTab === 1 ? 1 : 0
|
|
||||||
sourceComponent: performanceTabComponent
|
|
||||||
|
|
||||||
Behavior on opacity {
|
StyledText {
|
||||||
NumberAnimation {
|
text: I18n.tr("Uptime:", "uptime label in footer")
|
||||||
duration: Theme.mediumDuration
|
font.pixelSize: Theme.fontSizeSmall
|
||||||
easing.type: Theme.emphasizedEasing
|
color: Theme.surfaceVariantText
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Loader {
|
StyledText {
|
||||||
id: systemTab
|
text: DgopService.shortUptime || "--"
|
||||||
|
font.pixelSize: Theme.fontSizeSmall
|
||||||
|
font.weight: Font.Bold
|
||||||
|
color: Theme.surfaceText
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
anchors.fill: parent
|
Row {
|
||||||
anchors.margins: Theme.spacingS
|
anchors.right: parent.right
|
||||||
active: processListModal.visible && currentTab === 2
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
visible: currentTab === 2
|
spacing: Theme.spacingL
|
||||||
opacity: currentTab === 2 ? 1 : 0
|
|
||||||
sourceComponent: systemTabComponent
|
|
||||||
|
|
||||||
Behavior on opacity {
|
Row {
|
||||||
NumberAnimation {
|
spacing: Theme.spacingXS
|
||||||
duration: Theme.mediumDuration
|
|
||||||
easing.type: Theme.emphasizedEasing
|
DankIcon {
|
||||||
}
|
name: "swap_horiz"
|
||||||
}
|
size: 14
|
||||||
|
color: Theme.info
|
||||||
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
}
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: "↓" + formatBytes(DgopService.networkRxRate) + " ↑" + formatBytes(DgopService.networkTxRate)
|
||||||
|
font.pixelSize: Theme.fontSizeSmall
|
||||||
|
font.family: SettingsData.monoFontFamily
|
||||||
|
color: Theme.surfaceText
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
spacing: Theme.spacingXS
|
||||||
|
|
||||||
|
DankIcon {
|
||||||
|
name: "storage"
|
||||||
|
size: 14
|
||||||
|
color: Theme.warning
|
||||||
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
}
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: "↓" + formatBytes(DgopService.diskReadRate) + " ↑" + formatBytes(DgopService.diskWriteRate)
|
||||||
|
font.pixelSize: Theme.fontSizeSmall
|
||||||
|
font.family: SettingsData.monoFontFamily
|
||||||
|
color: Theme.surfaceText
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
spacing: Theme.spacingXS
|
||||||
|
|
||||||
|
DankIcon {
|
||||||
|
name: "memory"
|
||||||
|
size: 14
|
||||||
|
color: Theme.primary
|
||||||
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
}
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: DgopService.cpuUsage.toFixed(1) + "%"
|
||||||
|
font.pixelSize: Theme.fontSizeSmall
|
||||||
|
font.family: SettingsData.monoFontFamily
|
||||||
|
font.weight: Font.Bold
|
||||||
|
color: DgopService.cpuUsage > 80 ? Theme.error : Theme.surfaceText
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
spacing: Theme.spacingXS
|
||||||
|
|
||||||
|
DankIcon {
|
||||||
|
name: "sd_card"
|
||||||
|
size: 14
|
||||||
|
color: Theme.secondary
|
||||||
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
}
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: DgopService.formatSystemMemory(DgopService.usedMemoryKB) + " / " + DgopService.formatSystemMemory(DgopService.totalMemoryKB)
|
||||||
|
font.pixelSize: Theme.fontSizeSmall
|
||||||
|
font.family: SettingsData.monoFontFamily
|
||||||
|
font.weight: Font.Bold
|
||||||
|
color: DgopService.memoryUsage > 90 ? Theme.error : Theme.surfaceText
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -365,6 +365,7 @@ Item {
|
|||||||
onContentItemReady: contentItem => {
|
onContentItemReady: contentItem => {
|
||||||
contentItem.widthChanged.connect(() => layoutTimer.restart());
|
contentItem.widthChanged.connect(() => layoutTimer.restart());
|
||||||
contentItem.heightChanged.connect(() => layoutTimer.restart());
|
contentItem.heightChanged.connect(() => layoutTimer.restart());
|
||||||
|
layoutTimer.restart();
|
||||||
}
|
}
|
||||||
|
|
||||||
onActiveChanged: layoutTimer.restart()
|
onActiveChanged: layoutTimer.restart()
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ pragma ComponentBehavior: Bound
|
|||||||
import QtQuick
|
import QtQuick
|
||||||
import QtQuick.Shapes
|
import QtQuick.Shapes
|
||||||
import Quickshell
|
import Quickshell
|
||||||
|
import Quickshell.Hyprland
|
||||||
import Quickshell.Wayland
|
import Quickshell.Wayland
|
||||||
import qs.Common
|
import qs.Common
|
||||||
import qs.Services
|
import qs.Services
|
||||||
@@ -28,7 +29,7 @@ Variants {
|
|||||||
}
|
}
|
||||||
|
|
||||||
property var modelData: item
|
property var modelData: item
|
||||||
property bool autoHide: SettingsData.dockAutoHide
|
property bool autoHide: SettingsData.dockAutoHide || SettingsData.dockSmartAutoHide
|
||||||
property real backgroundTransparency: SettingsData.dockTransparency
|
property real backgroundTransparency: SettingsData.dockTransparency
|
||||||
property bool groupByApp: SettingsData.dockGroupByApp
|
property bool groupByApp: SettingsData.dockGroupByApp
|
||||||
readonly property int borderThickness: SettingsData.dockBorderEnabled ? SettingsData.dockBorderThickness : 0
|
readonly property int borderThickness: SettingsData.dockBorderEnabled ? SettingsData.dockBorderThickness : 0
|
||||||
@@ -111,6 +112,133 @@ Variants {
|
|||||||
property bool contextMenuOpen: (dockVariants.contextMenu && dockVariants.contextMenu.visible && dockVariants.contextMenu.screen === modelData)
|
property bool contextMenuOpen: (dockVariants.contextMenu && dockVariants.contextMenu.visible && dockVariants.contextMenu.screen === modelData)
|
||||||
property bool revealSticky: false
|
property bool revealSticky: false
|
||||||
|
|
||||||
|
readonly property bool shouldHideForWindows: {
|
||||||
|
if (!SettingsData.dockSmartAutoHide)
|
||||||
|
return false;
|
||||||
|
if (!CompositorService.isNiri && !CompositorService.isHyprland)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
const screenName = dock.modelData?.name ?? "";
|
||||||
|
const dockThickness = effectiveBarHeight + SettingsData.dockSpacing + SettingsData.dockBottomGap + SettingsData.dockMargin;
|
||||||
|
const screenWidth = dock.screen?.width ?? 0;
|
||||||
|
const screenHeight = dock.screen?.height ?? 0;
|
||||||
|
|
||||||
|
if (CompositorService.isNiri) {
|
||||||
|
NiriService.windows;
|
||||||
|
|
||||||
|
let currentWorkspaceId = null;
|
||||||
|
for (let i = 0; i < NiriService.allWorkspaces.length; i++) {
|
||||||
|
const ws = NiriService.allWorkspaces[i];
|
||||||
|
if (ws.output === screenName && ws.is_active) {
|
||||||
|
currentWorkspaceId = ws.id;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (currentWorkspaceId === null)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
for (let i = 0; i < NiriService.windows.length; i++) {
|
||||||
|
const win = NiriService.windows[i];
|
||||||
|
if (win.workspace_id !== currentWorkspaceId)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
// Get window position and size from layout data
|
||||||
|
const tilePos = win.layout?.tile_pos_in_workspace_view;
|
||||||
|
const winSize = win.layout?.window_size || win.layout?.tile_size;
|
||||||
|
|
||||||
|
if (tilePos && winSize) {
|
||||||
|
const winX = tilePos[0];
|
||||||
|
const winY = tilePos[1];
|
||||||
|
const winW = winSize[0];
|
||||||
|
const winH = winSize[1];
|
||||||
|
|
||||||
|
switch (SettingsData.dockPosition) {
|
||||||
|
case SettingsData.Position.Top:
|
||||||
|
if (winY < dockThickness)
|
||||||
|
return true;
|
||||||
|
break;
|
||||||
|
case SettingsData.Position.Bottom:
|
||||||
|
if (winY + winH > screenHeight - dockThickness)
|
||||||
|
return true;
|
||||||
|
break;
|
||||||
|
case SettingsData.Position.Left:
|
||||||
|
if (winX < dockThickness)
|
||||||
|
return true;
|
||||||
|
break;
|
||||||
|
case SettingsData.Position.Right:
|
||||||
|
if (winX + winW > screenWidth - dockThickness)
|
||||||
|
return true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
} else if (!win.is_floating) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Hyprland implementation
|
||||||
|
const filtered = CompositorService.filterCurrentWorkspace(CompositorService.sortedToplevels, screenName);
|
||||||
|
|
||||||
|
if (filtered.length === 0)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
for (let i = 0; i < filtered.length; i++) {
|
||||||
|
const toplevel = filtered[i];
|
||||||
|
|
||||||
|
let hyprToplevel = null;
|
||||||
|
if (Hyprland.toplevels) {
|
||||||
|
const hyprToplevels = Array.from(Hyprland.toplevels.values);
|
||||||
|
for (let j = 0; j < hyprToplevels.length; j++) {
|
||||||
|
if (hyprToplevels[j].wayland === toplevel) {
|
||||||
|
hyprToplevel = hyprToplevels[j];
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!hyprToplevel?.lastIpcObject)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
const ipc = hyprToplevel.lastIpcObject;
|
||||||
|
const at = ipc.at;
|
||||||
|
const size = ipc.size;
|
||||||
|
if (!at || !size)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
const monX = hyprToplevel.monitor?.x ?? 0;
|
||||||
|
const monY = hyprToplevel.monitor?.y ?? 0;
|
||||||
|
|
||||||
|
const winX = at[0] - monX;
|
||||||
|
const winY = at[1] - monY;
|
||||||
|
const winW = size[0];
|
||||||
|
const winH = size[1];
|
||||||
|
|
||||||
|
switch (SettingsData.dockPosition) {
|
||||||
|
case SettingsData.Position.Top:
|
||||||
|
if (winY < dockThickness)
|
||||||
|
return true;
|
||||||
|
break;
|
||||||
|
case SettingsData.Position.Bottom:
|
||||||
|
if (winY + winH > screenHeight - dockThickness)
|
||||||
|
return true;
|
||||||
|
break;
|
||||||
|
case SettingsData.Position.Left:
|
||||||
|
if (winX < dockThickness)
|
||||||
|
return true;
|
||||||
|
break;
|
||||||
|
case SettingsData.Position.Right:
|
||||||
|
if (winX + winW > screenWidth - dockThickness)
|
||||||
|
return true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
Timer {
|
Timer {
|
||||||
id: revealHold
|
id: revealHold
|
||||||
interval: 250
|
interval: 250
|
||||||
@@ -122,6 +250,15 @@ Variants {
|
|||||||
if (CompositorService.isNiri && NiriService.inOverview && SettingsData.dockOpenOnOverview) {
|
if (CompositorService.isNiri && NiriService.inOverview && SettingsData.dockOpenOnOverview) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Smart auto-hide: show dock when no windows overlap, hide when they do
|
||||||
|
if (SettingsData.dockSmartAutoHide) {
|
||||||
|
if (shouldHideForWindows)
|
||||||
|
return dockMouseArea.containsMouse || dockApps.requestDockShow || contextMenuOpen || revealSticky;
|
||||||
|
return true; // No overlapping windows - show dock
|
||||||
|
}
|
||||||
|
|
||||||
|
// Regular auto-hide: always hide unless hovering
|
||||||
return !autoHide || dockMouseArea.containsMouse || dockApps.requestDockShow || contextMenuOpen || revealSticky;
|
return !autoHide || dockMouseArea.containsMouse || dockApps.requestDockShow || contextMenuOpen || revealSticky;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
pragma ComponentBehavior: Bound
|
pragma ComponentBehavior: Bound
|
||||||
import QtQuick
|
import QtQuick
|
||||||
|
import Quickshell
|
||||||
import Quickshell.Io
|
import Quickshell.Io
|
||||||
import qs.Common
|
import qs.Common
|
||||||
import qs.Modals.Common
|
import qs.Modals.Common
|
||||||
@@ -51,7 +52,9 @@ Item {
|
|||||||
if (tabIndex === NotepadStorageService.currentTabIndex && hasUnsavedChanges()) {
|
if (tabIndex === NotepadStorageService.currentTabIndex && hasUnsavedChanges()) {
|
||||||
root.pendingAction = "close_tab_" + tabIndex;
|
root.pendingAction = "close_tab_" + tabIndex;
|
||||||
root.confirmationDialogOpen = true;
|
root.confirmationDialogOpen = true;
|
||||||
confirmationDialog.open();
|
confirmationDialogLoader.active = true;
|
||||||
|
if (confirmationDialogLoader.item)
|
||||||
|
confirmationDialogLoader.item.open();
|
||||||
} else {
|
} else {
|
||||||
performCloseTab(tabIndex);
|
performCloseTab(tabIndex);
|
||||||
}
|
}
|
||||||
@@ -101,7 +104,9 @@ Item {
|
|||||||
root.pendingFileUrl = fileUrl;
|
root.pendingFileUrl = fileUrl;
|
||||||
root.pendingAction = "load_file";
|
root.pendingAction = "load_file";
|
||||||
root.confirmationDialogOpen = true;
|
root.confirmationDialogOpen = true;
|
||||||
confirmationDialog.open();
|
confirmationDialogLoader.active = true;
|
||||||
|
if (confirmationDialogLoader.item)
|
||||||
|
confirmationDialogLoader.item.open();
|
||||||
} else {
|
} else {
|
||||||
performLoadFromFile(fileUrl);
|
performLoadFromFile(fileUrl);
|
||||||
}
|
}
|
||||||
@@ -170,7 +175,9 @@ Item {
|
|||||||
saveToFile(fileUrl);
|
saveToFile(fileUrl);
|
||||||
} else {
|
} else {
|
||||||
root.fileDialogOpen = true;
|
root.fileDialogOpen = true;
|
||||||
saveBrowser.open();
|
saveBrowserLoader.active = true;
|
||||||
|
if (saveBrowserLoader.item)
|
||||||
|
saveBrowserLoader.item.open();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -178,10 +185,14 @@ Item {
|
|||||||
if (hasUnsavedChanges()) {
|
if (hasUnsavedChanges()) {
|
||||||
root.pendingAction = "open";
|
root.pendingAction = "open";
|
||||||
root.confirmationDialogOpen = true;
|
root.confirmationDialogOpen = true;
|
||||||
confirmationDialog.open();
|
confirmationDialogLoader.active = true;
|
||||||
|
if (confirmationDialogLoader.item)
|
||||||
|
confirmationDialogLoader.item.open();
|
||||||
} else {
|
} else {
|
||||||
root.fileDialogOpen = true;
|
root.fileDialogOpen = true;
|
||||||
loadBrowser.open();
|
loadBrowserLoader.active = true;
|
||||||
|
if (loadBrowserLoader.item)
|
||||||
|
loadBrowserLoader.item.open();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -189,7 +200,9 @@ Item {
|
|||||||
if (hasUnsavedChanges()) {
|
if (hasUnsavedChanges()) {
|
||||||
root.pendingAction = "new";
|
root.pendingAction = "new";
|
||||||
root.confirmationDialogOpen = true;
|
root.confirmationDialogOpen = true;
|
||||||
confirmationDialog.open();
|
confirmationDialogLoader.active = true;
|
||||||
|
if (confirmationDialogLoader.item)
|
||||||
|
confirmationDialogLoader.item.open();
|
||||||
} else {
|
} else {
|
||||||
createNewTab();
|
createNewTab();
|
||||||
}
|
}
|
||||||
@@ -249,238 +262,259 @@ Item {
|
|||||||
onLoadFailed: error => {}
|
onLoadFailed: error => {}
|
||||||
}
|
}
|
||||||
|
|
||||||
FileBrowserModal {
|
LazyLoader {
|
||||||
id: saveBrowser
|
id: saveBrowserLoader
|
||||||
|
active: false
|
||||||
|
|
||||||
browserTitle: I18n.tr("Save Notepad File")
|
FileBrowserModal {
|
||||||
browserIcon: "save"
|
id: saveBrowser
|
||||||
browserType: "notepad_save"
|
|
||||||
fileExtensions: ["*.txt", "*.md", "*.*"]
|
|
||||||
allowStacking: true
|
|
||||||
saveMode: true
|
|
||||||
defaultFileName: {
|
|
||||||
if (currentTab && currentTab.title && currentTab.title !== "Untitled") {
|
|
||||||
return currentTab.title;
|
|
||||||
} else if (currentTab && !currentTab.isTemporary && currentTab.filePath) {
|
|
||||||
return currentTab.filePath.split('/').pop();
|
|
||||||
} else {
|
|
||||||
return "note.txt";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
onFileSelected: path => {
|
browserTitle: I18n.tr("Save Notepad File")
|
||||||
root.fileDialogOpen = false;
|
browserIcon: "save"
|
||||||
const cleanPath = path.toString().replace(/^file:\/\//, '');
|
browserType: "notepad_save"
|
||||||
const fileName = cleanPath.split('/').pop();
|
fileExtensions: ["*.txt", "*.md", "*.*"]
|
||||||
const fileUrl = "file://" + cleanPath;
|
allowStacking: true
|
||||||
|
saveMode: true
|
||||||
root.currentFileName = fileName;
|
defaultFileName: {
|
||||||
root.currentFileUrl = fileUrl;
|
if (currentTab && currentTab.title && currentTab.title !== "Untitled") {
|
||||||
|
return currentTab.title;
|
||||||
if (currentTab) {
|
} else if (currentTab && !currentTab.isTemporary && currentTab.filePath) {
|
||||||
NotepadStorageService.saveTabAs(NotepadStorageService.currentTabIndex, cleanPath);
|
return currentTab.filePath.split('/').pop();
|
||||||
|
} else {
|
||||||
|
return "note.txt";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
saveToFile(fileUrl);
|
onFileSelected: path => {
|
||||||
|
root.fileDialogOpen = false;
|
||||||
|
const cleanPath = path.toString().replace(/^file:\/\//, '');
|
||||||
|
const fileName = cleanPath.split('/').pop();
|
||||||
|
const fileUrl = "file://" + cleanPath;
|
||||||
|
|
||||||
if (root.pendingAction === "new") {
|
root.currentFileName = fileName;
|
||||||
Qt.callLater(() => {
|
root.currentFileUrl = fileUrl;
|
||||||
createNewTab();
|
|
||||||
});
|
|
||||||
} else if (root.pendingAction === "open") {
|
|
||||||
Qt.callLater(() => {
|
|
||||||
root.fileDialogOpen = true;
|
|
||||||
loadBrowser.open();
|
|
||||||
});
|
|
||||||
} else if (root.pendingAction.startsWith("close_tab_")) {
|
|
||||||
Qt.callLater(() => {
|
|
||||||
var tabIndex = parseInt(root.pendingAction.split("_")[2]);
|
|
||||||
performCloseTab(tabIndex);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
root.pendingAction = "";
|
|
||||||
|
|
||||||
close();
|
if (currentTab) {
|
||||||
}
|
NotepadStorageService.saveTabAs(NotepadStorageService.currentTabIndex, cleanPath);
|
||||||
|
|
||||||
onDialogClosed: {
|
|
||||||
root.fileDialogOpen = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
FileBrowserModal {
|
|
||||||
id: loadBrowser
|
|
||||||
|
|
||||||
browserTitle: I18n.tr("Open Notepad File")
|
|
||||||
browserIcon: "folder_open"
|
|
||||||
browserType: "notepad_load"
|
|
||||||
fileExtensions: ["*.txt", "*.md", "*.*"]
|
|
||||||
allowStacking: true
|
|
||||||
|
|
||||||
onFileSelected: path => {
|
|
||||||
root.fileDialogOpen = false;
|
|
||||||
const cleanPath = path.toString().replace(/^file:\/\//, '');
|
|
||||||
const fileName = cleanPath.split('/').pop();
|
|
||||||
const fileUrl = "file://" + cleanPath;
|
|
||||||
|
|
||||||
root.currentFileName = fileName;
|
|
||||||
root.currentFileUrl = fileUrl;
|
|
||||||
|
|
||||||
loadFromFile(fileUrl);
|
|
||||||
close();
|
|
||||||
}
|
|
||||||
|
|
||||||
onDialogClosed: {
|
|
||||||
root.fileDialogOpen = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
DankModal {
|
|
||||||
id: confirmationDialog
|
|
||||||
|
|
||||||
width: 400
|
|
||||||
height: 180
|
|
||||||
shouldBeVisible: false
|
|
||||||
allowStacking: true
|
|
||||||
|
|
||||||
onBackgroundClicked: {
|
|
||||||
close();
|
|
||||||
root.confirmationDialogOpen = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
content: Component {
|
|
||||||
FocusScope {
|
|
||||||
anchors.fill: parent
|
|
||||||
focus: true
|
|
||||||
|
|
||||||
Keys.onEscapePressed: event => {
|
|
||||||
confirmationDialog.close();
|
|
||||||
root.confirmationDialogOpen = false;
|
|
||||||
event.accepted = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Column {
|
saveToFile(fileUrl);
|
||||||
anchors.centerIn: parent
|
|
||||||
width: parent.width - Theme.spacingM * 2
|
|
||||||
spacing: Theme.spacingM
|
|
||||||
|
|
||||||
Row {
|
if (root.pendingAction === "new") {
|
||||||
width: parent.width
|
Qt.callLater(() => {
|
||||||
|
createNewTab();
|
||||||
|
});
|
||||||
|
} else if (root.pendingAction === "open") {
|
||||||
|
Qt.callLater(() => {
|
||||||
|
root.fileDialogOpen = true;
|
||||||
|
loadBrowserLoader.active = true;
|
||||||
|
if (loadBrowserLoader.item)
|
||||||
|
loadBrowserLoader.item.open();
|
||||||
|
});
|
||||||
|
} else if (root.pendingAction.startsWith("close_tab_")) {
|
||||||
|
Qt.callLater(() => {
|
||||||
|
var tabIndex = parseInt(root.pendingAction.split("_")[2]);
|
||||||
|
performCloseTab(tabIndex);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
root.pendingAction = "";
|
||||||
|
|
||||||
Column {
|
close();
|
||||||
width: parent.width - 40
|
}
|
||||||
spacing: Theme.spacingXS
|
|
||||||
|
|
||||||
StyledText {
|
onDialogClosed: {
|
||||||
text: I18n.tr("Unsaved Changes")
|
root.fileDialogOpen = false;
|
||||||
font.pixelSize: Theme.fontSizeLarge
|
}
|
||||||
color: Theme.surfaceText
|
}
|
||||||
font.weight: Font.Medium
|
}
|
||||||
}
|
|
||||||
|
|
||||||
StyledText {
|
LazyLoader {
|
||||||
text: root.pendingAction === "new" ? I18n.tr("You have unsaved changes. Save before creating a new file?") : root.pendingAction.startsWith("close_tab_") ? I18n.tr("You have unsaved changes. Save before closing this tab?") : root.pendingAction === "load_file" || root.pendingAction === "open" ? I18n.tr("You have unsaved changes. Save before opening a file?") : I18n.tr("You have unsaved changes. Save before continuing?")
|
id: loadBrowserLoader
|
||||||
font.pixelSize: Theme.fontSizeMedium
|
active: false
|
||||||
color: Theme.surfaceTextMedium
|
|
||||||
width: parent.width
|
|
||||||
wrapMode: Text.Wrap
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
DankActionButton {
|
FileBrowserModal {
|
||||||
iconName: "close"
|
id: loadBrowser
|
||||||
iconSize: Theme.iconSize - 4
|
|
||||||
iconColor: Theme.surfaceText
|
browserTitle: I18n.tr("Open Notepad File")
|
||||||
onClicked: {
|
browserIcon: "folder_open"
|
||||||
confirmationDialog.close();
|
browserType: "notepad_load"
|
||||||
root.confirmationDialogOpen = false;
|
fileExtensions: ["*.txt", "*.md", "*.*"]
|
||||||
}
|
allowStacking: true
|
||||||
}
|
|
||||||
|
onFileSelected: path => {
|
||||||
|
root.fileDialogOpen = false;
|
||||||
|
const cleanPath = path.toString().replace(/^file:\/\//, '');
|
||||||
|
const fileName = cleanPath.split('/').pop();
|
||||||
|
const fileUrl = "file://" + cleanPath;
|
||||||
|
|
||||||
|
root.currentFileName = fileName;
|
||||||
|
root.currentFileUrl = fileUrl;
|
||||||
|
|
||||||
|
loadFromFile(fileUrl);
|
||||||
|
close();
|
||||||
|
}
|
||||||
|
|
||||||
|
onDialogClosed: {
|
||||||
|
root.fileDialogOpen = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
LazyLoader {
|
||||||
|
id: confirmationDialogLoader
|
||||||
|
active: false
|
||||||
|
|
||||||
|
DankModal {
|
||||||
|
id: confirmationDialog
|
||||||
|
|
||||||
|
width: 400
|
||||||
|
height: 180
|
||||||
|
shouldBeVisible: false
|
||||||
|
allowStacking: true
|
||||||
|
|
||||||
|
onBackgroundClicked: {
|
||||||
|
close();
|
||||||
|
root.confirmationDialogOpen = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
content: Component {
|
||||||
|
FocusScope {
|
||||||
|
anchors.fill: parent
|
||||||
|
focus: true
|
||||||
|
|
||||||
|
Keys.onEscapePressed: event => {
|
||||||
|
confirmationDialog.close();
|
||||||
|
root.confirmationDialogOpen = false;
|
||||||
|
event.accepted = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
Item {
|
Column {
|
||||||
width: parent.width
|
anchors.centerIn: parent
|
||||||
height: 40
|
width: parent.width - Theme.spacingM * 2
|
||||||
|
spacing: Theme.spacingM
|
||||||
|
|
||||||
Row {
|
Row {
|
||||||
anchors.right: parent.right
|
width: parent.width
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
spacing: Theme.spacingM
|
|
||||||
|
|
||||||
Rectangle {
|
Column {
|
||||||
width: Math.max(80, discardText.contentWidth + Theme.spacingM * 2)
|
width: parent.width - 40
|
||||||
height: 36
|
spacing: Theme.spacingXS
|
||||||
radius: Theme.cornerRadius
|
|
||||||
color: discardArea.containsMouse ? Theme.surfaceTextHover : "transparent"
|
|
||||||
border.color: Theme.surfaceVariantAlpha
|
|
||||||
border.width: 1
|
|
||||||
|
|
||||||
StyledText {
|
StyledText {
|
||||||
id: discardText
|
text: I18n.tr("Unsaved Changes")
|
||||||
anchors.centerIn: parent
|
font.pixelSize: Theme.fontSizeLarge
|
||||||
text: I18n.tr("Don't Save")
|
|
||||||
font.pixelSize: Theme.fontSizeMedium
|
|
||||||
color: Theme.surfaceText
|
color: Theme.surfaceText
|
||||||
font.weight: Font.Medium
|
font.weight: Font.Medium
|
||||||
}
|
}
|
||||||
|
|
||||||
MouseArea {
|
StyledText {
|
||||||
id: discardArea
|
text: root.pendingAction === "new" ? I18n.tr("You have unsaved changes. Save before creating a new file?") : root.pendingAction.startsWith("close_tab_") ? I18n.tr("You have unsaved changes. Save before closing this tab?") : root.pendingAction === "load_file" || root.pendingAction === "open" ? I18n.tr("You have unsaved changes. Save before opening a file?") : I18n.tr("You have unsaved changes. Save before continuing?")
|
||||||
anchors.fill: parent
|
font.pixelSize: Theme.fontSizeMedium
|
||||||
hoverEnabled: true
|
color: Theme.surfaceTextMedium
|
||||||
cursorShape: Qt.PointingHandCursor
|
width: parent.width
|
||||||
onClicked: {
|
wrapMode: Text.Wrap
|
||||||
confirmationDialog.close();
|
|
||||||
root.confirmationDialogOpen = false;
|
|
||||||
if (root.pendingAction === "new") {
|
|
||||||
createNewTab();
|
|
||||||
} else if (root.pendingAction === "open") {
|
|
||||||
root.fileDialogOpen = true;
|
|
||||||
loadBrowser.open();
|
|
||||||
} else if (root.pendingAction === "load_file") {
|
|
||||||
performLoadFromFile(root.pendingFileUrl);
|
|
||||||
} else if (root.pendingAction.startsWith("close_tab_")) {
|
|
||||||
var tabIndex = parseInt(root.pendingAction.split("_")[2]);
|
|
||||||
performCloseTab(tabIndex);
|
|
||||||
}
|
|
||||||
root.pendingAction = "";
|
|
||||||
root.pendingFileUrl = "";
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Rectangle {
|
DankActionButton {
|
||||||
width: Math.max(70, saveAsText.contentWidth + Theme.spacingM * 2)
|
iconName: "close"
|
||||||
height: 36
|
iconSize: Theme.iconSize - 4
|
||||||
radius: Theme.cornerRadius
|
iconColor: Theme.surfaceText
|
||||||
color: saveAsArea.containsMouse ? Qt.darker(Theme.primary, 1.1) : Theme.primary
|
onClicked: {
|
||||||
|
confirmationDialog.close();
|
||||||
StyledText {
|
root.confirmationDialogOpen = false;
|
||||||
id: saveAsText
|
|
||||||
anchors.centerIn: parent
|
|
||||||
text: I18n.tr("Save")
|
|
||||||
font.pixelSize: Theme.fontSizeMedium
|
|
||||||
color: Theme.background
|
|
||||||
font.weight: Font.Medium
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
MouseArea {
|
Item {
|
||||||
id: saveAsArea
|
width: parent.width
|
||||||
anchors.fill: parent
|
height: 40
|
||||||
hoverEnabled: true
|
|
||||||
cursorShape: Qt.PointingHandCursor
|
Row {
|
||||||
onClicked: {
|
anchors.right: parent.right
|
||||||
confirmationDialog.close();
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
root.confirmationDialogOpen = false;
|
spacing: Theme.spacingM
|
||||||
root.fileDialogOpen = true;
|
|
||||||
saveBrowser.open();
|
Rectangle {
|
||||||
|
width: Math.max(80, discardText.contentWidth + Theme.spacingM * 2)
|
||||||
|
height: 36
|
||||||
|
radius: Theme.cornerRadius
|
||||||
|
color: discardArea.containsMouse ? Theme.surfaceTextHover : "transparent"
|
||||||
|
border.color: Theme.surfaceVariantAlpha
|
||||||
|
border.width: 1
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
id: discardText
|
||||||
|
anchors.centerIn: parent
|
||||||
|
text: I18n.tr("Don't Save")
|
||||||
|
font.pixelSize: Theme.fontSizeMedium
|
||||||
|
color: Theme.surfaceText
|
||||||
|
font.weight: Font.Medium
|
||||||
|
}
|
||||||
|
|
||||||
|
MouseArea {
|
||||||
|
id: discardArea
|
||||||
|
anchors.fill: parent
|
||||||
|
hoverEnabled: true
|
||||||
|
cursorShape: Qt.PointingHandCursor
|
||||||
|
onClicked: {
|
||||||
|
confirmationDialog.close();
|
||||||
|
root.confirmationDialogOpen = false;
|
||||||
|
if (root.pendingAction === "new") {
|
||||||
|
createNewTab();
|
||||||
|
} else if (root.pendingAction === "open") {
|
||||||
|
root.fileDialogOpen = true;
|
||||||
|
loadBrowserLoader.active = true;
|
||||||
|
if (loadBrowserLoader.item)
|
||||||
|
loadBrowserLoader.item.open();
|
||||||
|
} else if (root.pendingAction === "load_file") {
|
||||||
|
performLoadFromFile(root.pendingFileUrl);
|
||||||
|
} else if (root.pendingAction.startsWith("close_tab_")) {
|
||||||
|
var tabIndex = parseInt(root.pendingAction.split("_")[2]);
|
||||||
|
performCloseTab(tabIndex);
|
||||||
|
}
|
||||||
|
root.pendingAction = "";
|
||||||
|
root.pendingFileUrl = "";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Behavior on color {
|
Rectangle {
|
||||||
ColorAnimation {
|
width: Math.max(70, saveAsText.contentWidth + Theme.spacingM * 2)
|
||||||
duration: Theme.shortDuration
|
height: 36
|
||||||
easing.type: Theme.standardEasing
|
radius: Theme.cornerRadius
|
||||||
|
color: saveAsArea.containsMouse ? Qt.darker(Theme.primary, 1.1) : Theme.primary
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
id: saveAsText
|
||||||
|
anchors.centerIn: parent
|
||||||
|
text: I18n.tr("Save")
|
||||||
|
font.pixelSize: Theme.fontSizeMedium
|
||||||
|
color: Theme.background
|
||||||
|
font.weight: Font.Medium
|
||||||
|
}
|
||||||
|
|
||||||
|
MouseArea {
|
||||||
|
id: saveAsArea
|
||||||
|
anchors.fill: parent
|
||||||
|
hoverEnabled: true
|
||||||
|
cursorShape: Qt.PointingHandCursor
|
||||||
|
onClicked: {
|
||||||
|
confirmationDialog.close();
|
||||||
|
root.confirmationDialogOpen = false;
|
||||||
|
root.fileDialogOpen = true;
|
||||||
|
saveBrowserLoader.active = true;
|
||||||
|
if (saveBrowserLoader.item)
|
||||||
|
saveBrowserLoader.item.open();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Behavior on color {
|
||||||
|
ColorAnimation {
|
||||||
|
duration: Theme.shortDuration
|
||||||
|
easing.type: Theme.standardEasing
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ Column {
|
|||||||
property string detailsText: ""
|
property string detailsText: ""
|
||||||
property bool showCloseButton: false
|
property bool showCloseButton: false
|
||||||
property var closePopout: null
|
property var closePopout: null
|
||||||
|
property alias headerActions: headerActionsLoader.sourceComponent
|
||||||
|
|
||||||
readonly property int headerHeight: popoutHeader.visible ? popoutHeader.height : 0
|
readonly property int headerHeight: popoutHeader.visible ? popoutHeader.height : 0
|
||||||
readonly property int detailsHeight: popoutDetails.visible ? popoutDetails.implicitHeight : 0
|
readonly property int detailsHeight: popoutDetails.visible ? popoutDetails.implicitHeight : 0
|
||||||
@@ -31,31 +32,40 @@ Column {
|
|||||||
color: Theme.surfaceText
|
color: Theme.surfaceText
|
||||||
}
|
}
|
||||||
|
|
||||||
Rectangle {
|
Row {
|
||||||
id: closeButton
|
|
||||||
width: 32
|
|
||||||
height: 32
|
|
||||||
radius: 16
|
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
color: closeArea.containsMouse ? Theme.errorHover : "transparent"
|
spacing: Theme.spacingXS
|
||||||
visible: root.showCloseButton
|
|
||||||
|
|
||||||
DankIcon {
|
Loader {
|
||||||
anchors.centerIn: parent
|
id: headerActionsLoader
|
||||||
name: "close"
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
size: Theme.iconSize - 4
|
|
||||||
color: closeArea.containsMouse ? Theme.error : Theme.surfaceText
|
|
||||||
}
|
}
|
||||||
|
|
||||||
MouseArea {
|
Rectangle {
|
||||||
id: closeArea
|
id: closeButton
|
||||||
anchors.fill: parent
|
width: 32
|
||||||
hoverEnabled: true
|
height: 32
|
||||||
cursorShape: Qt.PointingHandCursor
|
radius: 16
|
||||||
onPressed: {
|
color: closeArea.containsMouse ? Theme.errorHover : "transparent"
|
||||||
if (root.closePopout) {
|
visible: root.showCloseButton
|
||||||
root.closePopout();
|
|
||||||
|
DankIcon {
|
||||||
|
anchors.centerIn: parent
|
||||||
|
name: "close"
|
||||||
|
size: Theme.iconSize - 4
|
||||||
|
color: closeArea.containsMouse ? Theme.error : Theme.surfaceText
|
||||||
|
}
|
||||||
|
|
||||||
|
MouseArea {
|
||||||
|
id: closeArea
|
||||||
|
anchors.fill: parent
|
||||||
|
hoverEnabled: true
|
||||||
|
cursorShape: Qt.PointingHandCursor
|
||||||
|
onPressed: {
|
||||||
|
if (root.closePopout) {
|
||||||
|
root.closePopout();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
346
quickshell/Modules/ProcessList/DisksView.qml
Normal file
346
quickshell/Modules/ProcessList/DisksView.qml
Normal file
@@ -0,0 +1,346 @@
|
|||||||
|
import QtQuick
|
||||||
|
import QtQuick.Layouts
|
||||||
|
import qs.Common
|
||||||
|
import qs.Services
|
||||||
|
import qs.Widgets
|
||||||
|
|
||||||
|
Item {
|
||||||
|
id: root
|
||||||
|
|
||||||
|
function formatSpeed(bytesPerSec) {
|
||||||
|
if (bytesPerSec < 1024)
|
||||||
|
return bytesPerSec.toFixed(0) + " B/s";
|
||||||
|
if (bytesPerSec < 1024 * 1024)
|
||||||
|
return (bytesPerSec / 1024).toFixed(1) + " KB/s";
|
||||||
|
if (bytesPerSec < 1024 * 1024 * 1024)
|
||||||
|
return (bytesPerSec / (1024 * 1024)).toFixed(1) + " MB/s";
|
||||||
|
return (bytesPerSec / (1024 * 1024 * 1024)).toFixed(2) + " GB/s";
|
||||||
|
}
|
||||||
|
|
||||||
|
Component.onCompleted: {
|
||||||
|
DgopService.addRef(["disk", "diskmounts"]);
|
||||||
|
}
|
||||||
|
|
||||||
|
Component.onDestruction: {
|
||||||
|
DgopService.removeRef(["disk", "diskmounts"]);
|
||||||
|
}
|
||||||
|
|
||||||
|
ColumnLayout {
|
||||||
|
anchors.fill: parent
|
||||||
|
spacing: Theme.spacingM
|
||||||
|
|
||||||
|
Rectangle {
|
||||||
|
Layout.fillWidth: true
|
||||||
|
Layout.preferredHeight: 80
|
||||||
|
radius: Theme.cornerRadius
|
||||||
|
color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
|
||||||
|
|
||||||
|
RowLayout {
|
||||||
|
anchors.fill: parent
|
||||||
|
anchors.margins: Theme.spacingM
|
||||||
|
spacing: Theme.spacingXL
|
||||||
|
|
||||||
|
Column {
|
||||||
|
Layout.fillWidth: true
|
||||||
|
spacing: Theme.spacingXS
|
||||||
|
|
||||||
|
Row {
|
||||||
|
spacing: Theme.spacingS
|
||||||
|
|
||||||
|
DankIcon {
|
||||||
|
name: "storage"
|
||||||
|
size: Theme.iconSize
|
||||||
|
color: Theme.primary
|
||||||
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
}
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: I18n.tr("Disk I/O", "disk io header in system monitor")
|
||||||
|
font.pixelSize: Theme.fontSizeLarge
|
||||||
|
font.weight: Font.Bold
|
||||||
|
color: Theme.surfaceText
|
||||||
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
spacing: Theme.spacingL
|
||||||
|
|
||||||
|
Row {
|
||||||
|
spacing: Theme.spacingXS
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: I18n.tr("Read:", "disk read label")
|
||||||
|
font.pixelSize: Theme.fontSizeSmall
|
||||||
|
color: Theme.surfaceVariantText
|
||||||
|
}
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: root.formatSpeed(DgopService.diskReadRate)
|
||||||
|
font.pixelSize: Theme.fontSizeSmall
|
||||||
|
font.family: SettingsData.monoFontFamily
|
||||||
|
font.weight: Font.Bold
|
||||||
|
color: Theme.primary
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
spacing: Theme.spacingXS
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: I18n.tr("Write:", "disk write label")
|
||||||
|
font.pixelSize: Theme.fontSizeSmall
|
||||||
|
color: Theme.surfaceVariantText
|
||||||
|
}
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: root.formatSpeed(DgopService.diskWriteRate)
|
||||||
|
font.pixelSize: Theme.fontSizeSmall
|
||||||
|
font.family: SettingsData.monoFontFamily
|
||||||
|
font.weight: Font.Bold
|
||||||
|
color: Theme.warning
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Rectangle {
|
||||||
|
Layout.fillWidth: true
|
||||||
|
Layout.fillHeight: true
|
||||||
|
radius: Theme.cornerRadius
|
||||||
|
color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
|
||||||
|
|
||||||
|
ColumnLayout {
|
||||||
|
anchors.fill: parent
|
||||||
|
anchors.margins: Theme.spacingM
|
||||||
|
spacing: Theme.spacingS
|
||||||
|
|
||||||
|
Row {
|
||||||
|
spacing: Theme.spacingS
|
||||||
|
|
||||||
|
DankIcon {
|
||||||
|
name: "folder"
|
||||||
|
size: Theme.iconSize - 2
|
||||||
|
color: Theme.secondary
|
||||||
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
}
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: I18n.tr("Mount Points", "mount points header in system monitor")
|
||||||
|
font.pixelSize: Theme.fontSizeMedium
|
||||||
|
font.weight: Font.Bold
|
||||||
|
color: Theme.surfaceText
|
||||||
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Rectangle {
|
||||||
|
Layout.fillWidth: true
|
||||||
|
Layout.preferredHeight: 1
|
||||||
|
color: Theme.outlineLight
|
||||||
|
}
|
||||||
|
|
||||||
|
DankListView {
|
||||||
|
id: mountListView
|
||||||
|
|
||||||
|
Layout.fillWidth: true
|
||||||
|
Layout.fillHeight: true
|
||||||
|
clip: true
|
||||||
|
spacing: 4
|
||||||
|
|
||||||
|
model: DgopService.diskMounts
|
||||||
|
|
||||||
|
delegate: Rectangle {
|
||||||
|
required property var modelData
|
||||||
|
required property int index
|
||||||
|
|
||||||
|
width: mountListView.width
|
||||||
|
height: 60
|
||||||
|
radius: Theme.cornerRadius
|
||||||
|
color: mountMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.06) : "transparent"
|
||||||
|
|
||||||
|
readonly property real usedPct: {
|
||||||
|
const pctStr = modelData?.percent ?? "0%";
|
||||||
|
return parseFloat(pctStr.replace("%", "")) / 100;
|
||||||
|
}
|
||||||
|
|
||||||
|
MouseArea {
|
||||||
|
id: mountMouseArea
|
||||||
|
anchors.fill: parent
|
||||||
|
hoverEnabled: true
|
||||||
|
}
|
||||||
|
|
||||||
|
RowLayout {
|
||||||
|
anchors.fill: parent
|
||||||
|
anchors.margins: Theme.spacingS
|
||||||
|
spacing: Theme.spacingM
|
||||||
|
|
||||||
|
Column {
|
||||||
|
Layout.fillWidth: true
|
||||||
|
spacing: Theme.spacingXS
|
||||||
|
|
||||||
|
Row {
|
||||||
|
spacing: Theme.spacingS
|
||||||
|
|
||||||
|
DankIcon {
|
||||||
|
name: {
|
||||||
|
const mp = modelData?.mount ?? "";
|
||||||
|
if (mp === "/")
|
||||||
|
return "home";
|
||||||
|
if (mp === "/home")
|
||||||
|
return "person";
|
||||||
|
if (mp.includes("boot"))
|
||||||
|
return "memory";
|
||||||
|
if (mp.includes("media") || mp.includes("mnt"))
|
||||||
|
return "usb";
|
||||||
|
return "folder";
|
||||||
|
}
|
||||||
|
size: Theme.iconSize - 4
|
||||||
|
color: Theme.surfaceText
|
||||||
|
opacity: 0.8
|
||||||
|
}
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: modelData?.mount ?? ""
|
||||||
|
font.pixelSize: Theme.fontSizeSmall
|
||||||
|
font.family: SettingsData.monoFontFamily
|
||||||
|
font.weight: Font.Medium
|
||||||
|
color: Theme.surfaceText
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
spacing: Theme.spacingS
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: modelData?.device ?? ""
|
||||||
|
font.pixelSize: Theme.fontSizeSmall - 2
|
||||||
|
font.family: SettingsData.monoFontFamily
|
||||||
|
color: Theme.surfaceVariantText
|
||||||
|
}
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: "•"
|
||||||
|
font.pixelSize: Theme.fontSizeSmall - 2
|
||||||
|
color: Theme.surfaceVariantText
|
||||||
|
}
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: modelData?.fstype ?? ""
|
||||||
|
font.pixelSize: Theme.fontSizeSmall - 2
|
||||||
|
font.family: SettingsData.monoFontFamily
|
||||||
|
color: Theme.surfaceVariantText
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Column {
|
||||||
|
Layout.preferredWidth: 200
|
||||||
|
spacing: Theme.spacingXS
|
||||||
|
|
||||||
|
Rectangle {
|
||||||
|
width: parent.width
|
||||||
|
height: 8
|
||||||
|
radius: 4
|
||||||
|
color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
|
||||||
|
|
||||||
|
Rectangle {
|
||||||
|
width: parent.width * Math.min(1, parent.parent.parent.parent.usedPct)
|
||||||
|
height: parent.height
|
||||||
|
radius: 4
|
||||||
|
color: {
|
||||||
|
const pct = parent.parent.parent.parent.usedPct;
|
||||||
|
if (pct > 0.95)
|
||||||
|
return Theme.error;
|
||||||
|
if (pct > 0.85)
|
||||||
|
return Theme.warning;
|
||||||
|
return Theme.primary;
|
||||||
|
}
|
||||||
|
|
||||||
|
Behavior on width {
|
||||||
|
NumberAnimation {
|
||||||
|
duration: Theme.shortDuration
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
anchors.right: parent.right
|
||||||
|
spacing: Theme.spacingS
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: modelData?.used ?? ""
|
||||||
|
font.pixelSize: Theme.fontSizeSmall - 2
|
||||||
|
font.family: SettingsData.monoFontFamily
|
||||||
|
color: Theme.surfaceText
|
||||||
|
}
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: "/"
|
||||||
|
font.pixelSize: Theme.fontSizeSmall - 2
|
||||||
|
color: Theme.surfaceVariantText
|
||||||
|
}
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: modelData?.size ?? ""
|
||||||
|
font.pixelSize: Theme.fontSizeSmall - 2
|
||||||
|
font.family: SettingsData.monoFontFamily
|
||||||
|
color: Theme.surfaceVariantText
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
Layout.preferredWidth: 50
|
||||||
|
text: modelData?.percent ?? ""
|
||||||
|
font.pixelSize: Theme.fontSizeSmall
|
||||||
|
font.family: SettingsData.monoFontFamily
|
||||||
|
font.weight: Font.Bold
|
||||||
|
color: {
|
||||||
|
const pct = parent.parent.usedPct;
|
||||||
|
if (pct > 0.95)
|
||||||
|
return Theme.error;
|
||||||
|
if (pct > 0.85)
|
||||||
|
return Theme.warning;
|
||||||
|
return Theme.surfaceText;
|
||||||
|
}
|
||||||
|
horizontalAlignment: Text.AlignRight
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Rectangle {
|
||||||
|
anchors.centerIn: parent
|
||||||
|
width: 300
|
||||||
|
height: 80
|
||||||
|
radius: Theme.cornerRadius
|
||||||
|
color: "transparent"
|
||||||
|
visible: DgopService.diskMounts.length === 0
|
||||||
|
|
||||||
|
Column {
|
||||||
|
anchors.centerIn: parent
|
||||||
|
spacing: Theme.spacingM
|
||||||
|
|
||||||
|
DankIcon {
|
||||||
|
name: "storage"
|
||||||
|
size: 32
|
||||||
|
color: Theme.surfaceVariantText
|
||||||
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
|
}
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: I18n.tr("No mount points found", "empty state in disk mounts list")
|
||||||
|
font.pixelSize: Theme.fontSizeMedium
|
||||||
|
color: Theme.surfaceVariantText
|
||||||
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,451 +0,0 @@
|
|||||||
import QtQuick
|
|
||||||
import qs.Common
|
|
||||||
import qs.Services
|
|
||||||
import qs.Widgets
|
|
||||||
|
|
||||||
Column {
|
|
||||||
function formatNetworkSpeed(bytesPerSec) {
|
|
||||||
if (bytesPerSec < 1024) {
|
|
||||||
return bytesPerSec.toFixed(0) + " B/s";
|
|
||||||
} else if (bytesPerSec < 1024 * 1024) {
|
|
||||||
return (bytesPerSec / 1024).toFixed(1) + " KB/s";
|
|
||||||
} else if (bytesPerSec < 1024 * 1024 * 1024) {
|
|
||||||
return (bytesPerSec / (1024 * 1024)).toFixed(1) + " MB/s";
|
|
||||||
} else {
|
|
||||||
return (bytesPerSec / (1024 * 1024 * 1024)).toFixed(1) + " GB/s";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function formatDiskSpeed(bytesPerSec) {
|
|
||||||
if (bytesPerSec < 1024 * 1024) {
|
|
||||||
return (bytesPerSec / 1024).toFixed(1) + " KB/s";
|
|
||||||
} else if (bytesPerSec < 1024 * 1024 * 1024) {
|
|
||||||
return (bytesPerSec / (1024 * 1024)).toFixed(1) + " MB/s";
|
|
||||||
} else {
|
|
||||||
return (bytesPerSec / (1024 * 1024 * 1024)).toFixed(1) + " GB/s";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
anchors.fill: parent
|
|
||||||
spacing: Theme.spacingM
|
|
||||||
Component.onCompleted: {
|
|
||||||
DgopService.addRef(["cpu", "memory", "network", "disk"]);
|
|
||||||
}
|
|
||||||
Component.onDestruction: {
|
|
||||||
DgopService.removeRef(["cpu", "memory", "network", "disk"]);
|
|
||||||
}
|
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
width: parent.width
|
|
||||||
height: 200
|
|
||||||
radius: Theme.cornerRadius
|
|
||||||
color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
|
|
||||||
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.06)
|
|
||||||
border.width: 1
|
|
||||||
|
|
||||||
Column {
|
|
||||||
anchors.fill: parent
|
|
||||||
anchors.margins: Theme.spacingM
|
|
||||||
spacing: Theme.spacingS
|
|
||||||
|
|
||||||
Row {
|
|
||||||
width: parent.width
|
|
||||||
height: 32
|
|
||||||
spacing: Theme.spacingM
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: "CPU"
|
|
||||||
font.pixelSize: Theme.fontSizeLarge
|
|
||||||
font.weight: Font.Bold
|
|
||||||
color: Theme.surfaceText
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
}
|
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
width: 80
|
|
||||||
height: 24
|
|
||||||
radius: Theme.cornerRadius
|
|
||||||
color: Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12)
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: `${DgopService.cpuUsage.toFixed(1)}%`
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
font.weight: Font.Bold
|
|
||||||
color: Theme.primary
|
|
||||||
anchors.centerIn: parent
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Item {
|
|
||||||
width: parent.width - 280
|
|
||||||
height: 1
|
|
||||||
}
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: `${DgopService.cpuCores} cores`
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
color: Theme.surfaceVariantText
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
DankFlickable {
|
|
||||||
clip: true
|
|
||||||
width: parent.width
|
|
||||||
height: parent.height - 40
|
|
||||||
contentHeight: coreUsageColumn.implicitHeight
|
|
||||||
|
|
||||||
Column {
|
|
||||||
id: coreUsageColumn
|
|
||||||
|
|
||||||
width: parent.width
|
|
||||||
spacing: 6
|
|
||||||
|
|
||||||
Repeater {
|
|
||||||
model: DgopService.perCoreCpuUsage
|
|
||||||
|
|
||||||
Row {
|
|
||||||
width: parent.width
|
|
||||||
height: 20
|
|
||||||
spacing: Theme.spacingS
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: `C${index}`
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
color: Theme.surfaceVariantText
|
|
||||||
width: 24
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
}
|
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
width: parent.width - 80
|
|
||||||
height: 6
|
|
||||||
radius: 3
|
|
||||||
color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
width: parent.width * Math.min(1, modelData / 100)
|
|
||||||
height: parent.height
|
|
||||||
radius: parent.radius
|
|
||||||
color: {
|
|
||||||
const usage = modelData;
|
|
||||||
if (usage > 80) {
|
|
||||||
return Theme.error;
|
|
||||||
}
|
|
||||||
if (usage > 60) {
|
|
||||||
return Theme.warning;
|
|
||||||
}
|
|
||||||
return Theme.primary;
|
|
||||||
}
|
|
||||||
|
|
||||||
Behavior on width {
|
|
||||||
NumberAnimation {
|
|
||||||
duration: Theme.shortDuration
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: modelData ? `${modelData.toFixed(0)}%` : "0%"
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
font.weight: Font.Medium
|
|
||||||
color: Theme.surfaceText
|
|
||||||
width: 32
|
|
||||||
horizontalAlignment: Text.AlignRight
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Row {
|
|
||||||
width: parent.width
|
|
||||||
height: 80
|
|
||||||
spacing: Theme.spacingM
|
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
width: (parent.width - Theme.spacingM) / 2
|
|
||||||
height: 80
|
|
||||||
radius: Theme.cornerRadius
|
|
||||||
color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
|
|
||||||
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.06)
|
|
||||||
border.width: 1
|
|
||||||
|
|
||||||
Row {
|
|
||||||
anchors.centerIn: parent
|
|
||||||
spacing: Theme.spacingM
|
|
||||||
|
|
||||||
Column {
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
spacing: 4
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: I18n.tr("Memory")
|
|
||||||
font.pixelSize: Theme.fontSizeLarge
|
|
||||||
font.weight: Font.Bold
|
|
||||||
color: Theme.surfaceText
|
|
||||||
}
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: `${DgopService.formatSystemMemory(DgopService.usedMemoryKB)} / ${DgopService.formatSystemMemory(DgopService.totalMemoryKB)}`
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
color: Theme.surfaceVariantText
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Column {
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
spacing: 4
|
|
||||||
width: 120
|
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
width: parent.width
|
|
||||||
height: 16
|
|
||||||
radius: 8
|
|
||||||
color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
|
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
width: DgopService.totalMemoryKB > 0 ? parent.width * (DgopService.usedMemoryKB / DgopService.totalMemoryKB) : 0
|
|
||||||
height: parent.height
|
|
||||||
radius: parent.radius
|
|
||||||
color: {
|
|
||||||
const usage = DgopService.totalMemoryKB > 0 ? (DgopService.usedMemoryKB / DgopService.totalMemoryKB) : 0;
|
|
||||||
if (usage > 0.9) {
|
|
||||||
return Theme.error;
|
|
||||||
}
|
|
||||||
if (usage > 0.7) {
|
|
||||||
return Theme.warning;
|
|
||||||
}
|
|
||||||
return Theme.secondary;
|
|
||||||
}
|
|
||||||
|
|
||||||
Behavior on width {
|
|
||||||
NumberAnimation {
|
|
||||||
duration: Theme.mediumDuration
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: DgopService.totalMemoryKB > 0 ? `${((DgopService.usedMemoryKB / DgopService.totalMemoryKB) * 100).toFixed(1)}% used` : "No data"
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
font.weight: Font.Bold
|
|
||||||
color: Theme.surfaceText
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
width: (parent.width - Theme.spacingM) / 2
|
|
||||||
height: 80
|
|
||||||
radius: Theme.cornerRadius
|
|
||||||
color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
|
|
||||||
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.06)
|
|
||||||
border.width: 1
|
|
||||||
|
|
||||||
Row {
|
|
||||||
anchors.centerIn: parent
|
|
||||||
spacing: Theme.spacingM
|
|
||||||
|
|
||||||
Column {
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
spacing: 4
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: I18n.tr("Swap")
|
|
||||||
font.pixelSize: Theme.fontSizeLarge
|
|
||||||
font.weight: Font.Bold
|
|
||||||
color: Theme.surfaceText
|
|
||||||
}
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: DgopService.totalSwapKB > 0 ? `${DgopService.formatSystemMemory(DgopService.usedSwapKB)} / ${DgopService.formatSystemMemory(DgopService.totalSwapKB)}` : "No swap"
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
color: Theme.surfaceVariantText
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Column {
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
spacing: 4
|
|
||||||
width: 120
|
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
width: parent.width
|
|
||||||
height: 16
|
|
||||||
radius: 8
|
|
||||||
color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
|
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
width: DgopService.totalSwapKB > 0 ? parent.width * (DgopService.usedSwapKB / DgopService.totalSwapKB) : 0
|
|
||||||
height: parent.height
|
|
||||||
radius: parent.radius
|
|
||||||
color: {
|
|
||||||
if (!DgopService.totalSwapKB) {
|
|
||||||
return Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.3);
|
|
||||||
}
|
|
||||||
const usage = DgopService.usedSwapKB / DgopService.totalSwapKB;
|
|
||||||
if (usage > 0.9) {
|
|
||||||
return Theme.error;
|
|
||||||
}
|
|
||||||
if (usage > 0.7) {
|
|
||||||
return Theme.warning;
|
|
||||||
}
|
|
||||||
return Theme.info;
|
|
||||||
}
|
|
||||||
|
|
||||||
Behavior on width {
|
|
||||||
NumberAnimation {
|
|
||||||
duration: Theme.mediumDuration
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: DgopService.totalSwapKB > 0 ? `${((DgopService.usedSwapKB / DgopService.totalSwapKB) * 100).toFixed(1)}% used` : "N/A"
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
font.weight: Font.Bold
|
|
||||||
color: Theme.surfaceText
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Row {
|
|
||||||
width: parent.width
|
|
||||||
height: 80
|
|
||||||
spacing: Theme.spacingM
|
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
width: (parent.width - Theme.spacingM) / 2
|
|
||||||
height: 80
|
|
||||||
radius: Theme.cornerRadius
|
|
||||||
color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
|
|
||||||
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.06)
|
|
||||||
border.width: 1
|
|
||||||
|
|
||||||
Column {
|
|
||||||
anchors.centerIn: parent
|
|
||||||
spacing: Theme.spacingXS
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: I18n.tr("Network")
|
|
||||||
font.pixelSize: Theme.fontSizeMedium
|
|
||||||
font.weight: Font.Bold
|
|
||||||
color: Theme.surfaceText
|
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
|
||||||
}
|
|
||||||
|
|
||||||
Row {
|
|
||||||
spacing: Theme.spacingS
|
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
|
||||||
|
|
||||||
Row {
|
|
||||||
spacing: 4
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: "↓"
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
color: Theme.info
|
|
||||||
}
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: DgopService.networkRxRate > 0 ? formatNetworkSpeed(DgopService.networkRxRate) : "0 B/s"
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
font.weight: Font.Bold
|
|
||||||
color: Theme.surfaceText
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Row {
|
|
||||||
spacing: 4
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: "↑"
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
color: Theme.error
|
|
||||||
}
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: DgopService.networkTxRate > 0 ? formatNetworkSpeed(DgopService.networkTxRate) : "0 B/s"
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
font.weight: Font.Bold
|
|
||||||
color: Theme.surfaceText
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
width: (parent.width - Theme.spacingM) / 2
|
|
||||||
height: 80
|
|
||||||
radius: Theme.cornerRadius
|
|
||||||
color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
|
|
||||||
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.06)
|
|
||||||
border.width: 1
|
|
||||||
|
|
||||||
Column {
|
|
||||||
anchors.centerIn: parent
|
|
||||||
spacing: Theme.spacingXS
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: I18n.tr("Disk")
|
|
||||||
font.pixelSize: Theme.fontSizeMedium
|
|
||||||
font.weight: Font.Bold
|
|
||||||
color: Theme.surfaceText
|
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
|
||||||
}
|
|
||||||
|
|
||||||
Row {
|
|
||||||
spacing: Theme.spacingS
|
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
|
||||||
|
|
||||||
Row {
|
|
||||||
spacing: 4
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: "R"
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
color: Theme.primary
|
|
||||||
}
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: formatDiskSpeed(DgopService.diskReadRate)
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
font.weight: Font.Bold
|
|
||||||
color: Theme.surfaceText
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Row {
|
|
||||||
spacing: 4
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: "W"
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
color: Theme.warning
|
|
||||||
}
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: formatDiskSpeed(DgopService.diskWriteRate)
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
font.weight: Font.Bold
|
|
||||||
color: Theme.surfaceText
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
304
quickshell/Modules/ProcessList/PerformanceView.qml
Normal file
304
quickshell/Modules/ProcessList/PerformanceView.qml
Normal file
@@ -0,0 +1,304 @@
|
|||||||
|
import QtQuick
|
||||||
|
import QtQuick.Layouts
|
||||||
|
import Quickshell
|
||||||
|
import qs.Common
|
||||||
|
import qs.Services
|
||||||
|
import qs.Widgets
|
||||||
|
|
||||||
|
Item {
|
||||||
|
id: root
|
||||||
|
|
||||||
|
readonly property int historySize: 60
|
||||||
|
|
||||||
|
property var cpuHistory: []
|
||||||
|
property var memoryHistory: []
|
||||||
|
property var networkRxHistory: []
|
||||||
|
property var networkTxHistory: []
|
||||||
|
property var diskReadHistory: []
|
||||||
|
property var diskWriteHistory: []
|
||||||
|
|
||||||
|
function formatBytes(bytes) {
|
||||||
|
if (bytes < 1024)
|
||||||
|
return bytes.toFixed(0) + " B/s";
|
||||||
|
if (bytes < 1024 * 1024)
|
||||||
|
return (bytes / 1024).toFixed(1) + " KB/s";
|
||||||
|
if (bytes < 1024 * 1024 * 1024)
|
||||||
|
return (bytes / (1024 * 1024)).toFixed(1) + " MB/s";
|
||||||
|
return (bytes / (1024 * 1024 * 1024)).toFixed(2) + " GB/s";
|
||||||
|
}
|
||||||
|
|
||||||
|
function addToHistory(arr, val) {
|
||||||
|
const newArr = arr.slice();
|
||||||
|
newArr.push(val);
|
||||||
|
if (newArr.length > historySize)
|
||||||
|
newArr.shift();
|
||||||
|
return newArr;
|
||||||
|
}
|
||||||
|
|
||||||
|
function sampleData() {
|
||||||
|
cpuHistory = addToHistory(cpuHistory, DgopService.cpuUsage);
|
||||||
|
memoryHistory = addToHistory(memoryHistory, DgopService.memoryUsage);
|
||||||
|
networkRxHistory = addToHistory(networkRxHistory, DgopService.networkRxRate);
|
||||||
|
networkTxHistory = addToHistory(networkTxHistory, DgopService.networkTxRate);
|
||||||
|
diskReadHistory = addToHistory(diskReadHistory, DgopService.diskReadRate);
|
||||||
|
diskWriteHistory = addToHistory(diskWriteHistory, DgopService.diskWriteRate);
|
||||||
|
}
|
||||||
|
|
||||||
|
Component.onCompleted: {
|
||||||
|
DgopService.addRef(["cpu", "memory", "network", "disk", "diskmounts", "system"]);
|
||||||
|
}
|
||||||
|
|
||||||
|
Component.onDestruction: {
|
||||||
|
DgopService.removeRef(["cpu", "memory", "network", "disk", "diskmounts", "system"]);
|
||||||
|
}
|
||||||
|
|
||||||
|
SystemClock {
|
||||||
|
id: sampleClock
|
||||||
|
precision: SystemClock.Seconds
|
||||||
|
onDateChanged: {
|
||||||
|
if (date.getSeconds() % 1 === 0)
|
||||||
|
root.sampleData();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ColumnLayout {
|
||||||
|
anchors.fill: parent
|
||||||
|
spacing: Theme.spacingM
|
||||||
|
|
||||||
|
RowLayout {
|
||||||
|
Layout.fillWidth: true
|
||||||
|
Layout.preferredHeight: (root.height - Theme.spacingM * 2) / 2
|
||||||
|
spacing: Theme.spacingM
|
||||||
|
|
||||||
|
PerformanceCard {
|
||||||
|
Layout.fillWidth: true
|
||||||
|
Layout.fillHeight: true
|
||||||
|
title: "CPU"
|
||||||
|
icon: "memory"
|
||||||
|
value: DgopService.cpuUsage.toFixed(1) + "%"
|
||||||
|
subtitle: DgopService.cpuModel || (DgopService.cpuCores + " cores")
|
||||||
|
accentColor: Theme.primary
|
||||||
|
history: root.cpuHistory
|
||||||
|
maxValue: 100
|
||||||
|
showSecondary: false
|
||||||
|
extraInfo: DgopService.cpuTemperature > 0 ? (DgopService.cpuTemperature.toFixed(0) + "°C") : ""
|
||||||
|
extraInfoColor: DgopService.cpuTemperature > 80 ? Theme.error : (DgopService.cpuTemperature > 60 ? Theme.warning : Theme.surfaceVariantText)
|
||||||
|
}
|
||||||
|
|
||||||
|
PerformanceCard {
|
||||||
|
Layout.fillWidth: true
|
||||||
|
Layout.fillHeight: true
|
||||||
|
title: I18n.tr("Memory")
|
||||||
|
icon: "sd_card"
|
||||||
|
value: DgopService.memoryUsage.toFixed(1) + "%"
|
||||||
|
subtitle: DgopService.formatSystemMemory(DgopService.usedMemoryKB) + " / " + DgopService.formatSystemMemory(DgopService.totalMemoryKB)
|
||||||
|
accentColor: Theme.secondary
|
||||||
|
history: root.memoryHistory
|
||||||
|
maxValue: 100
|
||||||
|
showSecondary: false
|
||||||
|
extraInfo: DgopService.totalSwapKB > 0 ? ("Swap: " + DgopService.formatSystemMemory(DgopService.usedSwapKB)) : ""
|
||||||
|
extraInfoColor: Theme.surfaceVariantText
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
RowLayout {
|
||||||
|
Layout.fillWidth: true
|
||||||
|
Layout.preferredHeight: (root.height - Theme.spacingM * 2) / 2
|
||||||
|
spacing: Theme.spacingM
|
||||||
|
|
||||||
|
PerformanceCard {
|
||||||
|
Layout.fillWidth: true
|
||||||
|
Layout.fillHeight: true
|
||||||
|
title: I18n.tr("Network")
|
||||||
|
icon: "swap_horiz"
|
||||||
|
value: "↓ " + root.formatBytes(DgopService.networkRxRate)
|
||||||
|
subtitle: "↑ " + root.formatBytes(DgopService.networkTxRate)
|
||||||
|
accentColor: Theme.info
|
||||||
|
history: root.networkRxHistory
|
||||||
|
history2: root.networkTxHistory
|
||||||
|
maxValue: 0
|
||||||
|
showSecondary: true
|
||||||
|
extraInfo: ""
|
||||||
|
extraInfoColor: Theme.surfaceVariantText
|
||||||
|
}
|
||||||
|
|
||||||
|
PerformanceCard {
|
||||||
|
Layout.fillWidth: true
|
||||||
|
Layout.fillHeight: true
|
||||||
|
title: I18n.tr("Disk")
|
||||||
|
icon: "storage"
|
||||||
|
value: "R: " + root.formatBytes(DgopService.diskReadRate)
|
||||||
|
subtitle: "W: " + root.formatBytes(DgopService.diskWriteRate)
|
||||||
|
accentColor: Theme.warning
|
||||||
|
history: root.diskReadHistory
|
||||||
|
history2: root.diskWriteHistory
|
||||||
|
maxValue: 0
|
||||||
|
showSecondary: true
|
||||||
|
extraInfo: {
|
||||||
|
const rootMount = DgopService.diskMounts.find(m => m.mountpoint === "/");
|
||||||
|
if (rootMount) {
|
||||||
|
const usedPct = ((rootMount.used || 0) / Math.max(1, rootMount.total || 1) * 100).toFixed(0);
|
||||||
|
return "/ " + usedPct + "% used";
|
||||||
|
}
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
extraInfoColor: Theme.surfaceVariantText
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
component PerformanceCard: Rectangle {
|
||||||
|
id: card
|
||||||
|
|
||||||
|
property string title: ""
|
||||||
|
property string icon: ""
|
||||||
|
property string value: ""
|
||||||
|
property string subtitle: ""
|
||||||
|
property color accentColor: Theme.primary
|
||||||
|
property var history: []
|
||||||
|
property var history2: null
|
||||||
|
property real maxValue: 100
|
||||||
|
property bool showSecondary: false
|
||||||
|
property string extraInfo: ""
|
||||||
|
property color extraInfoColor: Theme.surfaceVariantText
|
||||||
|
|
||||||
|
radius: Theme.cornerRadius
|
||||||
|
color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
|
||||||
|
border.color: Theme.outlineLight
|
||||||
|
border.width: 1
|
||||||
|
|
||||||
|
Canvas {
|
||||||
|
id: graphCanvas
|
||||||
|
anchors.fill: parent
|
||||||
|
anchors.margins: 4
|
||||||
|
renderStrategy: Canvas.Cooperative
|
||||||
|
|
||||||
|
property var hist: card.history
|
||||||
|
property var hist2: card.history2
|
||||||
|
|
||||||
|
onHistChanged: requestPaint()
|
||||||
|
onHist2Changed: requestPaint()
|
||||||
|
onWidthChanged: requestPaint()
|
||||||
|
onHeightChanged: requestPaint()
|
||||||
|
|
||||||
|
onPaint: {
|
||||||
|
const ctx = getContext("2d");
|
||||||
|
ctx.reset();
|
||||||
|
ctx.clearRect(0, 0, width, height);
|
||||||
|
|
||||||
|
if (!hist || hist.length < 2)
|
||||||
|
return;
|
||||||
|
|
||||||
|
let max = card.maxValue;
|
||||||
|
if (max <= 0) {
|
||||||
|
max = 1;
|
||||||
|
for (let k = 0; k < hist.length; k++)
|
||||||
|
max = Math.max(max, hist[k]);
|
||||||
|
if (hist2) {
|
||||||
|
for (let l = 0; l < hist2.length; l++)
|
||||||
|
max = Math.max(max, hist2[l]);
|
||||||
|
}
|
||||||
|
max *= 1.1;
|
||||||
|
}
|
||||||
|
|
||||||
|
const c = card.accentColor;
|
||||||
|
const grad = ctx.createLinearGradient(0, 0, 0, height);
|
||||||
|
grad.addColorStop(0, Qt.rgba(c.r, c.g, c.b, 0.25));
|
||||||
|
grad.addColorStop(1, Qt.rgba(c.r, c.g, c.b, 0.02));
|
||||||
|
|
||||||
|
ctx.fillStyle = grad;
|
||||||
|
ctx.beginPath();
|
||||||
|
ctx.moveTo(0, height);
|
||||||
|
for (let i = 0; i < hist.length; i++) {
|
||||||
|
const x = (width / (root.historySize - 1)) * i;
|
||||||
|
const y = height - (hist[i] / max) * height * 0.8;
|
||||||
|
ctx.lineTo(x, y);
|
||||||
|
}
|
||||||
|
ctx.lineTo((width / (root.historySize - 1)) * (hist.length - 1), height);
|
||||||
|
ctx.closePath();
|
||||||
|
ctx.fill();
|
||||||
|
|
||||||
|
ctx.strokeStyle = Qt.rgba(c.r, c.g, c.b, 0.8);
|
||||||
|
ctx.lineWidth = 2;
|
||||||
|
ctx.beginPath();
|
||||||
|
for (let j = 0; j < hist.length; j++) {
|
||||||
|
const px = (width / (root.historySize - 1)) * j;
|
||||||
|
const py = height - (hist[j] / max) * height * 0.8;
|
||||||
|
j === 0 ? ctx.moveTo(px, py) : ctx.lineTo(px, py);
|
||||||
|
}
|
||||||
|
ctx.stroke();
|
||||||
|
|
||||||
|
if (hist2 && hist2.length >= 2 && card.showSecondary) {
|
||||||
|
ctx.strokeStyle = Qt.rgba(c.r, c.g, c.b, 0.4);
|
||||||
|
ctx.lineWidth = 1.5;
|
||||||
|
ctx.setLineDash([4, 4]);
|
||||||
|
ctx.beginPath();
|
||||||
|
for (let m = 0; m < hist2.length; m++) {
|
||||||
|
const sx = (width / (root.historySize - 1)) * m;
|
||||||
|
const sy = height - (hist2[m] / max) * height * 0.8;
|
||||||
|
m === 0 ? ctx.moveTo(sx, sy) : ctx.lineTo(sx, sy);
|
||||||
|
}
|
||||||
|
ctx.stroke();
|
||||||
|
ctx.setLineDash([]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ColumnLayout {
|
||||||
|
anchors.fill: parent
|
||||||
|
anchors.margins: Theme.spacingM
|
||||||
|
spacing: Theme.spacingXS
|
||||||
|
|
||||||
|
RowLayout {
|
||||||
|
Layout.fillWidth: true
|
||||||
|
spacing: Theme.spacingS
|
||||||
|
|
||||||
|
DankIcon {
|
||||||
|
name: card.icon
|
||||||
|
size: Theme.iconSize
|
||||||
|
color: card.accentColor
|
||||||
|
}
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: card.title
|
||||||
|
font.pixelSize: Theme.fontSizeLarge
|
||||||
|
font.weight: Font.Bold
|
||||||
|
color: Theme.surfaceText
|
||||||
|
}
|
||||||
|
|
||||||
|
Item {
|
||||||
|
Layout.fillWidth: true
|
||||||
|
}
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: card.extraInfo
|
||||||
|
font.pixelSize: Theme.fontSizeSmall
|
||||||
|
font.family: SettingsData.monoFontFamily
|
||||||
|
color: card.extraInfoColor
|
||||||
|
visible: card.extraInfo.length > 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Item {
|
||||||
|
Layout.fillHeight: true
|
||||||
|
}
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: card.value
|
||||||
|
font.pixelSize: Theme.fontSizeXLarge
|
||||||
|
font.family: SettingsData.monoFontFamily
|
||||||
|
font.weight: Font.Bold
|
||||||
|
color: Theme.surfaceText
|
||||||
|
}
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: card.subtitle
|
||||||
|
font.pixelSize: Theme.fontSizeSmall
|
||||||
|
font.family: SettingsData.monoFontFamily
|
||||||
|
color: Theme.surfaceVariantText
|
||||||
|
elide: Text.ElideRight
|
||||||
|
Layout.fillWidth: true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -19,13 +19,10 @@ Popup {
|
|||||||
const menuWidth = processContextMenu.width;
|
const menuWidth = processContextMenu.width;
|
||||||
const menuHeight = processContextMenu.height;
|
const menuHeight = processContextMenu.height;
|
||||||
|
|
||||||
if (finalX + menuWidth > parentWidth) {
|
if (finalX + menuWidth > parentWidth)
|
||||||
finalX = Math.max(0, parentWidth - menuWidth);
|
finalX = Math.max(0, parentWidth - menuWidth);
|
||||||
}
|
if (finalY + menuHeight > parentHeight)
|
||||||
|
|
||||||
if (finalY + menuHeight > parentHeight) {
|
|
||||||
finalY = Math.max(0, parentHeight - menuHeight);
|
finalY = Math.max(0, parentHeight - menuHeight);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
processContextMenu.x = finalX;
|
processContextMenu.x = finalX;
|
||||||
@@ -33,25 +30,19 @@ Popup {
|
|||||||
open();
|
open();
|
||||||
}
|
}
|
||||||
|
|
||||||
width: 180
|
width: 200
|
||||||
height: menuColumn.implicitHeight + Theme.spacingS * 2
|
height: menuColumn.implicitHeight + Theme.spacingS * 2
|
||||||
padding: 0
|
padding: 0
|
||||||
modal: false
|
modal: false
|
||||||
closePolicy: Popup.CloseOnEscape
|
closePolicy: Popup.CloseOnEscape
|
||||||
onClosed: {
|
|
||||||
closePolicy = Popup.CloseOnEscape;
|
onClosed: closePolicy = Popup.CloseOnEscape
|
||||||
}
|
onOpened: outsideClickTimer.start()
|
||||||
onOpened: {
|
|
||||||
outsideClickTimer.start();
|
|
||||||
}
|
|
||||||
|
|
||||||
Timer {
|
Timer {
|
||||||
id: outsideClickTimer
|
id: outsideClickTimer
|
||||||
|
|
||||||
interval: 100
|
interval: 100
|
||||||
onTriggered: {
|
onTriggered: processContextMenu.closePolicy = Popup.CloseOnEscape | Popup.CloseOnPressOutside
|
||||||
processContextMenu.closePolicy = Popup.CloseOnEscape | Popup.CloseOnPressOutside;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
background: Rectangle {
|
background: Rectangle {
|
||||||
@@ -59,8 +50,6 @@ Popup {
|
|||||||
}
|
}
|
||||||
|
|
||||||
contentItem: Rectangle {
|
contentItem: Rectangle {
|
||||||
id: menuContent
|
|
||||||
|
|
||||||
color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
|
color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
|
||||||
radius: Theme.cornerRadius
|
radius: Theme.cornerRadius
|
||||||
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
|
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
|
||||||
@@ -68,157 +57,140 @@ Popup {
|
|||||||
|
|
||||||
Column {
|
Column {
|
||||||
id: menuColumn
|
id: menuColumn
|
||||||
|
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
anchors.margins: Theme.spacingS
|
anchors.margins: Theme.spacingS
|
||||||
spacing: 1
|
spacing: 1
|
||||||
|
|
||||||
Rectangle {
|
MenuItem {
|
||||||
width: parent.width
|
text: I18n.tr("Copy PID")
|
||||||
height: 28
|
iconName: "tag"
|
||||||
radius: Theme.cornerRadius
|
onClicked: {
|
||||||
color: copyPidArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent"
|
if (processContextMenu.processData)
|
||||||
|
Quickshell.execDetached(["dms", "cl", "copy", processContextMenu.processData.pid.toString()]);
|
||||||
StyledText {
|
processContextMenu.close();
|
||||||
anchors.left: parent.left
|
|
||||||
anchors.leftMargin: Theme.spacingS
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
text: I18n.tr("Copy PID")
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
color: Theme.surfaceText
|
|
||||||
font.weight: Font.Normal
|
|
||||||
}
|
|
||||||
|
|
||||||
MouseArea {
|
|
||||||
id: copyPidArea
|
|
||||||
|
|
||||||
anchors.fill: parent
|
|
||||||
hoverEnabled: true
|
|
||||||
cursorShape: Qt.PointingHandCursor
|
|
||||||
onClicked: {
|
|
||||||
if (processContextMenu.processData) {
|
|
||||||
Quickshell.execDetached(["dms", "cl", "copy", processContextMenu.processData.pid.toString()]);
|
|
||||||
}
|
|
||||||
processContextMenu.close();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Rectangle {
|
MenuItem {
|
||||||
width: parent.width
|
text: I18n.tr("Copy Name")
|
||||||
height: 28
|
iconName: "content_copy"
|
||||||
radius: Theme.cornerRadius
|
onClicked: {
|
||||||
color: copyNameArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent"
|
if (processContextMenu.processData) {
|
||||||
|
const name = processContextMenu.processData.command || "";
|
||||||
StyledText {
|
Quickshell.execDetached(["dms", "cl", "copy", name]);
|
||||||
anchors.left: parent.left
|
|
||||||
anchors.leftMargin: Theme.spacingS
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
text: I18n.tr("Copy Process Name")
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
color: Theme.surfaceText
|
|
||||||
font.weight: Font.Normal
|
|
||||||
}
|
|
||||||
|
|
||||||
MouseArea {
|
|
||||||
id: copyNameArea
|
|
||||||
|
|
||||||
anchors.fill: parent
|
|
||||||
hoverEnabled: true
|
|
||||||
cursorShape: Qt.PointingHandCursor
|
|
||||||
onClicked: {
|
|
||||||
if (processContextMenu.processData) {
|
|
||||||
const processName = processContextMenu.processData.displayName || processContextMenu.processData.command;
|
|
||||||
Quickshell.execDetached(["dms", "cl", "copy", processName]);
|
|
||||||
}
|
|
||||||
processContextMenu.close();
|
|
||||||
}
|
}
|
||||||
|
processContextMenu.close();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
MenuItem {
|
||||||
|
text: I18n.tr("Copy Full Command")
|
||||||
|
iconName: "code"
|
||||||
|
onClicked: {
|
||||||
|
if (processContextMenu.processData) {
|
||||||
|
const fullCmd = processContextMenu.processData.fullCommand || processContextMenu.processData.command || "";
|
||||||
|
Quickshell.execDetached(["dms", "cl", "copy", fullCmd]);
|
||||||
|
}
|
||||||
|
processContextMenu.close();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Rectangle {
|
Rectangle {
|
||||||
width: parent.width - Theme.spacingS * 2
|
width: parent.width - Theme.spacingS * 2
|
||||||
height: 5
|
height: 1
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
color: "transparent"
|
color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.15)
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
anchors.centerIn: parent
|
|
||||||
width: parent.width
|
|
||||||
height: 1
|
|
||||||
color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Rectangle {
|
MenuItem {
|
||||||
width: parent.width
|
text: I18n.tr("Kill Process")
|
||||||
height: 28
|
iconName: "close"
|
||||||
radius: Theme.cornerRadius
|
dangerous: true
|
||||||
color: killArea.containsMouse ? Qt.rgba(Theme.error.r, Theme.error.g, Theme.error.b, 0.12) : "transparent"
|
|
||||||
enabled: processContextMenu.processData
|
enabled: processContextMenu.processData
|
||||||
opacity: enabled ? 1 : 0.5
|
onClicked: {
|
||||||
|
if (processContextMenu.processData)
|
||||||
StyledText {
|
Quickshell.execDetached(["kill", processContextMenu.processData.pid.toString()]);
|
||||||
anchors.left: parent.left
|
processContextMenu.close();
|
||||||
anchors.leftMargin: Theme.spacingS
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
text: I18n.tr("Kill Process")
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
color: parent.enabled ? (killArea.containsMouse ? Theme.error : Theme.surfaceText) : Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.5)
|
|
||||||
font.weight: Font.Normal
|
|
||||||
}
|
|
||||||
|
|
||||||
MouseArea {
|
|
||||||
id: killArea
|
|
||||||
|
|
||||||
anchors.fill: parent
|
|
||||||
hoverEnabled: true
|
|
||||||
cursorShape: parent.enabled ? Qt.PointingHandCursor : Qt.ArrowCursor
|
|
||||||
enabled: parent.enabled
|
|
||||||
onClicked: {
|
|
||||||
if (processContextMenu.processData) {
|
|
||||||
Quickshell.execDetached(["kill", processContextMenu.processData.pid.toString()]);
|
|
||||||
}
|
|
||||||
|
|
||||||
processContextMenu.close();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Rectangle {
|
MenuItem {
|
||||||
width: parent.width
|
text: I18n.tr("Force Kill (SIGKILL)")
|
||||||
height: 28
|
iconName: "dangerous"
|
||||||
radius: Theme.cornerRadius
|
dangerous: true
|
||||||
color: forceKillArea.containsMouse ? Qt.rgba(Theme.error.r, Theme.error.g, Theme.error.b, 0.12) : "transparent"
|
|
||||||
enabled: processContextMenu.processData && processContextMenu.processData.pid > 1000
|
enabled: processContextMenu.processData && processContextMenu.processData.pid > 1000
|
||||||
opacity: enabled ? 1 : 0.5
|
onClicked: {
|
||||||
|
if (processContextMenu.processData)
|
||||||
StyledText {
|
Quickshell.execDetached(["kill", "-9", processContextMenu.processData.pid.toString()]);
|
||||||
anchors.left: parent.left
|
processContextMenu.close();
|
||||||
anchors.leftMargin: Theme.spacingS
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
text: I18n.tr("Force Kill Process")
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
color: parent.enabled ? (forceKillArea.containsMouse ? Theme.error : Theme.surfaceText) : Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.5)
|
|
||||||
font.weight: Font.Normal
|
|
||||||
}
|
|
||||||
|
|
||||||
MouseArea {
|
|
||||||
id: forceKillArea
|
|
||||||
|
|
||||||
anchors.fill: parent
|
|
||||||
hoverEnabled: true
|
|
||||||
cursorShape: parent.enabled ? Qt.PointingHandCursor : Qt.ArrowCursor
|
|
||||||
enabled: parent.enabled
|
|
||||||
onClicked: {
|
|
||||||
if (processContextMenu.processData) {
|
|
||||||
Quickshell.execDetached(["kill", "-9", processContextMenu.processData.pid.toString()]);
|
|
||||||
}
|
|
||||||
|
|
||||||
processContextMenu.close();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
component MenuItem: Rectangle {
|
||||||
|
id: menuItem
|
||||||
|
|
||||||
|
property string text: ""
|
||||||
|
property string iconName: ""
|
||||||
|
property bool dangerous: false
|
||||||
|
property bool enabled: true
|
||||||
|
|
||||||
|
signal clicked
|
||||||
|
|
||||||
|
width: parent.width
|
||||||
|
height: 32
|
||||||
|
radius: Theme.cornerRadius
|
||||||
|
color: {
|
||||||
|
if (!enabled)
|
||||||
|
return "transparent";
|
||||||
|
if (dangerous)
|
||||||
|
return menuItemArea.containsMouse ? Qt.rgba(Theme.error.r, Theme.error.g, Theme.error.b, 0.12) : "transparent";
|
||||||
|
return menuItemArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent";
|
||||||
|
}
|
||||||
|
opacity: enabled ? 1 : 0.5
|
||||||
|
|
||||||
|
Row {
|
||||||
|
anchors.left: parent.left
|
||||||
|
anchors.leftMargin: Theme.spacingS
|
||||||
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
spacing: Theme.spacingS
|
||||||
|
|
||||||
|
DankIcon {
|
||||||
|
name: menuItem.iconName
|
||||||
|
size: 16
|
||||||
|
color: {
|
||||||
|
if (!menuItem.enabled)
|
||||||
|
return Theme.surfaceVariantText;
|
||||||
|
if (menuItem.dangerous && menuItemArea.containsMouse)
|
||||||
|
return Theme.error;
|
||||||
|
return Theme.surfaceText;
|
||||||
|
}
|
||||||
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
}
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: menuItem.text
|
||||||
|
font.pixelSize: Theme.fontSizeSmall
|
||||||
|
font.weight: Font.Normal
|
||||||
|
color: {
|
||||||
|
if (!menuItem.enabled)
|
||||||
|
return Theme.surfaceVariantText;
|
||||||
|
if (menuItem.dangerous && menuItemArea.containsMouse)
|
||||||
|
return Theme.error;
|
||||||
|
return Theme.surfaceText;
|
||||||
|
}
|
||||||
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
MouseArea {
|
||||||
|
id: menuItemArea
|
||||||
|
anchors.fill: parent
|
||||||
|
hoverEnabled: true
|
||||||
|
cursorShape: menuItem.enabled ? Qt.PointingHandCursor : Qt.ArrowCursor
|
||||||
|
enabled: menuItem.enabled
|
||||||
|
onClicked: menuItem.clicked()
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,200 +0,0 @@
|
|||||||
import QtQuick
|
|
||||||
import qs.Common
|
|
||||||
import qs.Services
|
|
||||||
import qs.Widgets
|
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
id: processItem
|
|
||||||
|
|
||||||
property var process: null
|
|
||||||
property var contextMenu: null
|
|
||||||
|
|
||||||
width: parent ? parent.width : 0
|
|
||||||
height: 40
|
|
||||||
radius: Theme.cornerRadius
|
|
||||||
color: processMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : Theme.withAlpha(Theme.primary, 0)
|
|
||||||
border.color: processMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : Theme.withAlpha(Theme.primary, 0)
|
|
||||||
border.width: 1
|
|
||||||
|
|
||||||
MouseArea {
|
|
||||||
id: processMouseArea
|
|
||||||
|
|
||||||
anchors.fill: parent
|
|
||||||
hoverEnabled: true
|
|
||||||
cursorShape: Qt.PointingHandCursor
|
|
||||||
acceptedButtons: Qt.LeftButton | Qt.RightButton
|
|
||||||
onClicked: (mouse) => {
|
|
||||||
if (mouse.button === Qt.RightButton) {
|
|
||||||
if (process && process.pid > 0 && contextMenu) {
|
|
||||||
contextMenu.processData = process;
|
|
||||||
const globalPos = processMouseArea.mapToGlobal(mouse.x, mouse.y);
|
|
||||||
const localPos = contextMenu.parent ? contextMenu.parent.mapFromGlobal(globalPos.x, globalPos.y) : globalPos;
|
|
||||||
contextMenu.show(localPos.x, localPos.y);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
onPressAndHold: {
|
|
||||||
if (process && process.pid > 0 && contextMenu) {
|
|
||||||
contextMenu.processData = process;
|
|
||||||
const globalPos = processMouseArea.mapToGlobal(processMouseArea.width / 2, processMouseArea.height / 2);
|
|
||||||
contextMenu.show(globalPos.x, globalPos.y);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Item {
|
|
||||||
anchors.fill: parent
|
|
||||||
anchors.margins: 8
|
|
||||||
|
|
||||||
DankIcon {
|
|
||||||
id: processIcon
|
|
||||||
|
|
||||||
name: DgopService.getProcessIcon(process ? process.command : "")
|
|
||||||
size: Theme.iconSize - 4
|
|
||||||
color: {
|
|
||||||
if (process && process.cpu > 80) {
|
|
||||||
return Theme.error;
|
|
||||||
}
|
|
||||||
return Theme.surfaceText;
|
|
||||||
}
|
|
||||||
opacity: 0.8
|
|
||||||
anchors.left: parent.left
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
}
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: process ? process.displayName : ""
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
font.family: SettingsData.monoFontFamily
|
|
||||||
font.weight: Font.Medium
|
|
||||||
color: Theme.surfaceText
|
|
||||||
width: 250
|
|
||||||
elide: Text.ElideRight
|
|
||||||
anchors.left: processIcon.right
|
|
||||||
anchors.leftMargin: 8
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
}
|
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
id: cpuBadge
|
|
||||||
|
|
||||||
width: 80
|
|
||||||
height: 20
|
|
||||||
radius: Theme.cornerRadius
|
|
||||||
color: {
|
|
||||||
if (process && process.cpu > 80) {
|
|
||||||
return Qt.rgba(Theme.error.r, Theme.error.g, Theme.error.b, 0.12);
|
|
||||||
}
|
|
||||||
return Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.08);
|
|
||||||
}
|
|
||||||
anchors.right: parent.right
|
|
||||||
anchors.rightMargin: 194
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: DgopService.formatCpuUsage(process ? process.cpu : 0)
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
font.family: SettingsData.monoFontFamily
|
|
||||||
font.weight: Font.Bold
|
|
||||||
color: {
|
|
||||||
if (process && process.cpu > 80) {
|
|
||||||
return Theme.error;
|
|
||||||
}
|
|
||||||
return Theme.surfaceText;
|
|
||||||
}
|
|
||||||
anchors.centerIn: parent
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
id: memoryBadge
|
|
||||||
|
|
||||||
width: 80
|
|
||||||
height: 20
|
|
||||||
radius: Theme.cornerRadius
|
|
||||||
color: {
|
|
||||||
if (process && process.memoryKB > 1024 * 1024) {
|
|
||||||
return Qt.rgba(Theme.error.r, Theme.error.g, Theme.error.b, 0.12);
|
|
||||||
}
|
|
||||||
return Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.08);
|
|
||||||
}
|
|
||||||
anchors.right: parent.right
|
|
||||||
anchors.rightMargin: 102
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: DgopService.formatMemoryUsage(process ? process.memoryKB : 0)
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
font.family: SettingsData.monoFontFamily
|
|
||||||
font.weight: Font.Bold
|
|
||||||
color: {
|
|
||||||
if (process && process.memoryKB > 1024 * 1024) {
|
|
||||||
return Theme.error;
|
|
||||||
}
|
|
||||||
return Theme.surfaceText;
|
|
||||||
}
|
|
||||||
anchors.centerIn: parent
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: process ? process.pid.toString() : ""
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
font.family: SettingsData.monoFontFamily
|
|
||||||
color: Theme.surfaceText
|
|
||||||
opacity: 0.7
|
|
||||||
width: 50
|
|
||||||
horizontalAlignment: Text.AlignRight
|
|
||||||
anchors.right: parent.right
|
|
||||||
anchors.rightMargin: 40
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
}
|
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
id: menuButton
|
|
||||||
|
|
||||||
width: 28
|
|
||||||
height: 28
|
|
||||||
radius: Theme.cornerRadius
|
|
||||||
color: menuButtonArea.containsMouse ? Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.08) : Theme.withAlpha(Theme.surfaceText, 0)
|
|
||||||
anchors.right: parent.right
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
|
|
||||||
DankIcon {
|
|
||||||
name: "more_vert"
|
|
||||||
size: Theme.iconSize - 2
|
|
||||||
color: Theme.surfaceText
|
|
||||||
opacity: 0.6
|
|
||||||
anchors.centerIn: parent
|
|
||||||
}
|
|
||||||
|
|
||||||
MouseArea {
|
|
||||||
id: menuButtonArea
|
|
||||||
|
|
||||||
anchors.fill: parent
|
|
||||||
hoverEnabled: true
|
|
||||||
cursorShape: Qt.PointingHandCursor
|
|
||||||
onClicked: {
|
|
||||||
if (process && process.pid > 0 && contextMenu) {
|
|
||||||
contextMenu.processData = process;
|
|
||||||
const globalPos = menuButtonArea.mapToGlobal(menuButtonArea.width / 2, menuButtonArea.height);
|
|
||||||
const localPos = contextMenu.parent ? contextMenu.parent.mapFromGlobal(globalPos.x, globalPos.y) : globalPos;
|
|
||||||
contextMenu.show(localPos.x, localPos.y);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Behavior on color {
|
|
||||||
ColorAnimation {
|
|
||||||
duration: Theme.shortDuration
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -12,32 +12,39 @@ DankPopout {
|
|||||||
|
|
||||||
property var parentWidget: null
|
property var parentWidget: null
|
||||||
property var triggerScreen: null
|
property var triggerScreen: null
|
||||||
|
property string searchText: ""
|
||||||
|
property string expandedPid: ""
|
||||||
|
|
||||||
function hide() {
|
function hide() {
|
||||||
close();
|
close();
|
||||||
if (processContextMenu.visible) {
|
if (processContextMenu.visible)
|
||||||
processContextMenu.close();
|
processContextMenu.close();
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function show() {
|
function show() {
|
||||||
open();
|
open();
|
||||||
}
|
}
|
||||||
|
|
||||||
popupWidth: 600
|
popupWidth: 650
|
||||||
popupHeight: 600
|
popupHeight: 550
|
||||||
triggerWidth: 55
|
triggerWidth: 55
|
||||||
positioning: ""
|
positioning: ""
|
||||||
screen: triggerScreen
|
screen: triggerScreen
|
||||||
shouldBeVisible: false
|
shouldBeVisible: false
|
||||||
|
|
||||||
onBackgroundClicked: {
|
onBackgroundClicked: {
|
||||||
if (processContextMenu.visible) {
|
if (processContextMenu.visible)
|
||||||
processContextMenu.close();
|
processContextMenu.close();
|
||||||
}
|
|
||||||
close();
|
close();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
onShouldBeVisibleChanged: {
|
||||||
|
if (!shouldBeVisible) {
|
||||||
|
searchText = "";
|
||||||
|
expandedPid = "";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Ref {
|
Ref {
|
||||||
service: DgopService
|
service: DgopService
|
||||||
}
|
}
|
||||||
@@ -55,55 +62,247 @@ DankPopout {
|
|||||||
|
|
||||||
radius: Theme.cornerRadius
|
radius: Theme.cornerRadius
|
||||||
color: "transparent"
|
color: "transparent"
|
||||||
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
|
|
||||||
border.width: 0
|
|
||||||
clip: true
|
clip: true
|
||||||
antialiasing: true
|
|
||||||
smooth: true
|
|
||||||
focus: true
|
focus: true
|
||||||
|
|
||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
if (processListPopout.shouldBeVisible) {
|
if (processListPopout.shouldBeVisible)
|
||||||
forceActiveFocus();
|
forceActiveFocus();
|
||||||
}
|
|
||||||
processContextMenu.parent = processListContent;
|
processContextMenu.parent = processListContent;
|
||||||
}
|
}
|
||||||
|
|
||||||
Keys.onPressed: event => {
|
Keys.onPressed: event => {
|
||||||
if (event.key === Qt.Key_Escape) {
|
switch (event.key) {
|
||||||
|
case Qt.Key_Escape:
|
||||||
|
if (processListPopout.searchText.length > 0) {
|
||||||
|
processListPopout.searchText = "";
|
||||||
|
event.accepted = true;
|
||||||
|
return;
|
||||||
|
}
|
||||||
processListPopout.close();
|
processListPopout.close();
|
||||||
event.accepted = true;
|
event.accepted = true;
|
||||||
|
return;
|
||||||
|
case Qt.Key_F:
|
||||||
|
if (event.modifiers & Qt.ControlModifier) {
|
||||||
|
searchField.forceActiveFocus();
|
||||||
|
event.accepted = true;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Connections {
|
Connections {
|
||||||
|
target: processListPopout
|
||||||
function onShouldBeVisibleChanged() {
|
function onShouldBeVisibleChanged() {
|
||||||
if (processListPopout.shouldBeVisible) {
|
if (processListPopout.shouldBeVisible) {
|
||||||
Qt.callLater(() => {
|
Qt.callLater(() => processListContent.forceActiveFocus());
|
||||||
processListContent.forceActiveFocus();
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
target: processListPopout
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
anchors.margins: Theme.spacingL
|
anchors.margins: Theme.spacingS
|
||||||
spacing: Theme.spacingL
|
spacing: Theme.spacingS
|
||||||
|
|
||||||
Rectangle {
|
RowLayout {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
height: systemOverview.height + Theme.spacingM * 2
|
spacing: Theme.spacingM
|
||||||
radius: Theme.cornerRadius
|
|
||||||
color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
|
|
||||||
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
|
|
||||||
border.width: 0
|
|
||||||
|
|
||||||
SystemOverview {
|
Row {
|
||||||
id: systemOverview
|
spacing: Theme.spacingS
|
||||||
|
|
||||||
anchors.centerIn: parent
|
DankIcon {
|
||||||
width: parent.width - Theme.spacingM * 2
|
name: "analytics"
|
||||||
|
size: Theme.iconSize
|
||||||
|
color: Theme.primary
|
||||||
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
}
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: I18n.tr("Processes")
|
||||||
|
font.pixelSize: Theme.fontSizeLarge
|
||||||
|
font.weight: Font.Bold
|
||||||
|
color: Theme.surfaceText
|
||||||
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Item {
|
||||||
|
Layout.fillWidth: true
|
||||||
|
}
|
||||||
|
|
||||||
|
DankTextField {
|
||||||
|
id: searchField
|
||||||
|
Layout.preferredWidth: Theme.fontSizeMedium * 14
|
||||||
|
Layout.preferredHeight: Theme.fontSizeMedium * 2.5
|
||||||
|
placeholderText: I18n.tr("Search...")
|
||||||
|
leftIconName: "search"
|
||||||
|
showClearButton: true
|
||||||
|
text: processListPopout.searchText
|
||||||
|
onTextChanged: processListPopout.searchText = text
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Item {
|
||||||
|
id: statsContainer
|
||||||
|
Layout.fillWidth: true
|
||||||
|
Layout.preferredHeight: Math.max(leftInfo.height, gaugesRow.height) + Theme.spacingS
|
||||||
|
|
||||||
|
function compactMem(kb) {
|
||||||
|
if (kb < 1024 * 1024) {
|
||||||
|
const mb = kb / 1024;
|
||||||
|
return mb >= 100 ? mb.toFixed(0) + " MB" : mb.toFixed(1) + " MB";
|
||||||
|
}
|
||||||
|
const gb = kb / (1024 * 1024);
|
||||||
|
return gb >= 10 ? gb.toFixed(0) + " GB" : gb.toFixed(1) + " GB";
|
||||||
|
}
|
||||||
|
|
||||||
|
readonly property real gaugeSize: Theme.fontSizeMedium * 6.5
|
||||||
|
|
||||||
|
readonly property var enabledGpusWithTemp: {
|
||||||
|
if (!SessionData.enabledGpuPciIds || SessionData.enabledGpuPciIds.length === 0)
|
||||||
|
return [];
|
||||||
|
const result = [];
|
||||||
|
for (const gpu of DgopService.availableGpus) {
|
||||||
|
if (SessionData.enabledGpuPciIds.indexOf(gpu.pciId) !== -1 && gpu.temperature > 0)
|
||||||
|
result.push(gpu);
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
readonly property bool hasGpu: enabledGpusWithTemp.length > 0
|
||||||
|
|
||||||
|
Row {
|
||||||
|
id: leftInfo
|
||||||
|
anchors.left: parent.left
|
||||||
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
spacing: Theme.spacingM
|
||||||
|
|
||||||
|
Rectangle {
|
||||||
|
width: Theme.fontSizeMedium * 3
|
||||||
|
height: width
|
||||||
|
radius: Theme.cornerRadius
|
||||||
|
color: Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.1)
|
||||||
|
|
||||||
|
SystemLogo {
|
||||||
|
anchors.centerIn: parent
|
||||||
|
width: parent.width * 0.7
|
||||||
|
height: width
|
||||||
|
colorOverride: Theme.primary
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Column {
|
||||||
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
spacing: Theme.spacingXS / 2
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: DgopService.hostname || "localhost"
|
||||||
|
font.pixelSize: Theme.fontSizeMedium
|
||||||
|
font.weight: Font.Bold
|
||||||
|
color: Theme.surfaceText
|
||||||
|
}
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: DgopService.distribution || "Linux"
|
||||||
|
font.pixelSize: Theme.fontSizeSmall
|
||||||
|
color: Theme.surfaceVariantText
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
spacing: Theme.spacingS
|
||||||
|
|
||||||
|
Row {
|
||||||
|
spacing: Theme.spacingXS
|
||||||
|
|
||||||
|
DankIcon {
|
||||||
|
name: "schedule"
|
||||||
|
size: Theme.fontSizeSmall
|
||||||
|
color: Theme.surfaceVariantText
|
||||||
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
}
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: DgopService.shortUptime || "--"
|
||||||
|
font.pixelSize: Theme.fontSizeSmall - 1
|
||||||
|
font.family: SettingsData.monoFontFamily
|
||||||
|
color: Theme.surfaceVariantText
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: "•"
|
||||||
|
font.pixelSize: Theme.fontSizeSmall - 1
|
||||||
|
color: Theme.surfaceVariantText
|
||||||
|
}
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: DgopService.processCount + " " + I18n.tr("procs", "short for processes")
|
||||||
|
font.pixelSize: Theme.fontSizeSmall - 1
|
||||||
|
font.family: SettingsData.monoFontFamily
|
||||||
|
color: Theme.surfaceVariantText
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
id: gaugesRow
|
||||||
|
anchors.right: parent.right
|
||||||
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
spacing: Theme.spacingS
|
||||||
|
|
||||||
|
CircleGauge {
|
||||||
|
width: statsContainer.gaugeSize
|
||||||
|
height: statsContainer.gaugeSize
|
||||||
|
value: DgopService.cpuUsage / 100
|
||||||
|
label: DgopService.cpuUsage.toFixed(0) + "%"
|
||||||
|
sublabel: "CPU"
|
||||||
|
detail: DgopService.cpuTemperature > 0 ? (DgopService.cpuTemperature.toFixed(0) + "°") : ""
|
||||||
|
accentColor: DgopService.cpuUsage > 80 ? Theme.error : (DgopService.cpuUsage > 50 ? Theme.warning : Theme.primary)
|
||||||
|
detailColor: DgopService.cpuTemperature > 85 ? Theme.error : (DgopService.cpuTemperature > 70 ? Theme.warning : Theme.surfaceVariantText)
|
||||||
|
}
|
||||||
|
|
||||||
|
CircleGauge {
|
||||||
|
width: statsContainer.gaugeSize
|
||||||
|
height: statsContainer.gaugeSize
|
||||||
|
value: DgopService.memoryUsage / 100
|
||||||
|
label: statsContainer.compactMem(DgopService.usedMemoryKB)
|
||||||
|
sublabel: I18n.tr("Memory")
|
||||||
|
detail: DgopService.totalSwapKB > 0 ? ("+" + statsContainer.compactMem(DgopService.usedSwapKB)) : ""
|
||||||
|
accentColor: DgopService.memoryUsage > 90 ? Theme.error : (DgopService.memoryUsage > 70 ? Theme.warning : Theme.secondary)
|
||||||
|
}
|
||||||
|
|
||||||
|
CircleGauge {
|
||||||
|
width: statsContainer.gaugeSize
|
||||||
|
height: statsContainer.gaugeSize
|
||||||
|
visible: statsContainer.hasGpu
|
||||||
|
|
||||||
|
readonly property var gpu: statsContainer.enabledGpusWithTemp[0] ?? null
|
||||||
|
readonly property color vendorColor: {
|
||||||
|
const vendor = (gpu?.vendor ?? "").toLowerCase();
|
||||||
|
if (vendor.includes("nvidia"))
|
||||||
|
return Theme.success;
|
||||||
|
if (vendor.includes("amd"))
|
||||||
|
return Theme.error;
|
||||||
|
if (vendor.includes("intel"))
|
||||||
|
return Theme.info;
|
||||||
|
return Theme.info;
|
||||||
|
}
|
||||||
|
|
||||||
|
value: Math.min(1, (gpu?.temperature ?? 0) / 100)
|
||||||
|
label: (gpu?.temperature ?? 0) > 0 ? ((gpu?.temperature ?? 0).toFixed(0) + "°C") : "--"
|
||||||
|
sublabel: "GPU"
|
||||||
|
accentColor: {
|
||||||
|
const temp = gpu?.temperature ?? 0;
|
||||||
|
if (temp > 85)
|
||||||
|
return Theme.error;
|
||||||
|
if (temp > 70)
|
||||||
|
return Theme.warning;
|
||||||
|
return vendorColor;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -112,16 +311,176 @@ DankPopout {
|
|||||||
Layout.fillHeight: true
|
Layout.fillHeight: true
|
||||||
radius: Theme.cornerRadius
|
radius: Theme.cornerRadius
|
||||||
color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
|
color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
|
||||||
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.05)
|
clip: true
|
||||||
border.width: 0
|
|
||||||
|
|
||||||
ProcessListView {
|
ProcessesView {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
anchors.margins: Theme.spacingS
|
anchors.margins: Theme.spacingS
|
||||||
|
searchText: processListPopout.searchText
|
||||||
|
expandedPid: processListPopout.expandedPid
|
||||||
contextMenu: processContextMenu
|
contextMenu: processContextMenu
|
||||||
|
onExpandedPidChanged: processListPopout.expandedPid = expandedPid
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
component CircleGauge: Item {
|
||||||
|
id: gaugeRoot
|
||||||
|
|
||||||
|
property real value: 0
|
||||||
|
property string label: ""
|
||||||
|
property string sublabel: ""
|
||||||
|
property string detail: ""
|
||||||
|
property color accentColor: Theme.primary
|
||||||
|
property color detailColor: Theme.surfaceVariantText
|
||||||
|
|
||||||
|
readonly property real thickness: Math.max(4, Math.min(width, height) / 15)
|
||||||
|
readonly property real glowExtra: thickness * 1.4
|
||||||
|
readonly property real arcPadding: thickness / 1.3
|
||||||
|
|
||||||
|
readonly property real innerDiameter: width - (arcPadding + thickness + glowExtra) * 2
|
||||||
|
readonly property real maxTextWidth: innerDiameter * 0.9
|
||||||
|
readonly property real baseLabelSize: Math.round(width * 0.18)
|
||||||
|
readonly property real labelSize: Math.round(Math.min(baseLabelSize, maxTextWidth / Math.max(1, label.length * 0.65)))
|
||||||
|
readonly property real sublabelSize: Math.round(Math.min(width * 0.13, maxTextWidth / Math.max(1, sublabel.length * 0.7)))
|
||||||
|
readonly property real detailSize: Math.round(Math.min(width * 0.12, maxTextWidth / Math.max(1, detail.length * 0.65)))
|
||||||
|
|
||||||
|
property real animValue: 0
|
||||||
|
|
||||||
|
onValueChanged: animValue = Math.min(1, Math.max(0, value))
|
||||||
|
|
||||||
|
Behavior on animValue {
|
||||||
|
NumberAnimation {
|
||||||
|
duration: Theme.mediumDuration
|
||||||
|
easing.type: Easing.OutCubic
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Component.onCompleted: animValue = Math.min(1, Math.max(0, value))
|
||||||
|
|
||||||
|
Canvas {
|
||||||
|
id: glowCanvas
|
||||||
|
anchors.fill: parent
|
||||||
|
onPaint: {
|
||||||
|
const ctx = getContext("2d");
|
||||||
|
ctx.reset();
|
||||||
|
const cx = width / 2;
|
||||||
|
const cy = height / 2;
|
||||||
|
const radius = (Math.min(width, height) / 2) - gaugeRoot.arcPadding;
|
||||||
|
const startAngle = -Math.PI * 0.5;
|
||||||
|
const endAngle = Math.PI * 1.5;
|
||||||
|
|
||||||
|
ctx.lineCap = "round";
|
||||||
|
|
||||||
|
if (gaugeRoot.animValue > 0) {
|
||||||
|
const prog = startAngle + (endAngle - startAngle) * gaugeRoot.animValue;
|
||||||
|
ctx.beginPath();
|
||||||
|
ctx.arc(cx, cy, radius, startAngle, prog);
|
||||||
|
ctx.strokeStyle = Qt.rgba(gaugeRoot.accentColor.r, gaugeRoot.accentColor.g, gaugeRoot.accentColor.b, 0.2);
|
||||||
|
ctx.lineWidth = gaugeRoot.thickness + gaugeRoot.glowExtra;
|
||||||
|
ctx.stroke();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Connections {
|
||||||
|
target: gaugeRoot
|
||||||
|
function onAnimValueChanged() {
|
||||||
|
glowCanvas.requestPaint();
|
||||||
|
}
|
||||||
|
function onAccentColorChanged() {
|
||||||
|
glowCanvas.requestPaint();
|
||||||
|
}
|
||||||
|
function onWidthChanged() {
|
||||||
|
glowCanvas.requestPaint();
|
||||||
|
}
|
||||||
|
function onHeightChanged() {
|
||||||
|
glowCanvas.requestPaint();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Component.onCompleted: requestPaint()
|
||||||
|
}
|
||||||
|
|
||||||
|
Canvas {
|
||||||
|
id: arcCanvas
|
||||||
|
anchors.fill: parent
|
||||||
|
onPaint: {
|
||||||
|
const ctx = getContext("2d");
|
||||||
|
ctx.reset();
|
||||||
|
const cx = width / 2;
|
||||||
|
const cy = height / 2;
|
||||||
|
const radius = (Math.min(width, height) / 2) - gaugeRoot.arcPadding;
|
||||||
|
const startAngle = -Math.PI * 0.5;
|
||||||
|
const endAngle = Math.PI * 1.5;
|
||||||
|
|
||||||
|
ctx.lineCap = "round";
|
||||||
|
|
||||||
|
ctx.beginPath();
|
||||||
|
ctx.arc(cx, cy, radius, startAngle, endAngle);
|
||||||
|
ctx.strokeStyle = Qt.rgba(gaugeRoot.accentColor.r, gaugeRoot.accentColor.g, gaugeRoot.accentColor.b, 0.1);
|
||||||
|
ctx.lineWidth = gaugeRoot.thickness;
|
||||||
|
ctx.stroke();
|
||||||
|
|
||||||
|
if (gaugeRoot.animValue > 0) {
|
||||||
|
const prog = startAngle + (endAngle - startAngle) * gaugeRoot.animValue;
|
||||||
|
ctx.beginPath();
|
||||||
|
ctx.arc(cx, cy, radius, startAngle, prog);
|
||||||
|
ctx.strokeStyle = gaugeRoot.accentColor;
|
||||||
|
ctx.lineWidth = gaugeRoot.thickness;
|
||||||
|
ctx.stroke();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Connections {
|
||||||
|
target: gaugeRoot
|
||||||
|
function onAnimValueChanged() {
|
||||||
|
arcCanvas.requestPaint();
|
||||||
|
}
|
||||||
|
function onAccentColorChanged() {
|
||||||
|
arcCanvas.requestPaint();
|
||||||
|
}
|
||||||
|
function onWidthChanged() {
|
||||||
|
arcCanvas.requestPaint();
|
||||||
|
}
|
||||||
|
function onHeightChanged() {
|
||||||
|
arcCanvas.requestPaint();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Component.onCompleted: requestPaint()
|
||||||
|
}
|
||||||
|
|
||||||
|
Column {
|
||||||
|
anchors.centerIn: parent
|
||||||
|
spacing: 1
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: gaugeRoot.label
|
||||||
|
font.pixelSize: gaugeRoot.labelSize
|
||||||
|
font.family: SettingsData.monoFontFamily
|
||||||
|
font.weight: Font.Bold
|
||||||
|
color: Theme.surfaceText
|
||||||
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
|
}
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: gaugeRoot.sublabel
|
||||||
|
font.pixelSize: gaugeRoot.sublabelSize
|
||||||
|
font.weight: Font.Medium
|
||||||
|
color: gaugeRoot.accentColor
|
||||||
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
|
}
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: gaugeRoot.detail
|
||||||
|
font.pixelSize: gaugeRoot.detailSize
|
||||||
|
font.family: SettingsData.monoFontFamily
|
||||||
|
color: gaugeRoot.detailColor
|
||||||
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
|
visible: gaugeRoot.detail.length > 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,264 +0,0 @@
|
|||||||
import QtQuick
|
|
||||||
import QtQuick.Controls
|
|
||||||
import Quickshell
|
|
||||||
import qs.Common
|
|
||||||
import qs.Services
|
|
||||||
import qs.Widgets
|
|
||||||
|
|
||||||
Column {
|
|
||||||
id: root
|
|
||||||
|
|
||||||
property var contextMenu: null
|
|
||||||
|
|
||||||
Component.onCompleted: {
|
|
||||||
DgopService.addRef(["processes"]);
|
|
||||||
}
|
|
||||||
Component.onDestruction: {
|
|
||||||
DgopService.removeRef(["processes"]);
|
|
||||||
}
|
|
||||||
|
|
||||||
Item {
|
|
||||||
id: columnHeaders
|
|
||||||
|
|
||||||
width: parent.width
|
|
||||||
anchors.leftMargin: 8
|
|
||||||
height: 24
|
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
width: 60
|
|
||||||
height: 20
|
|
||||||
color: {
|
|
||||||
if (DgopService.currentSort === "name") {
|
|
||||||
return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12);
|
|
||||||
}
|
|
||||||
return processHeaderArea.containsMouse ? Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.08) : Theme.withAlpha(Theme.surfaceText, 0);
|
|
||||||
}
|
|
||||||
radius: Theme.cornerRadius
|
|
||||||
anchors.left: parent.left
|
|
||||||
anchors.leftMargin: 0
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: I18n.tr("Process")
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
font.family: SettingsData.monoFontFamily
|
|
||||||
font.weight: DgopService.currentSort === "name" ? Font.Bold : Font.Medium
|
|
||||||
color: Theme.surfaceText
|
|
||||||
opacity: DgopService.currentSort === "name" ? 1 : 0.7
|
|
||||||
anchors.centerIn: parent
|
|
||||||
}
|
|
||||||
|
|
||||||
MouseArea {
|
|
||||||
id: processHeaderArea
|
|
||||||
|
|
||||||
anchors.fill: parent
|
|
||||||
hoverEnabled: true
|
|
||||||
cursorShape: Qt.PointingHandCursor
|
|
||||||
onClicked: {
|
|
||||||
DgopService.setSortBy("name");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Behavior on color {
|
|
||||||
ColorAnimation {
|
|
||||||
duration: Theme.shortDuration
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
width: 80
|
|
||||||
height: 20
|
|
||||||
color: {
|
|
||||||
if (DgopService.currentSort === "cpu") {
|
|
||||||
return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12);
|
|
||||||
}
|
|
||||||
return cpuHeaderArea.containsMouse ? Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.08) : Theme.withAlpha(Theme.surfaceText, 0);
|
|
||||||
}
|
|
||||||
radius: Theme.cornerRadius
|
|
||||||
anchors.right: parent.right
|
|
||||||
anchors.rightMargin: 200
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: "CPU"
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
font.family: SettingsData.monoFontFamily
|
|
||||||
font.weight: DgopService.currentSort === "cpu" ? Font.Bold : Font.Medium
|
|
||||||
color: Theme.surfaceText
|
|
||||||
opacity: DgopService.currentSort === "cpu" ? 1 : 0.7
|
|
||||||
anchors.centerIn: parent
|
|
||||||
}
|
|
||||||
|
|
||||||
MouseArea {
|
|
||||||
id: cpuHeaderArea
|
|
||||||
|
|
||||||
anchors.fill: parent
|
|
||||||
hoverEnabled: true
|
|
||||||
cursorShape: Qt.PointingHandCursor
|
|
||||||
onClicked: {
|
|
||||||
DgopService.setSortBy("cpu");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Behavior on color {
|
|
||||||
ColorAnimation {
|
|
||||||
duration: Theme.shortDuration
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
width: 80
|
|
||||||
height: 20
|
|
||||||
color: {
|
|
||||||
if (DgopService.currentSort === "memory") {
|
|
||||||
return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12);
|
|
||||||
}
|
|
||||||
return memoryHeaderArea.containsMouse ? Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.08) : Theme.withAlpha(Theme.surfaceText, 0);
|
|
||||||
}
|
|
||||||
radius: Theme.cornerRadius
|
|
||||||
anchors.right: parent.right
|
|
||||||
anchors.rightMargin: 112
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: "RAM"
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
font.family: SettingsData.monoFontFamily
|
|
||||||
font.weight: DgopService.currentSort === "memory" ? Font.Bold : Font.Medium
|
|
||||||
color: Theme.surfaceText
|
|
||||||
opacity: DgopService.currentSort === "memory" ? 1 : 0.7
|
|
||||||
anchors.centerIn: parent
|
|
||||||
}
|
|
||||||
|
|
||||||
MouseArea {
|
|
||||||
id: memoryHeaderArea
|
|
||||||
|
|
||||||
anchors.fill: parent
|
|
||||||
hoverEnabled: true
|
|
||||||
cursorShape: Qt.PointingHandCursor
|
|
||||||
onClicked: {
|
|
||||||
DgopService.setSortBy("memory");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Behavior on color {
|
|
||||||
ColorAnimation {
|
|
||||||
duration: Theme.shortDuration
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
width: 50
|
|
||||||
height: 20
|
|
||||||
color: {
|
|
||||||
if (DgopService.currentSort === "pid") {
|
|
||||||
return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12);
|
|
||||||
}
|
|
||||||
return pidHeaderArea.containsMouse ? Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.08) : Theme.withAlpha(Theme.surfaceText, 0);
|
|
||||||
}
|
|
||||||
radius: Theme.cornerRadius
|
|
||||||
anchors.right: parent.right
|
|
||||||
anchors.rightMargin: 53
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: "PID"
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
font.family: SettingsData.monoFontFamily
|
|
||||||
font.weight: DgopService.currentSort === "pid" ? Font.Bold : Font.Medium
|
|
||||||
color: Theme.surfaceText
|
|
||||||
opacity: DgopService.currentSort === "pid" ? 1 : 0.7
|
|
||||||
horizontalAlignment: Text.AlignHCenter
|
|
||||||
anchors.centerIn: parent
|
|
||||||
}
|
|
||||||
|
|
||||||
MouseArea {
|
|
||||||
id: pidHeaderArea
|
|
||||||
|
|
||||||
anchors.fill: parent
|
|
||||||
hoverEnabled: true
|
|
||||||
cursorShape: Qt.PointingHandCursor
|
|
||||||
onClicked: {
|
|
||||||
DgopService.setSortBy("pid");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Behavior on color {
|
|
||||||
ColorAnimation {
|
|
||||||
duration: Theme.shortDuration
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
width: 28
|
|
||||||
height: 28
|
|
||||||
radius: Theme.cornerRadius
|
|
||||||
color: sortOrderArea.containsMouse ? Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.08) : Theme.withAlpha(Theme.surfaceText, 0)
|
|
||||||
anchors.right: parent.right
|
|
||||||
anchors.rightMargin: 8
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: DgopService.sortDescending ? "↓" : "↑"
|
|
||||||
font.pixelSize: Theme.fontSizeMedium
|
|
||||||
color: Theme.surfaceText
|
|
||||||
anchors.centerIn: parent
|
|
||||||
}
|
|
||||||
|
|
||||||
MouseArea {
|
|
||||||
// TODO: Re-implement sort order toggle
|
|
||||||
|
|
||||||
id: sortOrderArea
|
|
||||||
|
|
||||||
anchors.fill: parent
|
|
||||||
hoverEnabled: true
|
|
||||||
cursorShape: Qt.PointingHandCursor
|
|
||||||
onClicked: {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Behavior on color {
|
|
||||||
ColorAnimation {
|
|
||||||
duration: Theme.shortDuration
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
DankListView {
|
|
||||||
id: processListView
|
|
||||||
|
|
||||||
property string keyRoleName: "pid"
|
|
||||||
|
|
||||||
width: parent.width
|
|
||||||
height: parent.height - columnHeaders.height
|
|
||||||
clip: true
|
|
||||||
spacing: 4
|
|
||||||
model: ScriptModel {
|
|
||||||
values: DgopService.processes
|
|
||||||
objectProp: "pid"
|
|
||||||
}
|
|
||||||
|
|
||||||
delegate: ProcessListItem {
|
|
||||||
process: modelData
|
|
||||||
contextMenu: root.contextMenu
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
import QtQuick
|
|
||||||
import QtQuick.Layouts
|
|
||||||
import qs.Common
|
|
||||||
import qs.Modules.ProcessList
|
|
||||||
import qs.Services
|
|
||||||
|
|
||||||
ColumnLayout {
|
|
||||||
id: processesTab
|
|
||||||
|
|
||||||
property var contextMenu: null
|
|
||||||
|
|
||||||
anchors.fill: parent
|
|
||||||
spacing: Theme.spacingM
|
|
||||||
|
|
||||||
SystemOverview {
|
|
||||||
Layout.fillWidth: true
|
|
||||||
}
|
|
||||||
|
|
||||||
ProcessListView {
|
|
||||||
Layout.fillWidth: true
|
|
||||||
Layout.fillHeight: true
|
|
||||||
contextMenu: processesTab.contextMenu
|
|
||||||
}
|
|
||||||
|
|
||||||
ProcessContextMenu {
|
|
||||||
id: localContextMenu
|
|
||||||
}
|
|
||||||
}
|
|
||||||
607
quickshell/Modules/ProcessList/ProcessesView.qml
Normal file
607
quickshell/Modules/ProcessList/ProcessesView.qml
Normal file
@@ -0,0 +1,607 @@
|
|||||||
|
import QtQuick
|
||||||
|
import QtQuick.Layouts
|
||||||
|
import Quickshell
|
||||||
|
import qs.Common
|
||||||
|
import qs.Services
|
||||||
|
import qs.Widgets
|
||||||
|
|
||||||
|
Item {
|
||||||
|
id: root
|
||||||
|
|
||||||
|
property string searchText: ""
|
||||||
|
property string expandedPid: ""
|
||||||
|
property var contextMenu: null
|
||||||
|
property bool hoveringExpandedItem: false
|
||||||
|
|
||||||
|
readonly property bool pauseUpdates: hoveringExpandedItem || (contextMenu?.visible ?? false)
|
||||||
|
property var cachedProcesses: []
|
||||||
|
|
||||||
|
onFilteredProcessesChanged: {
|
||||||
|
if (!pauseUpdates)
|
||||||
|
cachedProcesses = filteredProcesses;
|
||||||
|
}
|
||||||
|
|
||||||
|
onPauseUpdatesChanged: {
|
||||||
|
if (!pauseUpdates)
|
||||||
|
cachedProcesses = filteredProcesses;
|
||||||
|
}
|
||||||
|
|
||||||
|
readonly property var filteredProcesses: {
|
||||||
|
if (!DgopService.allProcesses || DgopService.allProcesses.length === 0)
|
||||||
|
return [];
|
||||||
|
|
||||||
|
let procs = DgopService.allProcesses.slice();
|
||||||
|
|
||||||
|
if (searchText.length > 0) {
|
||||||
|
const search = searchText.toLowerCase();
|
||||||
|
procs = procs.filter(p => {
|
||||||
|
const cmd = (p.command || "").toLowerCase();
|
||||||
|
const fullCmd = (p.fullCommand || "").toLowerCase();
|
||||||
|
const pid = p.pid.toString();
|
||||||
|
return cmd.includes(search) || fullCmd.includes(search) || pid.includes(search);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
const asc = DgopService.sortAscending;
|
||||||
|
procs.sort((a, b) => {
|
||||||
|
let valueA, valueB, result;
|
||||||
|
switch (DgopService.currentSort) {
|
||||||
|
case "cpu":
|
||||||
|
valueA = a.cpu || 0;
|
||||||
|
valueB = b.cpu || 0;
|
||||||
|
result = valueB - valueA;
|
||||||
|
break;
|
||||||
|
case "memory":
|
||||||
|
valueA = a.memoryKB || 0;
|
||||||
|
valueB = b.memoryKB || 0;
|
||||||
|
result = valueB - valueA;
|
||||||
|
break;
|
||||||
|
case "name":
|
||||||
|
valueA = (a.command || "").toLowerCase();
|
||||||
|
valueB = (b.command || "").toLowerCase();
|
||||||
|
result = valueA.localeCompare(valueB);
|
||||||
|
break;
|
||||||
|
case "pid":
|
||||||
|
valueA = a.pid || 0;
|
||||||
|
valueB = b.pid || 0;
|
||||||
|
result = valueA - valueB;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
return asc ? -result : result;
|
||||||
|
});
|
||||||
|
|
||||||
|
return procs;
|
||||||
|
}
|
||||||
|
|
||||||
|
Component.onCompleted: {
|
||||||
|
DgopService.addRef(["processes", "cpu", "memory", "system"]);
|
||||||
|
cachedProcesses = filteredProcesses;
|
||||||
|
}
|
||||||
|
|
||||||
|
Component.onDestruction: {
|
||||||
|
DgopService.removeRef(["processes", "cpu", "memory", "system"]);
|
||||||
|
}
|
||||||
|
|
||||||
|
ColumnLayout {
|
||||||
|
anchors.fill: parent
|
||||||
|
spacing: 0
|
||||||
|
|
||||||
|
Item {
|
||||||
|
Layout.fillWidth: true
|
||||||
|
Layout.preferredHeight: 36
|
||||||
|
|
||||||
|
RowLayout {
|
||||||
|
anchors.fill: parent
|
||||||
|
anchors.leftMargin: Theme.spacingS
|
||||||
|
anchors.rightMargin: Theme.spacingS
|
||||||
|
spacing: 0
|
||||||
|
|
||||||
|
SortableHeader {
|
||||||
|
Layout.fillWidth: true
|
||||||
|
Layout.minimumWidth: 200
|
||||||
|
text: I18n.tr("Name")
|
||||||
|
sortKey: "name"
|
||||||
|
currentSort: DgopService.currentSort
|
||||||
|
sortAscending: DgopService.sortAscending
|
||||||
|
onClicked: DgopService.toggleSort("name")
|
||||||
|
alignment: Text.AlignLeft
|
||||||
|
}
|
||||||
|
|
||||||
|
SortableHeader {
|
||||||
|
Layout.preferredWidth: 100
|
||||||
|
text: "CPU"
|
||||||
|
sortKey: "cpu"
|
||||||
|
currentSort: DgopService.currentSort
|
||||||
|
sortAscending: DgopService.sortAscending
|
||||||
|
onClicked: DgopService.toggleSort("cpu")
|
||||||
|
}
|
||||||
|
|
||||||
|
SortableHeader {
|
||||||
|
Layout.preferredWidth: 100
|
||||||
|
text: I18n.tr("Memory")
|
||||||
|
sortKey: "memory"
|
||||||
|
currentSort: DgopService.currentSort
|
||||||
|
sortAscending: DgopService.sortAscending
|
||||||
|
onClicked: DgopService.toggleSort("memory")
|
||||||
|
}
|
||||||
|
|
||||||
|
SortableHeader {
|
||||||
|
Layout.preferredWidth: 80
|
||||||
|
text: "PID"
|
||||||
|
sortKey: "pid"
|
||||||
|
currentSort: DgopService.currentSort
|
||||||
|
sortAscending: DgopService.sortAscending
|
||||||
|
onClicked: DgopService.toggleSort("pid")
|
||||||
|
}
|
||||||
|
|
||||||
|
Item {
|
||||||
|
Layout.preferredWidth: 40
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Rectangle {
|
||||||
|
Layout.fillWidth: true
|
||||||
|
Layout.preferredHeight: 1
|
||||||
|
color: Theme.outlineLight
|
||||||
|
}
|
||||||
|
|
||||||
|
DankListView {
|
||||||
|
id: processListView
|
||||||
|
|
||||||
|
Layout.fillWidth: true
|
||||||
|
Layout.fillHeight: true
|
||||||
|
clip: true
|
||||||
|
spacing: 2
|
||||||
|
|
||||||
|
model: ScriptModel {
|
||||||
|
values: root.cachedProcesses
|
||||||
|
objectProp: "pid"
|
||||||
|
}
|
||||||
|
|
||||||
|
delegate: ProcessItem {
|
||||||
|
required property var modelData
|
||||||
|
|
||||||
|
width: processListView.width
|
||||||
|
process: modelData
|
||||||
|
isExpanded: root.expandedPid === (modelData?.pid ?? -1).toString()
|
||||||
|
contextMenu: root.contextMenu
|
||||||
|
onToggleExpand: {
|
||||||
|
const pidStr = (modelData?.pid ?? -1).toString();
|
||||||
|
root.expandedPid = (root.expandedPid === pidStr) ? "" : pidStr;
|
||||||
|
}
|
||||||
|
onHoveringExpandedChanged: {
|
||||||
|
if (hoveringExpanded)
|
||||||
|
root.hoveringExpandedItem = true;
|
||||||
|
else
|
||||||
|
Qt.callLater(() => {
|
||||||
|
root.hoveringExpandedItem = false;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Rectangle {
|
||||||
|
anchors.centerIn: parent
|
||||||
|
width: 300
|
||||||
|
height: 100
|
||||||
|
radius: Theme.cornerRadius
|
||||||
|
color: "transparent"
|
||||||
|
visible: root.cachedProcesses.length === 0
|
||||||
|
|
||||||
|
Column {
|
||||||
|
anchors.centerIn: parent
|
||||||
|
spacing: Theme.spacingM
|
||||||
|
|
||||||
|
DankIcon {
|
||||||
|
name: root.searchText.length > 0 ? "search_off" : "hourglass_empty"
|
||||||
|
size: 32
|
||||||
|
color: Theme.surfaceVariantText
|
||||||
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
|
}
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: I18n.tr("No matching processes", "empty state in process list")
|
||||||
|
font.pixelSize: Theme.fontSizeMedium
|
||||||
|
color: Theme.surfaceVariantText
|
||||||
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
|
visible: root.searchText.length > 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
component SortableHeader: Item {
|
||||||
|
id: headerItem
|
||||||
|
|
||||||
|
property string text: ""
|
||||||
|
property string sortKey: ""
|
||||||
|
property string currentSort: ""
|
||||||
|
property bool sortAscending: false
|
||||||
|
property int alignment: Text.AlignHCenter
|
||||||
|
|
||||||
|
signal clicked
|
||||||
|
|
||||||
|
readonly property bool isActive: sortKey === currentSort
|
||||||
|
|
||||||
|
height: 36
|
||||||
|
|
||||||
|
Rectangle {
|
||||||
|
anchors.fill: parent
|
||||||
|
anchors.margins: 2
|
||||||
|
radius: Theme.cornerRadius
|
||||||
|
color: headerItem.isActive ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : (headerMouseArea.containsMouse ? Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.06) : "transparent")
|
||||||
|
|
||||||
|
Behavior on color {
|
||||||
|
ColorAnimation {
|
||||||
|
duration: Theme.shortDuration
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
RowLayout {
|
||||||
|
anchors.fill: parent
|
||||||
|
anchors.leftMargin: Theme.spacingS
|
||||||
|
anchors.rightMargin: Theme.spacingS
|
||||||
|
spacing: 4
|
||||||
|
|
||||||
|
Item {
|
||||||
|
Layout.fillWidth: headerItem.alignment === Text.AlignLeft
|
||||||
|
visible: headerItem.alignment !== Text.AlignLeft
|
||||||
|
}
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: headerItem.text
|
||||||
|
font.pixelSize: Theme.fontSizeSmall
|
||||||
|
font.family: SettingsData.monoFontFamily
|
||||||
|
font.weight: headerItem.isActive ? Font.Bold : Font.Medium
|
||||||
|
color: headerItem.isActive ? Theme.primary : Theme.surfaceText
|
||||||
|
opacity: headerItem.isActive ? 1 : 0.8
|
||||||
|
}
|
||||||
|
|
||||||
|
DankIcon {
|
||||||
|
name: headerItem.sortAscending ? "arrow_upward" : "arrow_downward"
|
||||||
|
size: Theme.fontSizeSmall
|
||||||
|
color: Theme.primary
|
||||||
|
visible: headerItem.isActive
|
||||||
|
}
|
||||||
|
|
||||||
|
Item {
|
||||||
|
Layout.fillWidth: headerItem.alignment !== Text.AlignLeft
|
||||||
|
visible: headerItem.alignment === Text.AlignLeft
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
MouseArea {
|
||||||
|
id: headerMouseArea
|
||||||
|
anchors.fill: parent
|
||||||
|
hoverEnabled: true
|
||||||
|
cursorShape: Qt.PointingHandCursor
|
||||||
|
onClicked: headerItem.clicked()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
component ProcessItem: Rectangle {
|
||||||
|
id: processItemRoot
|
||||||
|
|
||||||
|
property var process: null
|
||||||
|
property bool isExpanded: false
|
||||||
|
property var contextMenu: null
|
||||||
|
readonly property bool hoveringExpanded: (isExpanded && processMouseArea.containsMouse) || copyMouseArea.containsMouse
|
||||||
|
|
||||||
|
signal toggleExpand
|
||||||
|
|
||||||
|
readonly property int processPid: process?.pid ?? 0
|
||||||
|
readonly property real processCpu: process?.cpu ?? 0
|
||||||
|
readonly property int processMemKB: process?.memoryKB ?? 0
|
||||||
|
readonly property string processCmd: process?.command ?? ""
|
||||||
|
readonly property string processFullCmd: process?.fullCommand ?? processCmd
|
||||||
|
|
||||||
|
height: isExpanded ? (44 + expandedRect.height + Theme.spacingXS) : 44
|
||||||
|
radius: Theme.cornerRadius
|
||||||
|
color: processMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.06) : "transparent"
|
||||||
|
border.color: processMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent"
|
||||||
|
border.width: 1
|
||||||
|
clip: true
|
||||||
|
|
||||||
|
Behavior on height {
|
||||||
|
NumberAnimation {
|
||||||
|
duration: Theme.shortDuration
|
||||||
|
easing.type: Theme.standardEasing
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Behavior on color {
|
||||||
|
ColorAnimation {
|
||||||
|
duration: Theme.shortDuration
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
MouseArea {
|
||||||
|
id: processMouseArea
|
||||||
|
anchors.fill: parent
|
||||||
|
hoverEnabled: true
|
||||||
|
cursorShape: Qt.PointingHandCursor
|
||||||
|
acceptedButtons: Qt.LeftButton | Qt.RightButton
|
||||||
|
onClicked: mouse => {
|
||||||
|
if (mouse.button === Qt.RightButton) {
|
||||||
|
if (processItemRoot.processPid > 0 && processItemRoot.contextMenu) {
|
||||||
|
processItemRoot.contextMenu.processData = processItemRoot.process;
|
||||||
|
const globalPos = processMouseArea.mapToGlobal(mouse.x, mouse.y);
|
||||||
|
const localPos = processItemRoot.contextMenu.parent ? processItemRoot.contextMenu.parent.mapFromGlobal(globalPos.x, globalPos.y) : globalPos;
|
||||||
|
processItemRoot.contextMenu.show(localPos.x, localPos.y);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
processItemRoot.toggleExpand();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Column {
|
||||||
|
anchors.fill: parent
|
||||||
|
spacing: 0
|
||||||
|
|
||||||
|
Item {
|
||||||
|
width: parent.width
|
||||||
|
height: 44
|
||||||
|
|
||||||
|
RowLayout {
|
||||||
|
anchors.fill: parent
|
||||||
|
anchors.leftMargin: Theme.spacingS
|
||||||
|
anchors.rightMargin: Theme.spacingS
|
||||||
|
spacing: 0
|
||||||
|
|
||||||
|
Item {
|
||||||
|
Layout.fillWidth: true
|
||||||
|
Layout.minimumWidth: 200
|
||||||
|
height: parent.height
|
||||||
|
|
||||||
|
Row {
|
||||||
|
anchors.left: parent.left
|
||||||
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
spacing: Theme.spacingS
|
||||||
|
|
||||||
|
DankIcon {
|
||||||
|
name: DgopService.getProcessIcon(processItemRoot.processCmd)
|
||||||
|
size: Theme.iconSize - 4
|
||||||
|
color: {
|
||||||
|
if (processItemRoot.processCpu > 80)
|
||||||
|
return Theme.error;
|
||||||
|
if (processItemRoot.processCpu > 50)
|
||||||
|
return Theme.warning;
|
||||||
|
return Theme.surfaceText;
|
||||||
|
}
|
||||||
|
opacity: 0.8
|
||||||
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
}
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: processItemRoot.processCmd
|
||||||
|
font.pixelSize: Theme.fontSizeSmall
|
||||||
|
font.family: SettingsData.monoFontFamily
|
||||||
|
font.weight: Font.Medium
|
||||||
|
color: Theme.surfaceText
|
||||||
|
elide: Text.ElideRight
|
||||||
|
width: Math.min(implicitWidth, 280)
|
||||||
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Item {
|
||||||
|
Layout.preferredWidth: 100
|
||||||
|
height: parent.height
|
||||||
|
|
||||||
|
Rectangle {
|
||||||
|
anchors.centerIn: parent
|
||||||
|
width: 70
|
||||||
|
height: 24
|
||||||
|
radius: Theme.cornerRadius
|
||||||
|
color: {
|
||||||
|
if (processItemRoot.processCpu > 80)
|
||||||
|
return Qt.rgba(Theme.error.r, Theme.error.g, Theme.error.b, 0.15);
|
||||||
|
if (processItemRoot.processCpu > 50)
|
||||||
|
return Qt.rgba(Theme.warning.r, Theme.warning.g, Theme.warning.b, 0.12);
|
||||||
|
return Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.06);
|
||||||
|
}
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
anchors.centerIn: parent
|
||||||
|
text: DgopService.formatCpuUsage(processItemRoot.processCpu)
|
||||||
|
font.pixelSize: Theme.fontSizeSmall
|
||||||
|
font.family: SettingsData.monoFontFamily
|
||||||
|
font.weight: Font.Bold
|
||||||
|
color: {
|
||||||
|
if (processItemRoot.processCpu > 80)
|
||||||
|
return Theme.error;
|
||||||
|
if (processItemRoot.processCpu > 50)
|
||||||
|
return Theme.warning;
|
||||||
|
return Theme.surfaceText;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Item {
|
||||||
|
Layout.preferredWidth: 100
|
||||||
|
height: parent.height
|
||||||
|
|
||||||
|
Rectangle {
|
||||||
|
anchors.centerIn: parent
|
||||||
|
width: 70
|
||||||
|
height: 24
|
||||||
|
radius: Theme.cornerRadius
|
||||||
|
color: {
|
||||||
|
if (processItemRoot.processMemKB > 2 * 1024 * 1024)
|
||||||
|
return Qt.rgba(Theme.error.r, Theme.error.g, Theme.error.b, 0.15);
|
||||||
|
if (processItemRoot.processMemKB > 1024 * 1024)
|
||||||
|
return Qt.rgba(Theme.warning.r, Theme.warning.g, Theme.warning.b, 0.12);
|
||||||
|
return Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.06);
|
||||||
|
}
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
anchors.centerIn: parent
|
||||||
|
text: DgopService.formatMemoryUsage(processItemRoot.processMemKB)
|
||||||
|
font.pixelSize: Theme.fontSizeSmall
|
||||||
|
font.family: SettingsData.monoFontFamily
|
||||||
|
font.weight: Font.Bold
|
||||||
|
color: {
|
||||||
|
if (processItemRoot.processMemKB > 2 * 1024 * 1024)
|
||||||
|
return Theme.error;
|
||||||
|
if (processItemRoot.processMemKB > 1024 * 1024)
|
||||||
|
return Theme.warning;
|
||||||
|
return Theme.surfaceText;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Item {
|
||||||
|
Layout.preferredWidth: 80
|
||||||
|
height: parent.height
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
anchors.centerIn: parent
|
||||||
|
text: processItemRoot.processPid > 0 ? processItemRoot.processPid.toString() : ""
|
||||||
|
font.pixelSize: Theme.fontSizeSmall
|
||||||
|
font.family: SettingsData.monoFontFamily
|
||||||
|
color: Theme.surfaceVariantText
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Item {
|
||||||
|
Layout.preferredWidth: 40
|
||||||
|
height: parent.height
|
||||||
|
|
||||||
|
DankIcon {
|
||||||
|
anchors.centerIn: parent
|
||||||
|
name: processItemRoot.isExpanded ? "expand_less" : "expand_more"
|
||||||
|
size: Theme.iconSize - 4
|
||||||
|
color: Theme.surfaceVariantText
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Rectangle {
|
||||||
|
id: expandedRect
|
||||||
|
width: parent.width - Theme.spacingM * 2
|
||||||
|
height: processItemRoot.isExpanded ? (expandedContent.implicitHeight + Theme.spacingS * 2) : 0
|
||||||
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
|
radius: Theme.cornerRadius - 2
|
||||||
|
color: Qt.rgba(Theme.surfaceContainerHigh.r, Theme.surfaceContainerHigh.g, Theme.surfaceContainerHigh.b, 0.6)
|
||||||
|
clip: true
|
||||||
|
visible: processItemRoot.isExpanded
|
||||||
|
|
||||||
|
Behavior on height {
|
||||||
|
NumberAnimation {
|
||||||
|
duration: Theme.shortDuration
|
||||||
|
easing.type: Theme.standardEasing
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Column {
|
||||||
|
id: expandedContent
|
||||||
|
anchors.left: parent.left
|
||||||
|
anchors.right: parent.right
|
||||||
|
anchors.top: parent.top
|
||||||
|
anchors.margins: Theme.spacingS
|
||||||
|
spacing: Theme.spacingXS
|
||||||
|
|
||||||
|
RowLayout {
|
||||||
|
width: parent.width
|
||||||
|
spacing: Theme.spacingS
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
id: cmdLabel
|
||||||
|
text: I18n.tr("Full Command:", "process detail label")
|
||||||
|
font.pixelSize: Theme.fontSizeSmall - 2
|
||||||
|
font.weight: Font.Bold
|
||||||
|
color: Theme.surfaceVariantText
|
||||||
|
Layout.alignment: Qt.AlignVCenter
|
||||||
|
}
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
id: cmdText
|
||||||
|
text: processItemRoot.processFullCmd
|
||||||
|
font.pixelSize: Theme.fontSizeSmall - 2
|
||||||
|
font.family: SettingsData.monoFontFamily
|
||||||
|
color: Theme.surfaceText
|
||||||
|
Layout.fillWidth: true
|
||||||
|
Layout.alignment: Qt.AlignVCenter
|
||||||
|
elide: Text.ElideMiddle
|
||||||
|
}
|
||||||
|
|
||||||
|
Rectangle {
|
||||||
|
id: copyBtn
|
||||||
|
Layout.preferredWidth: 24
|
||||||
|
Layout.preferredHeight: 24
|
||||||
|
Layout.alignment: Qt.AlignVCenter
|
||||||
|
radius: Theme.cornerRadius - 2
|
||||||
|
color: copyMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.15) : "transparent"
|
||||||
|
|
||||||
|
DankIcon {
|
||||||
|
anchors.centerIn: parent
|
||||||
|
name: "content_copy"
|
||||||
|
size: 14
|
||||||
|
color: copyMouseArea.containsMouse ? Theme.primary : Theme.surfaceVariantText
|
||||||
|
}
|
||||||
|
|
||||||
|
MouseArea {
|
||||||
|
id: copyMouseArea
|
||||||
|
anchors.fill: parent
|
||||||
|
hoverEnabled: true
|
||||||
|
cursorShape: Qt.PointingHandCursor
|
||||||
|
onClicked: {
|
||||||
|
Quickshell.execDetached(["dms", "cl", "copy", processItemRoot.processFullCmd]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
spacing: Theme.spacingL
|
||||||
|
|
||||||
|
Row {
|
||||||
|
spacing: Theme.spacingXS
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: "PPID:"
|
||||||
|
font.pixelSize: Theme.fontSizeSmall - 2
|
||||||
|
font.weight: Font.Bold
|
||||||
|
color: Theme.surfaceVariantText
|
||||||
|
}
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: (processItemRoot.process?.ppid ?? 0) > 0 ? processItemRoot.process.ppid.toString() : "--"
|
||||||
|
font.pixelSize: Theme.fontSizeSmall - 2
|
||||||
|
font.family: SettingsData.monoFontFamily
|
||||||
|
color: Theme.surfaceText
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
spacing: Theme.spacingXS
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: "Mem:"
|
||||||
|
font.pixelSize: Theme.fontSizeSmall - 2
|
||||||
|
font.weight: Font.Bold
|
||||||
|
color: Theme.surfaceVariantText
|
||||||
|
}
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: (processItemRoot.process?.memoryPercent ?? 0).toFixed(1) + "%"
|
||||||
|
font.pixelSize: Theme.fontSizeSmall - 2
|
||||||
|
font.family: SettingsData.monoFontFamily
|
||||||
|
color: Theme.surfaceText
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,435 +0,0 @@
|
|||||||
import QtQuick
|
|
||||||
import QtQuick.Controls
|
|
||||||
import qs.Common
|
|
||||||
import qs.Services
|
|
||||||
import qs.Widgets
|
|
||||||
|
|
||||||
Row {
|
|
||||||
width: parent.width
|
|
||||||
spacing: Theme.spacingM
|
|
||||||
Component.onCompleted: {
|
|
||||||
DgopService.addRef(["cpu", "memory", "system"]);
|
|
||||||
}
|
|
||||||
Component.onDestruction: {
|
|
||||||
DgopService.removeRef(["cpu", "memory", "system"]);
|
|
||||||
}
|
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
width: (parent.width - Theme.spacingM * 2) / 3
|
|
||||||
height: 80
|
|
||||||
radius: Theme.cornerRadius
|
|
||||||
color: {
|
|
||||||
if (DgopService.sortBy === "cpu") {
|
|
||||||
return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.16);
|
|
||||||
} else if (cpuCardMouseArea.containsMouse) {
|
|
||||||
return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12);
|
|
||||||
} else {
|
|
||||||
return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
border.color: DgopService.sortBy === "cpu" ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.4) : Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.2)
|
|
||||||
border.width: DgopService.sortBy === "cpu" ? 2 : 1
|
|
||||||
|
|
||||||
MouseArea {
|
|
||||||
id: cpuCardMouseArea
|
|
||||||
|
|
||||||
anchors.fill: parent
|
|
||||||
hoverEnabled: true
|
|
||||||
cursorShape: Qt.PointingHandCursor
|
|
||||||
onClicked: {
|
|
||||||
DgopService.setSortBy("cpu");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Column {
|
|
||||||
anchors.left: parent.left
|
|
||||||
anchors.leftMargin: Theme.spacingM
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
spacing: 2
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: I18n.tr("CPU")
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
font.weight: Font.Medium
|
|
||||||
color: DgopService.sortBy === "cpu" ? Theme.primary : Theme.secondary
|
|
||||||
opacity: DgopService.sortBy === "cpu" ? 1 : 0.8
|
|
||||||
}
|
|
||||||
|
|
||||||
Row {
|
|
||||||
spacing: Theme.spacingS
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: {
|
|
||||||
if (DgopService.cpuUsage === undefined || DgopService.cpuUsage === null) {
|
|
||||||
return "--%";
|
|
||||||
}
|
|
||||||
return DgopService.cpuUsage.toFixed(1) + "%";
|
|
||||||
}
|
|
||||||
font.pixelSize: Theme.fontSizeLarge
|
|
||||||
font.family: SettingsData.monoFontFamily
|
|
||||||
font.weight: Font.Bold
|
|
||||||
color: Theme.surfaceText
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
}
|
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
width: 1
|
|
||||||
height: 20
|
|
||||||
color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.3)
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
}
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: {
|
|
||||||
if (DgopService.cpuTemperature === undefined || DgopService.cpuTemperature === null || DgopService.cpuTemperature <= 0) {
|
|
||||||
return "--°";
|
|
||||||
}
|
|
||||||
return Math.round(DgopService.cpuTemperature) + "°";
|
|
||||||
}
|
|
||||||
font.pixelSize: Theme.fontSizeMedium
|
|
||||||
font.family: SettingsData.monoFontFamily
|
|
||||||
font.weight: Font.Medium
|
|
||||||
color: {
|
|
||||||
if (DgopService.cpuTemperature > 80) {
|
|
||||||
return Theme.error;
|
|
||||||
}
|
|
||||||
if (DgopService.cpuTemperature > 60) {
|
|
||||||
return Theme.warning;
|
|
||||||
}
|
|
||||||
return Theme.surfaceText;
|
|
||||||
}
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: `${DgopService.cpuCores} cores`
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
font.family: SettingsData.monoFontFamily
|
|
||||||
color: Theme.surfaceText
|
|
||||||
opacity: 0.7
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
Behavior on color {
|
|
||||||
ColorAnimation {
|
|
||||||
duration: Theme.shortDuration
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
Behavior on border.color {
|
|
||||||
ColorAnimation {
|
|
||||||
duration: Theme.shortDuration
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
width: (parent.width - Theme.spacingM * 2) / 3
|
|
||||||
height: 80
|
|
||||||
radius: Theme.cornerRadius
|
|
||||||
color: {
|
|
||||||
if (DgopService.sortBy === "memory") {
|
|
||||||
return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.16);
|
|
||||||
} else if (memoryCardMouseArea.containsMouse) {
|
|
||||||
return Qt.rgba(Theme.secondary.r, Theme.secondary.g, Theme.secondary.b, 0.12);
|
|
||||||
} else {
|
|
||||||
return Qt.rgba(Theme.secondary.r, Theme.secondary.g, Theme.secondary.b, 0.08);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
border.color: DgopService.sortBy === "memory" ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.4) : Qt.rgba(Theme.secondary.r, Theme.secondary.g, Theme.secondary.b, 0.2)
|
|
||||||
border.width: DgopService.sortBy === "memory" ? 2 : 1
|
|
||||||
|
|
||||||
MouseArea {
|
|
||||||
id: memoryCardMouseArea
|
|
||||||
|
|
||||||
anchors.fill: parent
|
|
||||||
hoverEnabled: true
|
|
||||||
cursorShape: Qt.PointingHandCursor
|
|
||||||
onClicked: {
|
|
||||||
DgopService.setSortBy("memory");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Column {
|
|
||||||
anchors.left: parent.left
|
|
||||||
anchors.leftMargin: Theme.spacingM
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
spacing: 2
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: I18n.tr("Memory")
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
font.weight: Font.Medium
|
|
||||||
color: DgopService.sortBy === "memory" ? Theme.primary : Theme.secondary
|
|
||||||
opacity: DgopService.sortBy === "memory" ? 1 : 0.8
|
|
||||||
}
|
|
||||||
|
|
||||||
Row {
|
|
||||||
spacing: Theme.spacingS
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: DgopService.formatSystemMemory(DgopService.usedMemoryKB)
|
|
||||||
font.pixelSize: Theme.fontSizeLarge
|
|
||||||
font.family: SettingsData.monoFontFamily
|
|
||||||
font.weight: Font.Bold
|
|
||||||
color: Theme.surfaceText
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
}
|
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
width: 1
|
|
||||||
height: 20
|
|
||||||
color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.3)
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
visible: DgopService.totalSwapKB > 0
|
|
||||||
}
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: DgopService.totalSwapKB > 0 ? DgopService.formatSystemMemory(DgopService.usedSwapKB) : ""
|
|
||||||
font.pixelSize: Theme.fontSizeMedium
|
|
||||||
font.family: SettingsData.monoFontFamily
|
|
||||||
font.weight: Font.Medium
|
|
||||||
color: Theme.surfaceText
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
visible: DgopService.totalSwapKB > 0
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: {
|
|
||||||
if (DgopService.totalSwapKB > 0) {
|
|
||||||
return "of " + DgopService.formatSystemMemory(DgopService.totalMemoryKB) + " + swap";
|
|
||||||
}
|
|
||||||
return "of " + DgopService.formatSystemMemory(DgopService.totalMemoryKB);
|
|
||||||
}
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
font.family: SettingsData.monoFontFamily
|
|
||||||
color: Theme.surfaceText
|
|
||||||
opacity: 0.7
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
Behavior on color {
|
|
||||||
ColorAnimation {
|
|
||||||
duration: Theme.shortDuration
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
Behavior on border.color {
|
|
||||||
ColorAnimation {
|
|
||||||
duration: Theme.shortDuration
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
width: (parent.width - Theme.spacingM * 2) / 3
|
|
||||||
height: 80
|
|
||||||
radius: Theme.cornerRadius
|
|
||||||
color: {
|
|
||||||
if (!DgopService.availableGpus || DgopService.availableGpus.length === 0) {
|
|
||||||
if (gpuCardMouseArea.containsMouse && DgopService.availableGpus.length > 1) {
|
|
||||||
return Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.16);
|
|
||||||
} else {
|
|
||||||
return Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.08);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
const gpu = DgopService.availableGpus[Math.min(SessionData.selectedGpuIndex, DgopService.availableGpus.length - 1)];
|
|
||||||
const vendor = gpu.vendor.toLowerCase();
|
|
||||||
if (vendor.includes("nvidia")) {
|
|
||||||
if (gpuCardMouseArea.containsMouse && DgopService.availableGpus.length > 1) {
|
|
||||||
return Qt.rgba(Theme.success.r, Theme.success.g, Theme.success.b, 0.2);
|
|
||||||
} else {
|
|
||||||
return Qt.rgba(Theme.success.r, Theme.success.g, Theme.success.b, 0.12);
|
|
||||||
}
|
|
||||||
} else if (vendor.includes("amd")) {
|
|
||||||
if (gpuCardMouseArea.containsMouse && DgopService.availableGpus.length > 1) {
|
|
||||||
return Qt.rgba(Theme.error.r, Theme.error.g, Theme.error.b, 0.2);
|
|
||||||
} else {
|
|
||||||
return Qt.rgba(Theme.error.r, Theme.error.g, Theme.error.b, 0.12);
|
|
||||||
}
|
|
||||||
} else if (vendor.includes("intel")) {
|
|
||||||
if (gpuCardMouseArea.containsMouse && DgopService.availableGpus.length > 1) {
|
|
||||||
return Qt.rgba(Theme.info.r, Theme.info.g, Theme.info.b, 0.2);
|
|
||||||
} else {
|
|
||||||
return Qt.rgba(Theme.info.r, Theme.info.g, Theme.info.b, 0.12);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (gpuCardMouseArea.containsMouse && DgopService.availableGpus.length > 1) {
|
|
||||||
return Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.16);
|
|
||||||
} else {
|
|
||||||
return Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.08);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
border.color: {
|
|
||||||
if (!DgopService.availableGpus || DgopService.availableGpus.length === 0) {
|
|
||||||
return Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.2);
|
|
||||||
}
|
|
||||||
const gpu = DgopService.availableGpus[Math.min(SessionData.selectedGpuIndex, DgopService.availableGpus.length - 1)];
|
|
||||||
const vendor = gpu.vendor.toLowerCase();
|
|
||||||
if (vendor.includes("nvidia")) {
|
|
||||||
return Qt.rgba(Theme.success.r, Theme.success.g, Theme.success.b, 0.3);
|
|
||||||
} else if (vendor.includes("amd")) {
|
|
||||||
return Qt.rgba(Theme.error.r, Theme.error.g, Theme.error.b, 0.3);
|
|
||||||
} else if (vendor.includes("intel")) {
|
|
||||||
return Qt.rgba(Theme.info.r, Theme.info.g, Theme.info.b, 0.3);
|
|
||||||
}
|
|
||||||
return Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.2);
|
|
||||||
}
|
|
||||||
border.width: 1
|
|
||||||
|
|
||||||
MouseArea {
|
|
||||||
id: gpuCardMouseArea
|
|
||||||
|
|
||||||
anchors.fill: parent
|
|
||||||
hoverEnabled: true
|
|
||||||
acceptedButtons: Qt.LeftButton | Qt.RightButton
|
|
||||||
cursorShape: DgopService.availableGpus.length > 1 ? Qt.PointingHandCursor : Qt.ArrowCursor
|
|
||||||
onClicked: (mouse) => {
|
|
||||||
if (mouse.button === Qt.LeftButton) {
|
|
||||||
if (DgopService.availableGpus.length > 1) {
|
|
||||||
const nextIndex = (SessionData.selectedGpuIndex + 1) % DgopService.availableGpus.length;
|
|
||||||
SessionData.setSelectedGpuIndex(nextIndex);
|
|
||||||
}
|
|
||||||
} else if (mouse.button === Qt.RightButton) {
|
|
||||||
gpuContextMenu.popup();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Column {
|
|
||||||
anchors.left: parent.left
|
|
||||||
anchors.leftMargin: Theme.spacingM
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
spacing: 2
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: I18n.tr("GPU")
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
font.weight: Font.Medium
|
|
||||||
color: Theme.secondary
|
|
||||||
opacity: 0.8
|
|
||||||
}
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: {
|
|
||||||
if (!DgopService.availableGpus || DgopService.availableGpus.length === 0) {
|
|
||||||
return "No GPU";
|
|
||||||
}
|
|
||||||
const gpu = DgopService.availableGpus[Math.min(SessionData.selectedGpuIndex, DgopService.availableGpus.length - 1)];
|
|
||||||
// Check if temperature monitoring is enabled for this GPU
|
|
||||||
const tempEnabled = SessionData.enabledGpuPciIds && SessionData.enabledGpuPciIds.indexOf(gpu.pciId) !== -1;
|
|
||||||
const temp = gpu.temperature;
|
|
||||||
const hasTemp = tempEnabled && temp !== undefined && temp !== null && temp !== 0;
|
|
||||||
if (hasTemp) {
|
|
||||||
return Math.round(temp) + "°";
|
|
||||||
} else {
|
|
||||||
return gpu.vendor;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
font.pixelSize: Theme.fontSizeLarge
|
|
||||||
font.family: SettingsData.monoFontFamily
|
|
||||||
font.weight: Font.Bold
|
|
||||||
color: {
|
|
||||||
if (!DgopService.availableGpus || DgopService.availableGpus.length === 0) {
|
|
||||||
return Theme.surfaceText;
|
|
||||||
}
|
|
||||||
const gpu = DgopService.availableGpus[Math.min(SessionData.selectedGpuIndex, DgopService.availableGpus.length - 1)];
|
|
||||||
const tempEnabled = SessionData.enabledGpuPciIds && SessionData.enabledGpuPciIds.indexOf(gpu.pciId) !== -1;
|
|
||||||
const temp = gpu.temperature || 0;
|
|
||||||
if (tempEnabled && temp > 80) {
|
|
||||||
return Theme.error;
|
|
||||||
}
|
|
||||||
if (tempEnabled && temp > 60) {
|
|
||||||
return Theme.warning;
|
|
||||||
}
|
|
||||||
return Theme.surfaceText;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: {
|
|
||||||
if (!DgopService.availableGpus || DgopService.availableGpus.length === 0) {
|
|
||||||
return "No GPUs detected";
|
|
||||||
}
|
|
||||||
const gpu = DgopService.availableGpus[Math.min(SessionData.selectedGpuIndex, DgopService.availableGpus.length - 1)];
|
|
||||||
const tempEnabled = SessionData.enabledGpuPciIds && SessionData.enabledGpuPciIds.indexOf(gpu.pciId) !== -1;
|
|
||||||
const temp = gpu.temperature;
|
|
||||||
const hasTemp = tempEnabled && temp !== undefined && temp !== null && temp !== 0;
|
|
||||||
if (hasTemp) {
|
|
||||||
return gpu.vendor + " " + gpu.displayName;
|
|
||||||
} else {
|
|
||||||
return gpu.displayName;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
font.family: SettingsData.monoFontFamily
|
|
||||||
color: Theme.surfaceText
|
|
||||||
opacity: 0.7
|
|
||||||
width: parent.parent.width - Theme.spacingM * 2
|
|
||||||
elide: Text.ElideRight
|
|
||||||
maximumLineCount: 1
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
Menu {
|
|
||||||
id: gpuContextMenu
|
|
||||||
|
|
||||||
MenuItem {
|
|
||||||
text: I18n.tr("Enable GPU Temperature")
|
|
||||||
checkable: true
|
|
||||||
checked: {
|
|
||||||
if (!DgopService.availableGpus || DgopService.availableGpus.length === 0) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
const gpu = DgopService.availableGpus[Math.min(SessionData.selectedGpuIndex, DgopService.availableGpus.length - 1)];
|
|
||||||
if (!gpu.pciId) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return SessionData.enabledGpuPciIds ? SessionData.enabledGpuPciIds.indexOf(gpu.pciId) !== -1 : false;
|
|
||||||
}
|
|
||||||
onTriggered: {
|
|
||||||
if (!DgopService.availableGpus || DgopService.availableGpus.length === 0) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const gpu = DgopService.availableGpus[Math.min(SessionData.selectedGpuIndex, DgopService.availableGpus.length - 1)];
|
|
||||||
if (!gpu.pciId) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const enabledIds = SessionData.enabledGpuPciIds ? SessionData.enabledGpuPciIds.slice() : [];
|
|
||||||
const index = enabledIds.indexOf(gpu.pciId);
|
|
||||||
if (checked && index === -1) {
|
|
||||||
enabledIds.push(gpu.pciId);
|
|
||||||
DgopService.addGpuPciId(gpu.pciId);
|
|
||||||
} else if (!checked && index !== -1) {
|
|
||||||
enabledIds.splice(index, 1);
|
|
||||||
DgopService.removeGpuPciId(gpu.pciId);
|
|
||||||
}
|
|
||||||
SessionData.setEnabledGpuPciIds(enabledIds);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
Behavior on color {
|
|
||||||
ColorAnimation {
|
|
||||||
duration: Theme.shortDuration
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,591 +0,0 @@
|
|||||||
import QtQuick
|
|
||||||
import qs.Common
|
|
||||||
import qs.Services
|
|
||||||
import qs.Widgets
|
|
||||||
|
|
||||||
DankFlickable {
|
|
||||||
anchors.fill: parent
|
|
||||||
contentHeight: systemColumn.implicitHeight
|
|
||||||
clip: true
|
|
||||||
Component.onCompleted: {
|
|
||||||
DgopService.addRef(["system", "diskmounts"]);
|
|
||||||
}
|
|
||||||
Component.onDestruction: {
|
|
||||||
DgopService.removeRef(["system", "diskmounts"]);
|
|
||||||
}
|
|
||||||
|
|
||||||
Column {
|
|
||||||
id: systemColumn
|
|
||||||
|
|
||||||
width: parent.width
|
|
||||||
spacing: Theme.spacingM
|
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
width: parent.width
|
|
||||||
height: systemInfoColumn.implicitHeight + 2 * Theme.spacingL
|
|
||||||
radius: Theme.cornerRadius
|
|
||||||
color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
|
|
||||||
border.width: 0
|
|
||||||
|
|
||||||
Column {
|
|
||||||
id: systemInfoColumn
|
|
||||||
|
|
||||||
anchors.left: parent.left
|
|
||||||
anchors.right: parent.right
|
|
||||||
anchors.top: parent.top
|
|
||||||
anchors.margins: Theme.spacingL
|
|
||||||
spacing: Theme.spacingL
|
|
||||||
|
|
||||||
Row {
|
|
||||||
width: parent.width
|
|
||||||
spacing: Theme.spacingL
|
|
||||||
|
|
||||||
SystemLogo {
|
|
||||||
width: 80
|
|
||||||
height: 80
|
|
||||||
}
|
|
||||||
|
|
||||||
Column {
|
|
||||||
width: parent.width - 80 - Theme.spacingL
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
spacing: Theme.spacingS
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: DgopService.hostname
|
|
||||||
font.pixelSize: Theme.fontSizeXLarge
|
|
||||||
font.family: SettingsData.monoFontFamily
|
|
||||||
font.weight: Font.Light
|
|
||||||
color: Theme.surfaceText
|
|
||||||
verticalAlignment: Text.AlignVCenter
|
|
||||||
}
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: `${DgopService.distribution} • ${DgopService.architecture} • ${DgopService.kernelVersion}`
|
|
||||||
font.pixelSize: Theme.fontSizeMedium
|
|
||||||
font.family: SettingsData.monoFontFamily
|
|
||||||
color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.7)
|
|
||||||
verticalAlignment: Text.AlignVCenter
|
|
||||||
}
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: `${DgopService.uptime} • Boot: ${DgopService.bootTime}`
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
font.family: SettingsData.monoFontFamily
|
|
||||||
color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.6)
|
|
||||||
verticalAlignment: Text.AlignVCenter
|
|
||||||
}
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: `Load: ${DgopService.loadAverage} • ${DgopService.processCount} processes, ${DgopService.threadCount} threads`
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
font.family: SettingsData.monoFontFamily
|
|
||||||
color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.6)
|
|
||||||
verticalAlignment: Text.AlignVCenter
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
width: parent.width
|
|
||||||
height: 1
|
|
||||||
color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
|
|
||||||
}
|
|
||||||
|
|
||||||
Row {
|
|
||||||
width: parent.width
|
|
||||||
spacing: Theme.spacingXL
|
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
width: (parent.width - Theme.spacingXL) / 2
|
|
||||||
height: hardwareColumn.implicitHeight + Theme.spacingL
|
|
||||||
radius: Theme.cornerRadius
|
|
||||||
color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
|
|
||||||
border.width: 1
|
|
||||||
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.1)
|
|
||||||
|
|
||||||
Column {
|
|
||||||
id: hardwareColumn
|
|
||||||
|
|
||||||
anchors.left: parent.left
|
|
||||||
anchors.right: parent.right
|
|
||||||
anchors.top: parent.top
|
|
||||||
anchors.margins: Theme.spacingM
|
|
||||||
spacing: Theme.spacingXS
|
|
||||||
|
|
||||||
Row {
|
|
||||||
width: parent.width
|
|
||||||
spacing: Theme.spacingS
|
|
||||||
|
|
||||||
DankIcon {
|
|
||||||
name: "memory"
|
|
||||||
size: Theme.iconSizeSmall
|
|
||||||
color: Theme.primary
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
}
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: I18n.tr("System")
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
font.family: SettingsData.monoFontFamily
|
|
||||||
font.weight: Font.Bold
|
|
||||||
color: Theme.primary
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: DgopService.cpuModel
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
font.family: SettingsData.monoFontFamily
|
|
||||||
font.weight: Font.Medium
|
|
||||||
color: Theme.surfaceText
|
|
||||||
width: parent.width
|
|
||||||
elide: Text.ElideRight
|
|
||||||
wrapMode: Text.NoWrap
|
|
||||||
maximumLineCount: 1
|
|
||||||
verticalAlignment: Text.AlignVCenter
|
|
||||||
}
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: DgopService.motherboard
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
font.family: SettingsData.monoFontFamily
|
|
||||||
color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.8)
|
|
||||||
width: parent.width
|
|
||||||
elide: Text.ElideRight
|
|
||||||
wrapMode: Text.NoWrap
|
|
||||||
maximumLineCount: 1
|
|
||||||
verticalAlignment: Text.AlignVCenter
|
|
||||||
}
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: `BIOS ${DgopService.biosVersion}`
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
font.family: SettingsData.monoFontFamily
|
|
||||||
color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.7)
|
|
||||||
width: parent.width
|
|
||||||
elide: Text.ElideRight
|
|
||||||
verticalAlignment: Text.AlignVCenter
|
|
||||||
}
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: `${DgopService.formatSystemMemory(DgopService.totalMemoryKB)} RAM`
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
font.family: SettingsData.monoFontFamily
|
|
||||||
color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.8)
|
|
||||||
width: parent.width
|
|
||||||
elide: Text.ElideRight
|
|
||||||
verticalAlignment: Text.AlignVCenter
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
width: (parent.width - Theme.spacingXL) / 2
|
|
||||||
height: gpuColumn.implicitHeight + Theme.spacingL
|
|
||||||
radius: Theme.cornerRadius
|
|
||||||
color: {
|
|
||||||
const baseColor = Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency);
|
|
||||||
const hoverColor = Qt.rgba(Theme.surfaceContainerHigh.r, Theme.surfaceContainerHigh.g, Theme.surfaceContainerHigh.b, Theme.popupTransparency * 1.5);
|
|
||||||
if (!DgopService.availableGpus || DgopService.availableGpus.length === 0) {
|
|
||||||
return gpuCardMouseArea.containsMouse && DgopService.availableGpus.length > 1 ? hoverColor : baseColor;
|
|
||||||
}
|
|
||||||
|
|
||||||
const gpu = DgopService.availableGpus[Math.min(SessionData.selectedGpuIndex, DgopService.availableGpus.length - 1)];
|
|
||||||
const vendor = gpu.fullName.split(' ')[0].toLowerCase();
|
|
||||||
let tintColor;
|
|
||||||
if (vendor.includes("nvidia")) {
|
|
||||||
tintColor = Theme.success;
|
|
||||||
} else if (vendor.includes("amd")) {
|
|
||||||
tintColor = Theme.error;
|
|
||||||
} else if (vendor.includes("intel")) {
|
|
||||||
tintColor = Theme.info;
|
|
||||||
} else {
|
|
||||||
return gpuCardMouseArea.containsMouse && DgopService.availableGpus.length > 1 ? hoverColor : baseColor;
|
|
||||||
}
|
|
||||||
if (gpuCardMouseArea.containsMouse && DgopService.availableGpus.length > 1) {
|
|
||||||
return Qt.rgba((hoverColor.r + tintColor.r * 0.1) / 1.1, (hoverColor.g + tintColor.g * 0.1) / 1.1, (hoverColor.b + tintColor.b * 0.1) / 1.1, 0.6);
|
|
||||||
} else {
|
|
||||||
return Qt.rgba((baseColor.r + tintColor.r * 0.08) / 1.08, (baseColor.g + tintColor.g * 0.08) / 1.08, (baseColor.b + tintColor.b * 0.08) / 1.08, 0.4);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
border.width: 1
|
|
||||||
border.color: {
|
|
||||||
if (!DgopService.availableGpus || DgopService.availableGpus.length === 0) {
|
|
||||||
return Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.1);
|
|
||||||
}
|
|
||||||
|
|
||||||
const gpu = DgopService.availableGpus[Math.min(SessionData.selectedGpuIndex, DgopService.availableGpus.length - 1)];
|
|
||||||
const vendor = gpu.fullName.split(' ')[0].toLowerCase();
|
|
||||||
if (vendor.includes("nvidia")) {
|
|
||||||
return Qt.rgba(Theme.success.r, Theme.success.g, Theme.success.b, 0.3);
|
|
||||||
} else if (vendor.includes("amd")) {
|
|
||||||
return Qt.rgba(Theme.error.r, Theme.error.g, Theme.error.b, 0.3);
|
|
||||||
} else if (vendor.includes("intel")) {
|
|
||||||
return Qt.rgba(Theme.info.r, Theme.info.g, Theme.info.b, 0.3);
|
|
||||||
}
|
|
||||||
return Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.1);
|
|
||||||
}
|
|
||||||
|
|
||||||
MouseArea {
|
|
||||||
id: gpuCardMouseArea
|
|
||||||
|
|
||||||
anchors.fill: parent
|
|
||||||
hoverEnabled: true
|
|
||||||
cursorShape: DgopService.availableGpus.length > 1 ? Qt.PointingHandCursor : Qt.ArrowCursor
|
|
||||||
onClicked: {
|
|
||||||
if (DgopService.availableGpus.length > 1) {
|
|
||||||
const nextIndex = (SessionData.selectedGpuIndex + 1) % DgopService.availableGpus.length;
|
|
||||||
SessionData.setSelectedGpuIndex(nextIndex);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Column {
|
|
||||||
id: gpuColumn
|
|
||||||
|
|
||||||
anchors.left: parent.left
|
|
||||||
anchors.right: parent.right
|
|
||||||
anchors.top: parent.top
|
|
||||||
anchors.margins: Theme.spacingM
|
|
||||||
spacing: Theme.spacingXS
|
|
||||||
|
|
||||||
Row {
|
|
||||||
width: parent.width
|
|
||||||
spacing: Theme.spacingS
|
|
||||||
|
|
||||||
DankIcon {
|
|
||||||
name: "auto_awesome_mosaic"
|
|
||||||
size: Theme.iconSizeSmall
|
|
||||||
color: Theme.secondary
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
}
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: "GPU"
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
font.family: SettingsData.monoFontFamily
|
|
||||||
font.weight: Font.Bold
|
|
||||||
color: Theme.secondary
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: {
|
|
||||||
if (!DgopService.availableGpus || DgopService.availableGpus.length === 0) {
|
|
||||||
return "No GPUs detected";
|
|
||||||
}
|
|
||||||
|
|
||||||
const gpu = DgopService.availableGpus[Math.min(SessionData.selectedGpuIndex, DgopService.availableGpus.length - 1)];
|
|
||||||
return gpu.fullName;
|
|
||||||
}
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
font.family: SettingsData.monoFontFamily
|
|
||||||
font.weight: Font.Medium
|
|
||||||
color: Theme.surfaceText
|
|
||||||
width: parent.width
|
|
||||||
elide: Text.ElideRight
|
|
||||||
maximumLineCount: 1
|
|
||||||
verticalAlignment: Text.AlignVCenter
|
|
||||||
}
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: {
|
|
||||||
if (!DgopService.availableGpus || DgopService.availableGpus.length === 0) {
|
|
||||||
return "Device: N/A";
|
|
||||||
}
|
|
||||||
|
|
||||||
const gpu = DgopService.availableGpus[Math.min(SessionData.selectedGpuIndex, DgopService.availableGpus.length - 1)];
|
|
||||||
return `Device: ${gpu.pciId}`;
|
|
||||||
}
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
font.family: SettingsData.monoFontFamily
|
|
||||||
color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.8)
|
|
||||||
width: parent.width
|
|
||||||
elide: Text.ElideRight
|
|
||||||
verticalAlignment: Text.AlignVCenter
|
|
||||||
textFormat: Text.RichText
|
|
||||||
}
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: {
|
|
||||||
if (!DgopService.availableGpus || DgopService.availableGpus.length === 0) {
|
|
||||||
return "Driver: N/A";
|
|
||||||
}
|
|
||||||
|
|
||||||
const gpu = DgopService.availableGpus[Math.min(SessionData.selectedGpuIndex, DgopService.availableGpus.length - 1)];
|
|
||||||
return `Driver: ${gpu.driver}`;
|
|
||||||
}
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
font.family: SettingsData.monoFontFamily
|
|
||||||
color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.8)
|
|
||||||
width: parent.width
|
|
||||||
elide: Text.ElideRight
|
|
||||||
verticalAlignment: Text.AlignVCenter
|
|
||||||
}
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: {
|
|
||||||
if (!DgopService.availableGpus || DgopService.availableGpus.length === 0) {
|
|
||||||
return "Temp: --°";
|
|
||||||
}
|
|
||||||
|
|
||||||
const gpu = DgopService.availableGpus[Math.min(SessionData.selectedGpuIndex, DgopService.availableGpus.length - 1)];
|
|
||||||
const temp = gpu.temperature;
|
|
||||||
return `Temp: ${(temp === undefined || temp === null || temp === 0) ? '--°' : `${Math.round(temp)}°C`}`;
|
|
||||||
}
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
font.family: SettingsData.monoFontFamily
|
|
||||||
color: {
|
|
||||||
if (!DgopService.availableGpus || DgopService.availableGpus.length === 0) {
|
|
||||||
return Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.7);
|
|
||||||
}
|
|
||||||
|
|
||||||
const gpu = DgopService.availableGpus[Math.min(SessionData.selectedGpuIndex, DgopService.availableGpus.length - 1)];
|
|
||||||
const temp = gpu.temperature || 0;
|
|
||||||
if (temp > 80) {
|
|
||||||
return Theme.error;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (temp > 60) {
|
|
||||||
return Theme.warning;
|
|
||||||
}
|
|
||||||
|
|
||||||
return Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.7);
|
|
||||||
}
|
|
||||||
width: parent.width
|
|
||||||
elide: Text.ElideRight
|
|
||||||
verticalAlignment: Text.AlignVCenter
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Behavior on color {
|
|
||||||
ColorAnimation {
|
|
||||||
duration: Theme.shortDuration
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
width: parent.width
|
|
||||||
height: storageColumn.implicitHeight + 2 * Theme.spacingL
|
|
||||||
radius: Theme.cornerRadius
|
|
||||||
color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
|
|
||||||
border.width: 0
|
|
||||||
|
|
||||||
Column {
|
|
||||||
id: storageColumn
|
|
||||||
|
|
||||||
anchors.left: parent.left
|
|
||||||
anchors.right: parent.right
|
|
||||||
anchors.top: parent.top
|
|
||||||
anchors.margins: Theme.spacingL
|
|
||||||
spacing: Theme.spacingS
|
|
||||||
|
|
||||||
Row {
|
|
||||||
width: parent.width
|
|
||||||
spacing: Theme.spacingS
|
|
||||||
|
|
||||||
DankIcon {
|
|
||||||
name: "storage"
|
|
||||||
size: Theme.iconSize
|
|
||||||
color: Theme.surfaceText
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
}
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: I18n.tr("Storage & Disks")
|
|
||||||
font.pixelSize: Theme.fontSizeLarge
|
|
||||||
font.family: SettingsData.monoFontFamily
|
|
||||||
font.weight: Font.Bold
|
|
||||||
color: Theme.surfaceText
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Column {
|
|
||||||
width: parent.width
|
|
||||||
spacing: 2
|
|
||||||
|
|
||||||
Row {
|
|
||||||
width: parent.width
|
|
||||||
height: 24
|
|
||||||
spacing: Theme.spacingS
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: I18n.tr("Device")
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
font.family: SettingsData.monoFontFamily
|
|
||||||
font.weight: Font.Bold
|
|
||||||
color: Theme.surfaceText
|
|
||||||
width: parent.width * 0.25
|
|
||||||
elide: Text.ElideRight
|
|
||||||
verticalAlignment: Text.AlignVCenter
|
|
||||||
}
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: I18n.tr("Mount")
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
font.family: SettingsData.monoFontFamily
|
|
||||||
font.weight: Font.Bold
|
|
||||||
color: Theme.surfaceText
|
|
||||||
width: parent.width * 0.2
|
|
||||||
elide: Text.ElideRight
|
|
||||||
verticalAlignment: Text.AlignVCenter
|
|
||||||
}
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: I18n.tr("Size")
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
font.family: SettingsData.monoFontFamily
|
|
||||||
font.weight: Font.Bold
|
|
||||||
color: Theme.surfaceText
|
|
||||||
width: parent.width * 0.15
|
|
||||||
elide: Text.ElideRight
|
|
||||||
verticalAlignment: Text.AlignVCenter
|
|
||||||
}
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: I18n.tr("Used")
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
font.family: SettingsData.monoFontFamily
|
|
||||||
font.weight: Font.Bold
|
|
||||||
color: Theme.surfaceText
|
|
||||||
width: parent.width * 0.15
|
|
||||||
elide: Text.ElideRight
|
|
||||||
verticalAlignment: Text.AlignVCenter
|
|
||||||
}
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: I18n.tr("Available")
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
font.family: SettingsData.monoFontFamily
|
|
||||||
font.weight: Font.Bold
|
|
||||||
color: Theme.surfaceText
|
|
||||||
width: parent.width * 0.15
|
|
||||||
elide: Text.ElideRight
|
|
||||||
verticalAlignment: Text.AlignVCenter
|
|
||||||
}
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: I18n.tr("Use%")
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
font.family: SettingsData.monoFontFamily
|
|
||||||
font.weight: Font.Bold
|
|
||||||
color: Theme.surfaceText
|
|
||||||
width: parent.width * 0.1
|
|
||||||
elide: Text.ElideRight
|
|
||||||
verticalAlignment: Text.AlignVCenter
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Repeater {
|
|
||||||
id: diskMountRepeater
|
|
||||||
|
|
||||||
model: DgopService.diskMounts
|
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
width: parent.width
|
|
||||||
height: 24
|
|
||||||
radius: Theme.cornerRadius
|
|
||||||
color: diskMouseArea.containsMouse ? Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.04) : "transparent"
|
|
||||||
|
|
||||||
MouseArea {
|
|
||||||
id: diskMouseArea
|
|
||||||
|
|
||||||
anchors.fill: parent
|
|
||||||
hoverEnabled: true
|
|
||||||
}
|
|
||||||
|
|
||||||
Row {
|
|
||||||
anchors.fill: parent
|
|
||||||
spacing: Theme.spacingS
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: modelData.device
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
font.family: SettingsData.monoFontFamily
|
|
||||||
color: Theme.surfaceText
|
|
||||||
width: parent.width * 0.25
|
|
||||||
elide: Text.ElideRight
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
verticalAlignment: Text.AlignVCenter
|
|
||||||
}
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: modelData.mount
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
font.family: SettingsData.monoFontFamily
|
|
||||||
color: Theme.surfaceText
|
|
||||||
width: parent.width * 0.2
|
|
||||||
elide: Text.ElideRight
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
verticalAlignment: Text.AlignVCenter
|
|
||||||
}
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: modelData.size
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
font.family: SettingsData.monoFontFamily
|
|
||||||
color: Theme.surfaceText
|
|
||||||
width: parent.width * 0.15
|
|
||||||
elide: Text.ElideRight
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
verticalAlignment: Text.AlignVCenter
|
|
||||||
}
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: modelData.used
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
font.family: SettingsData.monoFontFamily
|
|
||||||
color: Theme.surfaceText
|
|
||||||
width: parent.width * 0.15
|
|
||||||
elide: Text.ElideRight
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
verticalAlignment: Text.AlignVCenter
|
|
||||||
}
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: modelData.avail
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
font.family: SettingsData.monoFontFamily
|
|
||||||
color: Theme.surfaceText
|
|
||||||
width: parent.width * 0.15
|
|
||||||
elide: Text.ElideRight
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
verticalAlignment: Text.AlignVCenter
|
|
||||||
}
|
|
||||||
|
|
||||||
StyledText {
|
|
||||||
text: modelData.percent
|
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
|
||||||
font.family: SettingsData.monoFontFamily
|
|
||||||
color: {
|
|
||||||
const percent = parseInt(modelData.percent);
|
|
||||||
if (percent > 90) {
|
|
||||||
return Theme.error;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (percent > 75) {
|
|
||||||
return Theme.warning;
|
|
||||||
}
|
|
||||||
|
|
||||||
return Theme.surfaceText;
|
|
||||||
}
|
|
||||||
width: parent.width * 0.1
|
|
||||||
elide: Text.ElideRight
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
verticalAlignment: Text.AlignVCenter
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
386
quickshell/Modules/ProcessList/SystemView.qml
Normal file
386
quickshell/Modules/ProcessList/SystemView.qml
Normal file
@@ -0,0 +1,386 @@
|
|||||||
|
import QtQuick
|
||||||
|
import QtQuick.Layouts
|
||||||
|
import qs.Common
|
||||||
|
import qs.Services
|
||||||
|
import qs.Widgets
|
||||||
|
|
||||||
|
Item {
|
||||||
|
id: root
|
||||||
|
|
||||||
|
Component.onCompleted: {
|
||||||
|
DgopService.addRef(["system", "cpu"]);
|
||||||
|
}
|
||||||
|
|
||||||
|
Component.onDestruction: {
|
||||||
|
DgopService.removeRef(["system", "cpu"]);
|
||||||
|
}
|
||||||
|
|
||||||
|
ColumnLayout {
|
||||||
|
anchors.fill: parent
|
||||||
|
spacing: Theme.spacingM
|
||||||
|
|
||||||
|
Rectangle {
|
||||||
|
Layout.fillWidth: true
|
||||||
|
Layout.preferredHeight: systemInfoColumn.implicitHeight + Theme.spacingM * 2
|
||||||
|
radius: Theme.cornerRadius
|
||||||
|
color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
|
||||||
|
|
||||||
|
ColumnLayout {
|
||||||
|
id: systemInfoColumn
|
||||||
|
anchors.fill: parent
|
||||||
|
anchors.margins: Theme.spacingM
|
||||||
|
spacing: Theme.spacingM
|
||||||
|
|
||||||
|
Row {
|
||||||
|
spacing: Theme.spacingS
|
||||||
|
|
||||||
|
DankIcon {
|
||||||
|
name: "computer"
|
||||||
|
size: Theme.iconSize
|
||||||
|
color: Theme.primary
|
||||||
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
}
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: I18n.tr("System Information", "system info header in system monitor")
|
||||||
|
font.pixelSize: Theme.fontSizeLarge
|
||||||
|
font.weight: Font.Bold
|
||||||
|
color: Theme.surfaceText
|
||||||
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
GridLayout {
|
||||||
|
Layout.fillWidth: true
|
||||||
|
columns: 2
|
||||||
|
rowSpacing: Theme.spacingS
|
||||||
|
columnSpacing: Theme.spacingXL
|
||||||
|
|
||||||
|
InfoRow {
|
||||||
|
label: I18n.tr("Hostname", "system info label")
|
||||||
|
value: DgopService.hostname || "--"
|
||||||
|
}
|
||||||
|
InfoRow {
|
||||||
|
label: I18n.tr("Distribution", "system info label")
|
||||||
|
value: DgopService.distribution || "--"
|
||||||
|
}
|
||||||
|
InfoRow {
|
||||||
|
label: I18n.tr("Kernel", "system info label")
|
||||||
|
value: DgopService.kernelVersion || "--"
|
||||||
|
}
|
||||||
|
InfoRow {
|
||||||
|
label: I18n.tr("Architecture", "system info label")
|
||||||
|
value: DgopService.architecture || "--"
|
||||||
|
}
|
||||||
|
InfoRow {
|
||||||
|
label: I18n.tr("CPU")
|
||||||
|
value: DgopService.cpuModel || ("" + DgopService.cpuCores + " cores")
|
||||||
|
}
|
||||||
|
InfoRow {
|
||||||
|
label: I18n.tr("Uptime")
|
||||||
|
value: DgopService.uptime || "--"
|
||||||
|
}
|
||||||
|
InfoRow {
|
||||||
|
label: I18n.tr("Load Average", "system info label")
|
||||||
|
value: DgopService.loadAverage || "--"
|
||||||
|
}
|
||||||
|
InfoRow {
|
||||||
|
label: I18n.tr("Processes")
|
||||||
|
value: DgopService.processCount > 0 ? DgopService.processCount.toString() : "--"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Rectangle {
|
||||||
|
Layout.fillWidth: true
|
||||||
|
Layout.fillHeight: true
|
||||||
|
radius: Theme.cornerRadius
|
||||||
|
color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
|
||||||
|
|
||||||
|
ColumnLayout {
|
||||||
|
anchors.fill: parent
|
||||||
|
anchors.margins: Theme.spacingM
|
||||||
|
spacing: Theme.spacingM
|
||||||
|
|
||||||
|
Row {
|
||||||
|
spacing: Theme.spacingS
|
||||||
|
|
||||||
|
DankIcon {
|
||||||
|
name: "developer_board"
|
||||||
|
size: Theme.iconSize
|
||||||
|
color: Theme.secondary
|
||||||
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
}
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: I18n.tr("GPU Monitoring", "gpu section header in system monitor")
|
||||||
|
font.pixelSize: Theme.fontSizeLarge
|
||||||
|
font.weight: Font.Bold
|
||||||
|
color: Theme.surfaceText
|
||||||
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Rectangle {
|
||||||
|
Layout.fillWidth: true
|
||||||
|
Layout.preferredHeight: 1
|
||||||
|
color: Theme.outlineLight
|
||||||
|
}
|
||||||
|
|
||||||
|
DankListView {
|
||||||
|
id: gpuListView
|
||||||
|
|
||||||
|
Layout.fillWidth: true
|
||||||
|
Layout.fillHeight: true
|
||||||
|
clip: true
|
||||||
|
spacing: 8
|
||||||
|
|
||||||
|
model: DgopService.availableGpus
|
||||||
|
|
||||||
|
delegate: Rectangle {
|
||||||
|
required property var modelData
|
||||||
|
required property int index
|
||||||
|
|
||||||
|
width: gpuListView.width
|
||||||
|
height: 80
|
||||||
|
radius: Theme.cornerRadius
|
||||||
|
color: {
|
||||||
|
const vendor = (modelData?.vendor ?? "").toLowerCase();
|
||||||
|
if (vendor.includes("nvidia"))
|
||||||
|
return Qt.rgba(Theme.success.r, Theme.success.g, Theme.success.b, 0.08);
|
||||||
|
if (vendor.includes("amd"))
|
||||||
|
return Qt.rgba(Theme.error.r, Theme.error.g, Theme.error.b, 0.08);
|
||||||
|
if (vendor.includes("intel"))
|
||||||
|
return Qt.rgba(Theme.info.r, Theme.info.g, Theme.info.b, 0.08);
|
||||||
|
return Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.08);
|
||||||
|
}
|
||||||
|
border.color: {
|
||||||
|
const vendor = (modelData?.vendor ?? "").toLowerCase();
|
||||||
|
if (vendor.includes("nvidia"))
|
||||||
|
return Qt.rgba(Theme.success.r, Theme.success.g, Theme.success.b, 0.2);
|
||||||
|
if (vendor.includes("amd"))
|
||||||
|
return Qt.rgba(Theme.error.r, Theme.error.g, Theme.error.b, 0.2);
|
||||||
|
if (vendor.includes("intel"))
|
||||||
|
return Qt.rgba(Theme.info.r, Theme.info.g, Theme.info.b, 0.2);
|
||||||
|
return Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.2);
|
||||||
|
}
|
||||||
|
border.width: 1
|
||||||
|
|
||||||
|
readonly property bool tempEnabled: {
|
||||||
|
const pciId = modelData?.pciId ?? "";
|
||||||
|
if (!pciId)
|
||||||
|
return false;
|
||||||
|
return SessionData.enabledGpuPciIds ? SessionData.enabledGpuPciIds.indexOf(pciId) !== -1 : false;
|
||||||
|
}
|
||||||
|
|
||||||
|
RowLayout {
|
||||||
|
anchors.fill: parent
|
||||||
|
anchors.margins: Theme.spacingM
|
||||||
|
spacing: Theme.spacingM
|
||||||
|
|
||||||
|
DankIcon {
|
||||||
|
name: "developer_board"
|
||||||
|
size: Theme.iconSize + 4
|
||||||
|
color: {
|
||||||
|
const vendor = (modelData?.vendor ?? "").toLowerCase();
|
||||||
|
if (vendor.includes("nvidia"))
|
||||||
|
return Theme.success;
|
||||||
|
if (vendor.includes("amd"))
|
||||||
|
return Theme.error;
|
||||||
|
if (vendor.includes("intel"))
|
||||||
|
return Theme.info;
|
||||||
|
return Theme.surfaceVariantText;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Column {
|
||||||
|
Layout.fillWidth: true
|
||||||
|
spacing: Theme.spacingXS
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: modelData?.displayName ?? I18n.tr("Unknown GPU", "fallback gpu name")
|
||||||
|
font.pixelSize: Theme.fontSizeMedium
|
||||||
|
font.weight: Font.Bold
|
||||||
|
color: Theme.surfaceText
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
spacing: Theme.spacingS
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: modelData?.vendor ?? ""
|
||||||
|
font.pixelSize: Theme.fontSizeSmall
|
||||||
|
color: Theme.surfaceVariantText
|
||||||
|
}
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: "•"
|
||||||
|
font.pixelSize: Theme.fontSizeSmall
|
||||||
|
color: Theme.surfaceVariantText
|
||||||
|
visible: (modelData?.driver ?? "").length > 0
|
||||||
|
}
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: modelData?.driver ?? ""
|
||||||
|
font.pixelSize: Theme.fontSizeSmall
|
||||||
|
color: Theme.surfaceVariantText
|
||||||
|
visible: (modelData?.driver ?? "").length > 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: modelData?.pciId ?? ""
|
||||||
|
font.pixelSize: Theme.fontSizeSmall - 2
|
||||||
|
font.family: SettingsData.monoFontFamily
|
||||||
|
color: Theme.surfaceVariantText
|
||||||
|
opacity: 0.7
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Rectangle {
|
||||||
|
width: 70
|
||||||
|
height: 32
|
||||||
|
radius: Theme.cornerRadius
|
||||||
|
color: parent.parent.tempEnabled ? Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.3) : Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.15)
|
||||||
|
border.color: tempMouseArea.containsMouse ? Theme.outline : "transparent"
|
||||||
|
border.width: 1
|
||||||
|
|
||||||
|
Row {
|
||||||
|
id: tempRow
|
||||||
|
anchors.centerIn: parent
|
||||||
|
spacing: Theme.spacingXS
|
||||||
|
|
||||||
|
DankIcon {
|
||||||
|
name: "thermostat"
|
||||||
|
size: 16
|
||||||
|
color: {
|
||||||
|
if (!parent.parent.parent.parent.tempEnabled)
|
||||||
|
return Theme.surfaceVariantText;
|
||||||
|
const temp = modelData?.temperature ?? 0;
|
||||||
|
if (temp > 85)
|
||||||
|
return Theme.error;
|
||||||
|
if (temp > 70)
|
||||||
|
return Theme.warning;
|
||||||
|
return Theme.surfaceText;
|
||||||
|
}
|
||||||
|
opacity: parent.parent.parent.parent.tempEnabled ? 1 : 0.5
|
||||||
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
}
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: {
|
||||||
|
if (!parent.parent.parent.parent.tempEnabled)
|
||||||
|
return I18n.tr("Off");
|
||||||
|
const temp = modelData?.temperature ?? 0;
|
||||||
|
return temp > 0 ? (temp.toFixed(0) + "°C") : "--";
|
||||||
|
}
|
||||||
|
font.pixelSize: Theme.fontSizeSmall
|
||||||
|
font.family: parent.parent.parent.parent.tempEnabled ? SettingsData.monoFontFamily : ""
|
||||||
|
font.weight: parent.parent.parent.parent.tempEnabled ? Font.Bold : Font.Normal
|
||||||
|
color: {
|
||||||
|
if (!parent.parent.parent.parent.tempEnabled)
|
||||||
|
return Theme.surfaceVariantText;
|
||||||
|
const temp = modelData?.temperature ?? 0;
|
||||||
|
if (temp > 85)
|
||||||
|
return Theme.error;
|
||||||
|
if (temp > 70)
|
||||||
|
return Theme.warning;
|
||||||
|
return Theme.surfaceText;
|
||||||
|
}
|
||||||
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
MouseArea {
|
||||||
|
id: tempMouseArea
|
||||||
|
anchors.fill: parent
|
||||||
|
hoverEnabled: true
|
||||||
|
cursorShape: Qt.PointingHandCursor
|
||||||
|
onClicked: {
|
||||||
|
const pciId = modelData?.pciId;
|
||||||
|
if (!pciId)
|
||||||
|
return;
|
||||||
|
|
||||||
|
const enabledIds = SessionData.enabledGpuPciIds ? SessionData.enabledGpuPciIds.slice() : [];
|
||||||
|
const idx = enabledIds.indexOf(pciId);
|
||||||
|
const wasEnabled = idx !== -1;
|
||||||
|
|
||||||
|
if (!wasEnabled) {
|
||||||
|
enabledIds.push(pciId);
|
||||||
|
DgopService.addGpuPciId(pciId);
|
||||||
|
} else {
|
||||||
|
enabledIds.splice(idx, 1);
|
||||||
|
DgopService.removeGpuPciId(pciId);
|
||||||
|
}
|
||||||
|
|
||||||
|
SessionData.setEnabledGpuPciIds(enabledIds);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Behavior on color {
|
||||||
|
ColorAnimation {
|
||||||
|
duration: Theme.shortDuration
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Rectangle {
|
||||||
|
anchors.centerIn: parent
|
||||||
|
width: 300
|
||||||
|
height: 100
|
||||||
|
radius: Theme.cornerRadius
|
||||||
|
color: "transparent"
|
||||||
|
visible: DgopService.availableGpus.length === 0
|
||||||
|
|
||||||
|
Column {
|
||||||
|
anchors.centerIn: parent
|
||||||
|
spacing: Theme.spacingM
|
||||||
|
|
||||||
|
DankIcon {
|
||||||
|
name: "developer_board_off"
|
||||||
|
size: 32
|
||||||
|
color: Theme.surfaceVariantText
|
||||||
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
|
}
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: I18n.tr("No GPUs detected", "empty state in gpu list")
|
||||||
|
font.pixelSize: Theme.fontSizeMedium
|
||||||
|
color: Theme.surfaceVariantText
|
||||||
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
component InfoRow: RowLayout {
|
||||||
|
property string label: ""
|
||||||
|
property string value: ""
|
||||||
|
|
||||||
|
Layout.fillWidth: true
|
||||||
|
spacing: Theme.spacingS
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: label + ":"
|
||||||
|
font.pixelSize: Theme.fontSizeSmall
|
||||||
|
font.weight: Font.Medium
|
||||||
|
color: Theme.surfaceVariantText
|
||||||
|
Layout.preferredWidth: 100
|
||||||
|
}
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: value
|
||||||
|
font.pixelSize: Theme.fontSizeSmall
|
||||||
|
font.family: SettingsData.monoFontFamily
|
||||||
|
color: Theme.surfaceText
|
||||||
|
Layout.fillWidth: true
|
||||||
|
elide: Text.ElideRight
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -125,6 +125,33 @@ Item {
|
|||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
||||||
|
readonly property var maxPinnedOptions: [
|
||||||
|
{
|
||||||
|
text: "5",
|
||||||
|
value: 5
|
||||||
|
},
|
||||||
|
{
|
||||||
|
text: "10",
|
||||||
|
value: 10
|
||||||
|
},
|
||||||
|
{
|
||||||
|
text: "15",
|
||||||
|
value: 15
|
||||||
|
},
|
||||||
|
{
|
||||||
|
text: "25",
|
||||||
|
value: 25
|
||||||
|
},
|
||||||
|
{
|
||||||
|
text: "50",
|
||||||
|
value: 50
|
||||||
|
},
|
||||||
|
{
|
||||||
|
text: "100",
|
||||||
|
value: 100
|
||||||
|
}
|
||||||
|
]
|
||||||
|
|
||||||
function getMaxHistoryText(value) {
|
function getMaxHistoryText(value) {
|
||||||
if (value <= 0)
|
if (value <= 0)
|
||||||
return "∞";
|
return "∞";
|
||||||
@@ -152,6 +179,14 @@ Item {
|
|||||||
return value + " " + I18n.tr("days");
|
return value + " " + I18n.tr("days");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function getMaxPinnedText(value) {
|
||||||
|
for (let opt of maxPinnedOptions) {
|
||||||
|
if (opt.value === value)
|
||||||
|
return opt.text;
|
||||||
|
}
|
||||||
|
return value.toString();
|
||||||
|
}
|
||||||
|
|
||||||
function loadConfig() {
|
function loadConfig() {
|
||||||
configLoaded = false;
|
configLoaded = false;
|
||||||
configError = false;
|
configError = false;
|
||||||
@@ -295,6 +330,24 @@ Item {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SettingsDropdownRow {
|
||||||
|
tab: "clipboard"
|
||||||
|
tags: ["clipboard", "pinned", "max", "limit"]
|
||||||
|
settingKey: "maxPinned"
|
||||||
|
text: I18n.tr("Maximum Pinned Entries")
|
||||||
|
description: I18n.tr("Maximum number of entries that can be saved")
|
||||||
|
currentValue: root.getMaxPinnedText(root.config.maxPinned ?? 25)
|
||||||
|
options: root.maxPinnedOptions.map(opt => opt.text)
|
||||||
|
onValueChanged: value => {
|
||||||
|
for (let opt of root.maxPinnedOptions) {
|
||||||
|
if (opt.text === value) {
|
||||||
|
root.saveConfig("maxPinned", opt.value);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
SettingsCard {
|
SettingsCard {
|
||||||
|
|||||||
@@ -86,10 +86,30 @@ Item {
|
|||||||
settingKey: "dockAutoHide"
|
settingKey: "dockAutoHide"
|
||||||
tags: ["dock", "autohide", "hide", "hover"]
|
tags: ["dock", "autohide", "hide", "hover"]
|
||||||
text: I18n.tr("Auto-hide Dock")
|
text: I18n.tr("Auto-hide Dock")
|
||||||
description: I18n.tr("Hide the dock when not in use and reveal it when hovering near the dock area")
|
description: I18n.tr("Always hide the dock and reveal it when hovering near the dock area")
|
||||||
checked: SettingsData.dockAutoHide
|
checked: SettingsData.dockAutoHide
|
||||||
visible: SettingsData.showDock
|
visible: SettingsData.showDock
|
||||||
onToggled: checked => SettingsData.set("dockAutoHide", checked)
|
onToggled: checked => {
|
||||||
|
if (checked && SettingsData.dockSmartAutoHide) {
|
||||||
|
SettingsData.set("dockSmartAutoHide", false);
|
||||||
|
}
|
||||||
|
SettingsData.set("dockAutoHide", checked);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
SettingsToggleRow {
|
||||||
|
settingKey: "dockSmartAutoHide"
|
||||||
|
tags: ["dock", "smart", "autohide", "windows", "overlap", "intelligent"]
|
||||||
|
text: I18n.tr("Intelligent Auto-hide")
|
||||||
|
description: I18n.tr("Show dock when floating windows don't overlap its area")
|
||||||
|
checked: SettingsData.dockSmartAutoHide
|
||||||
|
visible: SettingsData.showDock && (CompositorService.isNiri || CompositorService.isHyprland)
|
||||||
|
onToggled: checked => {
|
||||||
|
if (checked && SettingsData.dockAutoHide) {
|
||||||
|
SettingsData.set("dockAutoHide", false);
|
||||||
|
}
|
||||||
|
SettingsData.set("dockSmartAutoHide", checked);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
SettingsToggleRow {
|
SettingsToggleRow {
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ Singleton {
|
|||||||
id: root
|
id: root
|
||||||
|
|
||||||
readonly property string currentVersion: "1.2"
|
readonly property string currentVersion: "1.2"
|
||||||
readonly property bool changelogEnabled: true
|
readonly property bool changelogEnabled: false
|
||||||
|
|
||||||
readonly property string configDir: Paths.strip(StandardPaths.writableLocation(StandardPaths.ConfigLocation)) + "/DankMaterialShell"
|
readonly property string configDir: Paths.strip(StandardPaths.writableLocation(StandardPaths.ConfigLocation)) + "/DankMaterialShell"
|
||||||
readonly property string changelogMarkerPath: configDir + "/.changelog-" + currentVersion
|
readonly property string changelogMarkerPath: configDir + "/.changelog-" + currentVersion
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ Singleton {
|
|||||||
property bool screensaverInhibited: false
|
property bool screensaverInhibited: false
|
||||||
property var screensaverInhibitors: []
|
property var screensaverInhibitors: []
|
||||||
|
|
||||||
property var activeSubscriptions: ["network", "network.credentials", "loginctl", "freedesktop", "freedesktop.screensaver", "gamma", "bluetooth", "bluetooth.pairing", "dwl", "brightness", "wlroutput", "evdev", "browser"]
|
property var activeSubscriptions: ["network", "network.credentials", "loginctl", "freedesktop", "freedesktop.screensaver", "gamma", "bluetooth", "bluetooth.pairing", "dwl", "brightness", "wlroutput", "evdev", "browser", "dbus"]
|
||||||
|
|
||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
if (socketPath && socketPath.length > 0) {
|
if (socketPath && socketPath.length > 0) {
|
||||||
@@ -191,17 +191,19 @@ Singleton {
|
|||||||
if (!line || line.length === 0)
|
if (!line || line.length === 0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
let response;
|
||||||
try {
|
try {
|
||||||
const response = JSON.parse(line);
|
response = JSON.parse(line);
|
||||||
const isClipboard = clipboardRequestIds[response.id];
|
|
||||||
if (isClipboard)
|
|
||||||
delete clipboardRequestIds[response.id];
|
|
||||||
else
|
|
||||||
console.log("DMSService: Request socket <<", line);
|
|
||||||
handleResponse(response);
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.warn("DMSService: Failed to parse request response");
|
console.warn("DMSService: Failed to parse request response:", line.substring(0, 100));
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
const isClipboard = clipboardRequestIds[response.id];
|
||||||
|
if (isClipboard)
|
||||||
|
delete clipboardRequestIds[response.id];
|
||||||
|
else
|
||||||
|
console.log("DMSService: Request socket <<", line);
|
||||||
|
handleResponse(response);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -223,14 +225,16 @@ Singleton {
|
|||||||
if (!line || line.length === 0)
|
if (!line || line.length === 0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
let response;
|
||||||
try {
|
try {
|
||||||
const response = JSON.parse(line);
|
response = JSON.parse(line);
|
||||||
if (!line.includes("clipboard"))
|
|
||||||
console.log("DMSService: Subscribe socket <<", line);
|
|
||||||
handleSubscriptionEvent(response);
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.warn("DMSService: Failed to parse subscription event");
|
console.warn("DMSService: Failed to parse subscription event:", line.substring(0, 100));
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
if (!line.includes("clipboard"))
|
||||||
|
console.log("DMSService: Subscribe socket <<", line);
|
||||||
|
handleSubscriptionEvent(response);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -300,7 +304,7 @@ Singleton {
|
|||||||
excludeServices = [excludeServices];
|
excludeServices = [excludeServices];
|
||||||
}
|
}
|
||||||
|
|
||||||
const allServices = ["network", "loginctl", "freedesktop", "gamma", "bluetooth", "cups", "dwl", "brightness", "extworkspace", "browser"];
|
const allServices = ["network", "loginctl", "freedesktop", "gamma", "bluetooth", "cups", "dwl", "brightness", "extworkspace", "browser", "dbus"];
|
||||||
const filtered = allServices.filter(s => !excludeServices.includes(s));
|
const filtered = allServices.filter(s => !excludeServices.includes(s));
|
||||||
subscribe(filtered);
|
subscribe(filtered);
|
||||||
}
|
}
|
||||||
@@ -383,6 +387,8 @@ Singleton {
|
|||||||
screensaverInhibited = data.inhibited || false;
|
screensaverInhibited = data.inhibited || false;
|
||||||
screensaverInhibitors = data.inhibitors || [];
|
screensaverInhibitors = data.inhibitors || [];
|
||||||
screensaverStateUpdate(data);
|
screensaverStateUpdate(data);
|
||||||
|
} else if (service === "dbus") {
|
||||||
|
dbusSignalReceived(data.subscriptionId || "", data);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -646,4 +652,89 @@ Singleton {
|
|||||||
"token": token
|
"token": token
|
||||||
}, callback);
|
}, callback);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
signal dbusSignalReceived(string subscriptionId, var data)
|
||||||
|
|
||||||
|
property var dbusSubscriptions: ({})
|
||||||
|
|
||||||
|
function dbusCall(bus, dest, path, iface, method, args, callback) {
|
||||||
|
sendRequest("dbus.call", {
|
||||||
|
"bus": bus,
|
||||||
|
"dest": dest,
|
||||||
|
"path": path,
|
||||||
|
"interface": iface,
|
||||||
|
"method": method,
|
||||||
|
"args": args || []
|
||||||
|
}, callback);
|
||||||
|
}
|
||||||
|
|
||||||
|
function dbusGetProperty(bus, dest, path, iface, property, callback) {
|
||||||
|
sendRequest("dbus.getProperty", {
|
||||||
|
"bus": bus,
|
||||||
|
"dest": dest,
|
||||||
|
"path": path,
|
||||||
|
"interface": iface,
|
||||||
|
"property": property
|
||||||
|
}, callback);
|
||||||
|
}
|
||||||
|
|
||||||
|
function dbusSetProperty(bus, dest, path, iface, property, value, callback) {
|
||||||
|
sendRequest("dbus.setProperty", {
|
||||||
|
"bus": bus,
|
||||||
|
"dest": dest,
|
||||||
|
"path": path,
|
||||||
|
"interface": iface,
|
||||||
|
"property": property,
|
||||||
|
"value": value
|
||||||
|
}, callback);
|
||||||
|
}
|
||||||
|
|
||||||
|
function dbusGetAllProperties(bus, dest, path, iface, callback) {
|
||||||
|
sendRequest("dbus.getAllProperties", {
|
||||||
|
"bus": bus,
|
||||||
|
"dest": dest,
|
||||||
|
"path": path,
|
||||||
|
"interface": iface
|
||||||
|
}, callback);
|
||||||
|
}
|
||||||
|
|
||||||
|
function dbusIntrospect(bus, dest, path, callback) {
|
||||||
|
sendRequest("dbus.introspect", {
|
||||||
|
"bus": bus,
|
||||||
|
"dest": dest,
|
||||||
|
"path": path || "/"
|
||||||
|
}, callback);
|
||||||
|
}
|
||||||
|
|
||||||
|
function dbusListNames(bus, callback) {
|
||||||
|
sendRequest("dbus.listNames", {
|
||||||
|
"bus": bus
|
||||||
|
}, callback);
|
||||||
|
}
|
||||||
|
|
||||||
|
function dbusSubscribe(bus, sender, path, iface, member, callback) {
|
||||||
|
sendRequest("dbus.subscribe", {
|
||||||
|
"bus": bus,
|
||||||
|
"sender": sender || "",
|
||||||
|
"path": path || "",
|
||||||
|
"interface": iface || "",
|
||||||
|
"member": member || ""
|
||||||
|
}, response => {
|
||||||
|
if (!response.error && response.result?.subscriptionId) {
|
||||||
|
dbusSubscriptions[response.result.subscriptionId] = true;
|
||||||
|
}
|
||||||
|
if (callback) callback(response);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function dbusUnsubscribe(subscriptionId, callback) {
|
||||||
|
sendRequest("dbus.unsubscribe", {
|
||||||
|
"subscriptionId": subscriptionId
|
||||||
|
}, response => {
|
||||||
|
if (!response.error) {
|
||||||
|
delete dbusSubscriptions[subscriptionId];
|
||||||
|
}
|
||||||
|
if (callback) callback(response);
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ Singleton {
|
|||||||
property int processLimit: 20
|
property int processLimit: 20
|
||||||
property string processSort: "cpu"
|
property string processSort: "cpu"
|
||||||
property bool noCpu: false
|
property bool noCpu: false
|
||||||
|
property int dgopProcessPid: 0
|
||||||
|
|
||||||
// Cursor data for accurate CPU calculations
|
// Cursor data for accurate CPU calculations
|
||||||
property string cpuCursor: ""
|
property string cpuCursor: ""
|
||||||
@@ -59,6 +60,7 @@ Singleton {
|
|||||||
property var processes: []
|
property var processes: []
|
||||||
property var allProcesses: []
|
property var allProcesses: []
|
||||||
property string currentSort: "cpu"
|
property string currentSort: "cpu"
|
||||||
|
property bool sortAscending: false
|
||||||
property var availableGpus: []
|
property var availableGpus: []
|
||||||
|
|
||||||
property string kernelVersion: ""
|
property string kernelVersion: ""
|
||||||
@@ -93,10 +95,8 @@ Singleton {
|
|||||||
if (modules) {
|
if (modules) {
|
||||||
const modulesToAdd = Array.isArray(modules) ? modules : [modules];
|
const modulesToAdd = Array.isArray(modules) ? modules : [modules];
|
||||||
for (const module of modulesToAdd) {
|
for (const module of modulesToAdd) {
|
||||||
// Increment reference count for this module
|
|
||||||
const currentCount = moduleRefCounts[module] || 0;
|
const currentCount = moduleRefCounts[module] || 0;
|
||||||
moduleRefCounts[module] = currentCount + 1;
|
moduleRefCounts[module] = currentCount + 1;
|
||||||
console.log("Adding ref for module:", module, "count:", moduleRefCounts[module]);
|
|
||||||
|
|
||||||
// Add to enabled modules if not already there
|
// Add to enabled modules if not already there
|
||||||
if (enabledModules.indexOf(module) === -1) {
|
if (enabledModules.indexOf(module) === -1) {
|
||||||
@@ -126,17 +126,13 @@ Singleton {
|
|||||||
for (const module of modulesToRemove) {
|
for (const module of modulesToRemove) {
|
||||||
const currentCount = moduleRefCounts[module] || 0;
|
const currentCount = moduleRefCounts[module] || 0;
|
||||||
if (currentCount > 1) {
|
if (currentCount > 1) {
|
||||||
// Decrement reference count
|
|
||||||
moduleRefCounts[module] = currentCount - 1;
|
moduleRefCounts[module] = currentCount - 1;
|
||||||
console.log("Removing ref for module:", module, "count:", moduleRefCounts[module]);
|
|
||||||
} else if (currentCount === 1) {
|
} else if (currentCount === 1) {
|
||||||
// Remove completely when count reaches 0
|
|
||||||
delete moduleRefCounts[module];
|
delete moduleRefCounts[module];
|
||||||
const index = enabledModules.indexOf(module);
|
const index = enabledModules.indexOf(module);
|
||||||
if (index > -1) {
|
if (index > -1) {
|
||||||
enabledModules.splice(index, 1);
|
enabledModules.splice(index, 1);
|
||||||
modulesChanged = true;
|
modulesChanged = true;
|
||||||
console.log("Disabling module:", module, "(no more refs)");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -171,17 +167,13 @@ Singleton {
|
|||||||
gpuPciIds = gpuPciIds.concat([pciId]);
|
gpuPciIds = gpuPciIds.concat([pciId]);
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log("Adding GPU PCI ID ref:", pciId, "count:", gpuPciIdRefCounts[pciId]);
|
|
||||||
// Force property change notification
|
|
||||||
gpuPciIdRefCounts = Object.assign({}, gpuPciIdRefCounts);
|
gpuPciIdRefCounts = Object.assign({}, gpuPciIdRefCounts);
|
||||||
}
|
}
|
||||||
|
|
||||||
function removeGpuPciId(pciId) {
|
function removeGpuPciId(pciId) {
|
||||||
const currentCount = gpuPciIdRefCounts[pciId] || 0;
|
const currentCount = gpuPciIdRefCounts[pciId] || 0;
|
||||||
if (currentCount > 1) {
|
if (currentCount > 1) {
|
||||||
// Decrement reference count
|
|
||||||
gpuPciIdRefCounts[pciId] = currentCount - 1;
|
gpuPciIdRefCounts[pciId] = currentCount - 1;
|
||||||
console.log("Removing GPU PCI ID ref:", pciId, "count:", gpuPciIdRefCounts[pciId]);
|
|
||||||
} else if (currentCount === 1) {
|
} else if (currentCount === 1) {
|
||||||
// Remove completely when count reaches 0
|
// Remove completely when count reaches 0
|
||||||
delete gpuPciIdRefCounts[pciId];
|
delete gpuPciIdRefCounts[pciId];
|
||||||
@@ -203,8 +195,6 @@ Singleton {
|
|||||||
}
|
}
|
||||||
availableGpus = updatedGpus;
|
availableGpus = updatedGpus;
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log("Removing GPU PCI ID completely:", pciId);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Force property change notification
|
// Force property change notification
|
||||||
@@ -389,8 +379,12 @@ Singleton {
|
|||||||
if (data.processes && Array.isArray(data.processes)) {
|
if (data.processes && Array.isArray(data.processes)) {
|
||||||
const newProcesses = [];
|
const newProcesses = [];
|
||||||
processSampleCount++;
|
processSampleCount++;
|
||||||
|
const ourPid = dgopProcessPid;
|
||||||
|
|
||||||
for (const proc of data.processes) {
|
for (const proc of data.processes) {
|
||||||
|
if (ourPid > 0 && proc.pid === ourPid)
|
||||||
|
continue;
|
||||||
|
|
||||||
const cpuUsage = processSampleCount >= 2 ? (proc.cpu || 0) : 0;
|
const cpuUsage = processSampleCount >= 2 ? (proc.cpu || 0) : 0;
|
||||||
|
|
||||||
newProcesses.push({
|
newProcesses.push({
|
||||||
@@ -577,39 +571,55 @@ Singleton {
|
|||||||
function setSortBy(newSortBy) {
|
function setSortBy(newSortBy) {
|
||||||
if (newSortBy !== currentSort) {
|
if (newSortBy !== currentSort) {
|
||||||
currentSort = newSortBy;
|
currentSort = newSortBy;
|
||||||
|
sortAscending = false;
|
||||||
applySorting();
|
applySorting();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function applySorting() {
|
function toggleSort(column) {
|
||||||
if (!allProcesses || allProcesses.length === 0) {
|
if (column === currentSort) {
|
||||||
return;
|
sortAscending = !sortAscending;
|
||||||
|
} else {
|
||||||
|
currentSort = column;
|
||||||
|
sortAscending = false;
|
||||||
}
|
}
|
||||||
|
applySorting();
|
||||||
|
}
|
||||||
|
|
||||||
|
function applySorting() {
|
||||||
|
if (!allProcesses || allProcesses.length === 0)
|
||||||
|
return;
|
||||||
|
|
||||||
|
const asc = sortAscending;
|
||||||
const sorted = allProcesses.slice();
|
const sorted = allProcesses.slice();
|
||||||
sorted.sort((a, b) => {
|
sorted.sort((a, b) => {
|
||||||
let valueA, valueB;
|
let valueA, valueB, result;
|
||||||
|
|
||||||
switch (currentSort) {
|
switch (currentSort) {
|
||||||
case "cpu":
|
case "cpu":
|
||||||
valueA = a.cpu || 0;
|
valueA = a.cpu || 0;
|
||||||
valueB = b.cpu || 0;
|
valueB = b.cpu || 0;
|
||||||
return valueB - valueA;
|
result = valueB - valueA;
|
||||||
|
break;
|
||||||
case "memory":
|
case "memory":
|
||||||
valueA = a.memoryKB || 0;
|
valueA = a.memoryKB || 0;
|
||||||
valueB = b.memoryKB || 0;
|
valueB = b.memoryKB || 0;
|
||||||
return valueB - valueA;
|
result = valueB - valueA;
|
||||||
|
break;
|
||||||
case "name":
|
case "name":
|
||||||
valueA = (a.command || "").toLowerCase();
|
valueA = (a.command || "").toLowerCase();
|
||||||
valueB = (b.command || "").toLowerCase();
|
valueB = (b.command || "").toLowerCase();
|
||||||
return valueA.localeCompare(valueB);
|
result = valueA.localeCompare(valueB);
|
||||||
|
break;
|
||||||
case "pid":
|
case "pid":
|
||||||
valueA = a.pid || 0;
|
valueA = a.pid || 0;
|
||||||
valueB = b.pid || 0;
|
valueB = b.pid || 0;
|
||||||
return valueA - valueB;
|
result = valueA - valueB;
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
return asc ? -result : result;
|
||||||
});
|
});
|
||||||
|
|
||||||
processes = sorted.slice(0, processLimit);
|
processes = sorted.slice(0, processLimit);
|
||||||
@@ -628,10 +638,7 @@ Singleton {
|
|||||||
id: dgopProcess
|
id: dgopProcess
|
||||||
command: root.buildDgopCommand()
|
command: root.buildDgopCommand()
|
||||||
running: false
|
running: false
|
||||||
onCommandChanged:
|
onStarted: dgopProcessPid = processId ?? 0
|
||||||
|
|
||||||
//console.log("DgopService command:", JSON.stringify(command))
|
|
||||||
{}
|
|
||||||
onExited: exitCode => {
|
onExited: exitCode => {
|
||||||
if (exitCode !== 0) {
|
if (exitCode !== 0) {
|
||||||
console.warn("Dgop process failed with exit code:", exitCode);
|
console.warn("Dgop process failed with exit code:", exitCode);
|
||||||
|
|||||||
@@ -556,6 +556,33 @@ Singleton {
|
|||||||
return loadPlugin(pluginId, true);
|
return loadPlugin(pluginId, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function togglePlugin(pluginId) {
|
||||||
|
let instance = pluginInstances[pluginId];
|
||||||
|
|
||||||
|
// Lazy instantiate daemon plugins on first toggle
|
||||||
|
// This respects the daemon lifecycle (not instantiated on load)
|
||||||
|
// while supporting toggle functionality for slideout-capable daemons
|
||||||
|
if (!instance && pluginDaemonComponents[pluginId]) {
|
||||||
|
const comp = pluginDaemonComponents[pluginId];
|
||||||
|
const newInstance = comp.createObject(root, {
|
||||||
|
"pluginId": pluginId,
|
||||||
|
"pluginService": root
|
||||||
|
});
|
||||||
|
if (newInstance) {
|
||||||
|
const newInstances = Object.assign({}, pluginInstances);
|
||||||
|
newInstances[pluginId] = newInstance;
|
||||||
|
pluginInstances = newInstances;
|
||||||
|
instance = newInstance;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (instance && typeof instance.toggle === "function") {
|
||||||
|
instance.toggle();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
function savePluginData(pluginId, key, value) {
|
function savePluginData(pluginId, key, value) {
|
||||||
SettingsData.setPluginSetting(pluginId, key, value);
|
SettingsData.setPluginSetting(pluginId, key, value);
|
||||||
pluginDataChanged(pluginId);
|
pluginDataChanged(pluginId);
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
v1.2.3
|
v1.4-unstable
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ StyledRect {
|
|||||||
property bool enabled: true
|
property bool enabled: true
|
||||||
property int buttonSize: 32
|
property int buttonSize: 32
|
||||||
property var tooltipText: null
|
property var tooltipText: null
|
||||||
|
property string tooltipSide: "bottom"
|
||||||
|
|
||||||
signal clicked
|
signal clicked
|
||||||
signal entered
|
signal entered
|
||||||
@@ -38,5 +39,6 @@ StyledRect {
|
|||||||
onEntered: root.entered()
|
onEntered: root.entered()
|
||||||
onExited: root.exited()
|
onExited: root.exited()
|
||||||
tooltipText: root.tooltipText
|
tooltipText: root.tooltipText
|
||||||
|
tooltipSide: root.tooltipSide
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ MouseArea {
|
|||||||
property color stateColor: Theme.surfaceText
|
property color stateColor: Theme.surfaceText
|
||||||
property real cornerRadius: parent && parent.radius !== undefined ? parent.radius : Theme.cornerRadius
|
property real cornerRadius: parent && parent.radius !== undefined ? parent.radius : Theme.cornerRadius
|
||||||
property var tooltipText: null
|
property var tooltipText: null
|
||||||
|
property string tooltipSide: "bottom"
|
||||||
|
|
||||||
readonly property real stateOpacity: disabled ? 0 : pressed ? 0.12 : containsMouse ? 0.08 : 0
|
readonly property real stateOpacity: disabled ? 0 : pressed ? 0.12 : containsMouse ? 0.08 : 0
|
||||||
|
|
||||||
@@ -26,7 +27,7 @@ MouseArea {
|
|||||||
interval: 400
|
interval: 400
|
||||||
repeat: false
|
repeat: false
|
||||||
onTriggered: {
|
onTriggered: {
|
||||||
tooltip.show(root.tooltipText, root, 0, 0, "bottom");
|
tooltip.show(root.tooltipText, root, 0, 0, root.tooltipSide);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -202,7 +202,7 @@
|
|||||||
{
|
{
|
||||||
"scope": ["keyword"],
|
"scope": ["keyword"],
|
||||||
"settings": {
|
"settings": {
|
||||||
"foreground": "{{dank16.color5.dark.hex}}"
|
"foreground": "{{dank16.color6.dark.hex}}"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -320,7 +320,7 @@
|
|||||||
"foreground": "{{dank16.color12.dark.hex}}"
|
"foreground": "{{dank16.color12.dark.hex}}"
|
||||||
},
|
},
|
||||||
"keyword": {
|
"keyword": {
|
||||||
"foreground": "{{dank16.color5.dark.hex}}"
|
"foreground": "{{dank16.color6.dark.hex}}"
|
||||||
},
|
},
|
||||||
"comment": {
|
"comment": {
|
||||||
"foreground": "{{dank16.color8.dark.hex}}"
|
"foreground": "{{dank16.color8.dark.hex}}"
|
||||||
|
|||||||
@@ -148,7 +148,7 @@
|
|||||||
{
|
{
|
||||||
"scope": ["keyword"],
|
"scope": ["keyword"],
|
||||||
"settings": {
|
"settings": {
|
||||||
"foreground": "{{dank16.color5.default.hex}}"
|
"foreground": "{{dank16.color6.default.hex}}"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -272,7 +272,7 @@
|
|||||||
"foreground": "{{dank16.color12.default.hex}}"
|
"foreground": "{{dank16.color12.default.hex}}"
|
||||||
},
|
},
|
||||||
"keyword": {
|
"keyword": {
|
||||||
"foreground": "{{dank16.color5.default.hex}}"
|
"foreground": "{{dank16.color6.default.hex}}"
|
||||||
},
|
},
|
||||||
"comment": {
|
"comment": {
|
||||||
"foreground": "{{colors.outline.default.hex}}"
|
"foreground": "{{colors.outline.default.hex}}"
|
||||||
|
|||||||
@@ -190,7 +190,7 @@
|
|||||||
"storage.type"
|
"storage.type"
|
||||||
],
|
],
|
||||||
"settings": {
|
"settings": {
|
||||||
"foreground": "{{dank16.color5.light.hex}}"
|
"foreground": "{{dank16.color6.light.hex}}"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -444,7 +444,7 @@
|
|||||||
"foreground": "{{colors.outline.light.hex}}"
|
"foreground": "{{colors.outline.light.hex}}"
|
||||||
},
|
},
|
||||||
"keyword": {
|
"keyword": {
|
||||||
"foreground": "{{dank16.color5.light.hex}}"
|
"foreground": "{{dank16.color6.light.hex}}"
|
||||||
},
|
},
|
||||||
"operator": {
|
"operator": {
|
||||||
"foreground": "{{colors.on_surface.light.hex}}"
|
"foreground": "{{colors.on_surface.light.hex}}"
|
||||||
|
|||||||
@@ -4265,6 +4265,12 @@
|
|||||||
"reference": "Modules/Settings/DankBarTab.qml:1068",
|
"reference": "Modules/Settings/DankBarTab.qml:1068",
|
||||||
"comment": ""
|
"comment": ""
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"term": "Intelligent Auto-hide",
|
||||||
|
"context": "Intelligent Auto-hide",
|
||||||
|
"reference": "Modules/Settings/DockTab.qml:103",
|
||||||
|
"comment": ""
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"term": "Interface:",
|
"term": "Interface:",
|
||||||
"context": "Interface:",
|
"context": "Interface:",
|
||||||
@@ -7415,6 +7421,12 @@
|
|||||||
"reference": "Modules/Settings/ThemeColorsTab.qml:1375",
|
"reference": "Modules/Settings/ThemeColorsTab.qml:1375",
|
||||||
"comment": ""
|
"comment": ""
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"term": "Show dock when windows don't overlap its area, hide when they do",
|
||||||
|
"context": "Show dock when windows don't overlap its area, hide when they do",
|
||||||
|
"reference": "Modules/Settings/DockTab.qml:104",
|
||||||
|
"comment": ""
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"term": "Show launcher overlay when typing in Niri overview. Disable to use another launcher.",
|
"term": "Show launcher overlay when typing in Niri overview. Disable to use another launcher.",
|
||||||
"context": "Show launcher overlay when typing in Niri overview. Disable to use another launcher.",
|
"context": "Show launcher overlay when typing in Niri overview. Disable to use another launcher.",
|
||||||
|
|||||||
@@ -4976,6 +4976,13 @@
|
|||||||
"reference": "",
|
"reference": "",
|
||||||
"comment": ""
|
"comment": ""
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"term": "Intelligent Auto-hide",
|
||||||
|
"translation": "",
|
||||||
|
"context": "Intelligent Auto-hide",
|
||||||
|
"reference": "",
|
||||||
|
"comment": ""
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"term": "Interface:",
|
"term": "Interface:",
|
||||||
"translation": "",
|
"translation": "",
|
||||||
@@ -8651,6 +8658,13 @@
|
|||||||
"reference": "",
|
"reference": "",
|
||||||
"comment": ""
|
"comment": ""
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"term": "Show dock when windows don't overlap its area, hide when they do",
|
||||||
|
"translation": "",
|
||||||
|
"context": "",
|
||||||
|
"reference": "",
|
||||||
|
"comment": ""
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"term": "Show launcher overlay when typing in Niri overview. Disable to use another launcher.",
|
"term": "Show launcher overlay when typing in Niri overview. Disable to use another launcher.",
|
||||||
"translation": "",
|
"translation": "",
|
||||||
|
|||||||
Reference in New Issue
Block a user