mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-01-31 00:42:50 -05:00
Compare commits
4 Commits
d6dacc2975
...
v1.2.1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b76d0ce97d | ||
|
|
fa66d330cf | ||
|
|
157eab2d07 | ||
|
|
f50ad2dc22 |
76
.github/workflows/run-obs.yml
vendored
76
.github/workflows/run-obs.yml
vendored
@@ -4,14 +4,13 @@ on:
|
|||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
inputs:
|
inputs:
|
||||||
package:
|
package:
|
||||||
description: "Package to update"
|
description: "Package to update (dms, dms-git, or all)"
|
||||||
required: true
|
required: false
|
||||||
type: choice
|
default: "all"
|
||||||
options:
|
tag_version:
|
||||||
- dms
|
description: "Specific tag version for dms stable (e.g., v1.0.2). Leave empty to auto-detect latest release."
|
||||||
- dms-git
|
required: false
|
||||||
- all
|
default: ""
|
||||||
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
|
||||||
@@ -57,9 +56,8 @@ 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() {
|
||||||
LATEST_TAG=$(curl -s https://api.github.com/repos/AvengeMedia/DankMaterialShell/releases/latest | grep '"tag_name"' | sed 's/.*"tag_name": "\([^"]*\)".*/\1/' || echo "")
|
local LATEST_TAG=$(curl -s https://api.github.com/repos/AvengeMedia/DankMaterialShell/releases/latest | grep '"tag_name"' | sed 's/.*"tag_name": "v\?\([^"]*\)".*/\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 "")
|
||||||
|
|
||||||
@@ -75,8 +73,8 @@ jobs:
|
|||||||
# Main logic
|
# Main logic
|
||||||
REBUILD="${{ github.event.inputs.rebuild_release }}"
|
REBUILD="${{ github.event.inputs.rebuild_release }}"
|
||||||
|
|
||||||
if [[ "${{ github.ref }}" =~ ^refs/tags/ ]]; then
|
if [[ "${{ github.event_name }}" == "push" && "${{ github.ref }}" =~ ^refs/tags/ ]]; then
|
||||||
# Tag selected or pushed - always update stable package
|
# Tag push - 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
|
||||||
@@ -106,12 +104,7 @@ 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")
|
||||||
if check_dms_stable; then
|
check_dms_stable && PACKAGES_TO_UPDATE+=("dms")
|
||||||
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
|
||||||
@@ -136,9 +129,6 @@ 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
|
||||||
@@ -171,19 +161,12 @@ jobs:
|
|||||||
- name: Determine packages to update
|
- name: Determine packages to update
|
||||||
id: packages
|
id: packages
|
||||||
run: |
|
run: |
|
||||||
# Check if GITHUB_REF points to a tag (works for both push events and workflow_dispatch with tag selected)
|
if [[ "${{ github.event_name }}" == "push" && "${{ github.ref }}" =~ ^refs/tags/ ]]; then
|
||||||
if [[ "${{ github.ref }}" =~ ^refs/tags/ ]]; then
|
# Tag push event - use the pushed tag
|
||||||
# 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 "Using tag from GITHUB_REF: $VERSION"
|
echo "Triggered by tag: $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
|
||||||
@@ -193,28 +176,22 @@ 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
|
||||||
# Use github.ref if tag selected, otherwise auto-detect latest
|
# For explicit dms selection, require tag_version
|
||||||
if [[ "${{ github.ref }}" =~ ^refs/tags/ ]]; then
|
if [[ -n "${{ github.event.inputs.tag_version }}" ]]; then
|
||||||
VERSION="${GITHUB_REF#refs/tags/}"
|
VERSION="${{ github.event.inputs.tag_version }}"
|
||||||
echo "version=$VERSION" >> $GITHUB_OUTPUT
|
echo "version=$VERSION" >> $GITHUB_OUTPUT
|
||||||
echo "Using tag from GITHUB_REF: $VERSION"
|
echo "Using specified tag: $VERSION"
|
||||||
else
|
else
|
||||||
# Auto-detect latest release for dms
|
echo "ERROR: tag_version is required when package=dms"
|
||||||
LATEST_TAG=$(curl -s https://api.github.com/repos/AvengeMedia/DankMaterialShell/releases/latest | grep '"tag_name"' | sed 's/.*"tag_name": "\([^"]*\)".*/\1/' || echo "")
|
echo "Please specify a tag version (e.g., v1.0.2) or use package=all for auto-detection"
|
||||||
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
|
exit 1
|
||||||
fi
|
fi
|
||||||
fi
|
|
||||||
elif [[ "${{ github.event.inputs.package }}" == "all" ]]; then
|
elif [[ "${{ github.event.inputs.package }}" == "all" ]]; then
|
||||||
# Use github.ref if tag selected, otherwise auto-detect latest
|
# For "all", auto-detect if tag_version not specified
|
||||||
if [[ "${{ github.ref }}" =~ ^refs/tags/ ]]; then
|
if [[ -n "${{ github.event.inputs.tag_version }}" ]]; then
|
||||||
VERSION="${GITHUB_REF#refs/tags/}"
|
VERSION="${{ github.event.inputs.tag_version }}"
|
||||||
echo "version=$VERSION" >> $GITHUB_OUTPUT
|
echo "version=$VERSION" >> $GITHUB_OUTPUT
|
||||||
echo "Using tag from GITHUB_REF: $VERSION"
|
echo "Using specified tag: $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 "")
|
||||||
@@ -229,7 +206,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 }}" ]] && [[ ! "${{ github.ref }}" =~ ^refs/tags/ ]]; then
|
if [[ "${{ github.event.inputs.package }}" == "all" ]] && [[ -z "${{ github.event.inputs.rebuild_release }}" ]] && [[ -z "${{ github.event.inputs.tag_version }}" ]]; 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
|
||||||
@@ -238,9 +215,6 @@ 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
|
||||||
|
|||||||
@@ -477,7 +477,7 @@ func checkWindowManagers() []checkResult {
|
|||||||
results = append(results, checkResult{
|
results = append(results, checkResult{
|
||||||
catCompositor, c.name, statusOK,
|
catCompositor, c.name, statusOK,
|
||||||
getVersionFromCommand(c.versionCmd, c.versionArg, c.versionRegex), details,
|
getVersionFromCommand(c.versionCmd, c.versionArg, c.versionRegex), details,
|
||||||
doctorDocsURL + "#compositor-checks",
|
doctorDocsURL + "#compositor",
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -486,7 +486,7 @@ func checkWindowManagers() []checkResult {
|
|||||||
catCompositor, "Compositor", statusError,
|
catCompositor, "Compositor", statusError,
|
||||||
"No supported Wayland compositor found",
|
"No supported Wayland compositor found",
|
||||||
"Install Hyprland, niri, Sway, River, or Wayfire",
|
"Install Hyprland, niri, Sway, River, or Wayfire",
|
||||||
doctorDocsURL + "#compositor-checks",
|
doctorDocsURL + "#compositor",
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -634,14 +634,19 @@ func checkI2CAvailability() checkResult {
|
|||||||
return checkResult{catOptionalFeatures, "I2C/DDC", statusOK, fmt.Sprintf("%d monitor(s) detected", len(devices)), "External monitor brightness control", doctorDocsURL + "#optional-features"}
|
return checkResult{catOptionalFeatures, "I2C/DDC", statusOK, fmt.Sprintf("%d monitor(s) detected", len(devices)), "External monitor brightness control", doctorDocsURL + "#optional-features"}
|
||||||
}
|
}
|
||||||
|
|
||||||
func detectNetworkBackend(stackResult *network.DetectResult) string {
|
func detectNetworkBackend() string {
|
||||||
switch stackResult.Backend {
|
result, err := network.DetectNetworkStack()
|
||||||
|
if err != nil {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
switch result.Backend {
|
||||||
case network.BackendNetworkManager:
|
case network.BackendNetworkManager:
|
||||||
return "NetworkManager"
|
return "NetworkManager"
|
||||||
case network.BackendIwd:
|
case network.BackendIwd:
|
||||||
return "iwd"
|
return "iwd"
|
||||||
case network.BackendNetworkd:
|
case network.BackendNetworkd:
|
||||||
if stackResult.HasIwd {
|
if result.HasIwd {
|
||||||
return "iwd + systemd-networkd"
|
return "iwd + systemd-networkd"
|
||||||
}
|
}
|
||||||
return "systemd-networkd"
|
return "systemd-networkd"
|
||||||
@@ -652,73 +657,75 @@ func detectNetworkBackend(stackResult *network.DetectResult) string {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func getOptionalDBusStatus(busName string) (status, string) {
|
|
||||||
if utils.IsDBusServiceAvailable(busName) {
|
|
||||||
return statusOK, "Available"
|
|
||||||
} else {
|
|
||||||
return statusWarn, "Not available"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func checkOptionalDependencies() []checkResult {
|
func checkOptionalDependencies() []checkResult {
|
||||||
var results []checkResult
|
var results []checkResult
|
||||||
|
|
||||||
optionalFeaturesURL := doctorDocsURL + "#optional-features"
|
if utils.IsServiceActive("accounts-daemon", false) {
|
||||||
|
results = append(results, checkResult{catOptionalFeatures, "accountsservice", statusOK, "Running", "User accounts", doctorDocsURL + "#optional-features"})
|
||||||
|
} else {
|
||||||
|
results = append(results, checkResult{catOptionalFeatures, "accountsservice", statusWarn, "Not running", "User accounts", doctorDocsURL + "#optional-features"})
|
||||||
|
}
|
||||||
|
|
||||||
accountsStatus, accountsMsg := getOptionalDBusStatus("org.freedesktop.Accounts")
|
if utils.IsServiceActive("power-profiles-daemon", false) {
|
||||||
results = append(results, checkResult{catOptionalFeatures, "accountsservice", accountsStatus, accountsMsg, "User accounts", optionalFeaturesURL})
|
results = append(results, checkResult{catOptionalFeatures, "power-profiles-daemon", statusOK, "Running", "Power profile management", doctorDocsURL + "#optional-features"})
|
||||||
|
} else {
|
||||||
ppdStatus, ppdMsg := getOptionalDBusStatus("org.freedesktop.UPower.PowerProfiles")
|
results = append(results, checkResult{catOptionalFeatures, "power-profiles-daemon", statusInfo, "Not running", "Power profile management", doctorDocsURL + "#optional-features"})
|
||||||
results = append(results, checkResult{catOptionalFeatures, "power-profiles-daemon", ppdStatus, ppdMsg, "Power profile management", optionalFeaturesURL})
|
}
|
||||||
|
|
||||||
logindStatus, logindMsg := getOptionalDBusStatus("org.freedesktop.login1")
|
|
||||||
results = append(results, checkResult{catOptionalFeatures, "logind", logindStatus, logindMsg, "Session management", optionalFeaturesURL})
|
|
||||||
|
|
||||||
results = append(results, checkI2CAvailability())
|
results = append(results, checkI2CAvailability())
|
||||||
|
|
||||||
terminals := []string{"ghostty", "kitty", "alacritty", "foot", "wezterm"}
|
terminals := []string{"ghostty", "kitty", "alacritty", "foot", "wezterm"}
|
||||||
if idx := slices.IndexFunc(terminals, utils.CommandExists); idx >= 0 {
|
if idx := slices.IndexFunc(terminals, utils.CommandExists); idx >= 0 {
|
||||||
results = append(results, checkResult{catOptionalFeatures, "Terminal", statusOK, terminals[idx], "", optionalFeaturesURL})
|
results = append(results, checkResult{catOptionalFeatures, "Terminal", statusOK, terminals[idx], "", doctorDocsURL + "#optional-features"})
|
||||||
} else {
|
} else {
|
||||||
results = append(results, checkResult{catOptionalFeatures, "Terminal", statusWarn, "None found", "Install ghostty, kitty, or alacritty", optionalFeaturesURL})
|
results = append(results, checkResult{catOptionalFeatures, "Terminal", statusWarn, "None found", "Install ghostty, kitty, or alacritty", doctorDocsURL + "#optional-features"})
|
||||||
}
|
}
|
||||||
|
|
||||||
networkResult, err := network.DetectNetworkStack()
|
|
||||||
networkStatus, networkMessage, networkDetails := statusOK, "Not available", "Network management"
|
|
||||||
|
|
||||||
if err == nil && networkResult.Backend != network.BackendNone {
|
|
||||||
networkMessage = detectNetworkBackend(networkResult)
|
|
||||||
if doctorVerbose {
|
|
||||||
networkDetails = networkResult.ChosenReason
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
networkStatus = statusInfo
|
|
||||||
}
|
|
||||||
|
|
||||||
results = append(results, checkResult{catOptionalFeatures, "Network", networkStatus, networkMessage, networkDetails, optionalFeaturesURL})
|
|
||||||
|
|
||||||
deps := []struct {
|
deps := []struct {
|
||||||
name, cmd, desc string
|
name, cmd, altCmd, desc string
|
||||||
important bool
|
important bool
|
||||||
}{
|
}{
|
||||||
{"matugen", "matugen", "Dynamic theming", true},
|
{"matugen", "matugen", "", "Dynamic theming", true},
|
||||||
{"dgop", "dgop", "System monitoring", true},
|
{"dgop", "dgop", "", "System monitoring", true},
|
||||||
{"cava", "cava", "Audio visualizer", true},
|
{"cava", "cava", "", "Audio visualizer", true},
|
||||||
{"khal", "khal", "Calendar events", false},
|
{"khal", "khal", "", "Calendar events", false},
|
||||||
{"danksearch", "dsearch", "File search", false},
|
{"Network", "nmcli", "iwctl", "Network management", false},
|
||||||
{"fprintd", "fprintd-list", "Fingerprint auth", false},
|
{"danksearch", "dsearch", "", "File search", false},
|
||||||
|
{"loginctl", "loginctl", "", "Session management", false},
|
||||||
|
{"fprintd", "fprintd-list", "", "Fingerprint auth", false},
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, d := range deps {
|
for _, d := range deps {
|
||||||
found := utils.CommandExists(d.cmd)
|
found, foundCmd := utils.CommandExists(d.cmd), d.cmd
|
||||||
|
if !found && d.altCmd != "" && utils.CommandExists(d.altCmd) {
|
||||||
|
found, foundCmd = true, d.altCmd
|
||||||
|
}
|
||||||
|
|
||||||
switch {
|
switch {
|
||||||
case found:
|
case found:
|
||||||
results = append(results, checkResult{catOptionalFeatures, d.name, statusOK, "Installed", d.desc, optionalFeaturesURL})
|
message := "Installed"
|
||||||
|
details := d.desc
|
||||||
|
if d.name == "Network" {
|
||||||
|
result, err := network.DetectNetworkStack()
|
||||||
|
if err == nil && result.Backend != network.BackendNone {
|
||||||
|
message = detectNetworkBackend() + " (active)"
|
||||||
|
if doctorVerbose {
|
||||||
|
details = result.ChosenReason
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
switch foundCmd {
|
||||||
|
case "nmcli":
|
||||||
|
message = "NetworkManager (installed)"
|
||||||
|
case "iwctl":
|
||||||
|
message = "iwd (installed)"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
results = append(results, checkResult{catOptionalFeatures, d.name, statusOK, message, details, doctorDocsURL + "#optional-features"})
|
||||||
case d.important:
|
case d.important:
|
||||||
results = append(results, checkResult{catOptionalFeatures, d.name, statusWarn, "Missing", d.desc, optionalFeaturesURL})
|
results = append(results, checkResult{catOptionalFeatures, d.name, statusWarn, "Missing", d.desc, doctorDocsURL + "#optional-features"})
|
||||||
default:
|
default:
|
||||||
results = append(results, checkResult{catOptionalFeatures, d.name, statusInfo, "Not installed", d.desc, optionalFeaturesURL})
|
results = append(results, checkResult{catOptionalFeatures, d.name, statusInfo, "Not installed", d.desc, doctorDocsURL + "#optional-features"})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -886,10 +893,6 @@ func printResultLine(r checkResult, styles tui.Styles) {
|
|||||||
if doctorVerbose && r.details != "" {
|
if doctorVerbose && r.details != "" {
|
||||||
fmt.Printf(" %s\n", styles.Subtle.Render("└─ "+r.details))
|
fmt.Printf(" %s\n", styles.Subtle.Render("└─ "+r.details))
|
||||||
}
|
}
|
||||||
|
|
||||||
if (r.status == statusError || r.status == statusWarn) && r.url != "" {
|
|
||||||
fmt.Printf(" %s\n", styles.Subtle.Render("→ "+r.url))
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func printSummary(results []checkResult, qsMissingFeatures bool) {
|
func printSummary(results []checkResult, qsMissingFeatures bool) {
|
||||||
|
|||||||
@@ -108,6 +108,7 @@ func (o *OpenSUSEDistribution) GetPackageMappingWithVariants(wm deps.WindowManag
|
|||||||
packages := map[string]PackageMapping{
|
packages := map[string]PackageMapping{
|
||||||
// Standard zypper packages
|
// Standard zypper packages
|
||||||
"git": {Name: "git", Repository: RepoTypeSystem},
|
"git": {Name: "git", Repository: RepoTypeSystem},
|
||||||
|
"ghostty": {Name: "ghostty", Repository: RepoTypeSystem},
|
||||||
"kitty": {Name: "kitty", Repository: RepoTypeSystem},
|
"kitty": {Name: "kitty", Repository: RepoTypeSystem},
|
||||||
"alacritty": {Name: "alacritty", Repository: RepoTypeSystem},
|
"alacritty": {Name: "alacritty", Repository: RepoTypeSystem},
|
||||||
"xdg-desktop-portal-gtk": {Name: "xdg-desktop-portal-gtk", Repository: RepoTypeSystem},
|
"xdg-desktop-portal-gtk": {Name: "xdg-desktop-portal-gtk", Repository: RepoTypeSystem},
|
||||||
@@ -116,7 +117,6 @@ func (o *OpenSUSEDistribution) GetPackageMappingWithVariants(wm deps.WindowManag
|
|||||||
// DMS packages from OBS
|
// DMS packages from OBS
|
||||||
"dms (DankMaterialShell)": o.getDmsMapping(variants["dms (DankMaterialShell)"]),
|
"dms (DankMaterialShell)": o.getDmsMapping(variants["dms (DankMaterialShell)"]),
|
||||||
"quickshell": o.getQuickshellMapping(variants["quickshell"]),
|
"quickshell": o.getQuickshellMapping(variants["quickshell"]),
|
||||||
"ghostty": {Name: "ghostty", Repository: RepoTypeOBS, RepoURL: "home:AvengeMedia:danklinux"},
|
|
||||||
"matugen": {Name: "matugen", Repository: RepoTypeOBS, RepoURL: "home:AvengeMedia:danklinux"},
|
"matugen": {Name: "matugen", Repository: RepoTypeOBS, RepoURL: "home:AvengeMedia:danklinux"},
|
||||||
"dgop": {Name: "dgop", Repository: RepoTypeOBS, RepoURL: "home:AvengeMedia:danklinux"},
|
"dgop": {Name: "dgop", Repository: RepoTypeOBS, RepoURL: "home:AvengeMedia:danklinux"},
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,20 +0,0 @@
|
|||||||
package utils
|
|
||||||
|
|
||||||
import (
|
|
||||||
"github.com/godbus/dbus/v5"
|
|
||||||
)
|
|
||||||
|
|
||||||
func IsDBusServiceAvailable(busName string) bool {
|
|
||||||
conn, err := dbus.ConnectSystemBus()
|
|
||||||
if err != nil {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
defer conn.Close()
|
|
||||||
|
|
||||||
obj := conn.Object("org.freedesktop.DBus", "/org/freedesktop/DBus")
|
|
||||||
var owned bool
|
|
||||||
if err := obj.Call("org.freedesktop.DBus.NameHasOwner", 0, busName).Store(&owned); err != nil {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
return owned
|
|
||||||
}
|
|
||||||
@@ -2,6 +2,7 @@ package utils
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"os/exec"
|
"os/exec"
|
||||||
|
"strings"
|
||||||
)
|
)
|
||||||
|
|
||||||
type AppChecker interface {
|
type AppChecker interface {
|
||||||
@@ -42,3 +43,16 @@ func AnyCommandExists(cmds ...string) bool {
|
|||||||
}
|
}
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func IsServiceActive(name string, userService bool) bool {
|
||||||
|
if !CommandExists("systemctl") {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
args := []string{"is-active", name}
|
||||||
|
if userService {
|
||||||
|
args = []string{"--user", "is-active", name}
|
||||||
|
}
|
||||||
|
output, _ := exec.Command("systemctl", args...).Output()
|
||||||
|
return strings.EqualFold(strings.TrimSpace(string(output)), "active")
|
||||||
|
}
|
||||||
|
|||||||
@@ -73,13 +73,6 @@ in
|
|||||||
default = hasPluginSettings;
|
default = hasPluginSettings;
|
||||||
description = ''Whether to manage plugin settings. Automatically enabled if any plugins have settings configured.'';
|
description = ''Whether to manage plugin settings. Automatically enabled if any plugins have settings configured.'';
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.target = lib.mkOption {
|
|
||||||
type = lib.types.str;
|
|
||||||
default = config.wayland.systemd.target;
|
|
||||||
defaultText = lib.literalExpression "config.wayland.systemd.target";
|
|
||||||
description = "Systemd target to bind to.";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
@@ -91,8 +84,8 @@ in
|
|||||||
systemd.user.services.dms = lib.mkIf cfg.systemd.enable {
|
systemd.user.services.dms = lib.mkIf cfg.systemd.enable {
|
||||||
Unit = {
|
Unit = {
|
||||||
Description = "DankMaterialShell";
|
Description = "DankMaterialShell";
|
||||||
PartOf = [ cfg.systemd.target ];
|
PartOf = [ config.wayland.systemd.target ];
|
||||||
After = [ cfg.systemd.target ];
|
After = [ config.wayland.systemd.target ];
|
||||||
};
|
};
|
||||||
|
|
||||||
Service = {
|
Service = {
|
||||||
@@ -100,7 +93,7 @@ in
|
|||||||
Restart = "on-failure";
|
Restart = "on-failure";
|
||||||
};
|
};
|
||||||
|
|
||||||
Install.WantedBy = [ cfg.systemd.target ];
|
Install.WantedBy = [ config.wayland.systemd.target ];
|
||||||
};
|
};
|
||||||
|
|
||||||
xdg.stateFile."DankMaterialShell/session.json" = lib.mkIf (cfg.session != { }) {
|
xdg.stateFile."DankMaterialShell/session.json" = lib.mkIf (cfg.session != { }) {
|
||||||
|
|||||||
@@ -20,19 +20,15 @@ in
|
|||||||
imports = [
|
imports = [
|
||||||
(import ./options.nix args)
|
(import ./options.nix args)
|
||||||
];
|
];
|
||||||
options.programs.dank-material-shell.systemd.target = lib.mkOption {
|
|
||||||
type = lib.types.str;
|
|
||||||
description = "Systemd target to bind to.";
|
|
||||||
default = "graphical-session.target";
|
|
||||||
};
|
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
systemd.user.services.dms = lib.mkIf cfg.systemd.enable {
|
systemd.user.services.dms = lib.mkIf cfg.systemd.enable {
|
||||||
description = "DankMaterialShell";
|
description = "DankMaterialShell";
|
||||||
path = lib.mkForce [ ];
|
path = lib.mkForce [ ];
|
||||||
|
|
||||||
partOf = [ cfg.systemd.target ];
|
partOf = [ "graphical-session.target" ];
|
||||||
after = [ cfg.systemd.target ];
|
after = [ "graphical-session.target" ];
|
||||||
wantedBy = [ cfg.systemd.target ];
|
wantedBy = [ "graphical-session.target" ];
|
||||||
restartIfChanged = cfg.systemd.restartIfChanged;
|
restartIfChanged = cfg.systemd.restartIfChanged;
|
||||||
|
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
Saffron Bloom
|
Spicy Miso
|
||||||
|
|||||||
@@ -45,10 +45,6 @@ Singleton {
|
|||||||
Quickshell.execDetached(["cp", strip(from), strip(to)]);
|
Quickshell.execDetached(["cp", strip(from), strip(to)]);
|
||||||
}
|
}
|
||||||
|
|
||||||
function isSteamApp(appId: string): bool {
|
|
||||||
return appId && /^steam_app_\d+$/.test(appId);
|
|
||||||
}
|
|
||||||
|
|
||||||
function moddedAppId(appId: string): string {
|
function moddedAppId(appId: string): string {
|
||||||
const subs = SettingsData.appIdSubstitutions || [];
|
const subs = SettingsData.appIdSubstitutions || [];
|
||||||
for (let i = 0; i < subs.length; i++) {
|
for (let i = 0; i < subs.length; i++) {
|
||||||
@@ -64,9 +60,6 @@ Singleton {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
const steamMatch = appId.match(/^steam_app_(\d+)$/);
|
|
||||||
if (steamMatch)
|
|
||||||
return `steam_icon_${steamMatch[1]}`;
|
|
||||||
return appId;
|
return appId;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -145,7 +145,6 @@ Singleton {
|
|||||||
property bool controlCenterShowMicPercent: true
|
property bool controlCenterShowMicPercent: true
|
||||||
property bool controlCenterShowBatteryIcon: false
|
property bool controlCenterShowBatteryIcon: false
|
||||||
property bool controlCenterShowPrinterIcon: false
|
property bool controlCenterShowPrinterIcon: false
|
||||||
property bool controlCenterShowScreenSharingIcon: true
|
|
||||||
property bool showPrivacyButton: true
|
property bool showPrivacyButton: true
|
||||||
property bool privacyShowMicIcon: false
|
property bool privacyShowMicIcon: false
|
||||||
property bool privacyShowCameraIcon: false
|
property bool privacyShowCameraIcon: false
|
||||||
|
|||||||
@@ -904,7 +904,7 @@ Singleton {
|
|||||||
if (typeof SettingsData !== "undefined") {
|
if (typeof SettingsData !== "undefined") {
|
||||||
const skipTemplates = [];
|
const skipTemplates = [];
|
||||||
if (!SettingsData.runDmsMatugenTemplates) {
|
if (!SettingsData.runDmsMatugenTemplates) {
|
||||||
skipTemplates.push("gtk", "nvim", "niri", "qt5ct", "qt6ct", "firefox", "pywalfox", "zenbrowser", "vesktop", "equibop", "ghostty", "kitty", "foot", "alacritty", "wezterm", "dgop", "kcolorscheme", "vscode");
|
skipTemplates.push("gtk", "neovim", "niri", "qt5ct", "qt6ct", "firefox", "pywalfox", "zenbrowser", "vesktop", "equibop", "ghostty", "kitty", "foot", "alacritty", "wezterm", "dgop", "kcolorscheme", "vscode");
|
||||||
} else {
|
} else {
|
||||||
if (!SettingsData.matugenTemplateGtk)
|
if (!SettingsData.matugenTemplateGtk)
|
||||||
skipTemplates.push("gtk");
|
skipTemplates.push("gtk");
|
||||||
|
|||||||
@@ -28,8 +28,7 @@ Singleton {
|
|||||||
showMicIcon: false,
|
showMicIcon: false,
|
||||||
showMicPercent: true,
|
showMicPercent: true,
|
||||||
showBatteryIcon: false,
|
showBatteryIcon: false,
|
||||||
showPrinterIcon: false,
|
showPrinterIcon: false
|
||||||
showScreenSharingIcon: true
|
|
||||||
};
|
};
|
||||||
leftModel.append(dummy);
|
leftModel.append(dummy);
|
||||||
centerModel.append(dummy);
|
centerModel.append(dummy);
|
||||||
@@ -85,8 +84,6 @@ Singleton {
|
|||||||
item.showBatteryIcon = order[i].showBatteryIcon;
|
item.showBatteryIcon = order[i].showBatteryIcon;
|
||||||
if (isObj && order[i].showPrinterIcon !== undefined)
|
if (isObj && order[i].showPrinterIcon !== undefined)
|
||||||
item.showPrinterIcon = order[i].showPrinterIcon;
|
item.showPrinterIcon = order[i].showPrinterIcon;
|
||||||
if (isObj && order[i].showScreenSharingIcon !== undefined)
|
|
||||||
item.showScreenSharingIcon = order[i].showScreenSharingIcon;
|
|
||||||
|
|
||||||
model.append(item);
|
model.append(item);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -70,7 +70,6 @@ var SPEC = {
|
|||||||
controlCenterShowMicPercent: { def: false },
|
controlCenterShowMicPercent: { def: false },
|
||||||
controlCenterShowBatteryIcon: { def: false },
|
controlCenterShowBatteryIcon: { def: false },
|
||||||
controlCenterShowPrinterIcon: { def: false },
|
controlCenterShowPrinterIcon: { def: false },
|
||||||
controlCenterShowScreenSharingIcon: { def: true },
|
|
||||||
|
|
||||||
showPrivacyButton: { def: true },
|
showPrivacyButton: { def: true },
|
||||||
privacyShowMicIcon: { def: false },
|
privacyShowMicIcon: { def: false },
|
||||||
|
|||||||
@@ -203,8 +203,6 @@ Item {
|
|||||||
|
|
||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
dockRecreateDebounce.start();
|
dockRecreateDebounce.start();
|
||||||
// Force PolkitService singleton to initialize
|
|
||||||
PolkitService.polkitAvailable;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Connections {
|
Connections {
|
||||||
@@ -317,26 +315,13 @@ Item {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
LazyLoader {
|
|
||||||
id: wifiPasswordModalLoader
|
|
||||||
active: false
|
|
||||||
|
|
||||||
Component.onCompleted: {
|
|
||||||
PopoutService.wifiPasswordModalLoader = wifiPasswordModalLoader;
|
|
||||||
}
|
|
||||||
|
|
||||||
WifiPasswordModal {
|
WifiPasswordModal {
|
||||||
id: wifiPasswordModalItem
|
id: wifiPasswordModal
|
||||||
|
|
||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
PopoutService.wifiPasswordModal = wifiPasswordModalItem;
|
PopoutService.wifiPasswordModal = wifiPasswordModal;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
LazyLoader {
|
|
||||||
id: polkitAuthModalLoader
|
|
||||||
active: false
|
|
||||||
|
|
||||||
PolkitAuthModal {
|
PolkitAuthModal {
|
||||||
id: polkitAuthModal
|
id: polkitAuthModal
|
||||||
@@ -345,18 +330,6 @@ Item {
|
|||||||
PopoutService.polkitAuthModal = polkitAuthModal;
|
PopoutService.polkitAuthModal = polkitAuthModal;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
Connections {
|
|
||||||
target: PolkitService.agent
|
|
||||||
enabled: PolkitService.polkitAvailable
|
|
||||||
|
|
||||||
function onAuthenticationRequestStarted() {
|
|
||||||
polkitAuthModalLoader.active = true;
|
|
||||||
if (polkitAuthModalLoader.item)
|
|
||||||
polkitAuthModalLoader.item.show();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
BluetoothPairingModal {
|
BluetoothPairingModal {
|
||||||
id: bluetoothPairingModal
|
id: bluetoothPairingModal
|
||||||
@@ -376,21 +349,17 @@ Item {
|
|||||||
const now = Date.now();
|
const now = Date.now();
|
||||||
const timeSinceLastPrompt = now - lastCredentialsTime;
|
const timeSinceLastPrompt = now - lastCredentialsTime;
|
||||||
|
|
||||||
wifiPasswordModalLoader.active = true;
|
if (wifiPasswordModal.visible && timeSinceLastPrompt < 1000) {
|
||||||
if (!wifiPasswordModalLoader.item)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (wifiPasswordModalLoader.item.visible && timeSinceLastPrompt < 1000) {
|
|
||||||
NetworkService.cancelCredentials(lastCredentialsToken);
|
NetworkService.cancelCredentials(lastCredentialsToken);
|
||||||
lastCredentialsToken = token;
|
lastCredentialsToken = token;
|
||||||
lastCredentialsTime = now;
|
lastCredentialsTime = now;
|
||||||
wifiPasswordModalLoader.item.showFromPrompt(token, ssid, setting, fields, hints, reason, connType, connName, vpnService, fieldsInfo);
|
wifiPasswordModal.showFromPrompt(token, ssid, setting, fields, hints, reason, connType, connName, vpnService, fieldsInfo);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
lastCredentialsToken = token;
|
lastCredentialsToken = token;
|
||||||
lastCredentialsTime = now;
|
lastCredentialsTime = now;
|
||||||
wifiPasswordModalLoader.item.showFromPrompt(token, ssid, setting, fields, hints, reason, connType, connName, vpnService, fieldsInfo);
|
wifiPasswordModal.showFromPrompt(token, ssid, setting, fields, hints, reason, connType, connName, vpnService, fieldsInfo);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -132,11 +132,8 @@ Item {
|
|||||||
case "media":
|
case "media":
|
||||||
root.dankDashPopoutLoader.item.currentTabIndex = 1;
|
root.dankDashPopoutLoader.item.currentTabIndex = 1;
|
||||||
break;
|
break;
|
||||||
case "wallpaper":
|
|
||||||
root.dankDashPopoutLoader.item.currentTabIndex = 2;
|
|
||||||
break;
|
|
||||||
case "weather":
|
case "weather":
|
||||||
root.dankDashPopoutLoader.item.currentTabIndex = SettingsData.weatherEnabled ? 3 : 0;
|
root.dankDashPopoutLoader.item.currentTabIndex = SettingsData.weatherEnabled ? 2 : 0;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
root.dankDashPopoutLoader.item.currentTabIndex = 0;
|
root.dankDashPopoutLoader.item.currentTabIndex = 0;
|
||||||
|
|||||||
@@ -122,21 +122,6 @@ Rectangle {
|
|||||||
contentHeight: audioColumn.height
|
contentHeight: audioColumn.height
|
||||||
clip: true
|
clip: true
|
||||||
|
|
||||||
property int maxPinnedInputs: 3
|
|
||||||
|
|
||||||
function normalizePinList(value) {
|
|
||||||
if (Array.isArray(value))
|
|
||||||
return value.filter(v => v)
|
|
||||||
if (typeof value === "string" && value.length > 0)
|
|
||||||
return [value]
|
|
||||||
return []
|
|
||||||
}
|
|
||||||
|
|
||||||
function getPinnedInputs() {
|
|
||||||
const pins = SettingsData.audioInputDevicePins || {}
|
|
||||||
return normalizePinList(pins["preferredInput"])
|
|
||||||
}
|
|
||||||
|
|
||||||
Column {
|
Column {
|
||||||
id: audioColumn
|
id: audioColumn
|
||||||
width: parent.width
|
width: parent.width
|
||||||
@@ -148,20 +133,16 @@ Rectangle {
|
|||||||
const nodes = Pipewire.nodes.values.filter(node => {
|
const nodes = Pipewire.nodes.values.filter(node => {
|
||||||
return node.audio && !node.isSink && !node.isStream;
|
return node.audio && !node.isSink && !node.isStream;
|
||||||
});
|
});
|
||||||
const pinnedList = audioContent.getPinnedInputs();
|
const pins = SettingsData.audioInputDevicePins || {};
|
||||||
|
const pinnedName = pins["preferredInput"];
|
||||||
|
|
||||||
let sorted = [...nodes];
|
let sorted = [...nodes];
|
||||||
sorted.sort((a, b) => {
|
sorted.sort((a, b) => {
|
||||||
// Pinned device first
|
// Pinned device first
|
||||||
const aPinnedIndex = pinnedList.indexOf(a.name)
|
if (a.name === pinnedName && b.name !== pinnedName)
|
||||||
const bPinnedIndex = pinnedList.indexOf(b.name)
|
return -1;
|
||||||
if (aPinnedIndex !== -1 || bPinnedIndex !== -1) {
|
if (b.name === pinnedName && a.name !== pinnedName)
|
||||||
if (aPinnedIndex === -1)
|
return 1;
|
||||||
return 1
|
|
||||||
if (bPinnedIndex === -1)
|
|
||||||
return -1
|
|
||||||
return aPinnedIndex - bPinnedIndex
|
|
||||||
}
|
|
||||||
// Then active device
|
// Then active device
|
||||||
if (a === AudioService.source && b !== AudioService.source)
|
if (a === AudioService.source && b !== AudioService.source)
|
||||||
return -1;
|
return -1;
|
||||||
@@ -243,7 +224,7 @@ Rectangle {
|
|||||||
height: 28
|
height: 28
|
||||||
radius: height / 2
|
radius: height / 2
|
||||||
color: {
|
color: {
|
||||||
const isThisDevicePinned = audioContent.getPinnedInputs().includes(modelData.name);
|
const isThisDevicePinned = (SettingsData.audioInputDevicePins || {})["preferredInput"] === modelData.name;
|
||||||
return isThisDevicePinned ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : Theme.withAlpha(Theme.surfaceText, 0.05);
|
return isThisDevicePinned ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : Theme.withAlpha(Theme.surfaceText, 0.05);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -256,7 +237,7 @@ Rectangle {
|
|||||||
name: "push_pin"
|
name: "push_pin"
|
||||||
size: 16
|
size: 16
|
||||||
color: {
|
color: {
|
||||||
const isThisDevicePinned = audioContent.getPinnedInputs().includes(modelData.name);
|
const isThisDevicePinned = (SettingsData.audioInputDevicePins || {})["preferredInput"] === modelData.name;
|
||||||
return isThisDevicePinned ? Theme.primary : Theme.surfaceText;
|
return isThisDevicePinned ? Theme.primary : Theme.surfaceText;
|
||||||
}
|
}
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
@@ -264,12 +245,12 @@ Rectangle {
|
|||||||
|
|
||||||
StyledText {
|
StyledText {
|
||||||
text: {
|
text: {
|
||||||
const isThisDevicePinned = audioContent.getPinnedInputs().includes(modelData.name);
|
const isThisDevicePinned = (SettingsData.audioInputDevicePins || {})["preferredInput"] === modelData.name;
|
||||||
return isThisDevicePinned ? I18n.tr("Pinned") : I18n.tr("Pin");
|
return isThisDevicePinned ? I18n.tr("Pinned") : I18n.tr("Pin");
|
||||||
}
|
}
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
font.pixelSize: Theme.fontSizeSmall
|
||||||
color: {
|
color: {
|
||||||
const isThisDevicePinned = audioContent.getPinnedInputs().includes(modelData.name);
|
const isThisDevicePinned = (SettingsData.audioInputDevicePins || {})["preferredInput"] === modelData.name;
|
||||||
return isThisDevicePinned ? Theme.primary : Theme.surfaceText;
|
return isThisDevicePinned ? Theme.primary : Theme.surfaceText;
|
||||||
}
|
}
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
@@ -280,24 +261,16 @@ Rectangle {
|
|||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
cursorShape: Qt.PointingHandCursor
|
cursorShape: Qt.PointingHandCursor
|
||||||
onClicked: {
|
onClicked: {
|
||||||
const pins = JSON.parse(JSON.stringify(SettingsData.audioInputDevicePins || {}))
|
const pins = JSON.parse(JSON.stringify(SettingsData.audioInputDevicePins || {}));
|
||||||
let pinnedList = audioContent.normalizePinList(pins["preferredInput"])
|
const isCurrentlyPinned = pins["preferredInput"] === modelData.name;
|
||||||
const pinIndex = pinnedList.indexOf(modelData.name)
|
|
||||||
|
|
||||||
if (pinIndex !== -1) {
|
if (isCurrentlyPinned) {
|
||||||
pinnedList.splice(pinIndex, 1)
|
delete pins["preferredInput"];
|
||||||
} else {
|
} else {
|
||||||
pinnedList.unshift(modelData.name)
|
pins["preferredInput"] = modelData.name;
|
||||||
if (pinnedList.length > audioContent.maxPinnedInputs)
|
|
||||||
pinnedList = pinnedList.slice(0, audioContent.maxPinnedInputs)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pinnedList.length > 0)
|
SettingsData.set("audioInputDevicePins", pins);
|
||||||
pins["preferredInput"] = pinnedList
|
|
||||||
else
|
|
||||||
delete pins["preferredInput"]
|
|
||||||
|
|
||||||
SettingsData.set("audioInputDevicePins", pins)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -132,21 +132,6 @@ Rectangle {
|
|||||||
contentHeight: audioColumn.height
|
contentHeight: audioColumn.height
|
||||||
clip: true
|
clip: true
|
||||||
|
|
||||||
property int maxPinnedOutputs: 3
|
|
||||||
|
|
||||||
function normalizePinList(value) {
|
|
||||||
if (Array.isArray(value))
|
|
||||||
return value.filter(v => v)
|
|
||||||
if (typeof value === "string" && value.length > 0)
|
|
||||||
return [value]
|
|
||||||
return []
|
|
||||||
}
|
|
||||||
|
|
||||||
function getPinnedOutputs() {
|
|
||||||
const pins = SettingsData.audioOutputDevicePins || {}
|
|
||||||
return normalizePinList(pins["preferredOutput"])
|
|
||||||
}
|
|
||||||
|
|
||||||
Column {
|
Column {
|
||||||
id: audioColumn
|
id: audioColumn
|
||||||
width: parent.width
|
width: parent.width
|
||||||
@@ -158,20 +143,16 @@ Rectangle {
|
|||||||
const nodes = Pipewire.nodes.values.filter(node => {
|
const nodes = Pipewire.nodes.values.filter(node => {
|
||||||
return node.audio && node.isSink && !node.isStream;
|
return node.audio && node.isSink && !node.isStream;
|
||||||
});
|
});
|
||||||
const pinnedList = audioContent.getPinnedOutputs();
|
const pins = SettingsData.audioOutputDevicePins || {};
|
||||||
|
const pinnedName = pins["preferredOutput"];
|
||||||
|
|
||||||
let sorted = [...nodes];
|
let sorted = [...nodes];
|
||||||
sorted.sort((a, b) => {
|
sorted.sort((a, b) => {
|
||||||
// Pinned device first
|
// Pinned device first
|
||||||
const aPinnedIndex = pinnedList.indexOf(a.name)
|
if (a.name === pinnedName && b.name !== pinnedName)
|
||||||
const bPinnedIndex = pinnedList.indexOf(b.name)
|
return -1;
|
||||||
if (aPinnedIndex !== -1 || bPinnedIndex !== -1) {
|
if (b.name === pinnedName && a.name !== pinnedName)
|
||||||
if (aPinnedIndex === -1)
|
return 1;
|
||||||
return 1
|
|
||||||
if (bPinnedIndex === -1)
|
|
||||||
return -1
|
|
||||||
return aPinnedIndex - bPinnedIndex
|
|
||||||
}
|
|
||||||
// Then active device
|
// Then active device
|
||||||
if (a === AudioService.sink && b !== AudioService.sink)
|
if (a === AudioService.sink && b !== AudioService.sink)
|
||||||
return -1;
|
return -1;
|
||||||
@@ -255,7 +236,7 @@ Rectangle {
|
|||||||
height: 28
|
height: 28
|
||||||
radius: height / 2
|
radius: height / 2
|
||||||
color: {
|
color: {
|
||||||
const isThisDevicePinned = audioContent.getPinnedOutputs().includes(modelData.name);
|
const isThisDevicePinned = (SettingsData.audioOutputDevicePins || {})["preferredOutput"] === modelData.name;
|
||||||
return isThisDevicePinned ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : Theme.withAlpha(Theme.surfaceText, 0.05);
|
return isThisDevicePinned ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : Theme.withAlpha(Theme.surfaceText, 0.05);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -268,7 +249,7 @@ Rectangle {
|
|||||||
name: "push_pin"
|
name: "push_pin"
|
||||||
size: 16
|
size: 16
|
||||||
color: {
|
color: {
|
||||||
const isThisDevicePinned = audioContent.getPinnedOutputs().includes(modelData.name);
|
const isThisDevicePinned = (SettingsData.audioOutputDevicePins || {})["preferredOutput"] === modelData.name;
|
||||||
return isThisDevicePinned ? Theme.primary : Theme.surfaceText;
|
return isThisDevicePinned ? Theme.primary : Theme.surfaceText;
|
||||||
}
|
}
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
@@ -276,12 +257,12 @@ Rectangle {
|
|||||||
|
|
||||||
StyledText {
|
StyledText {
|
||||||
text: {
|
text: {
|
||||||
const isThisDevicePinned = audioContent.getPinnedOutputs().includes(modelData.name);
|
const isThisDevicePinned = (SettingsData.audioOutputDevicePins || {})["preferredOutput"] === modelData.name;
|
||||||
return isThisDevicePinned ? I18n.tr("Pinned") : I18n.tr("Pin");
|
return isThisDevicePinned ? I18n.tr("Pinned") : I18n.tr("Pin");
|
||||||
}
|
}
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
font.pixelSize: Theme.fontSizeSmall
|
||||||
color: {
|
color: {
|
||||||
const isThisDevicePinned = audioContent.getPinnedOutputs().includes(modelData.name);
|
const isThisDevicePinned = (SettingsData.audioOutputDevicePins || {})["preferredOutput"] === modelData.name;
|
||||||
return isThisDevicePinned ? Theme.primary : Theme.surfaceText;
|
return isThisDevicePinned ? Theme.primary : Theme.surfaceText;
|
||||||
}
|
}
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
@@ -292,24 +273,16 @@ Rectangle {
|
|||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
cursorShape: Qt.PointingHandCursor
|
cursorShape: Qt.PointingHandCursor
|
||||||
onClicked: {
|
onClicked: {
|
||||||
const pins = JSON.parse(JSON.stringify(SettingsData.audioOutputDevicePins || {}))
|
const pins = JSON.parse(JSON.stringify(SettingsData.audioOutputDevicePins || {}));
|
||||||
let pinnedList = audioContent.normalizePinList(pins["preferredOutput"])
|
const isCurrentlyPinned = pins["preferredOutput"] === modelData.name;
|
||||||
const pinIndex = pinnedList.indexOf(modelData.name)
|
|
||||||
|
|
||||||
if (pinIndex !== -1) {
|
if (isCurrentlyPinned) {
|
||||||
pinnedList.splice(pinIndex, 1)
|
delete pins["preferredOutput"];
|
||||||
} else {
|
} else {
|
||||||
pinnedList.unshift(modelData.name)
|
pins["preferredOutput"] = modelData.name;
|
||||||
if (pinnedList.length > audioContent.maxPinnedOutputs)
|
|
||||||
pinnedList = pinnedList.slice(0, audioContent.maxPinnedOutputs)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pinnedList.length > 0)
|
SettingsData.set("audioOutputDevicePins", pins);
|
||||||
pins["preferredOutput"] = pinnedList
|
|
||||||
else
|
|
||||||
delete pins["preferredOutput"]
|
|
||||||
|
|
||||||
SettingsData.set("audioOutputDevicePins", pins)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -150,21 +150,6 @@ Rectangle {
|
|||||||
contentHeight: bluetoothColumn.height
|
contentHeight: bluetoothColumn.height
|
||||||
clip: true
|
clip: true
|
||||||
|
|
||||||
property int maxPinnedDevices: 3
|
|
||||||
|
|
||||||
function normalizePinList(value) {
|
|
||||||
if (Array.isArray(value))
|
|
||||||
return value.filter(v => v)
|
|
||||||
if (typeof value === "string" && value.length > 0)
|
|
||||||
return [value]
|
|
||||||
return []
|
|
||||||
}
|
|
||||||
|
|
||||||
function getPinnedDevices() {
|
|
||||||
const pins = SettingsData.bluetoothDevicePins || {}
|
|
||||||
return normalizePinList(pins["preferredDevice"])
|
|
||||||
}
|
|
||||||
|
|
||||||
Column {
|
Column {
|
||||||
id: bluetoothColumn
|
id: bluetoothColumn
|
||||||
width: parent.width
|
width: parent.width
|
||||||
@@ -177,18 +162,14 @@ Rectangle {
|
|||||||
if (!BluetoothService.adapter || !BluetoothService.adapter.devices)
|
if (!BluetoothService.adapter || !BluetoothService.adapter.devices)
|
||||||
return []
|
return []
|
||||||
|
|
||||||
const pinnedList = bluetoothContent.getPinnedDevices()
|
const pins = SettingsData.bluetoothDevicePins || {}
|
||||||
|
const pinnedAddr = pins["preferredDevice"]
|
||||||
|
|
||||||
let devices = [...BluetoothService.adapter.devices.values.filter(dev => dev && (dev.paired || dev.trusted))]
|
let devices = [...BluetoothService.adapter.devices.values.filter(dev => dev && (dev.paired || dev.trusted))]
|
||||||
devices.sort((a, b) => {
|
devices.sort((a, b) => {
|
||||||
// Pinned device first
|
// Pinned device first
|
||||||
const aPinnedIndex = pinnedList.indexOf(a.address)
|
if (a.address === pinnedAddr && b.address !== pinnedAddr) return -1
|
||||||
const bPinnedIndex = pinnedList.indexOf(b.address)
|
if (b.address === pinnedAddr && a.address !== pinnedAddr) return 1
|
||||||
if (aPinnedIndex !== -1 || bPinnedIndex !== -1) {
|
|
||||||
if (aPinnedIndex === -1) return 1
|
|
||||||
if (bPinnedIndex === -1) return -1
|
|
||||||
return aPinnedIndex - bPinnedIndex
|
|
||||||
}
|
|
||||||
// Then connected devices
|
// Then connected devices
|
||||||
if (a.connected && !b.connected) return -1
|
if (a.connected && !b.connected) return -1
|
||||||
if (!a.connected && b.connected) return 1
|
if (!a.connected && b.connected) return 1
|
||||||
@@ -321,7 +302,7 @@ Rectangle {
|
|||||||
height: 28
|
height: 28
|
||||||
radius: height / 2
|
radius: height / 2
|
||||||
color: {
|
color: {
|
||||||
const isThisDevicePinned = bluetoothContent.getPinnedDevices().includes(modelData.address)
|
const isThisDevicePinned = (SettingsData.bluetoothDevicePins || {})["preferredDevice"] === modelData.address
|
||||||
return isThisDevicePinned ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : Theme.withAlpha(Theme.surfaceText, 0.05)
|
return isThisDevicePinned ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : Theme.withAlpha(Theme.surfaceText, 0.05)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -334,7 +315,7 @@ Rectangle {
|
|||||||
name: "push_pin"
|
name: "push_pin"
|
||||||
size: 16
|
size: 16
|
||||||
color: {
|
color: {
|
||||||
const isThisDevicePinned = bluetoothContent.getPinnedDevices().includes(modelData.address)
|
const isThisDevicePinned = (SettingsData.bluetoothDevicePins || {})["preferredDevice"] === modelData.address
|
||||||
return isThisDevicePinned ? Theme.primary : Theme.surfaceText
|
return isThisDevicePinned ? Theme.primary : Theme.surfaceText
|
||||||
}
|
}
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
@@ -342,12 +323,12 @@ Rectangle {
|
|||||||
|
|
||||||
StyledText {
|
StyledText {
|
||||||
text: {
|
text: {
|
||||||
const isThisDevicePinned = bluetoothContent.getPinnedDevices().includes(modelData.address)
|
const isThisDevicePinned = (SettingsData.bluetoothDevicePins || {})["preferredDevice"] === modelData.address
|
||||||
return isThisDevicePinned ? I18n.tr("Pinned") : I18n.tr("Pin")
|
return isThisDevicePinned ? I18n.tr("Pinned") : I18n.tr("Pin")
|
||||||
}
|
}
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
font.pixelSize: Theme.fontSizeSmall
|
||||||
color: {
|
color: {
|
||||||
const isThisDevicePinned = bluetoothContent.getPinnedDevices().includes(modelData.address)
|
const isThisDevicePinned = (SettingsData.bluetoothDevicePins || {})["preferredDevice"] === modelData.address
|
||||||
return isThisDevicePinned ? Theme.primary : Theme.surfaceText
|
return isThisDevicePinned ? Theme.primary : Theme.surfaceText
|
||||||
}
|
}
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
@@ -359,21 +340,13 @@ Rectangle {
|
|||||||
cursorShape: Qt.PointingHandCursor
|
cursorShape: Qt.PointingHandCursor
|
||||||
onClicked: {
|
onClicked: {
|
||||||
const pins = JSON.parse(JSON.stringify(SettingsData.bluetoothDevicePins || {}))
|
const pins = JSON.parse(JSON.stringify(SettingsData.bluetoothDevicePins || {}))
|
||||||
let pinnedList = bluetoothContent.normalizePinList(pins["preferredDevice"])
|
const isCurrentlyPinned = pins["preferredDevice"] === modelData.address
|
||||||
const pinIndex = pinnedList.indexOf(modelData.address)
|
|
||||||
|
|
||||||
if (pinIndex !== -1) {
|
if (isCurrentlyPinned) {
|
||||||
pinnedList.splice(pinIndex, 1)
|
|
||||||
} else {
|
|
||||||
pinnedList.unshift(modelData.address)
|
|
||||||
if (pinnedList.length > bluetoothContent.maxPinnedDevices)
|
|
||||||
pinnedList = pinnedList.slice(0, bluetoothContent.maxPinnedDevices)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pinnedList.length > 0)
|
|
||||||
pins["preferredDevice"] = pinnedList
|
|
||||||
else
|
|
||||||
delete pins["preferredDevice"]
|
delete pins["preferredDevice"]
|
||||||
|
} else {
|
||||||
|
pins["preferredDevice"] = modelData.address
|
||||||
|
}
|
||||||
|
|
||||||
SettingsData.set("bluetoothDevicePins", pins)
|
SettingsData.set("bluetoothDevicePins", pins)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -463,39 +463,20 @@ Rectangle {
|
|||||||
contentHeight: wifiColumn.height
|
contentHeight: wifiColumn.height
|
||||||
clip: true
|
clip: true
|
||||||
|
|
||||||
property int maxPinnedNetworks: 3
|
|
||||||
|
|
||||||
function normalizePinList(value) {
|
|
||||||
if (Array.isArray(value))
|
|
||||||
return value.filter(v => v)
|
|
||||||
if (typeof value === "string" && value.length > 0)
|
|
||||||
return [value]
|
|
||||||
return []
|
|
||||||
}
|
|
||||||
|
|
||||||
function getPinnedNetworks() {
|
|
||||||
const pins = SettingsData.wifiNetworkPins || {}
|
|
||||||
return normalizePinList(pins["preferredWifi"])
|
|
||||||
}
|
|
||||||
|
|
||||||
property var frozenNetworks: []
|
property var frozenNetworks: []
|
||||||
property bool menuOpen: false
|
property bool menuOpen: false
|
||||||
property var sortedNetworks: {
|
property var sortedNetworks: {
|
||||||
const ssid = NetworkService.currentWifiSSID;
|
const ssid = NetworkService.currentWifiSSID;
|
||||||
const networks = NetworkService.wifiNetworks;
|
const networks = NetworkService.wifiNetworks;
|
||||||
const pinnedList = getPinnedNetworks()
|
const pins = SettingsData.wifiNetworkPins || {};
|
||||||
|
const pinnedSSID = pins["preferredWifi"];
|
||||||
|
|
||||||
let sorted = [...networks];
|
let sorted = [...networks];
|
||||||
sorted.sort((a, b) => {
|
sorted.sort((a, b) => {
|
||||||
const aPinnedIndex = pinnedList.indexOf(a.ssid)
|
if (a.ssid === pinnedSSID && b.ssid !== pinnedSSID)
|
||||||
const bPinnedIndex = pinnedList.indexOf(b.ssid)
|
return -1;
|
||||||
if (aPinnedIndex !== -1 || bPinnedIndex !== -1) {
|
if (b.ssid === pinnedSSID && a.ssid !== pinnedSSID)
|
||||||
if (aPinnedIndex === -1)
|
return 1;
|
||||||
return 1
|
|
||||||
if (bPinnedIndex === -1)
|
|
||||||
return -1
|
|
||||||
return aPinnedIndex - bPinnedIndex
|
|
||||||
}
|
|
||||||
if (a.ssid === ssid)
|
if (a.ssid === ssid)
|
||||||
return -1;
|
return -1;
|
||||||
if (b.ssid === ssid)
|
if (b.ssid === ssid)
|
||||||
@@ -644,7 +625,7 @@ Rectangle {
|
|||||||
height: 28
|
height: 28
|
||||||
radius: height / 2
|
radius: height / 2
|
||||||
color: {
|
color: {
|
||||||
const isThisNetworkPinned = wifiContent.getPinnedNetworks().includes(modelData.ssid);
|
const isThisNetworkPinned = (SettingsData.wifiNetworkPins || {})["preferredWifi"] === modelData.ssid;
|
||||||
return isThisNetworkPinned ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : Theme.withAlpha(Theme.surfaceText, 0.05);
|
return isThisNetworkPinned ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : Theme.withAlpha(Theme.surfaceText, 0.05);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -657,7 +638,7 @@ Rectangle {
|
|||||||
name: "push_pin"
|
name: "push_pin"
|
||||||
size: 16
|
size: 16
|
||||||
color: {
|
color: {
|
||||||
const isThisNetworkPinned = wifiContent.getPinnedNetworks().includes(modelData.ssid);
|
const isThisNetworkPinned = (SettingsData.wifiNetworkPins || {})["preferredWifi"] === modelData.ssid;
|
||||||
return isThisNetworkPinned ? Theme.primary : Theme.surfaceText;
|
return isThisNetworkPinned ? Theme.primary : Theme.surfaceText;
|
||||||
}
|
}
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
@@ -665,12 +646,12 @@ Rectangle {
|
|||||||
|
|
||||||
StyledText {
|
StyledText {
|
||||||
text: {
|
text: {
|
||||||
const isThisNetworkPinned = wifiContent.getPinnedNetworks().includes(modelData.ssid);
|
const isThisNetworkPinned = (SettingsData.wifiNetworkPins || {})["preferredWifi"] === modelData.ssid;
|
||||||
return isThisNetworkPinned ? I18n.tr("Pinned") : I18n.tr("Pin");
|
return isThisNetworkPinned ? I18n.tr("Pinned") : I18n.tr("Pin");
|
||||||
}
|
}
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
font.pixelSize: Theme.fontSizeSmall
|
||||||
color: {
|
color: {
|
||||||
const isThisNetworkPinned = wifiContent.getPinnedNetworks().includes(modelData.ssid);
|
const isThisNetworkPinned = (SettingsData.wifiNetworkPins || {})["preferredWifi"] === modelData.ssid;
|
||||||
return isThisNetworkPinned ? Theme.primary : Theme.surfaceText;
|
return isThisNetworkPinned ? Theme.primary : Theme.surfaceText;
|
||||||
}
|
}
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
@@ -681,24 +662,16 @@ Rectangle {
|
|||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
cursorShape: Qt.PointingHandCursor
|
cursorShape: Qt.PointingHandCursor
|
||||||
onClicked: {
|
onClicked: {
|
||||||
const pins = JSON.parse(JSON.stringify(SettingsData.wifiNetworkPins || {}))
|
const pins = JSON.parse(JSON.stringify(SettingsData.wifiNetworkPins || {}));
|
||||||
let pinnedList = wifiContent.normalizePinList(pins["preferredWifi"])
|
const isCurrentlyPinned = pins["preferredWifi"] === modelData.ssid;
|
||||||
const pinIndex = pinnedList.indexOf(modelData.ssid)
|
|
||||||
|
|
||||||
if (pinIndex !== -1) {
|
if (isCurrentlyPinned) {
|
||||||
pinnedList.splice(pinIndex, 1)
|
delete pins["preferredWifi"];
|
||||||
} else {
|
} else {
|
||||||
pinnedList.unshift(modelData.ssid)
|
pins["preferredWifi"] = modelData.ssid;
|
||||||
if (pinnedList.length > wifiContent.maxPinnedNetworks)
|
|
||||||
pinnedList = pinnedList.slice(0, wifiContent.maxPinnedNetworks)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pinnedList.length > 0)
|
SettingsData.set("wifiNetworkPins", pins);
|
||||||
pins["preferredWifi"] = pinnedList
|
|
||||||
else
|
|
||||||
delete pins["preferredWifi"]
|
|
||||||
|
|
||||||
SettingsData.set("wifiNetworkPins", pins)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -714,8 +687,8 @@ Rectangle {
|
|||||||
if (modelData.secured && !modelData.saved) {
|
if (modelData.secured && !modelData.saved) {
|
||||||
if (DMSService.apiVersion >= 7) {
|
if (DMSService.apiVersion >= 7) {
|
||||||
NetworkService.connectToWifi(modelData.ssid);
|
NetworkService.connectToWifi(modelData.ssid);
|
||||||
} else {
|
} else if (PopoutService.wifiPasswordModal) {
|
||||||
PopoutService.showWifiPasswordModal(modelData.ssid);
|
PopoutService.wifiPasswordModal.show(modelData.ssid);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
NetworkService.connectToWifi(modelData.ssid);
|
NetworkService.connectToWifi(modelData.ssid);
|
||||||
@@ -776,8 +749,8 @@ Rectangle {
|
|||||||
if (networkContextMenu.currentSecured && !networkContextMenu.currentSaved) {
|
if (networkContextMenu.currentSecured && !networkContextMenu.currentSaved) {
|
||||||
if (DMSService.apiVersion >= 7) {
|
if (DMSService.apiVersion >= 7) {
|
||||||
NetworkService.connectToWifi(networkContextMenu.currentSSID);
|
NetworkService.connectToWifi(networkContextMenu.currentSSID);
|
||||||
} else {
|
} else if (PopoutService.wifiPasswordModal) {
|
||||||
PopoutService.showWifiPasswordModal(networkContextMenu.currentSSID);
|
PopoutService.wifiPasswordModal.show(networkContextMenu.currentSSID);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
NetworkService.connectToWifi(networkContextMenu.currentSSID);
|
NetworkService.connectToWifi(networkContextMenu.currentSSID);
|
||||||
|
|||||||
@@ -24,12 +24,10 @@ BasePill {
|
|||||||
property bool showMicPercent: widgetData?.showMicPercent !== undefined ? widgetData.showMicPercent : SettingsData.controlCenterShowMicPercent
|
property bool showMicPercent: widgetData?.showMicPercent !== undefined ? widgetData.showMicPercent : SettingsData.controlCenterShowMicPercent
|
||||||
property bool showBatteryIcon: widgetData?.showBatteryIcon !== undefined ? widgetData.showBatteryIcon : SettingsData.controlCenterShowBatteryIcon
|
property bool showBatteryIcon: widgetData?.showBatteryIcon !== undefined ? widgetData.showBatteryIcon : SettingsData.controlCenterShowBatteryIcon
|
||||||
property bool showPrinterIcon: widgetData?.showPrinterIcon !== undefined ? widgetData.showPrinterIcon : SettingsData.controlCenterShowPrinterIcon
|
property bool showPrinterIcon: widgetData?.showPrinterIcon !== undefined ? widgetData.showPrinterIcon : SettingsData.controlCenterShowPrinterIcon
|
||||||
property bool showScreenSharingIcon: widgetData?.showScreenSharingIcon !== undefined ? widgetData.showScreenSharingIcon : SettingsData.controlCenterShowScreenSharingIcon
|
|
||||||
property real touchpadThreshold: 100
|
property real touchpadThreshold: 100
|
||||||
property real micAccumulator: 0
|
property real micAccumulator: 0
|
||||||
property real volumeAccumulator: 0
|
property real volumeAccumulator: 0
|
||||||
property real brightnessAccumulator: 0
|
property real brightnessAccumulator: 0
|
||||||
readonly property real vIconSize: Theme.barIconSize(root.barThickness, -4)
|
|
||||||
|
|
||||||
Loader {
|
Loader {
|
||||||
active: root.showPrinterIcon
|
active: root.showPrinterIcon
|
||||||
@@ -215,25 +213,7 @@ BasePill {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function hasNoVisibleIcons() {
|
function hasNoVisibleIcons() {
|
||||||
if (root.showScreenSharingIcon && NiriService.hasCasts)
|
return !root.showNetworkIcon && !root.showBluetoothIcon && !root.showAudioIcon && !root.showVpnIcon && !root.showBrightnessIcon && !root.showMicIcon && !root.showBatteryIcon && !root.showPrinterIcon;
|
||||||
return false;
|
|
||||||
if (root.showNetworkIcon && NetworkService.networkAvailable)
|
|
||||||
return false;
|
|
||||||
if (root.showVpnIcon && NetworkService.vpnAvailable && NetworkService.vpnConnected)
|
|
||||||
return false;
|
|
||||||
if (root.showBluetoothIcon && BluetoothService.available && BluetoothService.enabled)
|
|
||||||
return false;
|
|
||||||
if (root.showAudioIcon)
|
|
||||||
return false;
|
|
||||||
if (root.showMicIcon)
|
|
||||||
return false;
|
|
||||||
if (root.showBrightnessIcon && DisplayService.brightnessAvailable && root.hasPinnedBrightnessDevice())
|
|
||||||
return false;
|
|
||||||
if (root.showBatteryIcon && BatteryService.batteryAvailable)
|
|
||||||
return false;
|
|
||||||
if (root.showPrinterIcon && CupsService.cupsAvailable && root.hasPrintJobs())
|
|
||||||
return false;
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
content: Component {
|
content: Component {
|
||||||
@@ -247,75 +227,45 @@ BasePill {
|
|||||||
anchors.centerIn: parent
|
anchors.centerIn: parent
|
||||||
spacing: Theme.spacingXS
|
spacing: Theme.spacingXS
|
||||||
|
|
||||||
Item {
|
|
||||||
width: root.vIconSize
|
|
||||||
height: root.vIconSize
|
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
|
||||||
visible: root.showScreenSharingIcon && NiriService.hasCasts
|
|
||||||
|
|
||||||
DankIcon {
|
|
||||||
name: "screen_record"
|
|
||||||
size: root.vIconSize
|
|
||||||
color: NiriService.hasActiveCast ? Theme.primary : Theme.surfaceText
|
|
||||||
anchors.centerIn: parent
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Item {
|
|
||||||
width: root.vIconSize
|
|
||||||
height: root.vIconSize
|
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
|
||||||
visible: root.showNetworkIcon && NetworkService.networkAvailable
|
|
||||||
|
|
||||||
DankIcon {
|
DankIcon {
|
||||||
name: root.getNetworkIconName()
|
name: root.getNetworkIconName()
|
||||||
size: root.vIconSize
|
size: Theme.barIconSize(root.barThickness, -4)
|
||||||
color: root.getNetworkIconColor()
|
color: root.getNetworkIconColor()
|
||||||
anchors.centerIn: parent
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Item {
|
|
||||||
width: root.vIconSize
|
|
||||||
height: root.vIconSize
|
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
visible: root.showVpnIcon && NetworkService.vpnAvailable && NetworkService.vpnConnected
|
visible: root.showNetworkIcon && NetworkService.networkAvailable
|
||||||
|
}
|
||||||
|
|
||||||
DankIcon {
|
DankIcon {
|
||||||
name: "vpn_lock"
|
name: "vpn_lock"
|
||||||
size: root.vIconSize
|
size: Theme.barIconSize(root.barThickness, -4)
|
||||||
color: NetworkService.vpnConnected ? Theme.primary : Theme.surfaceText
|
color: NetworkService.vpnConnected ? Theme.primary : Theme.surfaceText
|
||||||
anchors.centerIn: parent
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Item {
|
|
||||||
width: root.vIconSize
|
|
||||||
height: root.vIconSize
|
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
visible: root.showBluetoothIcon && BluetoothService.available && BluetoothService.enabled
|
visible: root.showVpnIcon && NetworkService.vpnAvailable && NetworkService.vpnConnected
|
||||||
|
}
|
||||||
|
|
||||||
DankIcon {
|
DankIcon {
|
||||||
name: "bluetooth"
|
name: "bluetooth"
|
||||||
size: root.vIconSize
|
size: Theme.barIconSize(root.barThickness, -4)
|
||||||
color: BluetoothService.connected ? Theme.primary : Theme.surfaceText
|
color: BluetoothService.connected ? Theme.primary : Theme.surfaceText
|
||||||
anchors.centerIn: parent
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
}
|
visible: root.showBluetoothIcon && BluetoothService.available && BluetoothService.enabled
|
||||||
}
|
}
|
||||||
|
|
||||||
Item {
|
Rectangle {
|
||||||
width: root.vIconSize
|
width: audioIconV.implicitWidth + 4
|
||||||
height: root.vIconSize + (root.showAudioPercent ? audioPercentV.implicitHeight + 2 : 0)
|
height: audioIconV.implicitHeight + (root.showAudioPercent ? audioPercentV.implicitHeight : 0) + 4
|
||||||
|
color: "transparent"
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
visible: root.showAudioIcon
|
visible: root.showAudioIcon
|
||||||
|
|
||||||
DankIcon {
|
DankIcon {
|
||||||
id: audioIconV
|
id: audioIconV
|
||||||
name: root.getVolumeIconName()
|
name: root.getVolumeIconName()
|
||||||
size: root.vIconSize
|
size: Theme.barIconSize(root.barThickness, -4)
|
||||||
color: Theme.widgetIconColor
|
color: Theme.widgetIconColor
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
|
anchors.topMargin: 2
|
||||||
}
|
}
|
||||||
|
|
||||||
StyledText {
|
StyledText {
|
||||||
@@ -342,19 +292,21 @@ BasePill {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Item {
|
Rectangle {
|
||||||
width: root.vIconSize
|
width: micIconV.implicitWidth + 4
|
||||||
height: root.vIconSize + (root.showMicPercent ? micPercentV.implicitHeight + 2 : 0)
|
height: micIconV.implicitHeight + (root.showAudioPercent ? micPercentV.implicitHeight : 0) + 4
|
||||||
|
color: "transparent"
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
visible: root.showMicIcon
|
visible: root.showMicIcon
|
||||||
|
|
||||||
DankIcon {
|
DankIcon {
|
||||||
id: micIconV
|
id: micIconV
|
||||||
name: root.getMicIconName()
|
name: root.getMicIconName()
|
||||||
size: root.vIconSize
|
size: Theme.barIconSize(root.barThickness, -4)
|
||||||
color: root.getMicIconColor()
|
color: root.getMicIconColor()
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
|
anchors.topMargin: 2
|
||||||
}
|
}
|
||||||
|
|
||||||
StyledText {
|
StyledText {
|
||||||
@@ -381,19 +333,21 @@ BasePill {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Item {
|
Rectangle {
|
||||||
width: root.vIconSize
|
width: brightnessIconV.implicitWidth + 4
|
||||||
height: root.vIconSize + (root.showBrightnessPercent ? brightnessPercentV.implicitHeight + 2 : 0)
|
height: brightnessIconV.implicitHeight + (root.showBrightnessPercent ? brightnessPercentV.implicitHeight : 0) + 4
|
||||||
|
color: "transparent"
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
visible: root.showBrightnessIcon && DisplayService.brightnessAvailable && root.hasPinnedBrightnessDevice()
|
visible: root.showBrightnessIcon && DisplayService.brightnessAvailable && root.hasPinnedBrightnessDevice()
|
||||||
|
|
||||||
DankIcon {
|
DankIcon {
|
||||||
id: brightnessIconV
|
id: brightnessIconV
|
||||||
name: root.getBrightnessIconName()
|
name: root.getBrightnessIconName()
|
||||||
size: root.vIconSize
|
size: Theme.barIconSize(root.barThickness, -4)
|
||||||
color: Theme.widgetIconColor
|
color: Theme.widgetIconColor
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
|
anchors.topMargin: 2
|
||||||
}
|
}
|
||||||
|
|
||||||
StyledText {
|
StyledText {
|
||||||
@@ -417,46 +371,28 @@ BasePill {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Item {
|
|
||||||
width: root.vIconSize
|
|
||||||
height: root.vIconSize
|
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
|
||||||
visible: root.showBatteryIcon && BatteryService.batteryAvailable
|
|
||||||
|
|
||||||
DankIcon {
|
DankIcon {
|
||||||
name: Theme.getBatteryIcon(BatteryService.batteryLevel, BatteryService.isCharging, BatteryService.batteryAvailable)
|
name: Theme.getBatteryIcon(BatteryService.batteryLevel, BatteryService.isCharging, BatteryService.batteryAvailable)
|
||||||
size: root.vIconSize
|
size: Theme.barIconSize(root.barThickness, -4)
|
||||||
color: root.getBatteryIconColor()
|
color: root.getBatteryIconColor()
|
||||||
anchors.centerIn: parent
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Item {
|
|
||||||
width: root.vIconSize
|
|
||||||
height: root.vIconSize
|
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
visible: root.showPrinterIcon && CupsService.cupsAvailable && root.hasPrintJobs()
|
visible: root.showBatteryIcon && BatteryService.batteryAvailable
|
||||||
|
}
|
||||||
|
|
||||||
DankIcon {
|
DankIcon {
|
||||||
name: "print"
|
name: "print"
|
||||||
size: root.vIconSize
|
size: Theme.barIconSize(root.barThickness, -4)
|
||||||
color: Theme.primary
|
color: Theme.primary
|
||||||
anchors.centerIn: parent
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Item {
|
|
||||||
width: root.vIconSize
|
|
||||||
height: root.vIconSize
|
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
visible: root.hasNoVisibleIcons()
|
visible: root.showPrinterIcon && CupsService.cupsAvailable && root.hasPrintJobs()
|
||||||
|
}
|
||||||
|
|
||||||
DankIcon {
|
DankIcon {
|
||||||
name: "settings"
|
name: "settings"
|
||||||
size: root.vIconSize
|
size: Theme.barIconSize(root.barThickness, -4)
|
||||||
color: root.isActive ? Theme.primary : Theme.widgetIconColor
|
color: root.isActive ? Theme.primary : Theme.widgetIconColor
|
||||||
anchors.centerIn: parent
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
}
|
visible: root.hasNoVisibleIcons()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -466,14 +402,6 @@ BasePill {
|
|||||||
anchors.centerIn: parent
|
anchors.centerIn: parent
|
||||||
spacing: Theme.spacingXS
|
spacing: Theme.spacingXS
|
||||||
|
|
||||||
DankIcon {
|
|
||||||
name: "screen_record"
|
|
||||||
size: Theme.barIconSize(root.barThickness, -4)
|
|
||||||
color: NiriService.hasActiveCast ? Theme.primary : Theme.surfaceText
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
visible: root.showScreenSharingIcon && NiriService.hasCasts
|
|
||||||
}
|
|
||||||
|
|
||||||
DankIcon {
|
DankIcon {
|
||||||
id: networkIcon
|
id: networkIcon
|
||||||
name: root.getNetworkIconName()
|
name: root.getNetworkIconName()
|
||||||
|
|||||||
@@ -155,17 +155,9 @@ BasePill {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
DankIcon {
|
|
||||||
anchors.centerIn: parent
|
|
||||||
size: 18
|
|
||||||
name: "sports_esports"
|
|
||||||
color: Theme.widgetTextColor
|
|
||||||
visible: root.isVerticalOrientation && activeWindow && activeWindow.appId && appIcon.status !== Image.Ready && Paths.isSteamApp(activeWindow.appId)
|
|
||||||
}
|
|
||||||
|
|
||||||
Text {
|
Text {
|
||||||
anchors.centerIn: parent
|
anchors.centerIn: parent
|
||||||
visible: root.isVerticalOrientation && activeWindow && activeWindow.appId && appIcon.status !== Image.Ready && !Paths.isSteamApp(activeWindow.appId)
|
visible: root.isVerticalOrientation && activeWindow && activeWindow.appId && appIcon.status !== Image.Ready
|
||||||
text: {
|
text: {
|
||||||
if (!activeWindow || !activeWindow.appId)
|
if (!activeWindow || !activeWindow.appId)
|
||||||
return "?";
|
return "?";
|
||||||
|
|||||||
@@ -393,19 +393,9 @@ Item {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
DankIcon {
|
|
||||||
anchors.left: parent.left
|
|
||||||
anchors.leftMargin: (widgetData?.runningAppsCompactMode !== undefined ? widgetData.runningAppsCompactMode : SettingsData.runningAppsCompactMode) ? Math.round((parent.width - Theme.barIconSize(root.barThickness)) / 2) : Theme.spacingXS
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
size: Theme.barIconSize(root.barThickness)
|
|
||||||
name: "sports_esports"
|
|
||||||
color: Theme.widgetTextColor
|
|
||||||
visible: !iconImg.visible && Paths.isSteamApp(appId)
|
|
||||||
}
|
|
||||||
|
|
||||||
Text {
|
Text {
|
||||||
anchors.centerIn: parent
|
anchors.centerIn: parent
|
||||||
visible: !iconImg.visible && !Paths.isSteamApp(appId)
|
visible: !iconImg.visible
|
||||||
text: {
|
text: {
|
||||||
root._desktopEntriesUpdateTrigger;
|
root._desktopEntriesUpdateTrigger;
|
||||||
if (!appId)
|
if (!appId)
|
||||||
@@ -638,19 +628,9 @@ Item {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
DankIcon {
|
|
||||||
anchors.left: parent.left
|
|
||||||
anchors.leftMargin: (widgetData?.runningAppsCompactMode !== undefined ? widgetData.runningAppsCompactMode : SettingsData.runningAppsCompactMode) ? Math.round((parent.width - Theme.barIconSize(root.barThickness)) / 2) : Theme.spacingXS
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
size: Theme.barIconSize(root.barThickness)
|
|
||||||
name: "sports_esports"
|
|
||||||
color: Theme.widgetTextColor
|
|
||||||
visible: !iconImg.visible && Paths.isSteamApp(appId)
|
|
||||||
}
|
|
||||||
|
|
||||||
Text {
|
Text {
|
||||||
anchors.centerIn: parent
|
anchors.centerIn: parent
|
||||||
visible: !iconImg.visible && !Paths.isSteamApp(appId)
|
visible: !iconImg.visible
|
||||||
text: {
|
text: {
|
||||||
root._desktopEntriesUpdateTrigger;
|
root._desktopEntriesUpdateTrigger;
|
||||||
if (!appId)
|
if (!appId)
|
||||||
|
|||||||
@@ -265,7 +265,6 @@ Item {
|
|||||||
|
|
||||||
if (!byApp[key]) {
|
if (!byApp[key]) {
|
||||||
const isQuickshell = keyBase === "org.quickshell";
|
const isQuickshell = keyBase === "org.quickshell";
|
||||||
const isSteamApp = Paths.isSteamApp(keyBase);
|
|
||||||
const moddedId = Paths.moddedAppId(keyBase);
|
const moddedId = Paths.moddedAppId(keyBase);
|
||||||
const desktopEntry = DesktopEntries.heuristicLookup(moddedId);
|
const desktopEntry = DesktopEntries.heuristicLookup(moddedId);
|
||||||
const icon = Paths.getAppIcon(keyBase, desktopEntry);
|
const icon = Paths.getAppIcon(keyBase, desktopEntry);
|
||||||
@@ -273,7 +272,6 @@ Item {
|
|||||||
"type": "icon",
|
"type": "icon",
|
||||||
"icon": icon,
|
"icon": icon,
|
||||||
"isQuickshell": isQuickshell,
|
"isQuickshell": isQuickshell,
|
||||||
"isSteamApp": isSteamApp,
|
|
||||||
"active": !!((w.activated || w.is_focused) || (CompositorService.isNiri && w.is_focused)),
|
"active": !!((w.activated || w.is_focused) || (CompositorService.isNiri && w.is_focused)),
|
||||||
"count": 1,
|
"count": 1,
|
||||||
"windowId": w.address || w.id,
|
"windowId": w.address || w.id,
|
||||||
@@ -1137,7 +1135,7 @@ Item {
|
|||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
source: modelData.icon
|
source: modelData.icon
|
||||||
opacity: modelData.active ? 1.0 : rowAppMouseArea.containsMouse ? 0.8 : 0.6
|
opacity: modelData.active ? 1.0 : rowAppMouseArea.containsMouse ? 0.8 : 0.6
|
||||||
visible: !modelData.isQuickshell && !modelData.isSteamApp
|
visible: !modelData.isQuickshell
|
||||||
}
|
}
|
||||||
|
|
||||||
IconImage {
|
IconImage {
|
||||||
@@ -1153,22 +1151,6 @@ Item {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
IconImage {
|
|
||||||
anchors.fill: parent
|
|
||||||
source: modelData.icon
|
|
||||||
opacity: modelData.active ? 1.0 : rowAppMouseArea.containsMouse ? 0.8 : 0.6
|
|
||||||
visible: modelData.isSteamApp && modelData.icon
|
|
||||||
}
|
|
||||||
|
|
||||||
DankIcon {
|
|
||||||
anchors.centerIn: parent
|
|
||||||
size: root.appIconSize
|
|
||||||
name: "sports_esports"
|
|
||||||
color: Theme.widgetTextColor
|
|
||||||
opacity: modelData.active ? 1.0 : rowAppMouseArea.containsMouse ? 0.8 : 0.6
|
|
||||||
visible: modelData.isSteamApp && !modelData.icon
|
|
||||||
}
|
|
||||||
|
|
||||||
MouseArea {
|
MouseArea {
|
||||||
id: rowAppMouseArea
|
id: rowAppMouseArea
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
@@ -1247,7 +1229,7 @@ Item {
|
|||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
source: modelData.icon
|
source: modelData.icon
|
||||||
opacity: modelData.active ? 1.0 : colAppMouseArea.containsMouse ? 0.8 : 0.6
|
opacity: modelData.active ? 1.0 : colAppMouseArea.containsMouse ? 0.8 : 0.6
|
||||||
visible: !modelData.isQuickshell && !modelData.isSteamApp
|
visible: !modelData.isQuickshell
|
||||||
}
|
}
|
||||||
|
|
||||||
IconImage {
|
IconImage {
|
||||||
@@ -1263,22 +1245,6 @@ Item {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
IconImage {
|
|
||||||
anchors.fill: parent
|
|
||||||
source: modelData.icon
|
|
||||||
opacity: modelData.active ? 1.0 : colAppMouseArea.containsMouse ? 0.8 : 0.6
|
|
||||||
visible: modelData.isSteamApp && modelData.icon
|
|
||||||
}
|
|
||||||
|
|
||||||
DankIcon {
|
|
||||||
anchors.centerIn: parent
|
|
||||||
size: root.appIconSize
|
|
||||||
name: "sports_esports"
|
|
||||||
color: Theme.widgetTextColor
|
|
||||||
opacity: modelData.active ? 1.0 : colAppMouseArea.containsMouse ? 0.8 : 0.6
|
|
||||||
visible: modelData.isSteamApp && !modelData.icon
|
|
||||||
}
|
|
||||||
|
|
||||||
MouseArea {
|
MouseArea {
|
||||||
id: colAppMouseArea
|
id: colAppMouseArea
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
|
|||||||
@@ -327,12 +327,11 @@ Item {
|
|||||||
clip: false
|
clip: false
|
||||||
visible: !_noneAvailable && (!showNoPlayerNow)
|
visible: !_noneAvailable && (!showNoPlayerNow)
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
|
x: 72
|
||||||
|
y: 20
|
||||||
width: 484
|
width: 484
|
||||||
height: 370
|
height: 370
|
||||||
spacing: Theme.spacingXS
|
spacing: Theme.spacingXS
|
||||||
anchors.top: parent.top
|
|
||||||
anchors.topMargin: 20
|
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
width: parent.width
|
width: parent.width
|
||||||
|
|||||||
@@ -403,7 +403,7 @@ Item {
|
|||||||
width: actualIconSize
|
width: actualIconSize
|
||||||
height: actualIconSize
|
height: actualIconSize
|
||||||
anchors.centerIn: parent
|
anchors.centerIn: parent
|
||||||
visible: iconImg.status !== Image.Ready && appData && appData.appId && !Paths.isSteamApp(appData.appId)
|
visible: iconImg.status !== Image.Ready
|
||||||
color: Theme.surfaceLight
|
color: Theme.surfaceLight
|
||||||
radius: Theme.cornerRadius
|
radius: Theme.cornerRadius
|
||||||
border.width: 1
|
border.width: 1
|
||||||
@@ -425,14 +425,6 @@ Item {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
DankIcon {
|
|
||||||
anchors.centerIn: parent
|
|
||||||
size: actualIconSize
|
|
||||||
name: "sports_esports"
|
|
||||||
color: Theme.surfaceText
|
|
||||||
visible: iconImg.status !== Image.Ready && appData && appData.appId && Paths.isSteamApp(appData.appId)
|
|
||||||
}
|
|
||||||
|
|
||||||
Loader {
|
Loader {
|
||||||
anchors.horizontalCenter: SettingsData.dockPosition === SettingsData.Position.Left || SettingsData.dockPosition === SettingsData.Position.Right ? undefined : parent.horizontalCenter
|
anchors.horizontalCenter: SettingsData.dockPosition === SettingsData.Position.Left || SettingsData.dockPosition === SettingsData.Position.Right ? undefined : parent.horizontalCenter
|
||||||
anchors.verticalCenter: SettingsData.dockPosition === SettingsData.Position.Left || SettingsData.dockPosition === SettingsData.Position.Right ? parent.verticalCenter : undefined
|
anchors.verticalCenter: SettingsData.dockPosition === SettingsData.Position.Left || SettingsData.dockPosition === SettingsData.Position.Right ? parent.verticalCenter : undefined
|
||||||
|
|||||||
@@ -1406,14 +1406,6 @@ Item {
|
|||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
visible: NetworkService.networkAvailable || (BluetoothService.available && BluetoothService.enabled) || (AudioService.sink && AudioService.sink.audio)
|
visible: NetworkService.networkAvailable || (BluetoothService.available && BluetoothService.enabled) || (AudioService.sink && AudioService.sink.audio)
|
||||||
|
|
||||||
DankIcon {
|
|
||||||
name: "screen_record"
|
|
||||||
size: Theme.iconSize - 2
|
|
||||||
color: NiriService.hasActiveCast ? "white" : Qt.rgba(255, 255, 255, 0.5)
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
visible: NiriService.hasCasts
|
|
||||||
}
|
|
||||||
|
|
||||||
DankIcon {
|
DankIcon {
|
||||||
name: {
|
name: {
|
||||||
if (NetworkService.wifiToggling)
|
if (NetworkService.wifiToggling)
|
||||||
|
|||||||
@@ -262,10 +262,12 @@ DankOSD {
|
|||||||
target: AudioService.sink && AudioService.sink.audio ? AudioService.sink.audio : null
|
target: AudioService.sink && AudioService.sink.audio ? AudioService.sink.audio : null
|
||||||
|
|
||||||
function onVolumeChanged() {
|
function onVolumeChanged() {
|
||||||
|
if (!vertSlider.dragging) {
|
||||||
vertSlider.value = Math.min(100, Math.round(AudioService.sink.audio.volume * 100));
|
vertSlider.value = Math.min(100, Math.round(AudioService.sink.audio.volume * 100));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
StyledText {
|
StyledText {
|
||||||
anchors.bottom: parent.bottom
|
anchors.bottom: parent.bottom
|
||||||
|
|||||||
@@ -177,11 +177,10 @@ Item {
|
|||||||
|
|
||||||
StyledText {
|
StyledText {
|
||||||
text: {
|
text: {
|
||||||
if (!SystemUpdateService.shellVersion && !DMSService.cliVersion)
|
if (!SystemUpdateService.shellVersion)
|
||||||
return "dms";
|
return "dms";
|
||||||
|
|
||||||
let version = SystemUpdateService.shellVersion || "";
|
let version = SystemUpdateService.shellVersion;
|
||||||
let cliVersion = DMSService.cliVersion || "";
|
|
||||||
|
|
||||||
// Debian/Ubuntu/OpenSUSE git format: 1.0.3+git2264.c5c5ce84
|
// Debian/Ubuntu/OpenSUSE git format: 1.0.3+git2264.c5c5ce84
|
||||||
let match = version.match(/^([\d.]+)\+git(\d+)\./);
|
let match = version.match(/^([\d.]+)\+git(\d+)\./);
|
||||||
@@ -192,25 +191,7 @@ Item {
|
|||||||
// Fedora COPR git format: 0.0.git.2267.d430cae9
|
// Fedora COPR git format: 0.0.git.2267.d430cae9
|
||||||
match = version.match(/^[\d.]+\.git\.(\d+)\./);
|
match = version.match(/^[\d.]+\.git\.(\d+)\./);
|
||||||
if (match) {
|
if (match) {
|
||||||
function extractBaseVersion(value) {
|
return `dms (git) v1.0.3-${match[1]}`;
|
||||||
if (!value)
|
|
||||||
return "";
|
|
||||||
let baseMatch = value.match(/(\d+\.\d+\.\d+)/);
|
|
||||||
if (baseMatch)
|
|
||||||
return baseMatch[1];
|
|
||||||
baseMatch = value.match(/(\d+\.\d+)/);
|
|
||||||
if (baseMatch)
|
|
||||||
return baseMatch[1];
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
|
|
||||||
let baseVersion = extractBaseVersion(cliVersion);
|
|
||||||
if (!baseVersion)
|
|
||||||
baseVersion = extractBaseVersion(SystemUpdateService.semverVersion);
|
|
||||||
if (baseVersion) {
|
|
||||||
return `dms (git) v${baseVersion}-${match[1]}`;
|
|
||||||
}
|
|
||||||
return `dms (git) v${match[1]}`;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Stable release format: 1.0.3
|
// Stable release format: 1.0.3
|
||||||
@@ -219,18 +200,6 @@ Item {
|
|||||||
return `dms v${match[1]}`;
|
return `dms v${match[1]}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!version && cliVersion) {
|
|
||||||
match = cliVersion.match(/^([\d.]+)\+git(\d+)\./);
|
|
||||||
if (match) {
|
|
||||||
return `dms (git) v${match[1]}-${match[2]}`;
|
|
||||||
}
|
|
||||||
match = cliVersion.match(/^([\d.]+)$/);
|
|
||||||
if (match) {
|
|
||||||
return `dms v${match[1]}`;
|
|
||||||
}
|
|
||||||
return `dms ${cliVersion}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
return `dms ${version}`;
|
return `dms ${version}`;
|
||||||
}
|
}
|
||||||
font.pixelSize: Theme.fontSizeXLarge
|
font.pixelSize: Theme.fontSizeXLarge
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ pragma ComponentBehavior: Bound
|
|||||||
|
|
||||||
import QtQuick
|
import QtQuick
|
||||||
import QtQuick.Layouts
|
import QtQuick.Layouts
|
||||||
import Quickshell
|
|
||||||
import qs.Common
|
import qs.Common
|
||||||
import qs.Modals.Common
|
import qs.Modals.Common
|
||||||
import qs.Modals.FileBrowser
|
import qs.Modals.FileBrowser
|
||||||
@@ -15,7 +14,6 @@ Item {
|
|||||||
property string expandedVpnUuid: ""
|
property string expandedVpnUuid: ""
|
||||||
property string expandedWifiSsid: ""
|
property string expandedWifiSsid: ""
|
||||||
property string expandedEthDevice: ""
|
property string expandedEthDevice: ""
|
||||||
property int maxPinnedWifiNetworks: 3
|
|
||||||
|
|
||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
NetworkService.addRef();
|
NetworkService.addRef();
|
||||||
@@ -25,51 +23,8 @@ Item {
|
|||||||
NetworkService.removeRef();
|
NetworkService.removeRef();
|
||||||
}
|
}
|
||||||
|
|
||||||
function openVpnFileBrowser() {
|
|
||||||
vpnFileBrowserLoader.active = true;
|
|
||||||
if (vpnFileBrowserLoader.item)
|
|
||||||
vpnFileBrowserLoader.item.open();
|
|
||||||
}
|
|
||||||
|
|
||||||
function normalizePinList(value) {
|
|
||||||
if (Array.isArray(value))
|
|
||||||
return value.filter(v => v)
|
|
||||||
if (typeof value === "string" && value.length > 0)
|
|
||||||
return [value]
|
|
||||||
return []
|
|
||||||
}
|
|
||||||
|
|
||||||
function getPinnedWifiNetworks() {
|
|
||||||
const pins = SettingsData.wifiNetworkPins || {}
|
|
||||||
return normalizePinList(pins["preferredWifi"])
|
|
||||||
}
|
|
||||||
|
|
||||||
function toggleWifiPin(ssid) {
|
|
||||||
const pins = JSON.parse(JSON.stringify(SettingsData.wifiNetworkPins || {}))
|
|
||||||
let pinnedList = normalizePinList(pins["preferredWifi"])
|
|
||||||
const pinIndex = pinnedList.indexOf(ssid)
|
|
||||||
|
|
||||||
if (pinIndex !== -1) {
|
|
||||||
pinnedList.splice(pinIndex, 1)
|
|
||||||
} else {
|
|
||||||
pinnedList.unshift(ssid)
|
|
||||||
if (pinnedList.length > maxPinnedWifiNetworks)
|
|
||||||
pinnedList = pinnedList.slice(0, maxPinnedWifiNetworks)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pinnedList.length > 0)
|
|
||||||
pins["preferredWifi"] = pinnedList
|
|
||||||
else
|
|
||||||
delete pins["preferredWifi"]
|
|
||||||
|
|
||||||
SettingsData.set("wifiNetworkPins", pins)
|
|
||||||
}
|
|
||||||
|
|
||||||
LazyLoader {
|
|
||||||
id: vpnFileBrowserLoader
|
|
||||||
active: false
|
|
||||||
|
|
||||||
FileBrowserModal {
|
FileBrowserModal {
|
||||||
|
id: vpnFileBrowser
|
||||||
browserTitle: I18n.tr("Import VPN")
|
browserTitle: I18n.tr("Import VPN")
|
||||||
browserIcon: "vpn_key"
|
browserIcon: "vpn_key"
|
||||||
browserType: "vpn"
|
browserType: "vpn"
|
||||||
@@ -79,7 +34,6 @@ Item {
|
|||||||
VPNService.importVpn(path.replace("file://", ""));
|
VPNService.importVpn(path.replace("file://", ""));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
ConfirmModal {
|
ConfirmModal {
|
||||||
id: deleteVpnConfirm
|
id: deleteVpnConfirm
|
||||||
@@ -1060,19 +1014,15 @@ Item {
|
|||||||
model: {
|
model: {
|
||||||
const ssid = NetworkService.currentWifiSSID;
|
const ssid = NetworkService.currentWifiSSID;
|
||||||
const networks = NetworkService.wifiNetworks || [];
|
const networks = NetworkService.wifiNetworks || [];
|
||||||
const pinnedList = networkTab.getPinnedWifiNetworks();
|
const pins = SettingsData.wifiNetworkPins || {};
|
||||||
|
const pinnedSSID = pins["preferredWifi"];
|
||||||
|
|
||||||
let sorted = [...networks];
|
let sorted = [...networks];
|
||||||
sorted.sort((a, b) => {
|
sorted.sort((a, b) => {
|
||||||
const aPinnedIndex = pinnedList.indexOf(a.ssid)
|
if (a.ssid === pinnedSSID && b.ssid !== pinnedSSID)
|
||||||
const bPinnedIndex = pinnedList.indexOf(b.ssid)
|
return -1;
|
||||||
if (aPinnedIndex !== -1 || bPinnedIndex !== -1) {
|
if (b.ssid === pinnedSSID && a.ssid !== pinnedSSID)
|
||||||
if (aPinnedIndex === -1)
|
return 1;
|
||||||
return 1
|
|
||||||
if (bPinnedIndex === -1)
|
|
||||||
return -1
|
|
||||||
return aPinnedIndex - bPinnedIndex
|
|
||||||
}
|
|
||||||
if (a.ssid === ssid)
|
if (a.ssid === ssid)
|
||||||
return -1;
|
return -1;
|
||||||
if (b.ssid === ssid)
|
if (b.ssid === ssid)
|
||||||
@@ -1088,7 +1038,7 @@ Item {
|
|||||||
required property int index
|
required property int index
|
||||||
|
|
||||||
readonly property bool isConnected: modelData.ssid === NetworkService.currentWifiSSID
|
readonly property bool isConnected: modelData.ssid === NetworkService.currentWifiSSID
|
||||||
readonly property bool isPinned: networkTab.getPinnedWifiNetworks().includes(modelData.ssid)
|
readonly property bool isPinned: (SettingsData.wifiNetworkPins || {})["preferredWifi"] === modelData.ssid
|
||||||
readonly property bool isExpanded: networkTab.expandedWifiSsid === modelData.ssid
|
readonly property bool isExpanded: networkTab.expandedWifiSsid === modelData.ssid
|
||||||
|
|
||||||
width: parent.width
|
width: parent.width
|
||||||
@@ -1263,7 +1213,13 @@ Item {
|
|||||||
buttonSize: 28
|
buttonSize: 28
|
||||||
iconColor: isPinned ? Theme.primary : Theme.surfaceVariantText
|
iconColor: isPinned ? Theme.primary : Theme.surfaceVariantText
|
||||||
onClicked: {
|
onClicked: {
|
||||||
networkTab.toggleWifiPin(modelData.ssid)
|
const pins = JSON.parse(JSON.stringify(SettingsData.wifiNetworkPins || {}));
|
||||||
|
if (isPinned) {
|
||||||
|
delete pins["preferredWifi"];
|
||||||
|
} else {
|
||||||
|
pins["preferredWifi"] = modelData.ssid;
|
||||||
|
}
|
||||||
|
SettingsData.set("wifiNetworkPins", pins);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1564,7 +1520,7 @@ Item {
|
|||||||
hoverEnabled: true
|
hoverEnabled: true
|
||||||
cursorShape: VPNService.importing ? Qt.BusyCursor : Qt.PointingHandCursor
|
cursorShape: VPNService.importing ? Qt.BusyCursor : Qt.PointingHandCursor
|
||||||
enabled: !VPNService.importing
|
enabled: !VPNService.importing
|
||||||
onClicked: networkTab.openVpnFileBrowser()
|
onClicked: vpnFileBrowser.open()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -270,9 +270,7 @@ FloatingWindow {
|
|||||||
root.updateFilteredPlugins();
|
root.updateFilteredPlugins();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
thirdPartyConfirmLoader.active = true;
|
thirdPartyConfirmModal.visible = true;
|
||||||
if (thirdPartyConfirmLoader.item)
|
|
||||||
thirdPartyConfirmLoader.item.show();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -670,21 +668,9 @@ FloatingWindow {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
LazyLoader {
|
|
||||||
id: thirdPartyConfirmLoader
|
|
||||||
active: false
|
|
||||||
|
|
||||||
FloatingWindow {
|
FloatingWindow {
|
||||||
id: thirdPartyConfirmModal
|
id: thirdPartyConfirmModal
|
||||||
|
|
||||||
function show() {
|
|
||||||
visible = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
function hide() {
|
|
||||||
visible = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
objectName: "thirdPartyConfirm"
|
objectName: "thirdPartyConfirm"
|
||||||
title: I18n.tr("Third-Party Plugin Warning")
|
title: I18n.tr("Third-Party Plugin Warning")
|
||||||
implicitWidth: 500
|
implicitWidth: 500
|
||||||
@@ -698,7 +684,7 @@ FloatingWindow {
|
|||||||
|
|
||||||
Keys.onPressed: event => {
|
Keys.onPressed: event => {
|
||||||
if (event.key === Qt.Key_Escape) {
|
if (event.key === Qt.Key_Escape) {
|
||||||
thirdPartyConfirmModal.hide();
|
thirdPartyConfirmModal.visible = false;
|
||||||
event.accepted = true;
|
event.accepted = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -738,7 +724,7 @@ FloatingWindow {
|
|||||||
iconSize: Theme.iconSize - 2
|
iconSize: Theme.iconSize - 2
|
||||||
iconColor: Theme.outline
|
iconColor: Theme.outline
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
onClicked: thirdPartyConfirmModal.hide()
|
onClicked: thirdPartyConfirmModal.visible = false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -785,7 +771,7 @@ FloatingWindow {
|
|||||||
DankButton {
|
DankButton {
|
||||||
text: I18n.tr("Cancel")
|
text: I18n.tr("Cancel")
|
||||||
iconName: "close"
|
iconName: "close"
|
||||||
onClicked: thirdPartyConfirmModal.hide()
|
onClicked: thirdPartyConfirmModal.visible = false
|
||||||
}
|
}
|
||||||
|
|
||||||
DankButton {
|
DankButton {
|
||||||
@@ -794,8 +780,7 @@ FloatingWindow {
|
|||||||
onClicked: {
|
onClicked: {
|
||||||
SessionData.setShowThirdPartyPlugins(true);
|
SessionData.setShowThirdPartyPlugins(true);
|
||||||
root.updateFilteredPlugins();
|
root.updateFilteredPlugins();
|
||||||
thirdPartyConfirmModal.hide();
|
thirdPartyConfirmModal.visible = false;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -383,7 +383,6 @@ Item {
|
|||||||
widgetObj.showMicPercent = SettingsData.controlCenterShowMicPercent;
|
widgetObj.showMicPercent = SettingsData.controlCenterShowMicPercent;
|
||||||
widgetObj.showBatteryIcon = SettingsData.controlCenterShowBatteryIcon;
|
widgetObj.showBatteryIcon = SettingsData.controlCenterShowBatteryIcon;
|
||||||
widgetObj.showPrinterIcon = SettingsData.controlCenterShowPrinterIcon;
|
widgetObj.showPrinterIcon = SettingsData.controlCenterShowPrinterIcon;
|
||||||
widgetObj.showScreenSharingIcon = SettingsData.controlCenterShowScreenSharingIcon;
|
|
||||||
}
|
}
|
||||||
if (widgetId === "diskUsage")
|
if (widgetId === "diskUsage")
|
||||||
widgetObj.mountPath = "/";
|
widgetObj.mountPath = "/";
|
||||||
@@ -444,7 +443,6 @@ Item {
|
|||||||
newWidget.showMicPercent = widget.showMicPercent ?? SettingsData.controlCenterShowMicPercent;
|
newWidget.showMicPercent = widget.showMicPercent ?? SettingsData.controlCenterShowMicPercent;
|
||||||
newWidget.showBatteryIcon = widget.showBatteryIcon ?? SettingsData.controlCenterShowBatteryIcon;
|
newWidget.showBatteryIcon = widget.showBatteryIcon ?? SettingsData.controlCenterShowBatteryIcon;
|
||||||
newWidget.showPrinterIcon = widget.showPrinterIcon ?? SettingsData.controlCenterShowPrinterIcon;
|
newWidget.showPrinterIcon = widget.showPrinterIcon ?? SettingsData.controlCenterShowPrinterIcon;
|
||||||
newWidget.showScreenSharingIcon = widget.showScreenSharingIcon ?? SettingsData.controlCenterShowScreenSharingIcon;
|
|
||||||
}
|
}
|
||||||
widgets[i] = newWidget;
|
widgets[i] = newWidget;
|
||||||
break;
|
break;
|
||||||
@@ -501,7 +499,6 @@ Item {
|
|||||||
newWidget.showMicPercent = widget.showMicPercent ?? SettingsData.controlCenterShowMicPercent;
|
newWidget.showMicPercent = widget.showMicPercent ?? SettingsData.controlCenterShowMicPercent;
|
||||||
newWidget.showBatteryIcon = widget.showBatteryIcon ?? SettingsData.controlCenterShowBatteryIcon;
|
newWidget.showBatteryIcon = widget.showBatteryIcon ?? SettingsData.controlCenterShowBatteryIcon;
|
||||||
newWidget.showPrinterIcon = widget.showPrinterIcon ?? SettingsData.controlCenterShowPrinterIcon;
|
newWidget.showPrinterIcon = widget.showPrinterIcon ?? SettingsData.controlCenterShowPrinterIcon;
|
||||||
newWidget.showScreenSharingIcon = widget.showScreenSharingIcon ?? SettingsData.controlCenterShowScreenSharingIcon;
|
|
||||||
}
|
}
|
||||||
widgets[widgetIndex] = newWidget;
|
widgets[widgetIndex] = newWidget;
|
||||||
setWidgetsForSection(sectionId, widgets);
|
setWidgetsForSection(sectionId, widgets);
|
||||||
@@ -580,7 +577,6 @@ Item {
|
|||||||
newWidget.showMicPercent = widget.showMicPercent ?? SettingsData.controlCenterShowMicPercent;
|
newWidget.showMicPercent = widget.showMicPercent ?? SettingsData.controlCenterShowMicPercent;
|
||||||
newWidget.showBatteryIcon = widget.showBatteryIcon ?? SettingsData.controlCenterShowBatteryIcon;
|
newWidget.showBatteryIcon = widget.showBatteryIcon ?? SettingsData.controlCenterShowBatteryIcon;
|
||||||
newWidget.showPrinterIcon = widget.showPrinterIcon ?? SettingsData.controlCenterShowPrinterIcon;
|
newWidget.showPrinterIcon = widget.showPrinterIcon ?? SettingsData.controlCenterShowPrinterIcon;
|
||||||
newWidget.showScreenSharingIcon = widget.showScreenSharingIcon ?? SettingsData.controlCenterShowScreenSharingIcon;
|
|
||||||
}
|
}
|
||||||
widgets[widgetIndex] = newWidget;
|
widgets[widgetIndex] = newWidget;
|
||||||
setWidgetsForSection(sectionId, widgets);
|
setWidgetsForSection(sectionId, widgets);
|
||||||
@@ -612,8 +608,7 @@ Item {
|
|||||||
"showMicIcon": widget.showMicIcon ?? SettingsData.controlCenterShowMicIcon,
|
"showMicIcon": widget.showMicIcon ?? SettingsData.controlCenterShowMicIcon,
|
||||||
"showMicPercent": widget.showMicPercent ?? SettingsData.controlCenterShowMicPercent,
|
"showMicPercent": widget.showMicPercent ?? SettingsData.controlCenterShowMicPercent,
|
||||||
"showBatteryIcon": widget.showBatteryIcon ?? SettingsData.controlCenterShowBatteryIcon,
|
"showBatteryIcon": widget.showBatteryIcon ?? SettingsData.controlCenterShowBatteryIcon,
|
||||||
"showPrinterIcon": widget.showPrinterIcon ?? SettingsData.controlCenterShowPrinterIcon,
|
"showPrinterIcon": widget.showPrinterIcon ?? SettingsData.controlCenterShowPrinterIcon
|
||||||
"showScreenSharingIcon": widget.showScreenSharingIcon ?? SettingsData.controlCenterShowScreenSharingIcon
|
|
||||||
};
|
};
|
||||||
newWidget[settingName] = value;
|
newWidget[settingName] = value;
|
||||||
|
|
||||||
@@ -680,7 +675,6 @@ Item {
|
|||||||
newWidget.showMicPercent = widget.showMicPercent ?? SettingsData.controlCenterShowMicPercent;
|
newWidget.showMicPercent = widget.showMicPercent ?? SettingsData.controlCenterShowMicPercent;
|
||||||
newWidget.showBatteryIcon = widget.showBatteryIcon ?? SettingsData.controlCenterShowBatteryIcon;
|
newWidget.showBatteryIcon = widget.showBatteryIcon ?? SettingsData.controlCenterShowBatteryIcon;
|
||||||
newWidget.showPrinterIcon = widget.showPrinterIcon ?? SettingsData.controlCenterShowPrinterIcon;
|
newWidget.showPrinterIcon = widget.showPrinterIcon ?? SettingsData.controlCenterShowPrinterIcon;
|
||||||
newWidget.showScreenSharingIcon = widget.showScreenSharingIcon ?? SettingsData.controlCenterShowScreenSharingIcon;
|
|
||||||
}
|
}
|
||||||
widgets[widgetIndex] = newWidget;
|
widgets[widgetIndex] = newWidget;
|
||||||
setWidgetsForSection(sectionId, widgets);
|
setWidgetsForSection(sectionId, widgets);
|
||||||
@@ -741,7 +735,6 @@ Item {
|
|||||||
newWidget.showMicPercent = widget.showMicPercent ?? SettingsData.controlCenterShowMicPercent;
|
newWidget.showMicPercent = widget.showMicPercent ?? SettingsData.controlCenterShowMicPercent;
|
||||||
newWidget.showBatteryIcon = widget.showBatteryIcon ?? SettingsData.controlCenterShowBatteryIcon;
|
newWidget.showBatteryIcon = widget.showBatteryIcon ?? SettingsData.controlCenterShowBatteryIcon;
|
||||||
newWidget.showPrinterIcon = widget.showPrinterIcon ?? SettingsData.controlCenterShowPrinterIcon;
|
newWidget.showPrinterIcon = widget.showPrinterIcon ?? SettingsData.controlCenterShowPrinterIcon;
|
||||||
newWidget.showScreenSharingIcon = widget.showScreenSharingIcon ?? SettingsData.controlCenterShowScreenSharingIcon;
|
|
||||||
}
|
}
|
||||||
widgets[widgetIndex] = newWidget;
|
widgets[widgetIndex] = newWidget;
|
||||||
setWidgetsForSection(sectionId, widgets);
|
setWidgetsForSection(sectionId, widgets);
|
||||||
@@ -802,7 +795,6 @@ Item {
|
|||||||
newWidget.showMicPercent = widget.showMicPercent ?? SettingsData.controlCenterShowMicPercent;
|
newWidget.showMicPercent = widget.showMicPercent ?? SettingsData.controlCenterShowMicPercent;
|
||||||
newWidget.showBatteryIcon = widget.showBatteryIcon ?? SettingsData.controlCenterShowBatteryIcon;
|
newWidget.showBatteryIcon = widget.showBatteryIcon ?? SettingsData.controlCenterShowBatteryIcon;
|
||||||
newWidget.showPrinterIcon = widget.showPrinterIcon ?? SettingsData.controlCenterShowPrinterIcon;
|
newWidget.showPrinterIcon = widget.showPrinterIcon ?? SettingsData.controlCenterShowPrinterIcon;
|
||||||
newWidget.showScreenSharingIcon = widget.showScreenSharingIcon ?? SettingsData.controlCenterShowScreenSharingIcon;
|
|
||||||
}
|
}
|
||||||
widgets[i] = newWidget;
|
widgets[i] = newWidget;
|
||||||
widget = newWidget;
|
widget = newWidget;
|
||||||
@@ -875,8 +867,6 @@ Item {
|
|||||||
item.showBatteryIcon = widget.showBatteryIcon;
|
item.showBatteryIcon = widget.showBatteryIcon;
|
||||||
if (widget.showPrinterIcon !== undefined)
|
if (widget.showPrinterIcon !== undefined)
|
||||||
item.showPrinterIcon = widget.showPrinterIcon;
|
item.showPrinterIcon = widget.showPrinterIcon;
|
||||||
if (widget.showScreenSharingIcon !== undefined)
|
|
||||||
item.showScreenSharingIcon = widget.showScreenSharingIcon;
|
|
||||||
if (widget.minimumWidth !== undefined)
|
if (widget.minimumWidth !== undefined)
|
||||||
item.minimumWidth = widget.minimumWidth;
|
item.minimumWidth = widget.minimumWidth;
|
||||||
if (widget.showSwap !== undefined)
|
if (widget.showSwap !== undefined)
|
||||||
|
|||||||
@@ -875,11 +875,6 @@ Column {
|
|||||||
icon: "print",
|
icon: "print",
|
||||||
label: I18n.tr("Printer"),
|
label: I18n.tr("Printer"),
|
||||||
setting: "showPrinterIcon"
|
setting: "showPrinterIcon"
|
||||||
},
|
|
||||||
{
|
|
||||||
icon: "screen_record",
|
|
||||||
label: I18n.tr("Screen Sharing"),
|
|
||||||
setting: "showScreenSharingIcon"
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -912,8 +907,6 @@ Column {
|
|||||||
return wd?.showBatteryIcon ?? SettingsData.controlCenterShowBatteryIcon;
|
return wd?.showBatteryIcon ?? SettingsData.controlCenterShowBatteryIcon;
|
||||||
case "showPrinterIcon":
|
case "showPrinterIcon":
|
||||||
return wd?.showPrinterIcon ?? SettingsData.controlCenterShowPrinterIcon;
|
return wd?.showPrinterIcon ?? SettingsData.controlCenterShowPrinterIcon;
|
||||||
case "showScreenSharingIcon":
|
|
||||||
return wd?.showScreenSharingIcon ?? SettingsData.controlCenterShowScreenSharingIcon;
|
|
||||||
default:
|
default:
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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: false
|
readonly property bool changelogEnabled: true
|
||||||
|
|
||||||
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
|
||||||
|
|||||||
@@ -27,10 +27,6 @@ Singleton {
|
|||||||
|
|
||||||
property bool inOverview: false
|
property bool inOverview: false
|
||||||
|
|
||||||
property var casts: []
|
|
||||||
property bool hasCasts: casts.length > 0
|
|
||||||
property bool hasActiveCast: casts.some(c => c.is_active)
|
|
||||||
|
|
||||||
property int currentKeyboardLayoutIndex: 0
|
property int currentKeyboardLayoutIndex: 0
|
||||||
property var keyboardLayoutNames: []
|
property var keyboardLayoutNames: []
|
||||||
|
|
||||||
@@ -360,15 +356,6 @@ Singleton {
|
|||||||
case 'ScreenshotCaptured':
|
case 'ScreenshotCaptured':
|
||||||
handleScreenshotCaptured(event.ScreenshotCaptured);
|
handleScreenshotCaptured(event.ScreenshotCaptured);
|
||||||
break;
|
break;
|
||||||
case 'CastsChanged':
|
|
||||||
handleCastsChanged(event.CastsChanged);
|
|
||||||
break;
|
|
||||||
case 'CastStartedOrChanged':
|
|
||||||
handleCastStartedOrChanged(event.CastStartedOrChanged);
|
|
||||||
break;
|
|
||||||
case 'CastStopped':
|
|
||||||
handleCastStopped(event.CastStopped);
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -662,28 +649,6 @@ Singleton {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function handleCastsChanged(data) {
|
|
||||||
casts = data.casts || [];
|
|
||||||
}
|
|
||||||
|
|
||||||
function handleCastStartedOrChanged(data) {
|
|
||||||
if (!data.cast)
|
|
||||||
return;
|
|
||||||
const cast = data.cast;
|
|
||||||
const existingIndex = casts.findIndex(c => c.stream_id === cast.stream_id);
|
|
||||||
if (existingIndex >= 0) {
|
|
||||||
const updatedCasts = [...casts];
|
|
||||||
updatedCasts[existingIndex] = cast;
|
|
||||||
casts = updatedCasts;
|
|
||||||
} else {
|
|
||||||
casts = [...casts, cast];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function handleCastStopped(data) {
|
|
||||||
casts = casts.filter(c => c.stream_id !== data.stream_id);
|
|
||||||
}
|
|
||||||
|
|
||||||
function updateCurrentOutputWorkspaces() {
|
function updateCurrentOutputWorkspaces() {
|
||||||
if (!currentOutput) {
|
if (!currentOutput) {
|
||||||
currentOutputWorkspaces = allWorkspaces;
|
currentOutputWorkspaces = allWorkspaces;
|
||||||
|
|||||||
@@ -27,9 +27,7 @@ Singleton {
|
|||||||
property var colorPickerModal: null
|
property var colorPickerModal: null
|
||||||
property var notificationModal: null
|
property var notificationModal: null
|
||||||
property var wifiPasswordModal: null
|
property var wifiPasswordModal: null
|
||||||
property var wifiPasswordModalLoader: null
|
|
||||||
property var polkitAuthModal: null
|
property var polkitAuthModal: null
|
||||||
property var polkitAuthModalLoader: null
|
|
||||||
property var bluetoothPairingModal: null
|
property var bluetoothPairingModal: null
|
||||||
property var networkInfoModal: null
|
property var networkInfoModal: null
|
||||||
|
|
||||||
@@ -418,17 +416,11 @@ Singleton {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function showWifiPasswordModal(ssid) {
|
function showWifiPasswordModal(ssid) {
|
||||||
if (wifiPasswordModalLoader)
|
wifiPasswordModal?.show(ssid);
|
||||||
wifiPasswordModalLoader.active = true;
|
|
||||||
if (wifiPasswordModal)
|
|
||||||
wifiPasswordModal.show(ssid);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function showHiddenNetworkModal() {
|
function showHiddenNetworkModal() {
|
||||||
if (wifiPasswordModalLoader)
|
wifiPasswordModal?.showHidden();
|
||||||
wifiPasswordModalLoader.active = true;
|
|
||||||
if (wifiPasswordModal)
|
|
||||||
wifiPasswordModal.showHidden();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function hideWifiPasswordModal() {
|
function hideWifiPasswordModal() {
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
v1.4-unstable
|
v1.2.1
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -240,7 +240,7 @@
|
|||||||
"All displays": "Tutti gli schermi"
|
"All displays": "Tutti gli schermi"
|
||||||
},
|
},
|
||||||
"Allow clicks to pass through the widget": {
|
"Allow clicks to pass through the widget": {
|
||||||
"Allow clicks to pass through the widget": "Consenti il passaggio dei clic attraverso il widget"
|
"Allow clicks to pass through the widget": ""
|
||||||
},
|
},
|
||||||
"Alt+←/Backspace: Back • F1/I: File Info • F10: Help • Esc: Close": {
|
"Alt+←/Backspace: Back • F1/I: File Info • F10: Help • Esc: Close": {
|
||||||
"Alt+←/Backspace: Back • F1/I: File Info • F10: Help • Esc: Close": "Alt+←/Backspace: Indietro • F1/I: File Info • F10: Aiuto • Esc: Chiudi"
|
"Alt+←/Backspace: Back • F1/I: File Info • F10: Help • Esc: Close": "Alt+←/Backspace: Indietro • F1/I: File Info • F10: Aiuto • Esc: Chiudi"
|
||||||
@@ -279,7 +279,7 @@
|
|||||||
"Anonymous Identity (optional)": "Identità anonima (facoltativa)"
|
"Anonymous Identity (optional)": "Identità anonima (facoltativa)"
|
||||||
},
|
},
|
||||||
"App ID Substitutions": {
|
"App ID Substitutions": {
|
||||||
"App ID Substitutions": "Sostituzioni App ID"
|
"App ID Substitutions": ""
|
||||||
},
|
},
|
||||||
"App Launcher": {
|
"App Launcher": {
|
||||||
"App Launcher": "App Launcher"
|
"App Launcher": "App Launcher"
|
||||||
@@ -729,7 +729,7 @@
|
|||||||
"Click Import to add a .ovpn or .conf": "Clicca su Importa per aggiungere un file .ovpn o .conf"
|
"Click Import to add a .ovpn or .conf": "Clicca su Importa per aggiungere un file .ovpn o .conf"
|
||||||
},
|
},
|
||||||
"Click Through": {
|
"Click Through": {
|
||||||
"Click Through": "Clic passanti"
|
"Click Through": ""
|
||||||
},
|
},
|
||||||
"Click any shortcut to edit. Changes save to %1": {
|
"Click any shortcut to edit. Changes save to %1": {
|
||||||
"Click any shortcut to edit. Changes save to %1": "Clicca su qualsiasi scorciatoia per modificare. Le modifiche vengono salvate in %1"
|
"Click any shortcut to edit. Changes save to %1": "Clicca su qualsiasi scorciatoia per modificare. Le modifiche vengono salvate in %1"
|
||||||
@@ -1797,7 +1797,7 @@
|
|||||||
"Grid Columns": "Colonne Griglia"
|
"Grid Columns": "Colonne Griglia"
|
||||||
},
|
},
|
||||||
"Group": {
|
"Group": {
|
||||||
"Group": "Gruppo"
|
"Group": ""
|
||||||
},
|
},
|
||||||
"Group Workspace Apps": {
|
"Group Workspace Apps": {
|
||||||
"Group Workspace Apps": "Raggruppa App per Spazio di Lavoro"
|
"Group Workspace Apps": "Raggruppa App per Spazio di Lavoro"
|
||||||
@@ -1809,13 +1809,13 @@
|
|||||||
"Group multiple windows of the same app together with a window count indicator": "Raggruppa molteplici finestre della stessa app con un indicatore del numero di finestre"
|
"Group multiple windows of the same app together with a window count indicator": "Raggruppa molteplici finestre della stessa app con un indicatore del numero di finestre"
|
||||||
},
|
},
|
||||||
"Group removed": {
|
"Group removed": {
|
||||||
"Group removed": "Gruppo rimosso"
|
"Group removed": ""
|
||||||
},
|
},
|
||||||
"Group repeated application icons in unfocused workspaces": {
|
"Group repeated application icons in unfocused workspaces": {
|
||||||
"Group repeated application icons in unfocused workspaces": "Raggruppa le icone delle applicazioni duplicate negli spazi di lavoro non attivi"
|
"Group repeated application icons in unfocused workspaces": "Raggruppa le icone delle applicazioni duplicate negli spazi di lavoro non attivi"
|
||||||
},
|
},
|
||||||
"Groups": {
|
"Groups": {
|
||||||
"Groups": "Gruppi"
|
"Groups": ""
|
||||||
},
|
},
|
||||||
"HDR (EDID)": {
|
"HDR (EDID)": {
|
||||||
"HDR (EDID)": "HDR (EDID)"
|
"HDR (EDID)": "HDR (EDID)"
|
||||||
@@ -2214,7 +2214,7 @@
|
|||||||
"Manual Show/Hide": "Mostra/Nascondi Manuale"
|
"Manual Show/Hide": "Mostra/Nascondi Manuale"
|
||||||
},
|
},
|
||||||
"Map window class names to icon names for proper icon display": {
|
"Map window class names to icon names for proper icon display": {
|
||||||
"Map window class names to icon names for proper icon display": "Associa i nomi delle classi delle finestre ai nomi delle icone per una corretta visualizzazione"
|
"Map window class names to icon names for proper icon display": ""
|
||||||
},
|
},
|
||||||
"Margin": {
|
"Margin": {
|
||||||
"Margin": "Margini"
|
"Margin": "Margini"
|
||||||
@@ -2439,7 +2439,7 @@
|
|||||||
"New York, NY": "New York, NY"
|
"New York, NY": "New York, NY"
|
||||||
},
|
},
|
||||||
"New group name...": {
|
"New group name...": {
|
||||||
"New group name...": "Nome del nuovo gruppo..."
|
"New group name...": ""
|
||||||
},
|
},
|
||||||
"Next Transition": {
|
"Next Transition": {
|
||||||
"Next Transition": "Prossima Transizione"
|
"Next Transition": "Prossima Transizione"
|
||||||
@@ -2673,7 +2673,7 @@
|
|||||||
"Options": "Opzioni"
|
"Options": "Opzioni"
|
||||||
},
|
},
|
||||||
"Organize widgets into collapsible groups": {
|
"Organize widgets into collapsible groups": {
|
||||||
"Organize widgets into collapsible groups": "Organizza i widget in gruppi comprimibili"
|
"Organize widgets into collapsible groups": ""
|
||||||
},
|
},
|
||||||
"Other": {
|
"Other": {
|
||||||
"Other": "Altro"
|
"Other": "Altro"
|
||||||
@@ -2748,7 +2748,7 @@
|
|||||||
"Password": "Password"
|
"Password": "Password"
|
||||||
},
|
},
|
||||||
"Pattern": {
|
"Pattern": {
|
||||||
"Pattern": "Pattern"
|
"Pattern": ""
|
||||||
},
|
},
|
||||||
"Pause": {
|
"Pause": {
|
||||||
"Pause": "Pausa"
|
"Pause": "Pausa"
|
||||||
@@ -3012,7 +3012,7 @@
|
|||||||
"Repeat": "Ripetizione"
|
"Repeat": "Ripetizione"
|
||||||
},
|
},
|
||||||
"Replacement": {
|
"Replacement": {
|
||||||
"Replacement": "Sostituzione"
|
"Replacement": ""
|
||||||
},
|
},
|
||||||
"Report": {
|
"Report": {
|
||||||
"Report": "Riepilogo"
|
"Report": "Riepilogo"
|
||||||
@@ -3648,7 +3648,7 @@
|
|||||||
"Sync Mode with Portal": "Modalità Sync con Portale"
|
"Sync Mode with Portal": "Modalità Sync con Portale"
|
||||||
},
|
},
|
||||||
"Sync Position Across Screens": {
|
"Sync Position Across Screens": {
|
||||||
"Sync Position Across Screens": "Sincronizza la posizione tra gli schermi"
|
"Sync Position Across Screens": ""
|
||||||
},
|
},
|
||||||
"Sync dark mode with settings portals for system-wide theme hints": {
|
"Sync dark mode with settings portals for system-wide theme hints": {
|
||||||
"Sync dark mode with settings portals for system-wide theme hints": "Sincronizza tema scuro con impostazioni di sistema"
|
"Sync dark mode with settings portals for system-wide theme hints": "Sincronizza tema scuro con impostazioni di sistema"
|
||||||
@@ -3876,7 +3876,7 @@
|
|||||||
"Unfocused Color": "Colore Inattivo"
|
"Unfocused Color": "Colore Inattivo"
|
||||||
},
|
},
|
||||||
"Ungrouped": {
|
"Ungrouped": {
|
||||||
"Ungrouped": "Non Raggruppato"
|
"Ungrouped": ""
|
||||||
},
|
},
|
||||||
"Uninstall Plugin": {
|
"Uninstall Plugin": {
|
||||||
"Uninstall Plugin": "Disinstalla Plugin"
|
"Uninstall Plugin": "Disinstalla Plugin"
|
||||||
@@ -3978,13 +3978,13 @@
|
|||||||
"Use light theme instead of dark theme": "Usa tema chiaro invece del tema scuro"
|
"Use light theme instead of dark theme": "Usa tema chiaro invece del tema scuro"
|
||||||
},
|
},
|
||||||
"Use smaller notification cards": {
|
"Use smaller notification cards": {
|
||||||
"Use smaller notification cards": "Usa schede di notifica più piccole"
|
"Use smaller notification cards": ""
|
||||||
},
|
},
|
||||||
"Use sound theme from system settings": {
|
"Use sound theme from system settings": {
|
||||||
"Use sound theme from system settings": "Usa tema di suoni dalle impostazioni di sistema"
|
"Use sound theme from system settings": "Usa tema di suoni dalle impostazioni di sistema"
|
||||||
},
|
},
|
||||||
"Use the same position and size on all displays": {
|
"Use the same position and size on all displays": {
|
||||||
"Use the same position and size on all displays": "Usa la stessa posizione e dimensione su tutti gli schermi"
|
"Use the same position and size on all displays": ""
|
||||||
},
|
},
|
||||||
"Use trigger prefix to activate": {
|
"Use trigger prefix to activate": {
|
||||||
"Use trigger prefix to activate": "Usa il prefisso attivatore per attivare"
|
"Use trigger prefix to activate": "Usa il prefisso attivatore per attivare"
|
||||||
@@ -4553,7 +4553,7 @@
|
|||||||
"No wallpaper selected": "Nessuno sfondo selezionato"
|
"No wallpaper selected": "Nessuno sfondo selezionato"
|
||||||
},
|
},
|
||||||
"notification center tab": {
|
"notification center tab": {
|
||||||
"Current": "Attuali",
|
"Current": "Attuale",
|
||||||
"History": "Cronologia"
|
"History": "Cronologia"
|
||||||
},
|
},
|
||||||
"notification history filter": {
|
"notification history filter": {
|
||||||
|
|||||||
@@ -240,7 +240,7 @@
|
|||||||
"All displays": "所有显示器"
|
"All displays": "所有显示器"
|
||||||
},
|
},
|
||||||
"Allow clicks to pass through the widget": {
|
"Allow clicks to pass through the widget": {
|
||||||
"Allow clicks to pass through the widget": "允许鼠标穿透部件"
|
"Allow clicks to pass through the widget": ""
|
||||||
},
|
},
|
||||||
"Alt+←/Backspace: Back • F1/I: File Info • F10: Help • Esc: Close": {
|
"Alt+←/Backspace: Back • F1/I: File Info • F10: Help • Esc: Close": {
|
||||||
"Alt+←/Backspace: Back • F1/I: File Info • F10: Help • Esc: Close": "Alt+←/退格: 返回 • F1/I: 文件信息 • F10: 帮助 • Esc: 关闭"
|
"Alt+←/Backspace: Back • F1/I: File Info • F10: Help • Esc: Close": "Alt+←/退格: 返回 • F1/I: 文件信息 • F10: 帮助 • Esc: 关闭"
|
||||||
@@ -279,7 +279,7 @@
|
|||||||
"Anonymous Identity (optional)": "匿名身份(可选)"
|
"Anonymous Identity (optional)": "匿名身份(可选)"
|
||||||
},
|
},
|
||||||
"App ID Substitutions": {
|
"App ID Substitutions": {
|
||||||
"App ID Substitutions": "应用ID替换"
|
"App ID Substitutions": ""
|
||||||
},
|
},
|
||||||
"App Launcher": {
|
"App Launcher": {
|
||||||
"App Launcher": "启动器"
|
"App Launcher": "启动器"
|
||||||
@@ -729,7 +729,7 @@
|
|||||||
"Click Import to add a .ovpn or .conf": "点击导入添加 .ovpn 或 .conf 文件"
|
"Click Import to add a .ovpn or .conf": "点击导入添加 .ovpn 或 .conf 文件"
|
||||||
},
|
},
|
||||||
"Click Through": {
|
"Click Through": {
|
||||||
"Click Through": "鼠标穿透"
|
"Click Through": ""
|
||||||
},
|
},
|
||||||
"Click any shortcut to edit. Changes save to %1": {
|
"Click any shortcut to edit. Changes save to %1": {
|
||||||
"Click any shortcut to edit. Changes save to %1": "点击任意快捷方式以编辑。更改将保存至%1。"
|
"Click any shortcut to edit. Changes save to %1": "点击任意快捷方式以编辑。更改将保存至%1。"
|
||||||
@@ -1797,7 +1797,7 @@
|
|||||||
"Grid Columns": "网格列"
|
"Grid Columns": "网格列"
|
||||||
},
|
},
|
||||||
"Group": {
|
"Group": {
|
||||||
"Group": "分组"
|
"Group": ""
|
||||||
},
|
},
|
||||||
"Group Workspace Apps": {
|
"Group Workspace Apps": {
|
||||||
"Group Workspace Apps": "分组工作区应用"
|
"Group Workspace Apps": "分组工作区应用"
|
||||||
@@ -1809,13 +1809,13 @@
|
|||||||
"Group multiple windows of the same app together with a window count indicator": "将同一应用的多个窗口合并显示,并标注窗口数量"
|
"Group multiple windows of the same app together with a window count indicator": "将同一应用的多个窗口合并显示,并标注窗口数量"
|
||||||
},
|
},
|
||||||
"Group removed": {
|
"Group removed": {
|
||||||
"Group removed": "分组已移除"
|
"Group removed": ""
|
||||||
},
|
},
|
||||||
"Group repeated application icons in unfocused workspaces": {
|
"Group repeated application icons in unfocused workspaces": {
|
||||||
"Group repeated application icons in unfocused workspaces": "在不聚焦的工作区中将重复应用图标分组"
|
"Group repeated application icons in unfocused workspaces": "在不聚焦的工作区中将重复应用图标分组"
|
||||||
},
|
},
|
||||||
"Groups": {
|
"Groups": {
|
||||||
"Groups": "分组"
|
"Groups": ""
|
||||||
},
|
},
|
||||||
"HDR (EDID)": {
|
"HDR (EDID)": {
|
||||||
"HDR (EDID)": "HDR(EDID)"
|
"HDR (EDID)": "HDR(EDID)"
|
||||||
@@ -2214,7 +2214,7 @@
|
|||||||
"Manual Show/Hide": "手动显示/隐藏"
|
"Manual Show/Hide": "手动显示/隐藏"
|
||||||
},
|
},
|
||||||
"Map window class names to icon names for proper icon display": {
|
"Map window class names to icon names for proper icon display": {
|
||||||
"Map window class names to icon names for proper icon display": "将窗口类名称映射到图标名称以实现正确的图标显示"
|
"Map window class names to icon names for proper icon display": ""
|
||||||
},
|
},
|
||||||
"Margin": {
|
"Margin": {
|
||||||
"Margin": "边距"
|
"Margin": "边距"
|
||||||
@@ -2439,7 +2439,7 @@
|
|||||||
"New York, NY": "纽约,美国纽约州"
|
"New York, NY": "纽约,美国纽约州"
|
||||||
},
|
},
|
||||||
"New group name...": {
|
"New group name...": {
|
||||||
"New group name...": "新分组名..."
|
"New group name...": ""
|
||||||
},
|
},
|
||||||
"Next Transition": {
|
"Next Transition": {
|
||||||
"Next Transition": "下一过渡"
|
"Next Transition": "下一过渡"
|
||||||
@@ -2673,7 +2673,7 @@
|
|||||||
"Options": "选项"
|
"Options": "选项"
|
||||||
},
|
},
|
||||||
"Organize widgets into collapsible groups": {
|
"Organize widgets into collapsible groups": {
|
||||||
"Organize widgets into collapsible groups": "将部件组织成可折叠分组"
|
"Organize widgets into collapsible groups": ""
|
||||||
},
|
},
|
||||||
"Other": {
|
"Other": {
|
||||||
"Other": "其他"
|
"Other": "其他"
|
||||||
@@ -2748,7 +2748,7 @@
|
|||||||
"Password": "密码"
|
"Password": "密码"
|
||||||
},
|
},
|
||||||
"Pattern": {
|
"Pattern": {
|
||||||
"Pattern": "模式"
|
"Pattern": ""
|
||||||
},
|
},
|
||||||
"Pause": {
|
"Pause": {
|
||||||
"Pause": "暂停"
|
"Pause": "暂停"
|
||||||
@@ -3012,7 +3012,7 @@
|
|||||||
"Repeat": "重复"
|
"Repeat": "重复"
|
||||||
},
|
},
|
||||||
"Replacement": {
|
"Replacement": {
|
||||||
"Replacement": "替换"
|
"Replacement": ""
|
||||||
},
|
},
|
||||||
"Report": {
|
"Report": {
|
||||||
"Report": "报告"
|
"Report": "报告"
|
||||||
@@ -3648,7 +3648,7 @@
|
|||||||
"Sync Mode with Portal": "同步系统深色模式"
|
"Sync Mode with Portal": "同步系统深色模式"
|
||||||
},
|
},
|
||||||
"Sync Position Across Screens": {
|
"Sync Position Across Screens": {
|
||||||
"Sync Position Across Screens": "在显示器间同步位置"
|
"Sync Position Across Screens": ""
|
||||||
},
|
},
|
||||||
"Sync dark mode with settings portals for system-wide theme hints": {
|
"Sync dark mode with settings portals for system-wide theme hints": {
|
||||||
"Sync dark mode with settings portals for system-wide theme hints": "随系统设置开启深色模式,以适配全局主题"
|
"Sync dark mode with settings portals for system-wide theme hints": "随系统设置开启深色模式,以适配全局主题"
|
||||||
@@ -3876,7 +3876,7 @@
|
|||||||
"Unfocused Color": "未聚焦颜色"
|
"Unfocused Color": "未聚焦颜色"
|
||||||
},
|
},
|
||||||
"Ungrouped": {
|
"Ungrouped": {
|
||||||
"Ungrouped": "已解除分组"
|
"Ungrouped": ""
|
||||||
},
|
},
|
||||||
"Uninstall Plugin": {
|
"Uninstall Plugin": {
|
||||||
"Uninstall Plugin": "卸载插件"
|
"Uninstall Plugin": "卸载插件"
|
||||||
@@ -3978,13 +3978,13 @@
|
|||||||
"Use light theme instead of dark theme": "使用浅色主题替代深色主题"
|
"Use light theme instead of dark theme": "使用浅色主题替代深色主题"
|
||||||
},
|
},
|
||||||
"Use smaller notification cards": {
|
"Use smaller notification cards": {
|
||||||
"Use smaller notification cards": "使用更小的通知卡"
|
"Use smaller notification cards": ""
|
||||||
},
|
},
|
||||||
"Use sound theme from system settings": {
|
"Use sound theme from system settings": {
|
||||||
"Use sound theme from system settings": "使用系统设置中的声音主题"
|
"Use sound theme from system settings": "使用系统设置中的声音主题"
|
||||||
},
|
},
|
||||||
"Use the same position and size on all displays": {
|
"Use the same position and size on all displays": {
|
||||||
"Use the same position and size on all displays": "在所有显示器上使用同样的位置与大小"
|
"Use the same position and size on all displays": ""
|
||||||
},
|
},
|
||||||
"Use trigger prefix to activate": {
|
"Use trigger prefix to activate": {
|
||||||
"Use trigger prefix to activate": "使用触发前缀以激活"
|
"Use trigger prefix to activate": "使用触发前缀以激活"
|
||||||
|
|||||||
Reference in New Issue
Block a user