1
0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-01-29 16:02:51 -05:00

Compare commits

..

47 Commits

Author SHA1 Message Date
Flux
a7cdb39b0b labwc patch (#1391) 2026-01-16 09:52:13 -05:00
bbedward
0ceba92a23 i18n: more RTL fixes across settings 2026-01-16 09:52:13 -05:00
bbedward
4daa7a4c88 popout: fix cross-monitor handling of widgets fixes #1364 2026-01-16 09:52:13 -05:00
bbedward
cc4a6a5899 doctor: add mango and labwc to compositors fixes #1394 2026-01-16 09:52:13 -05:00
bbedward
994947477c greeter: remove WLR_DRM_DEVICES setting fixes #1393 2026-01-16 09:52:13 -05:00
bbedward
311817ee97 dankbar: fix property preservation in widgets fixes #1392 2026-01-16 09:52:13 -05:00
bbedward
b80c73f9b9 weather: fix precipitationw weekly propability fixes #1395 2026-01-16 09:52:13 -05:00
bbedward
a85101c099 plugins: ensure daemon plugins not instantiated twice 2026-01-16 09:52:13 -05:00
bbedward
3513d57e06 cc: fixed width column, remove anchoring from individual icons on vbar maybe #1376 2026-01-16 09:52:13 -05:00
Lucas
1234847abb nix: fix home module (#1387) 2026-01-16 09:52:13 -05:00
Bailey
0ed595b43d nix: Support specifying systemd target (#1385) 2026-01-16 09:52:13 -05:00
Ivan Molodetskikh
060cbefc79 Add screencast indicator for niri (#1361)
* niri: Handle new Cast events

* bar: Add screen sharing indicator

Configurable like other icons; on by default.

* lockscreen: Add screen sharing indicator
2026-01-16 09:52:10 -05:00
bbedward
e022c04519 bump version 2026-01-15 23:45:21 -05:00
bbedward
f534384e5e cc: wrap icons in fixed size containers
maybe #1376
2026-01-15 23:45:09 -05:00
bbedward
a25cdb43d5 controlcenter: fix visibility condition of no icons fixes #1377 2026-01-15 23:45:09 -05:00
purian23
4e9b4ca400 Fix fedora version format 2026-01-15 23:44:19 -05:00
bbedward
5bab1c98b1 plugins: fix plugin confirm third part repo window 2026-01-15 23:44:19 -05:00
purian23
2284bb002f distro: Update Fedora dynamic versioning 2026-01-15 23:44:19 -05:00
purian23
b0611d6104 feat: Allow more pinned services in Control Center/Settings 2026-01-15 23:44:19 -05:00
purian23
27965862d6 core: Update ghostty on dankinstall 2026-01-15 23:44:19 -05:00
Abhinav Chalise
e74a901e05 fix volume osd sliding ui update for vertical layout (#1382) 2026-01-15 23:44:19 -05:00
bbedward
77794deb2c widgets: add fallback for steam apps 2026-01-15 23:44:19 -05:00
Lucas
1c10746e50 doctor: use dbus for checking on services (#1384)
* doctor: use dbus for checking on services

* doctor: show docs URL for failed checks

* core: remove unused function
2026-01-15 23:44:19 -05:00
bbedward
8ecb7282b9 dankdash: fix weather open IPC fixes #1367 2026-01-15 23:44:19 -05:00
bbedward
9b3fa804ab matugen: fix nvim ID in skipTemplates 2026-01-15 23:44:19 -05:00
purian23
b2ad31a27e dankdash: Center Media Art & Controls 2026-01-15 23:44:19 -05:00
bbedward
db17e4cb14 i18n: update terms 2026-01-15 23:44:02 -05:00
bbedward
1b7dcf56a8 bump VERSION 2026-01-14 08:00:15 -05:00
bbedward
502bb88e92 modals: fix wifi passowrd, polkit, and VPN import 2026-01-14 08:00:05 -05:00
bbedward
b76d0ce97d settings: fix child windows on newer quickshell-git 2026-01-13 16:58:08 -05:00
bbedward
fa66d330cf bump VERSION 2026-01-13 16:42:49 -05:00
Lucas
157eab2d07 settings: fix modal not opening on latest quickshell (#1357) 2026-01-13 16:42:38 -05:00
Lucas
f50ad2dc22 nix: escape version string (#1353) 2026-01-13 16:42:38 -05:00
bbedward
cd9d92d884 update changelog link and VERSION 2026-01-13 08:31:50 -05:00
Lucas
1b69a5e62b nix: add wtype dependency (#1346) 2026-01-13 08:27:46 -05:00
bbedward
61d311b157 widgets: fix running apps positioning and popup manager 2026-01-13 08:26:29 -05:00
bbedward
6b76b86930 notifications: remove redundant trimStored and add null safety 2026-01-12 23:37:49 -05:00
bbedward
dcfb947c36 desktop widgets: sync position across screens option, clickthrough
option, grouping in settings, repositioning, new IPCs for control
fixes #1300
fixes #1301
2026-01-12 15:31:34 -05:00
bbedward
59893b7f44 notifications: use Theme.primary to represent do not distrub in bar 2026-01-12 11:57:42 -05:00
bbedward
d2c62f5533 matugen: add support for vscode-insiders 2026-01-12 11:46:29 -05:00
bbedward
2bbe9a0c45 core/wlcontext: use infinite poll timeout 2026-01-12 11:26:35 -05:00
bbedward
4e2ce82c0a notifications: swipe to dismiss on history 2026-01-12 11:08:22 -05:00
bbedward
104762186f widgets: respect radius for inactive DankButtonGroup i tems 2026-01-12 10:26:50 -05:00
bbedward
f1233ab1e3 matugen: add post_hook for mango 2026-01-12 10:05:19 -05:00
bbedward
d6b407ec37 settings: fix wallpaper preview cache update on per-mode change 2026-01-12 09:58:58 -05:00
bbedward
022b4b4bb3 enable changelog 2026-01-12 09:46:50 -05:00
bbedward
49b322582d keybinds: fix sh, fix screenshot-window options, empty args
part of #914
2026-01-12 09:35:30 -05:00
84 changed files with 4360 additions and 2327 deletions

View File

@@ -87,6 +87,8 @@ var (
swayVersionRegex = regexp.MustCompile(`sway version (\d+\.\d+)`) swayVersionRegex = regexp.MustCompile(`sway version (\d+\.\d+)`)
riverVersionRegex = regexp.MustCompile(`river (\d+\.\d+)`) riverVersionRegex = regexp.MustCompile(`river (\d+\.\d+)`)
wayfireVersionRegex = regexp.MustCompile(`wayfire (\d+\.\d+)`) wayfireVersionRegex = regexp.MustCompile(`wayfire (\d+\.\d+)`)
labwcVersionRegex = regexp.MustCompile(`labwc (\d+\.\d+\.\d+)`)
mangowcVersionRegex = regexp.MustCompile(`mango (\d+\.\d+\.\d+)`)
) )
var doctorCmd = &cobra.Command{ var doctorCmd = &cobra.Command{
@@ -448,11 +450,13 @@ func checkWindowManagers() []checkResult {
versionRegex *regexp.Regexp versionRegex *regexp.Regexp
commands []string commands []string
}{ }{
{"Hyprland", "hyprctl", "version", hyprlandVersionRegex, []string{"hyprland", "Hyprland"}}, {"Hyprland", "Hyprland", "--version", hyprlandVersionRegex, []string{"hyprland", "Hyprland"}},
{"niri", "niri", "--version", niriVersionRegex, []string{"niri"}}, {"niri", "niri", "--version", niriVersionRegex, []string{"niri"}},
{"Sway", "sway", "--version", swayVersionRegex, []string{"sway"}}, {"Sway", "sway", "--version", swayVersionRegex, []string{"sway"}},
{"River", "river", "-version", riverVersionRegex, []string{"river"}}, {"River", "river", "-version", riverVersionRegex, []string{"river"}},
{"Wayfire", "wayfire", "--version", wayfireVersionRegex, []string{"wayfire"}}, {"Wayfire", "wayfire", "--version", wayfireVersionRegex, []string{"wayfire"}},
{"labwc", "labwc", "--version", labwcVersionRegex, []string{"labwc"}},
{"mangowc", "mango", "-v", mangowcVersionRegex, []string{"mango"}},
} }
var results []checkResult var results []checkResult
@@ -477,7 +481,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", doctorDocsURL + "#compositor-checks",
}) })
} }
@@ -486,7 +490,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", doctorDocsURL + "#compositor-checks",
}) })
} }
@@ -498,8 +502,8 @@ func checkWindowManagers() []checkResult {
} }
func getVersionFromCommand(cmd, arg string, regex *regexp.Regexp) string { func getVersionFromCommand(cmd, arg string, regex *regexp.Regexp) string {
output, err := exec.Command(cmd, arg).Output() output, err := exec.Command(cmd, arg).CombinedOutput()
if err != nil { if err != nil && len(output) == 0 {
return "installed" return "installed"
} }
@@ -634,19 +638,14 @@ 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() string { func detectNetworkBackend(stackResult *network.DetectResult) string {
result, err := network.DetectNetworkStack() switch stackResult.Backend {
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 result.HasIwd { if stackResult.HasIwd {
return "iwd + systemd-networkd" return "iwd + systemd-networkd"
} }
return "systemd-networkd" return "systemd-networkd"
@@ -657,75 +656,73 @@ func detectNetworkBackend() 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
if utils.IsServiceActive("accounts-daemon", false) { optionalFeaturesURL := doctorDocsURL + "#optional-features"
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"})
}
if utils.IsServiceActive("power-profiles-daemon", false) { accountsStatus, accountsMsg := getOptionalDBusStatus("org.freedesktop.Accounts")
results = append(results, checkResult{catOptionalFeatures, "power-profiles-daemon", statusOK, "Running", "Power profile management", doctorDocsURL + "#optional-features"}) results = append(results, checkResult{catOptionalFeatures, "accountsservice", accountsStatus, accountsMsg, "User accounts", optionalFeaturesURL})
} else {
results = append(results, checkResult{catOptionalFeatures, "power-profiles-daemon", statusInfo, "Not running", "Power profile management", doctorDocsURL + "#optional-features"}) ppdStatus, ppdMsg := getOptionalDBusStatus("org.freedesktop.UPower.PowerProfiles")
} 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], "", doctorDocsURL + "#optional-features"}) results = append(results, checkResult{catOptionalFeatures, "Terminal", statusOK, terminals[idx], "", optionalFeaturesURL})
} else { } else {
results = append(results, checkResult{catOptionalFeatures, "Terminal", statusWarn, "None found", "Install ghostty, kitty, or alacritty", doctorDocsURL + "#optional-features"}) results = append(results, checkResult{catOptionalFeatures, "Terminal", statusWarn, "None found", "Install ghostty, kitty, or alacritty", optionalFeaturesURL})
} }
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, altCmd, desc string name, cmd, 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},
{"Network", "nmcli", "iwctl", "Network management", false}, {"danksearch", "dsearch", "File search", false},
{"danksearch", "dsearch", "", "File search", false}, {"fprintd", "fprintd-list", "Fingerprint auth", false},
{"loginctl", "loginctl", "", "Session management", false},
{"fprintd", "fprintd-list", "", "Fingerprint auth", false},
} }
for _, d := range deps { for _, d := range deps {
found, foundCmd := utils.CommandExists(d.cmd), d.cmd found := utils.CommandExists(d.cmd)
if !found && d.altCmd != "" && utils.CommandExists(d.altCmd) {
found, foundCmd = true, d.altCmd
}
switch { switch {
case found: case found:
message := "Installed" results = append(results, checkResult{catOptionalFeatures, d.name, statusOK, "Installed", d.desc, optionalFeaturesURL})
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, doctorDocsURL + "#optional-features"}) results = append(results, checkResult{catOptionalFeatures, d.name, statusWarn, "Missing", d.desc, optionalFeaturesURL})
default: default:
results = append(results, checkResult{catOptionalFeatures, d.name, statusInfo, "Not installed", d.desc, doctorDocsURL + "#optional-features"}) results = append(results, checkResult{catOptionalFeatures, d.name, statusInfo, "Not installed", d.desc, optionalFeaturesURL})
} }
} }
@@ -893,6 +890,10 @@ 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) {

View File

@@ -8,6 +8,7 @@ bind = SUPER, N, exec, dms ipc call notifications toggle
bind = SUPER SHIFT, N, exec, dms ipc call notepad toggle bind = SUPER SHIFT, N, exec, dms ipc call notepad toggle
bind = SUPER, Y, exec, dms ipc call dankdash wallpaper bind = SUPER, Y, exec, dms ipc call dankdash wallpaper
bind = SUPER, TAB, exec, dms ipc call hypr toggleOverview bind = SUPER, TAB, exec, dms ipc call hypr toggleOverview
bind = SUPER, X, exec, dms ipc call powermenu toggle
# === Cheat sheet # === Cheat sheet
bind = SUPER SHIFT, Slash, exec, dms ipc call keybinds toggle hyprland bind = SUPER SHIFT, Slash, exec, dms ipc call keybinds toggle hyprland

View File

@@ -15,6 +15,8 @@ binds {
Mod+M hotkey-overlay-title="Task Manager" { Mod+M hotkey-overlay-title="Task Manager" {
spawn "dms" "ipc" "call" "processlist" "focusOrToggle"; spawn "dms" "ipc" "call" "processlist" "focusOrToggle";
} }
Super+X hotkey-overlay-title="Power Menu: Toggle" { spawn "dms" "ipc" "call" "powermenu" "toggle"; }
Mod+Comma hotkey-overlay-title="Settings" { Mod+Comma hotkey-overlay-title="Settings" {
spawn "dms" "ipc" "call" "settings" "focusOrToggle"; spawn "dms" "ipc" "call" "settings" "focusOrToggle";
} }

View File

@@ -108,7 +108,6 @@ 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},
@@ -117,6 +116,7 @@ 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"},
} }

View File

@@ -325,24 +325,30 @@ func (n *NiriProvider) buildActionFromNode(bindNode *document.Node) string {
} }
actionNode := bindNode.Children[0] actionNode := bindNode.Children[0]
actionName := actionNode.Name.String()
kdlStr := strings.TrimSpace(actionNode.String()) if actionName == "" {
if kdlStr == "" {
return "" return ""
} }
return n.kdlActionToInternal(kdlStr) parts := []string{actionName}
} for _, arg := range actionNode.Arguments {
val := arg.ValueString()
func (n *NiriProvider) kdlActionToInternal(kdlAction string) string { if val == "" {
parts := n.parseActionParts(kdlAction) parts = append(parts, `""`)
if len(parts) == 0 { } else {
return kdlAction parts = append(parts, val)
}
} }
for i, part := range parts { if actionNode.Properties != nil {
if part == "" { if val, ok := actionNode.Properties.Get("focus"); ok {
parts[i] = `""` parts = append(parts, "focus="+val.String())
}
if val, ok := actionNode.Properties.Get("show-pointer"); ok {
parts = append(parts, "show-pointer="+val.String())
}
if val, ok := actionNode.Properties.Get("write-to-disk"); ok {
parts = append(parts, "write-to-disk="+val.String())
} }
} }

View File

@@ -314,6 +314,7 @@ output_path = '%s'
appendVSCodeConfig(cfgFile, "codeoss", filepath.Join(homeDir, ".config/Code - OSS/extensions"), opts.ShellDir) appendVSCodeConfig(cfgFile, "codeoss", filepath.Join(homeDir, ".config/Code - OSS/extensions"), opts.ShellDir)
appendVSCodeConfig(cfgFile, "cursor", filepath.Join(homeDir, ".cursor/extensions"), opts.ShellDir) appendVSCodeConfig(cfgFile, "cursor", filepath.Join(homeDir, ".cursor/extensions"), opts.ShellDir)
appendVSCodeConfig(cfgFile, "windsurf", filepath.Join(homeDir, ".windsurf/extensions"), opts.ShellDir) appendVSCodeConfig(cfgFile, "windsurf", filepath.Join(homeDir, ".windsurf/extensions"), opts.ShellDir)
appendVSCodeConfig(cfgFile, "vscode-insiders", filepath.Join(homeDir, ".vscode-insiders/extensions"), opts.ShellDir)
default: default:
appendConfig(opts, cfgFile, tmpl.Commands, tmpl.Flatpaks, tmpl.ConfigFile) appendConfig(opts, cfgFile, tmpl.Commands, tmpl.Flatpaks, tmpl.ConfigFile)
} }

View File

@@ -124,27 +124,23 @@ func (sc *SharedContext) eventDispatcher() {
} }
for { for {
sc.drainCmdQueue()
select { select {
case <-sc.stopChan: case <-sc.stopChan:
return return
default: default:
} }
sc.drainCmdQueue() _, err := unix.Poll(pollFds, -1)
switch {
n, err := unix.Poll(pollFds, 50) case err == unix.EINTR:
if err != nil { continue
if err == unix.EINTR { case err != nil:
continue
}
log.Errorf("Poll error: %v", err) log.Errorf("Poll error: %v", err)
return return
} }
if n == 0 {
continue
}
if pollFds[1].Revents&unix.POLLIN != 0 { if pollFds[1].Revents&unix.POLLIN != 0 {
var buf [64]byte var buf [64]byte
if _, err := unix.Read(sc.wakeR, buf[:]); err != nil && err != unix.EAGAIN { if _, err := unix.Read(sc.wakeR, buf[:]); err != nil && err != unix.EAGAIN {
@@ -152,13 +148,13 @@ func (sc *SharedContext) eventDispatcher() {
} }
} }
if pollFds[0].Revents&unix.POLLIN != 0 { if pollFds[0].Revents&unix.POLLIN == 0 {
if err := ctx.Dispatch(); err != nil { continue
if !os.IsTimeout(err) { }
log.Errorf("Wayland connection error: %v", err)
return if err := ctx.Dispatch(); err != nil && !os.IsTimeout(err) {
} log.Errorf("Wayland connection error: %v", err)
} return
} }
} }
} }
@@ -176,12 +172,16 @@ func (sc *SharedContext) drainCmdQueue() {
func (sc *SharedContext) Close() { func (sc *SharedContext) Close() {
close(sc.stopChan) close(sc.stopChan)
if _, err := unix.Write(sc.wakeW, []byte{1}); err != nil && err != unix.EAGAIN {
log.Errorf("wake pipe write error on close: %v", err)
}
sc.wg.Wait() sc.wg.Wait()
unix.Close(sc.wakeR) unix.Close(sc.wakeR)
unix.Close(sc.wakeW) unix.Close(sc.wakeW)
if sc.display != nil { if sc.display == nil {
sc.display.Context().Close() return
} }
sc.display.Context().Close()
} }

View File

@@ -0,0 +1,20 @@
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
}

View File

@@ -2,7 +2,6 @@ package utils
import ( import (
"os/exec" "os/exec"
"strings"
) )
type AppChecker interface { type AppChecker interface {
@@ -43,16 +42,3 @@ 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")
}

View File

@@ -19,7 +19,8 @@ in
] ]
++ lib.optional cfg.enableDynamicTheming pkgs.matugen ++ lib.optional cfg.enableDynamicTheming pkgs.matugen
++ lib.optional cfg.enableAudioWavelength pkgs.cava ++ lib.optional cfg.enableAudioWavelength pkgs.cava
++ lib.optional cfg.enableCalendarEvents pkgs.khal; ++ lib.optional cfg.enableCalendarEvents pkgs.khal
++ lib.optional cfg.enableClipboardPaste pkgs.wtype;
plugins = lib.mapAttrs (name: plugin: { plugins = lib.mapAttrs (name: plugin: {
source = plugin.src; source = plugin.src;

View File

@@ -11,12 +11,18 @@ let
inherit (config.services.greetd.settings.default_session) user; inherit (config.services.greetd.settings.default_session) user;
compositorPackage =
let
configured = lib.attrByPath [ "programs" cfg.compositor.name "package" ] null config;
in
if configured != null then configured else builtins.getAttr cfg.compositor.name pkgs;
cacheDir = "/var/lib/dms-greeter"; cacheDir = "/var/lib/dms-greeter";
greeterScript = pkgs.writeShellScriptBin "dms-greeter" '' greeterScript = pkgs.writeShellScriptBin "dms-greeter" ''
export PATH=$PATH:${ export PATH=$PATH:${
lib.makeBinPath [ lib.makeBinPath [
cfg.quickshell.package cfg.quickshell.package
config.programs.${cfg.compositor.name}.package compositorPackage
] ]
} }
${ ${
@@ -64,6 +70,7 @@ in
"niri" "niri"
"hyprland" "hyprland"
"sway" "sway"
"labwc"
]; ];
description = "Compositor to run greeter in"; description = "Compositor to run greeter in";
}; };

View File

@@ -73,6 +73,13 @@ 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 {
@@ -84,8 +91,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 = [ config.wayland.systemd.target ]; PartOf = [ cfg.systemd.target ];
After = [ config.wayland.systemd.target ]; After = [ cfg.systemd.target ];
}; };
Service = { Service = {
@@ -93,7 +100,7 @@ in
Restart = "on-failure"; Restart = "on-failure";
}; };
Install.WantedBy = [ config.wayland.systemd.target ]; Install.WantedBy = [ cfg.systemd.target ];
}; };
xdg.stateFile."DankMaterialShell/session.json" = lib.mkIf (cfg.session != { }) { xdg.stateFile."DankMaterialShell/session.json" = lib.mkIf (cfg.session != { }) {

View File

@@ -20,15 +20,19 @@ 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 = [ "graphical-session.target" ]; partOf = [ cfg.systemd.target ];
after = [ "graphical-session.target" ]; after = [ cfg.systemd.target ];
wantedBy = [ "graphical-session.target" ]; wantedBy = [ cfg.systemd.target ];
restartIfChanged = cfg.systemd.restartIfChanged; restartIfChanged = cfg.systemd.restartIfChanged;
serviceConfig = { serviceConfig = {

View File

@@ -70,6 +70,12 @@ in
description = "Add calendar events support via khal"; description = "Add calendar events support via khal";
}; };
enableClipboardPaste = lib.mkOption {
type = types.bool;
default = true;
description = "Adds needed dependencies for directly pasting items from the clipboard history.";
};
quickshell = { quickshell = {
package = lib.mkPackageOption dmsPkgs "quickshell" { package = lib.mkPackageOption dmsPkgs "quickshell" {
extraDescription = "The quickshell package to use (defaults to be built from source, due to unreleased features used by DMS)."; extraDescription = "The quickshell package to use (defaults to be built from source, due to unreleased features used by DMS).";

View File

@@ -61,11 +61,13 @@
(builtins.substring 6 2 longDate) (builtins.substring 6 2 longDate)
]; ];
version = version =
pkgs.lib.removePrefix "v" (pkgs.lib.trim (builtins.readFile ./quickshell/VERSION)) let
+ "+date=" rawVersion = pkgs.lib.removePrefix "v" (pkgs.lib.trim (builtins.readFile ./quickshell/VERSION));
+ mkDate (self.lastModifiedDate or "19700101") cleanVersion = builtins.replaceStrings [ " " ] [ "" ] rawVersion;
+ "_" dateSuffix = "+date=" + mkDate (self.lastModifiedDate or "19700101");
+ (self.shortRev or "dirty"); revSuffix = "_" + (self.shortRev or "dirty");
in
"${cleanVersion}${dateSuffix}${revSuffix}";
in in
{ {
dms-shell = pkgs.buildGoModule ( dms-shell = pkgs.buildGoModule (
@@ -83,7 +85,7 @@
ldflags = [ ldflags = [
"-s" "-s"
"-w" "-w"
"-X main.Version=${version}" "-X 'main.Version=${version}'"
]; ];
nativeBuildInputs = with pkgs; [ nativeBuildInputs = with pkgs; [

View File

@@ -450,10 +450,7 @@ const NIRI_ACTION_ARGS = {
] ]
}, },
"screenshot-window": { "screenshot-window": {
args: [ args: [{ name: "write-to-disk", type: "bool", label: "Save to disk" }]
{ name: "show-pointer", type: "bool", label: "Show pointer" },
{ name: "write-to-disk", type: "bool", label: "Save to disk" }
]
} }
}; };
@@ -841,7 +838,7 @@ function getActionType(action) {
return "compositor"; return "compositor";
if (action.startsWith("spawn dms ipc call ")) if (action.startsWith("spawn dms ipc call "))
return "dms"; return "dms";
if (action.startsWith("spawn sh -c ") || action.startsWith("spawn bash -c ") || action.startsWith("spawn_shell ")) if (/^spawn \w+ -c /.test(action) || action.startsWith("spawn_shell "))
return "shell"; return "shell";
if (action.startsWith("spawn ")) if (action.startsWith("spawn "))
return "spawn"; return "spawn";
@@ -888,12 +885,13 @@ function buildSpawnAction(command, args) {
return "spawn " + parts.join(" "); return "spawn " + parts.join(" ");
} }
function buildShellAction(compositor, shellCmd) { function buildShellAction(compositor, shellCmd, shell) {
if (!shellCmd) if (!shellCmd)
return ""; return "";
if (compositor === "mangowc") if (compositor === "mangowc")
return "spawn_shell " + shellCmd; return "spawn_shell " + shellCmd;
return "spawn sh -c \"" + shellCmd.replace(/"/g, "\\\"") + "\""; var shellBin = shell || "sh";
return "spawn " + shellBin + " -c \"" + shellCmd.replace(/"/g, "\\\"") + "\"";
} }
function parseSpawnCommand(action) { function parseSpawnCommand(action) {
@@ -910,8 +908,9 @@ function parseSpawnCommand(action) {
function parseShellCommand(action) { function parseShellCommand(action) {
if (!action) if (!action)
return ""; return "";
if (action.startsWith("spawn sh -c ")) { var match = action.match(/^spawn (\w+) -c (.+)$/);
var content = action.slice(12); if (match) {
var content = match[2];
if ((content.startsWith('"') && content.endsWith('"')) || (content.startsWith("'") && content.endsWith("'"))) if ((content.startsWith('"') && content.endsWith('"')) || (content.startsWith("'") && content.endsWith("'")))
content = content.slice(1, -1); content = content.slice(1, -1);
return content.replace(/\\"/g, "\""); return content.replace(/\\"/g, "\"");
@@ -921,6 +920,13 @@ function parseShellCommand(action) {
return ""; return "";
} }
function getShellFromAction(action) {
if (!action)
return "sh";
var match = action.match(/^spawn (\w+) -c /);
return match ? match[1] : "sh";
}
function getActionArgConfig(compositor, action) { function getActionArgConfig(compositor, action) {
if (!action) if (!action)
return null; return null;
@@ -1107,12 +1113,27 @@ function buildCompositorAction(compositor, base, args) {
parts.push("focus=false"); parts.push("focus=false");
break; break;
default: default:
if (base.startsWith("screenshot")) { switch (base) {
case "screenshot":
if (args["show-pointer"] === true) if (args["show-pointer"] === true)
parts.push("show-pointer=true"); parts.push("show-pointer=true");
else if (args["show-pointer"] === false)
parts.push("show-pointer=false");
break;
case "screenshot-screen":
if (args["show-pointer"] === true)
parts.push("show-pointer=true");
else if (args["show-pointer"] === false)
parts.push("show-pointer=false");
if (args["write-to-disk"] === true) if (args["write-to-disk"] === true)
parts.push("write-to-disk=true"); parts.push("write-to-disk=true");
} else if (args.value) { break;
case "screenshot-window":
if (args["write-to-disk"] === true)
parts.push("write-to-disk=true");
break;
}
if (args.value) {
parts.push(args.value); parts.push(args.value);
} else if (args.index) { } else if (args.index) {
parts.push(args.index); parts.push(args.index);

View File

@@ -45,6 +45,10 @@ 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++) {
@@ -60,6 +64,9 @@ Singleton {
} }
} }
} }
const steamMatch = appId.match(/^steam_app_(\d+)$/);
if (steamMatch)
return `steam_icon_${steamMatch[1]}`;
return appId; return appId;
} }

View File

@@ -82,15 +82,19 @@ Singleton {
popoutOpening(); popoutOpening();
} }
let justClosedSamePopout = false; let movedFromOtherScreen = false;
for (const otherScreenName in currentPopoutsByScreen) { for (const otherScreenName in currentPopoutsByScreen) {
if (otherScreenName === screenName) if (otherScreenName === screenName)
continue; continue;
const otherPopout = currentPopoutsByScreen[otherScreenName]; const otherPopout = currentPopoutsByScreen[otherScreenName];
if (!otherPopout) if (!otherPopout)
continue; continue;
if (otherPopout === popout) { if (otherPopout === popout) {
justClosedSamePopout = true; movedFromOtherScreen = true;
currentPopoutsByScreen[otherScreenName] = null;
currentPopoutTriggers[otherScreenName] = null;
continue;
} }
if (otherPopout.dashVisible !== undefined) { if (otherPopout.dashVisible !== undefined) {
@@ -112,7 +116,7 @@ Singleton {
} }
} }
if (currentPopout === popout && popout.shouldBeVisible) { if (currentPopout === popout && popout.shouldBeVisible && !movedFromOtherScreen) {
if (triggerId !== undefined && currentPopoutTriggers[screenName] === triggerId) { if (triggerId !== undefined && currentPopoutTriggers[screenName] === triggerId) {
if (popout.dashVisible !== undefined) { if (popout.dashVisible !== undefined) {
popout.dashVisible = false; popout.dashVisible = false;
@@ -139,6 +143,7 @@ Singleton {
popout.currentTabIndex = tabIndex; popout.currentTabIndex = tabIndex;
} }
currentPopoutTriggers[screenName] = triggerId; currentPopoutTriggers[screenName] = triggerId;
return;
} }
currentPopoutTriggers[screenName] = triggerId; currentPopoutTriggers[screenName] = triggerId;
@@ -153,16 +158,8 @@ Singleton {
ModalManager.closeAllModalsExcept(null); ModalManager.closeAllModalsExcept(null);
} }
if (justClosedSamePopout) { if (movedFromOtherScreen) {
Qt.callLater(() => { popout.open();
if (popout.dashVisible !== undefined) {
popout.dashVisible = true;
} else if (popout.notificationHistoryVisible !== undefined) {
popout.notificationHistoryVisible = true;
} else {
popout.open();
}
});
} else { } else {
if (popout.dashVisible !== undefined) { if (popout.dashVisible !== undefined) {
popout.dashVisible = true; popout.dashVisible = true;

View File

@@ -145,6 +145,7 @@ 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
@@ -538,6 +539,7 @@ Singleton {
property var desktopWidgetPositions: ({}) property var desktopWidgetPositions: ({})
property var desktopWidgetGridSettings: ({}) property var desktopWidgetGridSettings: ({})
property var desktopWidgetInstances: [] property var desktopWidgetInstances: []
property var desktopWidgetGroups: []
function getDesktopWidgetGridSetting(screenKey, property, defaultValue) { function getDesktopWidgetGridSetting(screenKey, property, defaultValue) {
const val = desktopWidgetGridSettings?.[screenKey]?.[property]; const val = desktopWidgetGridSettings?.[screenKey]?.[property];
@@ -689,6 +691,38 @@ Singleton {
saveSettings(); saveSettings();
} }
function syncDesktopWidgetPositionToAllScreens(instanceId) {
const instances = JSON.parse(JSON.stringify(desktopWidgetInstances || []));
const idx = instances.findIndex(inst => inst.id === instanceId);
if (idx === -1)
return;
const positions = instances[idx].positions || {};
const screenKeys = Object.keys(positions).filter(k => k !== "_synced");
if (screenKeys.length === 0)
return;
const sourceKey = screenKeys[0];
const sourcePos = positions[sourceKey];
if (!sourcePos)
return;
const screen = Array.from(Quickshell.screens.values()).find(s => getScreenDisplayName(s) === sourceKey);
if (!screen)
return;
const screenW = screen.width;
const screenH = screen.height;
const synced = {};
if (sourcePos.x !== undefined)
synced.x = sourcePos.x / screenW;
if (sourcePos.y !== undefined)
synced.y = sourcePos.y / screenH;
if (sourcePos.width !== undefined)
synced.width = sourcePos.width;
if (sourcePos.height !== undefined)
synced.height = sourcePos.height;
instances[idx].positions["_synced"] = synced;
desktopWidgetInstances = instances;
saveSettings();
}
function duplicateDesktopWidgetInstance(instanceId) { function duplicateDesktopWidgetInstance(instanceId) {
const source = getDesktopWidgetInstance(instanceId); const source = getDesktopWidgetInstance(instanceId);
if (!source) if (!source)
@@ -721,6 +755,110 @@ Singleton {
return (desktopWidgetInstances || []).filter(inst => inst.enabled); return (desktopWidgetInstances || []).filter(inst => inst.enabled);
} }
function moveDesktopWidgetInstance(instanceId, direction) {
const instances = JSON.parse(JSON.stringify(desktopWidgetInstances || []));
const idx = instances.findIndex(inst => inst.id === instanceId);
if (idx === -1)
return false;
const targetIdx = direction === "up" ? idx - 1 : idx + 1;
if (targetIdx < 0 || targetIdx >= instances.length)
return false;
const temp = instances[idx];
instances[idx] = instances[targetIdx];
instances[targetIdx] = temp;
desktopWidgetInstances = instances;
saveSettings();
return true;
}
function reorderDesktopWidgetInstance(instanceId, newIndex) {
const instances = JSON.parse(JSON.stringify(desktopWidgetInstances || []));
const idx = instances.findIndex(inst => inst.id === instanceId);
if (idx === -1 || newIndex < 0 || newIndex >= instances.length)
return false;
const [item] = instances.splice(idx, 1);
instances.splice(newIndex, 0, item);
desktopWidgetInstances = instances;
saveSettings();
return true;
}
function reorderDesktopWidgetInstanceInGroup(instanceId, groupId, newIndexInGroup) {
const instances = JSON.parse(JSON.stringify(desktopWidgetInstances || []));
const groups = desktopWidgetGroups || [];
const groupMatches = inst => {
if (groupId === null)
return !inst.group || !groups.some(g => g.id === inst.group);
return inst.group === groupId;
};
const groupInstances = instances.filter(groupMatches);
const currentGroupIdx = groupInstances.findIndex(inst => inst.id === instanceId);
if (currentGroupIdx === -1 || currentGroupIdx === newIndexInGroup)
return false;
if (newIndexInGroup < 0 || newIndexInGroup >= groupInstances.length)
return false;
const globalIdx = instances.findIndex(inst => inst.id === instanceId);
if (globalIdx === -1)
return false;
const [item] = instances.splice(globalIdx, 1);
const targetInstance = groupInstances[newIndexInGroup];
let targetGlobalIdx = instances.findIndex(inst => inst.id === targetInstance.id);
if (newIndexInGroup > currentGroupIdx)
targetGlobalIdx++;
instances.splice(targetGlobalIdx, 0, item);
desktopWidgetInstances = instances;
saveSettings();
return true;
}
function createDesktopWidgetGroup(name) {
const id = "dwg_" + Date.now() + "_" + Math.random().toString(36).substr(2, 9);
const group = {
id: id,
name: name,
collapsed: false
};
const groups = JSON.parse(JSON.stringify(desktopWidgetGroups || []));
groups.push(group);
desktopWidgetGroups = groups;
saveSettings();
return group;
}
function updateDesktopWidgetGroup(groupId, updates) {
const groups = JSON.parse(JSON.stringify(desktopWidgetGroups || []));
const idx = groups.findIndex(g => g.id === groupId);
if (idx === -1)
return;
Object.assign(groups[idx], updates);
desktopWidgetGroups = groups;
saveSettings();
}
function removeDesktopWidgetGroup(groupId) {
const instances = JSON.parse(JSON.stringify(desktopWidgetInstances || []));
for (let i = 0; i < instances.length; i++) {
if (instances[i].group === groupId)
instances[i].group = null;
}
desktopWidgetInstances = instances;
const groups = (desktopWidgetGroups || []).filter(g => g.id !== groupId);
desktopWidgetGroups = groups;
saveSettings();
}
function getDesktopWidgetGroup(groupId) {
return (desktopWidgetGroups || []).find(g => g.id === groupId) || null;
}
function getDesktopWidgetInstancesByGroup(groupId) {
return (desktopWidgetInstances || []).filter(inst => inst.group === groupId);
}
function getUngroupedDesktopWidgetInstances() {
return (desktopWidgetInstances || []).filter(inst => !inst.group);
}
signal forceDankBarLayoutRefresh signal forceDankBarLayoutRefresh
signal forceDockLayoutRefresh signal forceDockLayoutRefresh
signal widgetDataChanged signal widgetDataChanged

View File

@@ -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", "neovim", "niri", "qt5ct", "qt6ct", "firefox", "pywalfox", "zenbrowser", "vesktop", "equibop", "ghostty", "kitty", "foot", "alacritty", "wezterm", "dgop", "kcolorscheme", "vscode"); skipTemplates.push("gtk", "nvim", "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");

View File

@@ -28,7 +28,8 @@ 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);
@@ -84,6 +85,8 @@ 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);
} }

View File

@@ -70,6 +70,7 @@ 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 },
@@ -402,6 +403,8 @@ var SPEC = {
desktopWidgetInstances: { def: [] }, desktopWidgetInstances: { def: [] },
desktopWidgetGroups: { def: [] },
builtInPluginSettings: { def: {} } builtInPluginSettings: { def: {} }
}; };

View File

@@ -203,6 +203,8 @@ Item {
Component.onCompleted: { Component.onCompleted: {
dockRecreateDebounce.start(); dockRecreateDebounce.start();
// Force PolkitService singleton to initialize
PolkitService.polkitAvailable;
} }
Connections { Connections {
@@ -315,19 +317,44 @@ Item {
} }
} }
WifiPasswordModal { LazyLoader {
id: wifiPasswordModal id: wifiPasswordModalLoader
active: false
Component.onCompleted: { Component.onCompleted: {
PopoutService.wifiPasswordModal = wifiPasswordModal; PopoutService.wifiPasswordModalLoader = wifiPasswordModalLoader;
}
WifiPasswordModal {
id: wifiPasswordModalItem
Component.onCompleted: {
PopoutService.wifiPasswordModal = wifiPasswordModalItem;
}
} }
} }
PolkitAuthModal { LazyLoader {
id: polkitAuthModal id: polkitAuthModalLoader
active: false
Component.onCompleted: { PolkitAuthModal {
PopoutService.polkitAuthModal = polkitAuthModal; id: polkitAuthModal
Component.onCompleted: {
PopoutService.polkitAuthModal = polkitAuthModal;
}
}
}
Connections {
target: PolkitService.agent
enabled: PolkitService.polkitAvailable
function onAuthenticationRequestStarted() {
polkitAuthModalLoader.active = true;
if (polkitAuthModalLoader.item)
polkitAuthModalLoader.item.show();
} }
} }
@@ -349,17 +376,21 @@ Item {
const now = Date.now(); const now = Date.now();
const timeSinceLastPrompt = now - lastCredentialsTime; const timeSinceLastPrompt = now - lastCredentialsTime;
if (wifiPasswordModal.visible && timeSinceLastPrompt < 1000) { wifiPasswordModalLoader.active = true;
if (!wifiPasswordModalLoader.item)
return;
if (wifiPasswordModalLoader.item.visible && timeSinceLastPrompt < 1000) {
NetworkService.cancelCredentials(lastCredentialsToken); NetworkService.cancelCredentials(lastCredentialsToken);
lastCredentialsToken = token; lastCredentialsToken = token;
lastCredentialsTime = now; lastCredentialsTime = now;
wifiPasswordModal.showFromPrompt(token, ssid, setting, fields, hints, reason, connType, connName, vpnService, fieldsInfo); wifiPasswordModalLoader.item.showFromPrompt(token, ssid, setting, fields, hints, reason, connType, connName, vpnService, fieldsInfo);
return; return;
} }
lastCredentialsToken = token; lastCredentialsToken = token;
lastCredentialsTime = now; lastCredentialsTime = now;
wifiPasswordModal.showFromPrompt(token, ssid, setting, fields, hints, reason, connType, connName, vpnService, fieldsInfo); wifiPasswordModalLoader.item.showFromPrompt(token, ssid, setting, fields, hints, reason, connType, connName, vpnService, fieldsInfo);
} }
} }
@@ -442,17 +473,15 @@ Item {
PopoutService.settingsModalLoader = settingsModalLoader; PopoutService.settingsModalLoader = settingsModalLoader;
} }
onActiveChanged: {
if (active && item) {
PopoutService.settingsModal = item;
PopoutService._onSettingsModalLoaded();
}
}
SettingsModal { SettingsModal {
id: settingsModal id: settingsModal
property bool wasShown: false property bool wasShown: false
Component.onCompleted: {
PopoutService.settingsModal = settingsModal;
PopoutService._onSettingsModalLoaded();
}
onVisibleChanged: { onVisibleChanged: {
if (visible) { if (visible) {
wasShown = true; wasShown = true;

View File

@@ -132,8 +132,11 @@ 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 ? 2 : 0; root.dankDashPopoutLoader.item.currentTabIndex = SettingsData.weatherEnabled ? 3 : 0;
break; break;
default: default:
root.dankDashPopoutLoader.item.currentTabIndex = 0; root.dankDashPopoutLoader.item.currentTabIndex = 0;
@@ -797,11 +800,9 @@ Item {
const modal = PopoutService.settingsModal; const modal = PopoutService.settingsModal;
if (modal) { if (modal) {
if (type === "wallpaper") { if (type === "wallpaper") {
modal.wallpaperBrowser.allowStacking = false; modal.openWallpaperBrowser(false);
modal.wallpaperBrowser.open();
} else if (type === "profile") { } else if (type === "profile") {
modal.profileBrowser.allowStacking = false; modal.openProfileBrowser(false);
modal.profileBrowser.open();
} }
} else { } else {
PopoutService.openSettings(); PopoutService.openSettings();
@@ -1068,7 +1069,7 @@ Item {
const instances = SettingsData.desktopWidgetInstances || []; const instances = SettingsData.desktopWidgetInstances || [];
if (instances.length === 0) if (instances.length === 0)
return "No desktop widgets configured"; return "No desktop widgets configured";
return instances.map(i => `${i.id} [${i.widgetType}] ${i.name || i.widgetType}`).join("\n"); return instances.map(i => `${i.id} [${i.widgetType}] ${i.name || i.widgetType} ${i.enabled ? "[enabled]" : "[disabled]"}`).join("\n");
} }
function status(instanceId: string): string { function status(instanceId: string): string {
@@ -1079,9 +1080,115 @@ Item {
if (!instance) if (!instance)
return `DESKTOP_WIDGET_NOT_FOUND: ${instanceId}`; return `DESKTOP_WIDGET_NOT_FOUND: ${instanceId}`;
const enabled = instance.enabled ?? true;
const overlay = instance.config?.showOnOverlay ?? false; const overlay = instance.config?.showOnOverlay ?? false;
const overview = instance.config?.showOnOverview ?? false; const overview = instance.config?.showOnOverview ?? false;
return `overlay: ${overlay}, overview: ${overview}`; const clickThrough = instance.config?.clickThrough ?? false;
const syncPosition = instance.config?.syncPositionAcrossScreens ?? false;
return `enabled: ${enabled}, overlay: ${overlay}, overview: ${overview}, clickThrough: ${clickThrough}, syncPosition: ${syncPosition}`;
}
function enable(instanceId: string): string {
if (!instanceId)
return "ERROR: No instance ID specified";
const instance = SettingsData.getDesktopWidgetInstance(instanceId);
if (!instance)
return `DESKTOP_WIDGET_NOT_FOUND: ${instanceId}`;
SettingsData.updateDesktopWidgetInstance(instanceId, {
enabled: true
});
return `DESKTOP_WIDGET_ENABLED: ${instanceId}`;
}
function disable(instanceId: string): string {
if (!instanceId)
return "ERROR: No instance ID specified";
const instance = SettingsData.getDesktopWidgetInstance(instanceId);
if (!instance)
return `DESKTOP_WIDGET_NOT_FOUND: ${instanceId}`;
SettingsData.updateDesktopWidgetInstance(instanceId, {
enabled: false
});
return `DESKTOP_WIDGET_DISABLED: ${instanceId}`;
}
function toggleEnabled(instanceId: string): string {
if (!instanceId)
return "ERROR: No instance ID specified";
const instance = SettingsData.getDesktopWidgetInstance(instanceId);
if (!instance)
return `DESKTOP_WIDGET_NOT_FOUND: ${instanceId}`;
const currentValue = instance.enabled ?? true;
SettingsData.updateDesktopWidgetInstance(instanceId, {
enabled: !currentValue
});
return !currentValue ? `DESKTOP_WIDGET_ENABLED: ${instanceId}` : `DESKTOP_WIDGET_DISABLED: ${instanceId}`;
}
function toggleClickThrough(instanceId: string): string {
if (!instanceId)
return "ERROR: No instance ID specified";
const instance = SettingsData.getDesktopWidgetInstance(instanceId);
if (!instance)
return `DESKTOP_WIDGET_NOT_FOUND: ${instanceId}`;
const currentValue = instance.config?.clickThrough ?? false;
SettingsData.updateDesktopWidgetInstanceConfig(instanceId, {
clickThrough: !currentValue
});
return !currentValue ? `DESKTOP_WIDGET_CLICK_THROUGH_ENABLED: ${instanceId}` : `DESKTOP_WIDGET_CLICK_THROUGH_DISABLED: ${instanceId}`;
}
function setClickThrough(instanceId: string, enabled: string): string {
if (!instanceId)
return "ERROR: No instance ID specified";
const instance = SettingsData.getDesktopWidgetInstance(instanceId);
if (!instance)
return `DESKTOP_WIDGET_NOT_FOUND: ${instanceId}`;
const enabledBool = enabled === "true" || enabled === "1";
SettingsData.updateDesktopWidgetInstanceConfig(instanceId, {
clickThrough: enabledBool
});
return enabledBool ? `DESKTOP_WIDGET_CLICK_THROUGH_ENABLED: ${instanceId}` : `DESKTOP_WIDGET_CLICK_THROUGH_DISABLED: ${instanceId}`;
}
function toggleSyncPosition(instanceId: string): string {
if (!instanceId)
return "ERROR: No instance ID specified";
const instance = SettingsData.getDesktopWidgetInstance(instanceId);
if (!instance)
return `DESKTOP_WIDGET_NOT_FOUND: ${instanceId}`;
const currentValue = instance.config?.syncPositionAcrossScreens ?? false;
SettingsData.updateDesktopWidgetInstanceConfig(instanceId, {
syncPositionAcrossScreens: !currentValue
});
return !currentValue ? `DESKTOP_WIDGET_SYNC_POSITION_ENABLED: ${instanceId}` : `DESKTOP_WIDGET_SYNC_POSITION_DISABLED: ${instanceId}`;
}
function setSyncPosition(instanceId: string, enabled: string): string {
if (!instanceId)
return "ERROR: No instance ID specified";
const instance = SettingsData.getDesktopWidgetInstance(instanceId);
if (!instance)
return `DESKTOP_WIDGET_NOT_FOUND: ${instanceId}`;
const enabledBool = enabled === "true" || enabled === "1";
SettingsData.updateDesktopWidgetInstanceConfig(instanceId, {
syncPositionAcrossScreens: enabledBool
});
return enabledBool ? `DESKTOP_WIDGET_SYNC_POSITION_ENABLED: ${instanceId}` : `DESKTOP_WIDGET_SYNC_POSITION_DISABLED: ${instanceId}`;
} }
target: "desktopWidget" target: "desktopWidget"

View File

@@ -128,7 +128,7 @@ FloatingWindow {
iconName: "open_in_new" iconName: "open_in_new"
backgroundColor: Theme.surfaceContainerHighest backgroundColor: Theme.surfaceContainerHighest
textColor: Theme.surfaceText textColor: Theme.surfaceText
onClicked: Qt.openUrlExternally("https://danklinux.com/blog/dms-1-2-spicy-miso") onClicked: Qt.openUrlExternally("https://danklinux.com/blog/v1-2-release")
} }
DankButton { DankButton {

View File

@@ -74,9 +74,7 @@ Rectangle {
if (root.parentModal) { if (root.parentModal) {
root.parentModal.allowFocusOverride = true; root.parentModal.allowFocusOverride = true;
root.parentModal.shouldHaveFocus = false; root.parentModal.shouldHaveFocus = false;
if (root.parentModal.profileBrowser) { root.parentModal.openProfileBrowser();
root.parentModal.profileBrowser.open();
}
} }
} }
} }

View File

@@ -8,8 +8,26 @@ import qs.Widgets
FloatingWindow { FloatingWindow {
id: settingsModal id: settingsModal
property alias profileBrowser: profileBrowser property var profileBrowser: profileBrowserLoader.item
property alias wallpaperBrowser: wallpaperBrowser property var wallpaperBrowser: wallpaperBrowserLoader.item
function openProfileBrowser(allowStacking) {
profileBrowserLoader.active = true;
if (!profileBrowserLoader.item)
return;
if (allowStacking !== undefined)
profileBrowserLoader.item.allowStacking = allowStacking;
profileBrowserLoader.item.open();
}
function openWallpaperBrowser(allowStacking) {
wallpaperBrowserLoader.active = true;
if (!wallpaperBrowserLoader.item)
return;
if (allowStacking !== undefined)
wallpaperBrowserLoader.item.allowStacking = allowStacking;
wallpaperBrowserLoader.item.open();
}
property alias sidebar: sidebar property alias sidebar: sidebar
property int currentTabIndex: 0 property int currentTabIndex: 0
property bool shouldHaveFocus: visible property bool shouldHaveFocus: visible
@@ -96,41 +114,51 @@ FloatingWindow {
} }
} }
FileBrowserModal { LazyLoader {
id: profileBrowser id: profileBrowserLoader
active: false
allowStacking: true FileBrowserModal {
parentModal: settingsModal id: profileBrowserItem
browserTitle: I18n.tr("Select Profile Image", "profile image file browser title")
browserIcon: "person" allowStacking: true
browserType: "profile" parentModal: settingsModal
showHiddenFiles: true browserTitle: I18n.tr("Select Profile Image", "profile image file browser title")
fileExtensions: ["*.jpg", "*.jpeg", "*.png", "*.bmp", "*.gif", "*.webp"] browserIcon: "person"
onFileSelected: path => { browserType: "profile"
PortalService.setProfileImage(path); showHiddenFiles: true
close(); fileExtensions: ["*.jpg", "*.jpeg", "*.png", "*.bmp", "*.gif", "*.webp"]
} onFileSelected: path => {
onDialogClosed: () => { PortalService.setProfileImage(path);
allowStacking = true; close();
}
onDialogClosed: () => {
allowStacking = true;
}
} }
} }
FileBrowserModal { LazyLoader {
id: wallpaperBrowser id: wallpaperBrowserLoader
active: false
allowStacking: true FileBrowserModal {
parentModal: settingsModal id: wallpaperBrowserItem
browserTitle: I18n.tr("Select Wallpaper", "wallpaper file browser title")
browserIcon: "wallpaper" allowStacking: true
browserType: "wallpaper" parentModal: settingsModal
showHiddenFiles: true browserTitle: I18n.tr("Select Wallpaper", "wallpaper file browser title")
fileExtensions: ["*.jpg", "*.jpeg", "*.png", "*.bmp", "*.gif", "*.webp"] browserIcon: "wallpaper"
onFileSelected: path => { browserType: "wallpaper"
SessionData.setWallpaper(path); showHiddenFiles: true
close(); fileExtensions: ["*.jpg", "*.jpeg", "*.png", "*.bmp", "*.gif", "*.webp"]
} onFileSelected: path => {
onDialogClosed: () => { SessionData.setWallpaper(path);
allowStacking = true; close();
}
onDialogClosed: () => {
allowStacking = true;
}
} }
} }

View File

@@ -122,6 +122,21 @@ 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
@@ -133,16 +148,20 @@ 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 pins = SettingsData.audioInputDevicePins || {}; const pinnedList = audioContent.getPinnedInputs();
const pinnedName = pins["preferredInput"];
let sorted = [...nodes]; let sorted = [...nodes];
sorted.sort((a, b) => { sorted.sort((a, b) => {
// Pinned device first // Pinned device first
if (a.name === pinnedName && b.name !== pinnedName) const aPinnedIndex = pinnedList.indexOf(a.name)
return -1; const bPinnedIndex = pinnedList.indexOf(b.name)
if (b.name === pinnedName && a.name !== pinnedName) if (aPinnedIndex !== -1 || bPinnedIndex !== -1) {
return 1; if (aPinnedIndex === -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;
@@ -224,7 +243,7 @@ Rectangle {
height: 28 height: 28
radius: height / 2 radius: height / 2
color: { color: {
const isThisDevicePinned = (SettingsData.audioInputDevicePins || {})["preferredInput"] === modelData.name; const isThisDevicePinned = audioContent.getPinnedInputs().includes(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);
} }
@@ -237,7 +256,7 @@ Rectangle {
name: "push_pin" name: "push_pin"
size: 16 size: 16
color: { color: {
const isThisDevicePinned = (SettingsData.audioInputDevicePins || {})["preferredInput"] === modelData.name; const isThisDevicePinned = audioContent.getPinnedInputs().includes(modelData.name);
return isThisDevicePinned ? Theme.primary : Theme.surfaceText; return isThisDevicePinned ? Theme.primary : Theme.surfaceText;
} }
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
@@ -245,12 +264,12 @@ Rectangle {
StyledText { StyledText {
text: { text: {
const isThisDevicePinned = (SettingsData.audioInputDevicePins || {})["preferredInput"] === modelData.name; const isThisDevicePinned = audioContent.getPinnedInputs().includes(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 = (SettingsData.audioInputDevicePins || {})["preferredInput"] === modelData.name; const isThisDevicePinned = audioContent.getPinnedInputs().includes(modelData.name);
return isThisDevicePinned ? Theme.primary : Theme.surfaceText; return isThisDevicePinned ? Theme.primary : Theme.surfaceText;
} }
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
@@ -261,16 +280,24 @@ 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 || {}))
const isCurrentlyPinned = pins["preferredInput"] === modelData.name; let pinnedList = audioContent.normalizePinList(pins["preferredInput"])
const pinIndex = pinnedList.indexOf(modelData.name)
if (isCurrentlyPinned) { if (pinIndex !== -1) {
delete pins["preferredInput"]; pinnedList.splice(pinIndex, 1)
} else { } else {
pins["preferredInput"] = modelData.name; pinnedList.unshift(modelData.name)
if (pinnedList.length > audioContent.maxPinnedInputs)
pinnedList = pinnedList.slice(0, audioContent.maxPinnedInputs)
} }
SettingsData.set("audioInputDevicePins", pins); if (pinnedList.length > 0)
pins["preferredInput"] = pinnedList
else
delete pins["preferredInput"]
SettingsData.set("audioInputDevicePins", pins)
} }
} }
} }

View File

@@ -132,6 +132,21 @@ 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
@@ -143,16 +158,20 @@ 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 pins = SettingsData.audioOutputDevicePins || {}; const pinnedList = audioContent.getPinnedOutputs();
const pinnedName = pins["preferredOutput"];
let sorted = [...nodes]; let sorted = [...nodes];
sorted.sort((a, b) => { sorted.sort((a, b) => {
// Pinned device first // Pinned device first
if (a.name === pinnedName && b.name !== pinnedName) const aPinnedIndex = pinnedList.indexOf(a.name)
return -1; const bPinnedIndex = pinnedList.indexOf(b.name)
if (b.name === pinnedName && a.name !== pinnedName) if (aPinnedIndex !== -1 || bPinnedIndex !== -1) {
return 1; if (aPinnedIndex === -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;
@@ -236,7 +255,7 @@ Rectangle {
height: 28 height: 28
radius: height / 2 radius: height / 2
color: { color: {
const isThisDevicePinned = (SettingsData.audioOutputDevicePins || {})["preferredOutput"] === modelData.name; const isThisDevicePinned = audioContent.getPinnedOutputs().includes(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);
} }
@@ -249,7 +268,7 @@ Rectangle {
name: "push_pin" name: "push_pin"
size: 16 size: 16
color: { color: {
const isThisDevicePinned = (SettingsData.audioOutputDevicePins || {})["preferredOutput"] === modelData.name; const isThisDevicePinned = audioContent.getPinnedOutputs().includes(modelData.name);
return isThisDevicePinned ? Theme.primary : Theme.surfaceText; return isThisDevicePinned ? Theme.primary : Theme.surfaceText;
} }
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
@@ -257,12 +276,12 @@ Rectangle {
StyledText { StyledText {
text: { text: {
const isThisDevicePinned = (SettingsData.audioOutputDevicePins || {})["preferredOutput"] === modelData.name; const isThisDevicePinned = audioContent.getPinnedOutputs().includes(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 = (SettingsData.audioOutputDevicePins || {})["preferredOutput"] === modelData.name; const isThisDevicePinned = audioContent.getPinnedOutputs().includes(modelData.name);
return isThisDevicePinned ? Theme.primary : Theme.surfaceText; return isThisDevicePinned ? Theme.primary : Theme.surfaceText;
} }
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
@@ -273,16 +292,24 @@ 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 || {}))
const isCurrentlyPinned = pins["preferredOutput"] === modelData.name; let pinnedList = audioContent.normalizePinList(pins["preferredOutput"])
const pinIndex = pinnedList.indexOf(modelData.name)
if (isCurrentlyPinned) { if (pinIndex !== -1) {
delete pins["preferredOutput"]; pinnedList.splice(pinIndex, 1)
} else { } else {
pins["preferredOutput"] = modelData.name; pinnedList.unshift(modelData.name)
if (pinnedList.length > audioContent.maxPinnedOutputs)
pinnedList = pinnedList.slice(0, audioContent.maxPinnedOutputs)
} }
SettingsData.set("audioOutputDevicePins", pins); if (pinnedList.length > 0)
pins["preferredOutput"] = pinnedList
else
delete pins["preferredOutput"]
SettingsData.set("audioOutputDevicePins", pins)
} }
} }
} }

View File

@@ -150,6 +150,21 @@ 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
@@ -162,14 +177,18 @@ Rectangle {
if (!BluetoothService.adapter || !BluetoothService.adapter.devices) if (!BluetoothService.adapter || !BluetoothService.adapter.devices)
return [] return []
const pins = SettingsData.bluetoothDevicePins || {} const pinnedList = bluetoothContent.getPinnedDevices()
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
if (a.address === pinnedAddr && b.address !== pinnedAddr) return -1 const aPinnedIndex = pinnedList.indexOf(a.address)
if (b.address === pinnedAddr && a.address !== pinnedAddr) return 1 const bPinnedIndex = pinnedList.indexOf(b.address)
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
@@ -302,7 +321,7 @@ Rectangle {
height: 28 height: 28
radius: height / 2 radius: height / 2
color: { color: {
const isThisDevicePinned = (SettingsData.bluetoothDevicePins || {})["preferredDevice"] === modelData.address const isThisDevicePinned = bluetoothContent.getPinnedDevices().includes(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)
} }
@@ -315,7 +334,7 @@ Rectangle {
name: "push_pin" name: "push_pin"
size: 16 size: 16
color: { color: {
const isThisDevicePinned = (SettingsData.bluetoothDevicePins || {})["preferredDevice"] === modelData.address const isThisDevicePinned = bluetoothContent.getPinnedDevices().includes(modelData.address)
return isThisDevicePinned ? Theme.primary : Theme.surfaceText return isThisDevicePinned ? Theme.primary : Theme.surfaceText
} }
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
@@ -323,12 +342,12 @@ Rectangle {
StyledText { StyledText {
text: { text: {
const isThisDevicePinned = (SettingsData.bluetoothDevicePins || {})["preferredDevice"] === modelData.address const isThisDevicePinned = bluetoothContent.getPinnedDevices().includes(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 = (SettingsData.bluetoothDevicePins || {})["preferredDevice"] === modelData.address const isThisDevicePinned = bluetoothContent.getPinnedDevices().includes(modelData.address)
return isThisDevicePinned ? Theme.primary : Theme.surfaceText return isThisDevicePinned ? Theme.primary : Theme.surfaceText
} }
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
@@ -340,14 +359,22 @@ 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 || {}))
const isCurrentlyPinned = pins["preferredDevice"] === modelData.address let pinnedList = bluetoothContent.normalizePinList(pins["preferredDevice"])
const pinIndex = pinnedList.indexOf(modelData.address)
if (isCurrentlyPinned) { if (pinIndex !== -1) {
delete pins["preferredDevice"] pinnedList.splice(pinIndex, 1)
} else { } else {
pins["preferredDevice"] = modelData.address 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"]
SettingsData.set("bluetoothDevicePins", pins) SettingsData.set("bluetoothDevicePins", pins)
} }
} }

View File

@@ -463,20 +463,39 @@ 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 pins = SettingsData.wifiNetworkPins || {}; const pinnedList = getPinnedNetworks()
const pinnedSSID = pins["preferredWifi"];
let sorted = [...networks]; let sorted = [...networks];
sorted.sort((a, b) => { sorted.sort((a, b) => {
if (a.ssid === pinnedSSID && b.ssid !== pinnedSSID) const aPinnedIndex = pinnedList.indexOf(a.ssid)
return -1; const bPinnedIndex = pinnedList.indexOf(b.ssid)
if (b.ssid === pinnedSSID && a.ssid !== pinnedSSID) if (aPinnedIndex !== -1 || bPinnedIndex !== -1) {
return 1; if (aPinnedIndex === -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)
@@ -625,7 +644,7 @@ Rectangle {
height: 28 height: 28
radius: height / 2 radius: height / 2
color: { color: {
const isThisNetworkPinned = (SettingsData.wifiNetworkPins || {})["preferredWifi"] === modelData.ssid; const isThisNetworkPinned = wifiContent.getPinnedNetworks().includes(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);
} }
@@ -638,7 +657,7 @@ Rectangle {
name: "push_pin" name: "push_pin"
size: 16 size: 16
color: { color: {
const isThisNetworkPinned = (SettingsData.wifiNetworkPins || {})["preferredWifi"] === modelData.ssid; const isThisNetworkPinned = wifiContent.getPinnedNetworks().includes(modelData.ssid);
return isThisNetworkPinned ? Theme.primary : Theme.surfaceText; return isThisNetworkPinned ? Theme.primary : Theme.surfaceText;
} }
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
@@ -646,12 +665,12 @@ Rectangle {
StyledText { StyledText {
text: { text: {
const isThisNetworkPinned = (SettingsData.wifiNetworkPins || {})["preferredWifi"] === modelData.ssid; const isThisNetworkPinned = wifiContent.getPinnedNetworks().includes(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 = (SettingsData.wifiNetworkPins || {})["preferredWifi"] === modelData.ssid; const isThisNetworkPinned = wifiContent.getPinnedNetworks().includes(modelData.ssid);
return isThisNetworkPinned ? Theme.primary : Theme.surfaceText; return isThisNetworkPinned ? Theme.primary : Theme.surfaceText;
} }
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
@@ -662,16 +681,24 @@ 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 || {}))
const isCurrentlyPinned = pins["preferredWifi"] === modelData.ssid; let pinnedList = wifiContent.normalizePinList(pins["preferredWifi"])
const pinIndex = pinnedList.indexOf(modelData.ssid)
if (isCurrentlyPinned) { if (pinIndex !== -1) {
delete pins["preferredWifi"]; pinnedList.splice(pinIndex, 1)
} else { } else {
pins["preferredWifi"] = modelData.ssid; pinnedList.unshift(modelData.ssid)
if (pinnedList.length > wifiContent.maxPinnedNetworks)
pinnedList = pinnedList.slice(0, wifiContent.maxPinnedNetworks)
} }
SettingsData.set("wifiNetworkPins", pins); if (pinnedList.length > 0)
pins["preferredWifi"] = pinnedList
else
delete pins["preferredWifi"]
SettingsData.set("wifiNetworkPins", pins)
} }
} }
} }
@@ -687,8 +714,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 if (PopoutService.wifiPasswordModal) { } else {
PopoutService.wifiPasswordModal.show(modelData.ssid); PopoutService.showWifiPasswordModal(modelData.ssid);
} }
} else { } else {
NetworkService.connectToWifi(modelData.ssid); NetworkService.connectToWifi(modelData.ssid);
@@ -749,8 +776,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 if (PopoutService.wifiPasswordModal) { } else {
PopoutService.wifiPasswordModal.show(networkContextMenu.currentSSID); PopoutService.showWifiPasswordModal(networkContextMenu.currentSSID);
} }
} else { } else {
NetworkService.connectToWifi(networkContextMenu.currentSSID); NetworkService.connectToWifi(networkContextMenu.currentSSID);

View File

@@ -24,10 +24,12 @@ 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
@@ -213,7 +215,25 @@ BasePill {
} }
function hasNoVisibleIcons() { function hasNoVisibleIcons() {
return !root.showNetworkIcon && !root.showBluetoothIcon && !root.showAudioIcon && !root.showVpnIcon && !root.showBrightnessIcon && !root.showMicIcon && !root.showBatteryIcon && !root.showPrinterIcon; if (root.showScreenSharingIcon && NiriService.hasCasts)
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 {
@@ -224,48 +244,74 @@ BasePill {
Column { Column {
id: controlColumn id: controlColumn
visible: root.isVerticalOrientation visible: root.isVerticalOrientation
anchors.centerIn: parent width: root.vIconSize
anchors.horizontalCenter: parent.horizontalCenter
spacing: Theme.spacingXS spacing: Theme.spacingXS
DankIcon { Item {
name: root.getNetworkIconName() width: root.vIconSize
size: Theme.barIconSize(root.barThickness, -4) height: root.vIconSize
color: root.getNetworkIconColor() visible: root.showScreenSharingIcon && NiriService.hasCasts
anchors.horizontalCenter: parent.horizontalCenter
DankIcon {
name: "screen_record"
size: root.vIconSize
color: NiriService.hasActiveCast ? Theme.primary : Theme.surfaceText
anchors.centerIn: parent
}
}
Item {
width: root.vIconSize
height: root.vIconSize
visible: root.showNetworkIcon && NetworkService.networkAvailable visible: root.showNetworkIcon && NetworkService.networkAvailable
DankIcon {
name: root.getNetworkIconName()
size: root.vIconSize
color: root.getNetworkIconColor()
anchors.centerIn: parent
}
} }
DankIcon { Item {
name: "vpn_lock" width: root.vIconSize
size: Theme.barIconSize(root.barThickness, -4) height: root.vIconSize
color: NetworkService.vpnConnected ? Theme.primary : Theme.surfaceText
anchors.horizontalCenter: parent.horizontalCenter
visible: root.showVpnIcon && NetworkService.vpnAvailable && NetworkService.vpnConnected visible: root.showVpnIcon && NetworkService.vpnAvailable && NetworkService.vpnConnected
DankIcon {
name: "vpn_lock"
size: root.vIconSize
color: NetworkService.vpnConnected ? Theme.primary : Theme.surfaceText
anchors.centerIn: parent
}
} }
DankIcon { Item {
name: "bluetooth" width: root.vIconSize
size: Theme.barIconSize(root.barThickness, -4) height: root.vIconSize
color: BluetoothService.connected ? Theme.primary : Theme.surfaceText
anchors.horizontalCenter: parent.horizontalCenter
visible: root.showBluetoothIcon && BluetoothService.available && BluetoothService.enabled visible: root.showBluetoothIcon && BluetoothService.available && BluetoothService.enabled
DankIcon {
name: "bluetooth"
size: root.vIconSize
color: BluetoothService.connected ? Theme.primary : Theme.surfaceText
anchors.centerIn: parent
}
} }
Rectangle { Item {
width: audioIconV.implicitWidth + 4 width: root.vIconSize
height: audioIconV.implicitHeight + (root.showAudioPercent ? audioPercentV.implicitHeight : 0) + 4 height: root.vIconSize + (root.showAudioPercent ? audioPercentV.implicitHeight + 2 : 0)
color: "transparent"
anchors.horizontalCenter: parent.horizontalCenter
visible: root.showAudioIcon visible: root.showAudioIcon
DankIcon { DankIcon {
id: audioIconV id: audioIconV
name: root.getVolumeIconName() name: root.getVolumeIconName()
size: Theme.barIconSize(root.barThickness, -4) size: root.vIconSize
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 {
@@ -292,21 +338,18 @@ BasePill {
} }
} }
Rectangle { Item {
width: micIconV.implicitWidth + 4 width: root.vIconSize
height: micIconV.implicitHeight + (root.showAudioPercent ? micPercentV.implicitHeight : 0) + 4 height: root.vIconSize + (root.showMicPercent ? micPercentV.implicitHeight + 2 : 0)
color: "transparent"
anchors.horizontalCenter: parent.horizontalCenter
visible: root.showMicIcon visible: root.showMicIcon
DankIcon { DankIcon {
id: micIconV id: micIconV
name: root.getMicIconName() name: root.getMicIconName()
size: Theme.barIconSize(root.barThickness, -4) size: root.vIconSize
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 {
@@ -333,21 +376,18 @@ BasePill {
} }
} }
Rectangle { Item {
width: brightnessIconV.implicitWidth + 4 width: root.vIconSize
height: brightnessIconV.implicitHeight + (root.showBrightnessPercent ? brightnessPercentV.implicitHeight : 0) + 4 height: root.vIconSize + (root.showBrightnessPercent ? brightnessPercentV.implicitHeight + 2 : 0)
color: "transparent"
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: Theme.barIconSize(root.barThickness, -4) size: root.vIconSize
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 {
@@ -371,28 +411,43 @@ BasePill {
} }
} }
DankIcon { Item {
name: Theme.getBatteryIcon(BatteryService.batteryLevel, BatteryService.isCharging, BatteryService.batteryAvailable) width: root.vIconSize
size: Theme.barIconSize(root.barThickness, -4) height: root.vIconSize
color: root.getBatteryIconColor()
anchors.horizontalCenter: parent.horizontalCenter
visible: root.showBatteryIcon && BatteryService.batteryAvailable visible: root.showBatteryIcon && BatteryService.batteryAvailable
DankIcon {
name: Theme.getBatteryIcon(BatteryService.batteryLevel, BatteryService.isCharging, BatteryService.batteryAvailable)
size: root.vIconSize
color: root.getBatteryIconColor()
anchors.centerIn: parent
}
} }
DankIcon { Item {
name: "print" width: root.vIconSize
size: Theme.barIconSize(root.barThickness, -4) height: root.vIconSize
color: Theme.primary
anchors.horizontalCenter: parent.horizontalCenter
visible: root.showPrinterIcon && CupsService.cupsAvailable && root.hasPrintJobs() visible: root.showPrinterIcon && CupsService.cupsAvailable && root.hasPrintJobs()
DankIcon {
name: "print"
size: root.vIconSize
color: Theme.primary
anchors.centerIn: parent
}
} }
DankIcon { Item {
name: "settings" width: root.vIconSize
size: Theme.barIconSize(root.barThickness, -4) height: root.vIconSize
color: root.isActive ? Theme.primary : Theme.widgetIconColor
anchors.horizontalCenter: parent.horizontalCenter
visible: root.hasNoVisibleIcons() visible: root.hasNoVisibleIcons()
DankIcon {
name: "settings"
size: root.vIconSize
color: root.isActive ? Theme.primary : Theme.widgetIconColor
anchors.centerIn: parent
}
} }
} }
@@ -402,6 +457,14 @@ 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()

View File

@@ -155,9 +155,17 @@ 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 visible: root.isVerticalOrientation && activeWindow && activeWindow.appId && appIcon.status !== Image.Ready && !Paths.isSteamApp(activeWindow.appId)
text: { text: {
if (!activeWindow || !activeWindow.appId) if (!activeWindow || !activeWindow.appId)
return "?"; return "?";

View File

@@ -19,7 +19,7 @@ BasePill {
anchors.centerIn: parent anchors.centerIn: parent
name: SessionData.doNotDisturb ? "notifications_off" : "notifications" name: SessionData.doNotDisturb ? "notifications_off" : "notifications"
size: Theme.barIconSize(root.barThickness, -4) size: Theme.barIconSize(root.barThickness, -4)
color: SessionData.doNotDisturb ? Theme.error : (root.isActive ? Theme.primary : Theme.widgetIconColor) color: SessionData.doNotDisturb ? Theme.primary : (root.isActive ? Theme.primary : Theme.widgetIconColor)
} }
Rectangle { Rectangle {
@@ -35,6 +35,6 @@ BasePill {
} }
onRightClicked: { onRightClicked: {
SessionData.setDoNotDisturb(!SessionData.doNotDisturb) SessionData.setDoNotDisturb(!SessionData.doNotDisturb);
} }
} }

View File

@@ -393,9 +393,19 @@ 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 visible: !iconImg.visible && !Paths.isSteamApp(appId)
text: { text: {
root._desktopEntriesUpdateTrigger; root._desktopEntriesUpdateTrigger;
if (!appId) if (!appId)
@@ -493,8 +503,10 @@ Item {
const globalPos = delegateItem.mapToGlobal(delegateItem.width / 2, 0); const globalPos = delegateItem.mapToGlobal(delegateItem.width / 2, 0);
const screenX = root.parentScreen ? root.parentScreen.x : 0; const screenX = root.parentScreen ? root.parentScreen.x : 0;
const relativeX = globalPos.x - screenX; const relativeX = globalPos.x - screenX;
const yPos = root.barThickness + root.barSpacing - 7; const screenHeight = root.parentScreen ? root.parentScreen.height : Screen.height;
windowContextMenuLoader.item.showAt(relativeX, yPos, false, "top"); const isBottom = root.axis?.edge === "bottom";
const yPos = isBottom ? (screenHeight - root.barThickness - root.barSpacing - 32 - Theme.spacingXS) : (root.barThickness + root.barSpacing + Theme.spacingXS);
windowContextMenuLoader.item.showAt(relativeX, yPos, false, root.axis?.edge);
} }
} }
} else if (mouse.button === Qt.MiddleButton) { } else if (mouse.button === Qt.MiddleButton) {
@@ -626,9 +638,19 @@ 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 visible: !iconImg.visible && !Paths.isSteamApp(appId)
text: { text: {
root._desktopEntriesUpdateTrigger; root._desktopEntriesUpdateTrigger;
if (!appId) if (!appId)
@@ -726,8 +748,10 @@ Item {
const globalPos = delegateItem.mapToGlobal(delegateItem.width / 2, 0); const globalPos = delegateItem.mapToGlobal(delegateItem.width / 2, 0);
const screenX = root.parentScreen ? root.parentScreen.x : 0; const screenX = root.parentScreen ? root.parentScreen.x : 0;
const relativeX = globalPos.x - screenX; const relativeX = globalPos.x - screenX;
const yPos = root.barThickness + root.barSpacing - 7; const screenHeight = root.parentScreen ? root.parentScreen.height : Screen.height;
windowContextMenuLoader.item.showAt(relativeX, yPos, false, "top"); const isBottom = root.axis?.edge === "bottom";
const yPos = isBottom ? (screenHeight - root.barThickness - root.barSpacing - 32 - Theme.spacingXS) : (root.barThickness + root.barSpacing + Theme.spacingXS);
windowContextMenuLoader.item.showAt(relativeX, yPos, false, root.axis?.edge);
} }
} }
} }

View File

@@ -265,6 +265,7 @@ 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);
@@ -272,6 +273,7 @@ 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,
@@ -1135,7 +1137,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 visible: !modelData.isQuickshell && !modelData.isSteamApp
} }
IconImage { IconImage {
@@ -1151,6 +1153,22 @@ 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
@@ -1229,7 +1247,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 visible: !modelData.isQuickshell && !modelData.isSteamApp
} }
IconImage { IconImage {
@@ -1245,6 +1263,22 @@ 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

View File

@@ -327,11 +327,12 @@ 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

View File

@@ -403,7 +403,7 @@ Item {
width: actualIconSize width: actualIconSize
height: actualIconSize height: actualIconSize
anchors.centerIn: parent anchors.centerIn: parent
visible: iconImg.status !== Image.Ready visible: iconImg.status !== Image.Ready && appData && appData.appId && !Paths.isSteamApp(appData.appId)
color: Theme.surfaceLight color: Theme.surfaceLight
radius: Theme.cornerRadius radius: Theme.cornerRadius
border.width: 1 border.width: 1
@@ -425,6 +425,14 @@ 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

View File

@@ -2,8 +2,6 @@
set -e set -e
export WLR_DRM_DEVICES=/dev/dri/card1
COMPOSITOR="" COMPOSITOR=""
COMPOSITOR_CONFIG="" COMPOSITOR_CONFIG=""
DMS_PATH="dms-greeter" DMS_PATH="dms-greeter"
@@ -16,7 +14,7 @@ dms-greeter - DankMaterialShell greeter launcher
Usage: dms-greeter --command COMPOSITOR [OPTIONS] Usage: dms-greeter --command COMPOSITOR [OPTIONS]
Required: Required:
--command COMPOSITOR Compositor to use (niri, hyprland, sway, scroll or mangowc) --command COMPOSITOR Compositor to use (niri, hyprland, sway, scroll, mangowc, or labwc)
Options: Options:
-C, --config PATH Custom compositor config file -C, --config PATH Custom compositor config file
@@ -33,6 +31,7 @@ Examples:
dms-greeter --command scroll -p /home/user/.config/quickshell/custom-dms dms-greeter --command scroll -p /home/user/.config/quickshell/custom-dms
dms-greeter --command niri --cache-dir /tmp/dmsgreeter dms-greeter --command niri --cache-dir /tmp/dmsgreeter
dms-greeter --command mangowc dms-greeter --command mangowc
dms-greeter --command labwc
EOF EOF
} }
@@ -231,6 +230,15 @@ SCROLL_EOF
exec scroll -c "$COMPOSITOR_CONFIG" exec scroll -c "$COMPOSITOR_CONFIG"
;; ;;
labwc)
if [[ -n "$COMPOSITOR_CONFIG" ]]; then
exec labwc --config "$COMPOSITOR_CONFIG" --session "$QS_CMD"
else
exec labwc --session "$QS_CMD"
fi
;;
mangowc) mangowc)
if [[ -n "$COMPOSITOR_CONFIG" ]]; then if [[ -n "$COMPOSITOR_CONFIG" ]]; then
exec mango -c "$COMPOSITOR_CONFIG" -s "$QS_CMD && mmsg -d quit" exec mango -c "$COMPOSITOR_CONFIG" -s "$QS_CMD && mmsg -d quit"
@@ -241,7 +249,7 @@ SCROLL_EOF
*) *)
echo "Error: Unsupported compositor: $COMPOSITOR" >&2 echo "Error: Unsupported compositor: $COMPOSITOR" >&2
echo "Supported compositors: niri, hyprland, sway, mangowc" >&2 echo "Supported compositors: niri, hyprland, sway, scroll, mangowc, labwc" >&2
exit 1 exit 1
;; ;;
esac esac

View File

@@ -1406,6 +1406,14 @@ 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)

View File

@@ -83,23 +83,54 @@ Item {
} }
readonly property var allFilters: [ readonly property var allFilters: [
{ label: I18n.tr("All", "notification history filter"), key: "all", maxDays: 0 }, {
{ label: I18n.tr("Last hour", "notification history filter"), key: "1h", maxDays: 1 }, label: I18n.tr("All", "notification history filter"),
{ label: I18n.tr("Today", "notification history filter"), key: "today", maxDays: 1 }, key: "all",
{ label: I18n.tr("Yesterday", "notification history filter"), key: "yesterday", maxDays: 2 }, maxDays: 0
{ label: I18n.tr("7 days", "notification history filter"), key: "7d", maxDays: 7 }, },
{ label: I18n.tr("30 days", "notification history filter"), key: "30d", maxDays: 30 }, {
{ label: I18n.tr("Older", "notification history filter for content older than other filters"), key: "older", maxDays: 0 } label: I18n.tr("Last hour", "notification history filter"),
key: "1h",
maxDays: 1
},
{
label: I18n.tr("Today", "notification history filter"),
key: "today",
maxDays: 1
},
{
label: I18n.tr("Yesterday", "notification history filter"),
key: "yesterday",
maxDays: 2
},
{
label: I18n.tr("7 days", "notification history filter"),
key: "7d",
maxDays: 7
},
{
label: I18n.tr("30 days", "notification history filter"),
key: "30d",
maxDays: 30
},
{
label: I18n.tr("Older", "notification history filter for content older than other filters"),
key: "older",
maxDays: 0
}
] ]
function filterRelevantForRetention(filter) { function filterRelevantForRetention(filter) {
const retention = SettingsData.notificationHistoryMaxAgeDays; const retention = SettingsData.notificationHistoryMaxAgeDays;
if (filter.key === "older") { if (filter.key === "older") {
if (retention === 0) return true; if (retention === 0)
return true;
return retention > 2 && retention < 7 || retention > 30; return retention > 2 && retention < 7 || retention > 30;
} }
if (retention === 0) return true; if (retention === 0)
if (filter.maxDays === 0) return true; return true;
if (filter.maxDays === 0)
return true;
return filter.maxDays <= retention; return filter.maxDays <= retention;
} }
@@ -119,10 +150,15 @@ Item {
const retention = SettingsData.notificationHistoryMaxAgeDays; const retention = SettingsData.notificationHistoryMaxAgeDays;
for (let i = 0; i < allFilters.length; i++) { for (let i = 0; i < allFilters.length; i++) {
const f = allFilters[i]; const f = allFilters[i];
if (!filterRelevantForRetention(f)) continue; if (!filterRelevantForRetention(f))
continue;
const count = countForFilter(f.key); const count = countForFilter(f.key);
if (f.key === "all" || count > 0) { if (f.key === "all" || count > 0) {
result.push({ label: f.label, key: f.key, count: count }); result.push({
label: f.label,
key: f.key,
count: count
});
} }
} }
return result; return result;
@@ -165,6 +201,14 @@ Item {
function enableAutoScroll() { function enableAutoScroll() {
} }
function removeWithScrollPreserve(itemId) {
historyListView.savedY = historyListView.contentY;
NotificationService.removeFromHistory(itemId);
Qt.callLater(() => {
historyListView.forceLayout();
});
}
Column { Column {
anchors.fill: parent anchors.fill: parent
spacing: Theme.spacingS spacing: Theme.spacingS
@@ -201,14 +245,66 @@ Item {
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
} }
delegate: HistoryNotificationCard { delegate: Item {
id: delegateRoot
required property var modelData required property var modelData
required property int index required property int index
property real swipeOffset: 0
property bool isDismissing: false
readonly property real dismissThreshold: width * 0.35
width: ListView.view.width width: ListView.view.width
historyItem: modelData height: historyCard.height
isSelected: root.keyboardActive && root.selectedIndex === index clip: true
keyboardNavigationActive: root.keyboardActive
HistoryNotificationCard {
id: historyCard
width: parent.width
x: delegateRoot.swipeOffset
historyItem: modelData
isSelected: root.keyboardActive && root.selectedIndex === index
keyboardNavigationActive: root.keyboardActive
opacity: 1 - Math.abs(delegateRoot.swipeOffset) / (delegateRoot.width * 0.5)
Behavior on x {
enabled: !swipeDragHandler.active
NumberAnimation {
duration: Theme.shortDuration
easing.type: Theme.standardEasing
}
}
Behavior on opacity {
NumberAnimation {
duration: Theme.shortDuration
}
}
}
DragHandler {
id: swipeDragHandler
target: null
yAxis.enabled: false
xAxis.enabled: true
onActiveChanged: {
if (active || delegateRoot.isDismissing)
return;
if (Math.abs(delegateRoot.swipeOffset) > delegateRoot.dismissThreshold) {
delegateRoot.isDismissing = true;
root.removeWithScrollPreserve(delegateRoot.modelData?.id || "");
} else {
delegateRoot.swipeOffset = 0;
}
}
onTranslationChanged: {
if (delegateRoot.isDismissing)
return;
delegateRoot.swipeOffset = translation.x;
}
}
} }
} }
} }

View File

@@ -10,8 +10,9 @@ QtObject {
readonly property bool compactMode: SettingsData.notificationCompactMode readonly property bool compactMode: SettingsData.notificationCompactMode
readonly property real cardPadding: compactMode ? Theme.spacingS : Theme.spacingM readonly property real cardPadding: compactMode ? Theme.spacingS : Theme.spacingM
readonly property real popupIconSize: compactMode ? 48 : 63 readonly property real popupIconSize: compactMode ? 48 : 63
readonly property real popupSpacing: Theme.spacingS readonly property real actionButtonHeight: compactMode ? 20 : 24
readonly property int baseNotificationHeight: cardPadding * 3 + popupIconSize + popupSpacing readonly property real popupSpacing: 4
readonly property int baseNotificationHeight: cardPadding * 2 + popupIconSize + actionButtonHeight + Theme.spacingS + popupSpacing
property int maxTargetNotifications: 4 property int maxTargetNotifications: 4
property var popupWindows: [] // strong refs to windows (live until exitFinished) property var popupWindows: [] // strong refs to windows (live until exitFinished)
property var destroyingWindows: new Set() property var destroyingWindows: new Set()

View File

@@ -262,9 +262,7 @@ 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));
}
} }
} }
} }

View File

@@ -26,6 +26,8 @@ Item {
readonly property bool showOnOverview: instanceData?.config?.showOnOverview ?? false readonly property bool showOnOverview: instanceData?.config?.showOnOverview ?? false
readonly property bool showOnOverviewOnly: instanceData?.config?.showOnOverviewOnly ?? false readonly property bool showOnOverviewOnly: instanceData?.config?.showOnOverviewOnly ?? false
readonly property bool overviewActive: CompositorService.isNiri && NiriService.inOverview readonly property bool overviewActive: CompositorService.isNiri && NiriService.inOverview
readonly property bool clickThrough: instanceData?.config?.clickThrough ?? false
readonly property bool syncPositionAcrossScreens: instanceData?.config?.syncPositionAcrossScreens ?? false
Connections { Connections {
target: PluginService target: PluginService
@@ -83,6 +85,7 @@ Item {
} }
} }
readonly property string screenKey: SettingsData.getScreenDisplayName(screen) readonly property string screenKey: SettingsData.getScreenDisplayName(screen)
readonly property string positionKey: syncPositionAcrossScreens ? "_synced" : screenKey
readonly property int screenWidth: screen?.width ?? 1920 readonly property int screenWidth: screen?.width ?? 1920
readonly property int screenHeight: screen?.height ?? 1080 readonly property int screenHeight: screen?.height ?? 1080
@@ -96,53 +99,114 @@ Item {
readonly property bool hasSavedPosition: { readonly property bool hasSavedPosition: {
if (isInstance) if (isInstance)
return instanceData?.positions?.[screenKey]?.x !== undefined; return instanceData?.positions?.[positionKey]?.x !== undefined;
if (usePluginService) if (usePluginService)
return pluginService.loadPluginData(pluginId, "desktopX_" + screenKey, null) !== null; return pluginService.loadPluginData(pluginId, "desktopX_" + positionKey, null) !== null;
return SettingsData.getDesktopWidgetPosition(pluginId, screenKey, "x", null) !== null; return SettingsData.getDesktopWidgetPosition(pluginId, positionKey, "x", null) !== null;
} }
readonly property bool hasSavedSize: { readonly property bool hasSavedSize: {
if (isInstance) if (isInstance)
return instanceData?.positions?.[screenKey]?.width !== undefined; return instanceData?.positions?.[positionKey]?.width !== undefined;
if (usePluginService) if (usePluginService)
return pluginService.loadPluginData(pluginId, "desktopWidth_" + screenKey, null) !== null; return pluginService.loadPluginData(pluginId, "desktopWidth_" + positionKey, null) !== null;
return SettingsData.getDesktopWidgetPosition(pluginId, screenKey, "width", null) !== null; return SettingsData.getDesktopWidgetPosition(pluginId, positionKey, "width", null) !== null;
} }
property real savedX: { property real savedX: {
if (isInstance) if (isInstance) {
return instanceData?.positions?.[screenKey]?.x ?? (screenWidth / 2 - savedWidth / 2); const val = instanceData?.positions?.[positionKey]?.x;
if (usePluginService) if (val === undefined)
return pluginService.loadPluginData(pluginId, "desktopX_" + screenKey, screenWidth / 2 - savedWidth / 2); return screenWidth / 2 - savedWidth / 2;
return SettingsData.getDesktopWidgetPosition(pluginId, screenKey, "x", screenWidth / 2 - savedWidth / 2); return syncPositionAcrossScreens ? val * screenWidth : val;
}
if (usePluginService) {
const val = pluginService.loadPluginData(pluginId, "desktopX_" + positionKey, null);
if (val === null)
return screenWidth / 2 - savedWidth / 2;
return syncPositionAcrossScreens ? val * screenWidth : val;
}
const val = SettingsData.getDesktopWidgetPosition(pluginId, positionKey, "x", null);
if (val === null)
return screenWidth / 2 - savedWidth / 2;
return syncPositionAcrossScreens ? val * screenWidth : val;
} }
property real savedY: { property real savedY: {
if (isInstance) if (isInstance) {
return instanceData?.positions?.[screenKey]?.y ?? (screenHeight / 2 - savedHeight / 2); const val = instanceData?.positions?.[positionKey]?.y;
if (usePluginService) if (val === undefined)
return pluginService.loadPluginData(pluginId, "desktopY_" + screenKey, screenHeight / 2 - savedHeight / 2); return screenHeight / 2 - savedHeight / 2;
return SettingsData.getDesktopWidgetPosition(pluginId, screenKey, "y", screenHeight / 2 - savedHeight / 2); return syncPositionAcrossScreens ? val * screenHeight : val;
}
if (usePluginService) {
const val = pluginService.loadPluginData(pluginId, "desktopY_" + positionKey, null);
if (val === null)
return screenHeight / 2 - savedHeight / 2;
return syncPositionAcrossScreens ? val * screenHeight : val;
}
const val = SettingsData.getDesktopWidgetPosition(pluginId, positionKey, "y", null);
if (val === null)
return screenHeight / 2 - savedHeight / 2;
return syncPositionAcrossScreens ? val * screenHeight : val;
} }
property real savedWidth: { property real savedWidth: {
if (isInstance) if (isInstance) {
return instanceData?.positions?.[screenKey]?.width ?? 280; const val = instanceData?.positions?.[positionKey]?.width;
if (usePluginService) if (val === undefined)
return pluginService.loadPluginData(pluginId, "desktopWidth_" + screenKey, 200); return 280;
return SettingsData.getDesktopWidgetPosition(pluginId, screenKey, "width", 280); return val;
}
if (usePluginService) {
const val = pluginService.loadPluginData(pluginId, "desktopWidth_" + positionKey, null);
if (val === null)
return 200;
return val;
}
const val = SettingsData.getDesktopWidgetPosition(pluginId, positionKey, "width", null);
if (val === null)
return 280;
return val;
} }
property real savedHeight: { property real savedHeight: {
if (isInstance) if (isInstance) {
return instanceData?.positions?.[screenKey]?.height ?? 180; const val = instanceData?.positions?.[positionKey]?.height;
if (usePluginService) if (val === undefined)
return pluginService.loadPluginData(pluginId, "desktopHeight_" + screenKey, 200); return forceSquare ? savedWidth : 180;
return SettingsData.getDesktopWidgetPosition(pluginId, screenKey, "height", 180); return forceSquare ? savedWidth : val;
}
if (usePluginService) {
const val = pluginService.loadPluginData(pluginId, "desktopHeight_" + positionKey, null);
if (val === null)
return forceSquare ? savedWidth : 200;
return forceSquare ? savedWidth : val;
}
const val = SettingsData.getDesktopWidgetPosition(pluginId, positionKey, "height", null);
if (val === null)
return forceSquare ? savedWidth : 180;
return forceSquare ? savedWidth : val;
} }
property real widgetX: Math.max(0, Math.min(savedX, screenWidth - widgetWidth)) property real dragOverrideX: -1
property real widgetY: Math.max(0, Math.min(savedY, screenHeight - widgetHeight)) property real dragOverrideY: -1
property real widgetWidth: Math.max(minWidth, Math.min(savedWidth, screenWidth)) property real dragOverrideW: -1
property real widgetHeight: Math.max(minHeight, Math.min(savedHeight, screenHeight)) property real dragOverrideH: -1
readonly property real effectiveX: dragOverrideX >= 0 ? dragOverrideX : savedX
readonly property real effectiveY: dragOverrideY >= 0 ? dragOverrideY : savedY
readonly property real effectiveW: dragOverrideW >= 0 ? dragOverrideW : savedWidth
readonly property real effectiveH: dragOverrideH >= 0 ? dragOverrideH : savedHeight
readonly property real widgetX: Math.max(0, Math.min(effectiveX, screenWidth - widgetWidth))
readonly property real widgetY: Math.max(0, Math.min(effectiveY, screenHeight - widgetHeight))
readonly property real widgetWidth: Math.max(minWidth, Math.min(effectiveW, screenWidth))
readonly property real widgetHeight: Math.max(minHeight, Math.min(effectiveH, screenHeight))
function clearDragOverrides() {
dragOverrideX = -1;
dragOverrideY = -1;
dragOverrideW = -1;
dragOverrideH = -1;
}
property real minWidth: contentLoader.item?.minWidth ?? 100 property real minWidth: contentLoader.item?.minWidth ?? 100
property real minHeight: contentLoader.item?.minHeight ?? 100 property real minHeight: contentLoader.item?.minHeight ?? 100
@@ -163,41 +227,45 @@ Item {
return Math.round(value / gridSize) * gridSize; return Math.round(value / gridSize) * gridSize;
} }
function savePosition() { function savePosition(finalX, finalY) {
const xVal = syncPositionAcrossScreens ? finalX / screenWidth : finalX;
const yVal = syncPositionAcrossScreens ? finalY / screenHeight : finalY;
if (isInstance && instanceData) { if (isInstance && instanceData) {
SettingsData.updateDesktopWidgetInstancePosition(instanceId, screenKey, { SettingsData.updateDesktopWidgetInstancePosition(instanceId, positionKey, {
x: root.widgetX, x: xVal,
y: root.widgetY y: yVal
}); });
return; return;
} }
if (usePluginService) { if (usePluginService) {
pluginService.savePluginData(pluginId, "desktopX_" + screenKey, root.widgetX); pluginService.savePluginData(pluginId, "desktopX_" + positionKey, xVal);
pluginService.savePluginData(pluginId, "desktopY_" + screenKey, root.widgetY); pluginService.savePluginData(pluginId, "desktopY_" + positionKey, yVal);
return; return;
} }
SettingsData.updateDesktopWidgetPosition(pluginId, screenKey, { SettingsData.updateDesktopWidgetPosition(pluginId, positionKey, {
x: root.widgetX, x: xVal,
y: root.widgetY y: yVal
}); });
} }
function saveSize() { function saveSize(finalW, finalH) {
const sizeVal = forceSquare ? Math.max(finalW, finalH) : finalW;
const heightVal = forceSquare ? sizeVal : finalH;
if (isInstance && instanceData) { if (isInstance && instanceData) {
SettingsData.updateDesktopWidgetInstancePosition(instanceId, screenKey, { SettingsData.updateDesktopWidgetInstancePosition(instanceId, positionKey, {
width: root.widgetWidth, width: sizeVal,
height: root.widgetHeight height: heightVal
}); });
return; return;
} }
if (usePluginService) { if (usePluginService) {
pluginService.savePluginData(pluginId, "desktopWidth_" + screenKey, root.widgetWidth); pluginService.savePluginData(pluginId, "desktopWidth_" + positionKey, sizeVal);
pluginService.savePluginData(pluginId, "desktopHeight_" + screenKey, root.widgetHeight); pluginService.savePluginData(pluginId, "desktopHeight_" + positionKey, heightVal);
return; return;
} }
SettingsData.updateDesktopWidgetPosition(pluginId, screenKey, { SettingsData.updateDesktopWidgetPosition(pluginId, positionKey, {
width: root.widgetWidth, width: sizeVal,
height: root.widgetHeight height: heightVal
}); });
} }
@@ -213,6 +281,12 @@ Item {
} }
color: "transparent" color: "transparent"
Region {
id: emptyMask
}
mask: root.clickThrough ? emptyMask : null
WlrLayershell.namespace: "quickshell:desktop-widget:" + root.pluginId + (root.instanceId ? ":" + root.instanceId : "") WlrLayershell.namespace: "quickshell:desktop-widget:" + root.pluginId + (root.instanceId ? ":" + root.instanceId : "")
WlrLayershell.layer: { WlrLayershell.layer: {
if (root.isInteracting && !CompositorService.useHyprlandFocusGrab) if (root.isInteracting && !CompositorService.useHyprlandFocusGrab)
@@ -315,12 +389,14 @@ Item {
if (!root.hasSavedSize) { if (!root.hasSavedSize) {
const defW = item.defaultWidth ?? item.widgetWidth ?? 280; const defW = item.defaultWidth ?? item.widgetWidth ?? 280;
const defH = item.defaultHeight ?? item.widgetHeight ?? 180; const defH = item.defaultHeight ?? item.widgetHeight ?? 180;
root.widgetWidth = Math.max(root.minWidth, Math.min(defW, root.screenWidth)); const finalW = Math.max(root.minWidth, Math.min(defW, root.screenWidth));
root.widgetHeight = Math.max(root.minHeight, Math.min(defH, root.screenHeight)); const finalH = Math.max(root.minHeight, Math.min(defH, root.screenHeight));
root.saveSize(finalW, finalH);
} }
if (!root.hasSavedPosition) { if (!root.hasSavedPosition) {
root.widgetX = Math.max(0, Math.min(root.screenWidth / 2 - root.widgetWidth / 2, root.screenWidth - root.widgetWidth)); const finalX = Math.max(0, Math.min(root.screenWidth / 2 - root.widgetWidth / 2, root.screenWidth - root.widgetWidth));
root.widgetY = Math.max(0, Math.min(root.screenHeight / 2 - root.widgetHeight / 2, root.screenHeight - root.widgetHeight)); const finalY = Math.max(0, Math.min(root.screenHeight / 2 - root.widgetHeight / 2, root.screenHeight - root.widgetHeight));
root.savePosition(finalX, finalY);
} }
if (item.widgetWidth !== undefined) if (item.widgetWidth !== undefined)
item.widgetWidth = Qt.binding(() => contentLoader.width); item.widgetWidth = Qt.binding(() => contentLoader.width);
@@ -355,6 +431,7 @@ Item {
id: dragArea id: dragArea
anchors.fill: parent anchors.fill: parent
acceptedButtons: Qt.RightButton acceptedButtons: Qt.RightButton
enabled: !root.clickThrough
cursorShape: pressed ? Qt.ClosedHandCursor : Qt.ArrowCursor cursorShape: pressed ? Qt.ClosedHandCursor : Qt.ArrowCursor
property point startPos property point startPos
@@ -367,6 +444,8 @@ Item {
startY = root.widgetY; startY = root.widgetY;
root.previewX = root.widgetX; root.previewX = root.widgetX;
root.previewY = root.widgetY; root.previewY = root.widgetY;
root.dragOverrideX = root.widgetX;
root.dragOverrideY = root.widgetY;
} }
onPositionChanged: mouse => { onPositionChanged: mouse => {
@@ -384,16 +463,15 @@ Item {
root.previewY = newY; root.previewY = newY;
return; return;
} }
root.widgetX = newX; root.dragOverrideX = newX;
root.widgetY = newY; root.dragOverrideY = newY;
} }
onReleased: { onReleased: {
if (root.useGhostPreview) { const finalX = root.useGhostPreview ? root.previewX : root.dragOverrideX;
root.widgetX = root.previewX; const finalY = root.useGhostPreview ? root.previewY : root.dragOverrideY;
root.widgetY = root.previewY; root.savePosition(finalX, finalY);
} root.clearDragOverrides();
root.savePosition();
} }
} }
@@ -404,6 +482,7 @@ Item {
anchors.right: parent.right anchors.right: parent.right
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
acceptedButtons: Qt.RightButton acceptedButtons: Qt.RightButton
enabled: !root.clickThrough
cursorShape: pressed ? Qt.SizeFDiagCursor : Qt.ArrowCursor cursorShape: pressed ? Qt.SizeFDiagCursor : Qt.ArrowCursor
property point startPos property point startPos
@@ -416,6 +495,8 @@ Item {
startHeight = root.widgetHeight; startHeight = root.widgetHeight;
root.previewWidth = root.widgetWidth; root.previewWidth = root.widgetWidth;
root.previewHeight = root.widgetHeight; root.previewHeight = root.widgetHeight;
root.dragOverrideW = root.widgetWidth;
root.dragOverrideH = root.widgetHeight;
} }
onPositionChanged: mouse => { onPositionChanged: mouse => {
@@ -438,16 +519,15 @@ Item {
root.previewHeight = newH; root.previewHeight = newH;
return; return;
} }
root.widgetWidth = newW; root.dragOverrideW = newW;
root.widgetHeight = newH; root.dragOverrideH = newH;
} }
onReleased: { onReleased: {
if (root.useGhostPreview) { const finalW = root.useGhostPreview ? root.previewWidth : root.dragOverrideW;
root.widgetWidth = root.previewWidth; const finalH = root.useGhostPreview ? root.previewHeight : root.dragOverrideH;
root.widgetHeight = root.previewHeight; root.saveSize(finalW, finalH);
} root.clearDragOverrides();
root.saveSize();
} }
} }
} }

View File

@@ -177,10 +177,11 @@ Item {
StyledText { StyledText {
text: { text: {
if (!SystemUpdateService.shellVersion) if (!SystemUpdateService.shellVersion && !DMSService.cliVersion)
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+)\./);
@@ -191,7 +192,25 @@ 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) {
return `dms (git) v1.0.3-${match[1]}`; function extractBaseVersion(value) {
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
@@ -200,6 +219,18 @@ 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

View File

@@ -63,7 +63,13 @@ SettingsCard {
DankActionButton { DankActionButton {
id: menuButton id: menuButton
iconName: "more_vert" iconName: "more_vert"
onClicked: actionsMenu.open() onClicked: {
if (actionsMenu.opened) {
actionsMenu.close();
return;
}
actionsMenu.open();
}
Popup { Popup {
id: actionsMenu id: actionsMenu
@@ -71,7 +77,7 @@ SettingsCard {
y: parent.height + Theme.spacingXS y: parent.height + Theme.spacingXS
width: 160 width: 160
padding: Theme.spacingXS padding: Theme.spacingXS
modal: true modal: false
focus: true focus: true
closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside
@@ -218,6 +224,73 @@ SettingsCard {
SettingsDivider {} SettingsDivider {}
Item {
width: parent.width
height: groupRow.height + Theme.spacingM * 2
visible: (SettingsData.desktopWidgetGroups || []).length > 0
Row {
id: groupRow
x: Theme.spacingM
anchors.verticalCenter: parent.verticalCenter
spacing: Theme.spacingM
width: parent.width - Theme.spacingM * 2
StyledText {
text: I18n.tr("Group")
font.pixelSize: Theme.fontSizeMedium
color: Theme.surfaceText
anchors.verticalCenter: parent.verticalCenter
width: 80
horizontalAlignment: Text.AlignLeft
}
DankDropdown {
id: groupDropdown
width: parent.width - 80 - Theme.spacingM
compactMode: true
property var groupsData: {
const groups = SettingsData.desktopWidgetGroups || [];
const items = [
{
value: "",
label: I18n.tr("None")
}
];
for (const g of groups) {
items.push({
value: g.id,
label: g.name
});
}
return items;
}
options: groupsData.map(g => g.label)
currentValue: {
const currentGroup = root.instanceData?.group ?? "";
const item = groupsData.find(g => g.value === currentGroup);
return item?.label ?? I18n.tr("None");
}
onValueChanged: value => {
if (!root.instanceId)
return;
const item = groupsData.find(g => g.label === value);
const groupId = item?.value ?? "";
SettingsData.updateDesktopWidgetInstance(root.instanceId, {
group: groupId || null
});
}
}
}
}
SettingsDivider {
visible: (SettingsData.desktopWidgetGroups || []).length > 0
}
SettingsToggleRow { SettingsToggleRow {
text: I18n.tr("Show on Overlay") text: I18n.tr("Show on Overlay")
checked: instanceData?.config?.showOnOverlay ?? false checked: instanceData?.config?.showOnOverlay ?? false
@@ -266,6 +339,38 @@ SettingsCard {
SettingsDivider {} SettingsDivider {}
SettingsToggleRow {
text: I18n.tr("Click Through")
description: I18n.tr("Allow clicks to pass through the widget")
checked: instanceData?.config?.clickThrough ?? false
onToggled: isChecked => {
if (!root.instanceId)
return;
SettingsData.updateDesktopWidgetInstanceConfig(root.instanceId, {
clickThrough: isChecked
});
}
}
SettingsDivider {}
SettingsToggleRow {
text: I18n.tr("Sync Position Across Screens")
description: I18n.tr("Use the same position and size on all displays")
checked: instanceData?.config?.syncPositionAcrossScreens ?? false
onToggled: isChecked => {
if (!root.instanceId)
return;
if (isChecked)
SettingsData.syncDesktopWidgetPositionToAllScreens(root.instanceId);
SettingsData.updateDesktopWidgetInstanceConfig(root.instanceId, {
syncPositionAcrossScreens: isChecked
});
}
}
SettingsDivider {}
Item { Item {
width: parent.width width: parent.width
height: ipcColumn.height + Theme.spacingM * 2 height: ipcColumn.height + Theme.spacingM * 2

View File

@@ -14,20 +14,46 @@ Item {
LayoutMirroring.childrenInherit: true LayoutMirroring.childrenInherit: true
property var expandedStates: ({}) property var expandedStates: ({})
property var groupCollapsedStates: ({})
property var parentModal: null property var parentModal: null
property string editingGroupId: ""
property string newGroupName: ""
DesktopWidgetBrowser { readonly property var allInstances: SettingsData.desktopWidgetInstances || []
id: widgetBrowser readonly property var allGroups: SettingsData.desktopWidgetGroups || []
parentModal: root.parentModal
onWidgetAdded: widgetType => { function showWidgetBrowser() {
ToastService.showInfo(I18n.tr("Widget added")); widgetBrowserLoader.active = true;
if (widgetBrowserLoader.item)
widgetBrowserLoader.item.show();
}
function showDesktopPluginBrowser() {
desktopPluginBrowserLoader.active = true;
if (desktopPluginBrowserLoader.item)
desktopPluginBrowserLoader.item.show();
}
LazyLoader {
id: widgetBrowserLoader
active: false
DesktopWidgetBrowser {
parentModal: root.parentModal
onWidgetAdded: widgetType => {
ToastService.showInfo(I18n.tr("Widget added"));
}
} }
} }
PluginBrowser { LazyLoader {
id: desktopPluginBrowser id: desktopPluginBrowserLoader
parentModal: root.parentModal active: false
typeFilter: "desktop-widget"
PluginBrowser {
parentModal: root.parentModal
typeFilter: "desktop-widget"
}
} }
DankFlickable { DankFlickable {
@@ -68,66 +94,512 @@ Item {
DankButton { DankButton {
text: I18n.tr("Add Widget") text: I18n.tr("Add Widget")
iconName: "add" iconName: "add"
onClicked: widgetBrowser.show() onClicked: root.showWidgetBrowser()
} }
DankButton { DankButton {
text: I18n.tr("Browse Plugins") text: I18n.tr("Browse Plugins")
iconName: "store" iconName: "store"
onClicked: desktopPluginBrowser.show() onClicked: root.showDesktopPluginBrowser()
}
}
}
}
SettingsCard {
width: parent.width
iconName: "folder"
title: I18n.tr("Groups")
collapsible: true
expanded: root.allGroups.length > 0
Column {
width: parent.width - Theme.spacingM * 2
x: Theme.spacingM
spacing: Theme.spacingM
StyledText {
width: parent.width
text: I18n.tr("Organize widgets into collapsible groups")
font.pixelSize: Theme.fontSizeSmall
color: Theme.surfaceVariantText
wrapMode: Text.WordWrap
horizontalAlignment: Text.AlignLeft
}
Row {
spacing: Theme.spacingS
width: parent.width
DankTextField {
id: newGroupField
width: parent.width - addGroupBtn.width - Theme.spacingS
placeholderText: I18n.tr("New group name...")
text: root.newGroupName
onTextChanged: root.newGroupName = text
onAccepted: {
if (!text.trim())
return;
SettingsData.createDesktopWidgetGroup(text.trim());
root.newGroupName = "";
text = "";
}
}
DankButton {
id: addGroupBtn
iconName: "add"
text: I18n.tr("Add")
enabled: root.newGroupName.trim().length > 0
onClicked: {
SettingsData.createDesktopWidgetGroup(root.newGroupName.trim());
root.newGroupName = "";
newGroupField.text = "";
}
}
}
Column {
width: parent.width
spacing: Theme.spacingXS
visible: root.allGroups.length > 0
Repeater {
model: root.allGroups
Rectangle {
id: groupItem
required property var modelData
required property int index
width: parent.width
height: 40
radius: Theme.cornerRadius
color: groupMouseArea.containsMouse ? Theme.surfaceHover : Theme.surfaceContainer
Row {
anchors.fill: parent
anchors.leftMargin: Theme.spacingS
anchors.rightMargin: Theme.spacingS
spacing: Theme.spacingS
DankIcon {
name: "folder"
size: Theme.iconSizeSmall
color: Theme.surfaceText
anchors.verticalCenter: parent.verticalCenter
}
Loader {
active: root.editingGroupId === groupItem.modelData.id
width: active ? parent.width - Theme.iconSizeSmall - deleteGroupBtn.width - Theme.spacingS * 3 : 0
height: active ? 32 : 0
anchors.verticalCenter: parent.verticalCenter
sourceComponent: DankTextField {
text: groupItem.modelData.name
onAccepted: {
if (!text.trim())
return;
SettingsData.updateDesktopWidgetGroup(groupItem.modelData.id, {
name: text.trim()
});
root.editingGroupId = "";
}
onEditingFinished: {
if (!text.trim())
return;
SettingsData.updateDesktopWidgetGroup(groupItem.modelData.id, {
name: text.trim()
});
root.editingGroupId = "";
}
Component.onCompleted: forceActiveFocus()
}
}
StyledText {
visible: root.editingGroupId !== groupItem.modelData.id
text: groupItem.modelData.name
font.pixelSize: Theme.fontSizeMedium
color: Theme.surfaceText
anchors.verticalCenter: parent.verticalCenter
elide: Text.ElideRight
width: parent.width - Theme.iconSizeSmall - deleteGroupBtn.width - Theme.spacingS * 3
}
DankActionButton {
id: deleteGroupBtn
iconName: "delete"
anchors.verticalCenter: parent.verticalCenter
onClicked: {
SettingsData.removeDesktopWidgetGroup(groupItem.modelData.id);
ToastService.showInfo(I18n.tr("Group removed"));
}
}
}
MouseArea {
id: groupMouseArea
anchors.fill: parent
hoverEnabled: true
onDoubleClicked: root.editingGroupId = groupItem.modelData.id
}
}
}
}
}
}
Repeater {
model: root.allGroups
Column {
id: groupSection
required property var modelData
required property int index
readonly property string groupId: modelData.id
readonly property var groupInstances: root.allInstances.filter(inst => inst.group === groupId)
width: mainColumn.width
spacing: Theme.spacingM
visible: groupInstances.length > 0
Rectangle {
width: parent.width
height: 44
radius: Theme.cornerRadius
color: Theme.surfaceContainer
Row {
anchors.fill: parent
anchors.leftMargin: Theme.spacingM
anchors.rightMargin: Theme.spacingM
spacing: Theme.spacingS
DankIcon {
name: (root.groupCollapsedStates[groupSection.groupId] ?? false) ? "expand_more" : "expand_less"
size: Theme.iconSize
color: Theme.surfaceText
anchors.verticalCenter: parent.verticalCenter
}
DankIcon {
name: "folder"
size: Theme.iconSize
color: Theme.primary
anchors.verticalCenter: parent.verticalCenter
}
StyledText {
text: groupSection.modelData.name
font.pixelSize: Theme.fontSizeMedium
font.weight: Font.Medium
color: Theme.surfaceText
anchors.verticalCenter: parent.verticalCenter
}
StyledText {
text: "(" + groupSection.groupInstances.length + ")"
font.pixelSize: Theme.fontSizeSmall
color: Theme.surfaceVariantText
anchors.verticalCenter: parent.verticalCenter
}
}
MouseArea {
anchors.fill: parent
cursorShape: Qt.PointingHandCursor
onClicked: {
var states = Object.assign({}, root.groupCollapsedStates);
states[groupSection.groupId] = !(states[groupSection.groupId] ?? false);
root.groupCollapsedStates = states;
}
}
}
Column {
width: parent.width
spacing: Theme.spacingM
visible: !(root.groupCollapsedStates[groupSection.groupId] ?? false)
leftPadding: Theme.spacingM
Repeater {
model: ScriptModel {
objectProp: "id"
values: groupSection.groupInstances
}
Item {
id: groupDelegateItem
required property var modelData
required property int index
property bool held: groupDragArea.pressed
property real originalY: y
readonly property string instanceIdRef: modelData.id
readonly property var liveInstanceData: {
const instances = root.allInstances;
return instances.find(inst => inst.id === instanceIdRef) ?? modelData;
}
width: groupSection.width - Theme.spacingM
height: groupCard.height
z: held ? 2 : 1
DesktopWidgetInstanceCard {
id: groupCard
width: parent.width
headerLeftPadding: 20
instanceData: groupDelegateItem.liveInstanceData
isExpanded: root.expandedStates[groupDelegateItem.instanceIdRef] ?? false
onExpandedChanged: {
if (expanded === (root.expandedStates[groupDelegateItem.instanceIdRef] ?? false))
return;
var states = Object.assign({}, root.expandedStates);
states[groupDelegateItem.instanceIdRef] = expanded;
root.expandedStates = states;
}
onDuplicateRequested: SettingsData.duplicateDesktopWidgetInstance(groupDelegateItem.instanceIdRef)
onDeleteRequested: {
SettingsData.removeDesktopWidgetInstance(groupDelegateItem.instanceIdRef);
ToastService.showInfo(I18n.tr("Widget removed"));
}
}
MouseArea {
id: groupDragArea
anchors.left: parent.left
anchors.top: parent.top
width: 40
height: 50
hoverEnabled: true
cursorShape: Qt.SizeVerCursor
drag.target: groupDelegateItem.held ? groupDelegateItem : undefined
drag.axis: Drag.YAxis
preventStealing: true
onPressed: {
groupDelegateItem.z = 2;
groupDelegateItem.originalY = groupDelegateItem.y;
}
onReleased: {
groupDelegateItem.z = 1;
if (!drag.active) {
groupDelegateItem.y = groupDelegateItem.originalY;
return;
}
const spacing = Theme.spacingM;
const itemH = groupDelegateItem.height + spacing;
var newIndex = Math.round(groupDelegateItem.y / itemH);
newIndex = Math.max(0, Math.min(newIndex, groupSection.groupInstances.length - 1));
if (newIndex !== groupDelegateItem.index)
SettingsData.reorderDesktopWidgetInstanceInGroup(groupDelegateItem.instanceIdRef, groupSection.groupId, newIndex);
groupDelegateItem.y = groupDelegateItem.originalY;
}
}
DankIcon {
x: Theme.spacingL - 2
y: Theme.spacingL + (Theme.iconSize / 2) - (size / 2)
name: "drag_indicator"
size: 18
color: Theme.outline
opacity: groupDragArea.containsMouse || groupDragArea.pressed ? 1 : 0.5
}
Behavior on y {
enabled: !groupDragArea.pressed && !groupDragArea.drag.active
NumberAnimation {
duration: Theme.shortDuration
easing.type: Theme.standardEasing
}
}
}
} }
} }
} }
} }
Column { Column {
id: instancesColumn id: ungroupedSection
width: parent.width width: parent.width
spacing: Theme.spacingM spacing: Theme.spacingM
visible: SettingsData.desktopWidgetInstances.length > 0 visible: ungroupedInstances.length > 0
Repeater { readonly property var ungroupedInstances: root.allInstances.filter(inst => {
id: instanceRepeater if (!inst.group)
model: ScriptModel { return true;
id: instancesModel return !root.allGroups.some(g => g.id === inst.group);
objectProp: "id" })
values: SettingsData.desktopWidgetInstances
Rectangle {
width: parent.width
height: 44
radius: Theme.cornerRadius
color: Theme.surfaceContainer
visible: root.allGroups.length > 0
Row {
anchors.fill: parent
anchors.leftMargin: Theme.spacingM
anchors.rightMargin: Theme.spacingM
spacing: Theme.spacingS
DankIcon {
name: (root.groupCollapsedStates["_ungrouped"] ?? false) ? "expand_more" : "expand_less"
size: Theme.iconSize
color: Theme.surfaceText
anchors.verticalCenter: parent.verticalCenter
}
DankIcon {
name: "widgets"
size: Theme.iconSize
color: Theme.primary
anchors.verticalCenter: parent.verticalCenter
}
StyledText {
text: I18n.tr("Ungrouped")
font.pixelSize: Theme.fontSizeMedium
font.weight: Font.Medium
color: Theme.surfaceText
anchors.verticalCenter: parent.verticalCenter
}
StyledText {
text: "(" + ungroupedSection.ungroupedInstances.length + ")"
font.pixelSize: Theme.fontSizeSmall
color: Theme.surfaceVariantText
anchors.verticalCenter: parent.verticalCenter
}
} }
DesktopWidgetInstanceCard { MouseArea {
required property var modelData anchors.fill: parent
required property int index cursorShape: Qt.PointingHandCursor
onClicked: {
var states = Object.assign({}, root.groupCollapsedStates);
states["_ungrouped"] = !(states["_ungrouped"] ?? false);
root.groupCollapsedStates = states;
}
}
}
readonly property string instanceIdRef: modelData.id Column {
readonly property var liveInstanceData: { width: parent.width
const instances = SettingsData.desktopWidgetInstances || []; spacing: Theme.spacingM
return instances.find(inst => inst.id === instanceIdRef) ?? modelData; visible: !(root.groupCollapsedStates["_ungrouped"] ?? false)
leftPadding: root.allGroups.length > 0 ? Theme.spacingM : 0
Repeater {
model: ScriptModel {
objectProp: "id"
values: ungroupedSection.ungroupedInstances
} }
width: instancesColumn.width Item {
instanceData: liveInstanceData id: ungroupedDelegateItem
isExpanded: root.expandedStates[instanceIdRef] ?? false required property var modelData
required property int index
onExpandedChanged: { property bool held: ungroupedDragArea.pressed
if (expanded === (root.expandedStates[instanceIdRef] ?? false)) property real originalY: y
return;
var states = Object.assign({}, root.expandedStates);
states[instanceIdRef] = expanded;
root.expandedStates = states;
}
onDuplicateRequested: SettingsData.duplicateDesktopWidgetInstance(instanceIdRef) readonly property string instanceIdRef: modelData.id
readonly property var liveInstanceData: {
const instances = root.allInstances;
return instances.find(inst => inst.id === instanceIdRef) ?? modelData;
}
onDeleteRequested: { width: ungroupedSection.width - (root.allGroups.length > 0 ? Theme.spacingM : 0)
SettingsData.removeDesktopWidgetInstance(instanceIdRef); height: ungroupedCard.height
ToastService.showInfo(I18n.tr("Widget removed")); z: held ? 2 : 1
DesktopWidgetInstanceCard {
id: ungroupedCard
width: parent.width
headerLeftPadding: 20
instanceData: ungroupedDelegateItem.liveInstanceData
isExpanded: root.expandedStates[ungroupedDelegateItem.instanceIdRef] ?? false
onExpandedChanged: {
if (expanded === (root.expandedStates[ungroupedDelegateItem.instanceIdRef] ?? false))
return;
var states = Object.assign({}, root.expandedStates);
states[ungroupedDelegateItem.instanceIdRef] = expanded;
root.expandedStates = states;
}
onDuplicateRequested: SettingsData.duplicateDesktopWidgetInstance(ungroupedDelegateItem.instanceIdRef)
onDeleteRequested: {
SettingsData.removeDesktopWidgetInstance(ungroupedDelegateItem.instanceIdRef);
ToastService.showInfo(I18n.tr("Widget removed"));
}
}
MouseArea {
id: ungroupedDragArea
anchors.left: parent.left
anchors.top: parent.top
width: 40
height: 50
hoverEnabled: true
cursorShape: Qt.SizeVerCursor
drag.target: ungroupedDelegateItem.held ? ungroupedDelegateItem : undefined
drag.axis: Drag.YAxis
preventStealing: true
onPressed: {
ungroupedDelegateItem.z = 2;
ungroupedDelegateItem.originalY = ungroupedDelegateItem.y;
}
onReleased: {
ungroupedDelegateItem.z = 1;
if (!drag.active) {
ungroupedDelegateItem.y = ungroupedDelegateItem.originalY;
return;
}
const spacing = Theme.spacingM;
const itemH = ungroupedDelegateItem.height + spacing;
var newIndex = Math.round(ungroupedDelegateItem.y / itemH);
newIndex = Math.max(0, Math.min(newIndex, ungroupedSection.ungroupedInstances.length - 1));
if (newIndex !== ungroupedDelegateItem.index)
SettingsData.reorderDesktopWidgetInstanceInGroup(ungroupedDelegateItem.instanceIdRef, null, newIndex);
ungroupedDelegateItem.y = ungroupedDelegateItem.originalY;
}
}
DankIcon {
x: Theme.spacingL - 2
y: Theme.spacingL + (Theme.iconSize / 2) - (size / 2)
name: "drag_indicator"
size: 18
color: Theme.outline
opacity: ungroupedDragArea.containsMouse || ungroupedDragArea.pressed ? 1 : 0.5
}
Behavior on y {
enabled: !ungroupedDragArea.pressed && !ungroupedDragArea.drag.active
NumberAnimation {
duration: Theme.shortDuration
easing.type: Theme.standardEasing
}
}
} }
} }
} }
} }
StyledText { StyledText {
visible: SettingsData.desktopWidgetInstances.length === 0 visible: root.allInstances.length === 0
text: I18n.tr("No widgets added. Click \"Add Widget\" to get started.") text: I18n.tr("No widgets added. Click \"Add Widget\" to get started.")
font.pixelSize: Theme.fontSizeMedium font.pixelSize: Theme.fontSizeMedium
color: Theme.surfaceVariantText color: Theme.surfaceVariantText

View File

@@ -29,6 +29,9 @@ Item {
SettingsButtonGroupRow { SettingsButtonGroupRow {
text: I18n.tr("Position") text: I18n.tr("Position")
model: ["Top", "Bottom", "Left", "Right"] model: ["Top", "Bottom", "Left", "Right"]
buttonPadding: Theme.spacingS
minButtonWidth: 44
textSize: Theme.fontSizeSmall
currentIndex: { currentIndex: {
switch (SettingsData.dockPosition) { switch (SettingsData.dockPosition) {
case SettingsData.Position.Top: case SettingsData.Position.Top:
@@ -129,6 +132,9 @@ Item {
tags: ["dock", "indicator", "style", "circle", "line"] tags: ["dock", "indicator", "style", "circle", "line"]
text: I18n.tr("Indicator Style") text: I18n.tr("Indicator Style")
model: ["Circle", "Line"] model: ["Circle", "Line"]
buttonPadding: Theme.spacingS
minButtonWidth: 44
textSize: Theme.fontSizeSmall
currentIndex: SettingsData.dockIndicatorStyle === "circle" ? 0 : 1 currentIndex: SettingsData.dockIndicatorStyle === "circle" ? 0 : 1
onSelectionChanged: (index, selected) => { onSelectionChanged: (index, selected) => {
if (selected) { if (selected) {
@@ -225,6 +231,9 @@ Item {
description: I18n.tr("Choose the border accent color") description: I18n.tr("Choose the border accent color")
visible: SettingsData.dockBorderEnabled visible: SettingsData.dockBorderEnabled
model: ["Surface", "Secondary", "Primary"] model: ["Surface", "Secondary", "Primary"]
buttonPadding: Theme.spacingS
minButtonWidth: 44
textSize: Theme.fontSizeSmall
currentIndex: { currentIndex: {
switch (SettingsData.dockBorderColor) { switch (SettingsData.dockBorderColor) {
case "surfaceText": case "surfaceText":

View File

@@ -2,6 +2,7 @@ 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
@@ -14,6 +15,7 @@ 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();
@@ -23,15 +25,59 @@ Item {
NetworkService.removeRef(); NetworkService.removeRef();
} }
FileBrowserModal { function openVpnFileBrowser() {
id: vpnFileBrowser vpnFileBrowserLoader.active = true;
browserTitle: I18n.tr("Import VPN") if (vpnFileBrowserLoader.item)
browserIcon: "vpn_key" vpnFileBrowserLoader.item.open();
browserType: "vpn" }
fileExtensions: VPNService.getFileFilter()
onFileSelected: path => { function normalizePinList(value) {
VPNService.importVpn(path.replace("file://", "")); 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 {
browserTitle: I18n.tr("Import VPN")
browserIcon: "vpn_key"
browserType: "vpn"
fileExtensions: VPNService.getFileFilter()
onFileSelected: path => {
VPNService.importVpn(path.replace("file://", ""));
}
} }
} }
@@ -1014,15 +1060,19 @@ Item {
model: { model: {
const ssid = NetworkService.currentWifiSSID; const ssid = NetworkService.currentWifiSSID;
const networks = NetworkService.wifiNetworks || []; const networks = NetworkService.wifiNetworks || [];
const pins = SettingsData.wifiNetworkPins || {}; const pinnedList = networkTab.getPinnedWifiNetworks();
const pinnedSSID = pins["preferredWifi"];
let sorted = [...networks]; let sorted = [...networks];
sorted.sort((a, b) => { sorted.sort((a, b) => {
if (a.ssid === pinnedSSID && b.ssid !== pinnedSSID) const aPinnedIndex = pinnedList.indexOf(a.ssid)
return -1; const bPinnedIndex = pinnedList.indexOf(b.ssid)
if (b.ssid === pinnedSSID && a.ssid !== pinnedSSID) if (aPinnedIndex !== -1 || bPinnedIndex !== -1) {
return 1; if (aPinnedIndex === -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)
@@ -1038,7 +1088,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: (SettingsData.wifiNetworkPins || {})["preferredWifi"] === modelData.ssid readonly property bool isPinned: networkTab.getPinnedWifiNetworks().includes(modelData.ssid)
readonly property bool isExpanded: networkTab.expandedWifiSsid === modelData.ssid readonly property bool isExpanded: networkTab.expandedWifiSsid === modelData.ssid
width: parent.width width: parent.width
@@ -1213,13 +1263,7 @@ Item {
buttonSize: 28 buttonSize: 28
iconColor: isPinned ? Theme.primary : Theme.surfaceVariantText iconColor: isPinned ? Theme.primary : Theme.surfaceVariantText
onClicked: { onClicked: {
const pins = JSON.parse(JSON.stringify(SettingsData.wifiNetworkPins || {})); networkTab.toggleWifiPin(modelData.ssid)
if (isPinned) {
delete pins["preferredWifi"];
} else {
pins["preferredWifi"] = modelData.ssid;
}
SettingsData.set("wifiNetworkPins", pins);
} }
} }
@@ -1520,7 +1564,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: vpnFileBrowser.open() onClicked: networkTab.openVpnFileBrowser()
} }
} }

View File

@@ -270,7 +270,9 @@ FloatingWindow {
root.updateFilteredPlugins(); root.updateFilteredPlugins();
return; return;
} }
thirdPartyConfirmModal.visible = true; thirdPartyConfirmLoader.active = true;
if (thirdPartyConfirmLoader.item)
thirdPartyConfirmLoader.item.show();
} }
} }
@@ -668,119 +670,132 @@ FloatingWindow {
} }
} }
FloatingWindow { LazyLoader {
id: thirdPartyConfirmModal id: thirdPartyConfirmLoader
active: false
objectName: "thirdPartyConfirm" FloatingWindow {
title: I18n.tr("Third-Party Plugin Warning") id: thirdPartyConfirmModal
implicitWidth: 500
implicitHeight: 350
color: Theme.surfaceContainer
visible: false
FocusScope { function show() {
anchors.fill: parent visible = true;
focus: true
Keys.onPressed: event => {
if (event.key === Qt.Key_Escape) {
thirdPartyConfirmModal.visible = false;
event.accepted = true;
}
} }
Column { function hide() {
visible = false;
}
objectName: "thirdPartyConfirm"
title: I18n.tr("Third-Party Plugin Warning")
implicitWidth: 500
implicitHeight: 350
color: Theme.surfaceContainer
visible: false
FocusScope {
anchors.fill: parent anchors.fill: parent
anchors.margins: Theme.spacingL focus: true
spacing: Theme.spacingL
Row { Keys.onPressed: event => {
width: parent.width if (event.key === Qt.Key_Escape) {
spacing: Theme.spacingM thirdPartyConfirmModal.hide();
event.accepted = true;
DankIcon {
name: "warning"
size: Theme.iconSize
color: Theme.warning
anchors.verticalCenter: parent.verticalCenter
} }
StyledText {
text: I18n.tr("Third-Party Plugin Warning")
font.pixelSize: Theme.fontSizeLarge
font.weight: Font.Medium
color: Theme.surfaceText
anchors.verticalCenter: parent.verticalCenter
}
Item {
width: parent.width - parent.spacing * 2 - Theme.iconSize - parent.children[1].implicitWidth - closeConfirmBtn.width
height: 1
}
DankActionButton {
id: closeConfirmBtn
iconName: "close"
iconSize: Theme.iconSize - 2
iconColor: Theme.outline
anchors.verticalCenter: parent.verticalCenter
onClicked: thirdPartyConfirmModal.visible = false
}
}
StyledText {
width: parent.width
text: I18n.tr("Third-party plugins are created by the community and are not officially supported by DankMaterialShell.\n\nThese plugins may pose security and privacy risks - install at your own risk.")
font.pixelSize: Theme.fontSizeMedium
color: Theme.surfaceText
wrapMode: Text.WordWrap
} }
Column { Column {
width: parent.width anchors.fill: parent
spacing: Theme.spacingS anchors.margins: Theme.spacingL
spacing: Theme.spacingL
StyledText { Row {
text: I18n.tr("• Plugins may contain bugs or security issues") width: parent.width
font.pixelSize: Theme.fontSizeSmall spacing: Theme.spacingM
color: Theme.surfaceVariantText
DankIcon {
name: "warning"
size: Theme.iconSize
color: Theme.warning
anchors.verticalCenter: parent.verticalCenter
}
StyledText {
text: I18n.tr("Third-Party Plugin Warning")
font.pixelSize: Theme.fontSizeLarge
font.weight: Font.Medium
color: Theme.surfaceText
anchors.verticalCenter: parent.verticalCenter
}
Item {
width: parent.width - parent.spacing * 2 - Theme.iconSize - parent.children[1].implicitWidth - closeConfirmBtn.width
height: 1
}
DankActionButton {
id: closeConfirmBtn
iconName: "close"
iconSize: Theme.iconSize - 2
iconColor: Theme.outline
anchors.verticalCenter: parent.verticalCenter
onClicked: thirdPartyConfirmModal.hide()
}
} }
StyledText { StyledText {
text: I18n.tr("• Review code before installation when possible") width: parent.width
font.pixelSize: Theme.fontSizeSmall text: I18n.tr("Third-party plugins are created by the community and are not officially supported by DankMaterialShell.\n\nThese plugins may pose security and privacy risks - install at your own risk.")
color: Theme.surfaceVariantText font.pixelSize: Theme.fontSizeMedium
color: Theme.surfaceText
wrapMode: Text.WordWrap
} }
StyledText { Column {
text: I18n.tr("• Install only from trusted sources") width: parent.width
font.pixelSize: Theme.fontSizeSmall spacing: Theme.spacingS
color: Theme.surfaceVariantText
}
}
Item { StyledText {
width: parent.width text: I18n.tr("• Plugins may contain bugs or security issues")
height: parent.height - parent.spacing * 3 - y font.pixelSize: Theme.fontSizeSmall
} color: Theme.surfaceVariantText
}
Row { StyledText {
anchors.right: parent.right text: I18n.tr("• Review code before installation when possible")
spacing: Theme.spacingM font.pixelSize: Theme.fontSizeSmall
color: Theme.surfaceVariantText
}
DankButton { StyledText {
text: I18n.tr("Cancel") text: I18n.tr("• Install only from trusted sources")
iconName: "close" font.pixelSize: Theme.fontSizeSmall
onClicked: thirdPartyConfirmModal.visible = false color: Theme.surfaceVariantText
}
} }
DankButton { Item {
text: I18n.tr("I Understand") width: parent.width
iconName: "check" height: parent.height - parent.spacing * 3 - y
onClicked: { }
SessionData.setShowThirdPartyPlugins(true);
root.updateFilteredPlugins(); Row {
thirdPartyConfirmModal.visible = false; anchors.right: parent.right
spacing: Theme.spacingM
DankButton {
text: I18n.tr("Cancel")
iconName: "close"
onClicked: thirdPartyConfirmModal.hide()
}
DankButton {
text: I18n.tr("I Understand")
iconName: "check"
onClicked: {
SessionData.setShowThirdPartyPlugins(true);
root.updateFilteredPlugins();
thirdPartyConfirmModal.hide();
}
} }
} }
} }

View File

@@ -1,4 +1,5 @@
import QtQuick import QtQuick
import Quickshell
import qs.Common import qs.Common
import qs.Services import qs.Services
import qs.Widgets import qs.Widgets
@@ -209,7 +210,7 @@ FocusScope {
iconName: "store" iconName: "store"
enabled: DMSService.dmsAvailable enabled: DMSService.dmsAvailable
onClicked: { onClicked: {
pluginBrowser.show(); showPluginBrowser();
} }
} }
@@ -382,9 +383,11 @@ FocusScope {
Connections { Connections {
target: DMSService target: DMSService
function onPluginsListReceived(plugins) { function onPluginsListReceived(plugins) {
pluginBrowser.isLoading = false; if (!pluginBrowserLoader.item)
pluginBrowser.allPlugins = plugins; return;
pluginBrowser.updateFilteredPlugins(); pluginBrowserLoader.item.isLoading = false;
pluginBrowserLoader.item.allPlugins = plugins;
pluginBrowserLoader.item.updateFilteredPlugins();
} }
function onInstalledPluginsReceived(plugins) { function onInstalledPluginsReceived(plugins) {
var pluginMap = {}; var pluginMap = {};
@@ -410,22 +413,36 @@ FocusScope {
} }
Component.onCompleted: { Component.onCompleted: {
pluginBrowser.parentModal = pluginsTab.parentModal;
if (DMSService.dmsAvailable && DMSService.apiVersion >= 8) if (DMSService.dmsAvailable && DMSService.apiVersion >= 8)
DMSService.listInstalled(); DMSService.listInstalled();
if (PopoutService.pendingPluginInstall) if (PopoutService.pendingPluginInstall)
Qt.callLater(() => pluginBrowser.show()); Qt.callLater(showPluginBrowser);
} }
Connections { Connections {
target: PopoutService target: PopoutService
function onPendingPluginInstallChanged() { function onPendingPluginInstallChanged() {
if (PopoutService.pendingPluginInstall) if (PopoutService.pendingPluginInstall)
pluginBrowser.show(); showPluginBrowser();
} }
} }
PluginBrowser { LazyLoader {
id: pluginBrowser id: pluginBrowserLoader
active: false
PluginBrowser {
id: pluginBrowserItem
Component.onCompleted: {
pluginBrowserItem.parentModal = pluginsTab.parentModal;
}
}
}
function showPluginBrowser() {
pluginBrowserLoader.active = true;
if (pluginBrowserLoader.item)
pluginBrowserLoader.item.show();
} }
} }

View File

@@ -131,7 +131,7 @@ Item {
if (DMSService.dmsAvailable) if (DMSService.dmsAvailable)
DMSService.listInstalledThemes(); DMSService.listInstalledThemes();
if (PopoutService.pendingThemeInstall) if (PopoutService.pendingThemeInstall)
Qt.callLater(() => themeBrowser.show()); Qt.callLater(() => showThemeBrowser());
templateCheckProcess.running = true; templateCheckProcess.running = true;
if (CompositorService.isNiri || CompositorService.isHyprland || CompositorService.isDwl) if (CompositorService.isNiri || CompositorService.isHyprland || CompositorService.isDwl)
checkCursorIncludeStatus(); checkCursorIncludeStatus();
@@ -169,7 +169,7 @@ Item {
target: PopoutService target: PopoutService
function onPendingThemeInstallChanged() { function onPendingThemeInstallChanged() {
if (PopoutService.pendingThemeInstall) if (PopoutService.pendingThemeInstall)
themeBrowser.show(); showThemeBrowser();
} }
} }
@@ -939,7 +939,7 @@ Item {
text: I18n.tr("Browse Themes", "browse themes button") text: I18n.tr("Browse Themes", "browse themes button")
iconName: "store" iconName: "store"
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
onClicked: themeBrowser.show() onClicked: showThemeBrowser()
} }
} }
} }
@@ -2041,7 +2041,18 @@ Item {
} }
} }
ThemeBrowser { LazyLoader {
id: themeBrowser id: themeBrowserLoader
active: false
ThemeBrowser {
id: themeBrowserItem
}
}
function showThemeBrowser() {
themeBrowserLoader.active = true;
if (themeBrowserLoader.item)
themeBrowserLoader.item.show();
} }
} }

View File

@@ -139,7 +139,7 @@ Item {
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
cursorShape: Qt.PointingHandCursor cursorShape: Qt.PointingHandCursor
onClicked: mainWallpaperBrowser.open() onClicked: root.openMainWallpaperBrowser()
} }
} }
@@ -476,7 +476,7 @@ Item {
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
cursorShape: Qt.PointingHandCursor cursorShape: Qt.PointingHandCursor
onClicked: lightWallpaperBrowser.open() onClicked: root.openLightWallpaperBrowser()
} }
} }
@@ -660,7 +660,7 @@ Item {
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
cursorShape: Qt.PointingHandCursor cursorShape: Qt.PointingHandCursor
onClicked: darkWallpaperBrowser.open() onClicked: root.openDarkWallpaperBrowser()
} }
} }
@@ -1242,53 +1242,83 @@ Item {
} }
} }
FileBrowserModal { function openMainWallpaperBrowser() {
id: mainWallpaperBrowser mainWallpaperBrowserLoader.active = true;
parentModal: root.parentModal if (mainWallpaperBrowserLoader.item)
browserTitle: I18n.tr("Select Wallpaper", "wallpaper file browser title") mainWallpaperBrowserLoader.item.open();
browserIcon: "wallpaper" }
browserType: "wallpaper"
showHiddenFiles: true function openLightWallpaperBrowser() {
fileExtensions: ["*.jpg", "*.jpeg", "*.png", "*.bmp", "*.gif", "*.webp"] lightWallpaperBrowserLoader.active = true;
onFileSelected: path => { if (lightWallpaperBrowserLoader.item)
if (SessionData.perMonitorWallpaper) { lightWallpaperBrowserLoader.item.open();
SessionData.setMonitorWallpaper(selectedMonitorName, path); }
} else {
SessionData.setWallpaper(path); function openDarkWallpaperBrowser() {
darkWallpaperBrowserLoader.active = true;
if (darkWallpaperBrowserLoader.item)
darkWallpaperBrowserLoader.item.open();
}
LazyLoader {
id: mainWallpaperBrowserLoader
active: false
FileBrowserModal {
parentModal: root.parentModal
browserTitle: I18n.tr("Select Wallpaper", "wallpaper file browser title")
browserIcon: "wallpaper"
browserType: "wallpaper"
showHiddenFiles: true
fileExtensions: ["*.jpg", "*.jpeg", "*.png", "*.bmp", "*.gif", "*.webp"]
onFileSelected: path => {
if (SessionData.perMonitorWallpaper) {
SessionData.setMonitorWallpaper(selectedMonitorName, path);
} else {
SessionData.setWallpaper(path);
}
close();
} }
close();
} }
} }
FileBrowserModal { LazyLoader {
id: lightWallpaperBrowser id: lightWallpaperBrowserLoader
parentModal: root.parentModal active: false
browserTitle: I18n.tr("Select Wallpaper", "light mode wallpaper file browser title")
browserIcon: "light_mode" FileBrowserModal {
browserType: "wallpaper" parentModal: root.parentModal
showHiddenFiles: true browserTitle: I18n.tr("Select Wallpaper", "light mode wallpaper file browser title")
fileExtensions: ["*.jpg", "*.jpeg", "*.png", "*.bmp", "*.gif", "*.webp"] browserIcon: "light_mode"
onFileSelected: path => { browserType: "wallpaper"
SessionData.wallpaperPathLight = path; showHiddenFiles: true
SessionData.syncWallpaperForCurrentMode(); fileExtensions: ["*.jpg", "*.jpeg", "*.png", "*.bmp", "*.gif", "*.webp"]
SessionData.saveSettings(); onFileSelected: path => {
close(); SessionData.wallpaperPathLight = path;
SessionData.syncWallpaperForCurrentMode();
SessionData.saveSettings();
close();
}
} }
} }
FileBrowserModal { LazyLoader {
id: darkWallpaperBrowser id: darkWallpaperBrowserLoader
parentModal: root.parentModal active: false
browserTitle: I18n.tr("Select Wallpaper", "dark mode wallpaper file browser title")
browserIcon: "dark_mode" FileBrowserModal {
browserType: "wallpaper" parentModal: root.parentModal
showHiddenFiles: true browserTitle: I18n.tr("Select Wallpaper", "dark mode wallpaper file browser title")
fileExtensions: ["*.jpg", "*.jpeg", "*.png", "*.bmp", "*.gif", "*.webp"] browserIcon: "dark_mode"
onFileSelected: path => { browserType: "wallpaper"
SessionData.wallpaperPathDark = path; showHiddenFiles: true
SessionData.syncWallpaperForCurrentMode(); fileExtensions: ["*.jpg", "*.jpeg", "*.png", "*.bmp", "*.gif", "*.webp"]
SessionData.saveSettings(); onFileSelected: path => {
close(); SessionData.wallpaperPathDark = path;
SessionData.syncWallpaperForCurrentMode();
SessionData.saveSettings();
close();
}
} }
} }
} }

View File

@@ -19,6 +19,7 @@ StyledRect {
property string iconName: "" property string iconName: ""
property bool collapsible: false property bool collapsible: false
property bool expanded: true property bool expanded: true
property real headerLeftPadding: 0
default property alias content: contentColumn.children default property alias content: contentColumn.children
property alias headerActions: headerActionsRow.children property alias headerActions: headerActionsRow.children
@@ -115,6 +116,7 @@ StyledRect {
Row { Row {
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: root.headerLeftPadding
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
spacing: Theme.spacingM spacing: Theme.spacingM

View File

@@ -51,6 +51,7 @@ StyledRect {
Row { Row {
spacing: Theme.spacingM spacing: Theme.spacingM
width: parent.width
DankIcon { DankIcon {
id: headerIcon id: headerIcon
@@ -69,6 +70,8 @@ StyledRect {
color: Theme.surfaceText color: Theme.surfaceText
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
visible: root.title !== "" visible: root.title !== ""
width: parent.width - (headerIcon.visible ? headerIcon.width + parent.spacing : 0)
horizontalAlignment: Text.AlignLeft
} }
} }

View File

@@ -1,5 +1,6 @@
import QtQuick import QtQuick
import QtQuick.Layouts import QtQuick.Layouts
import Quickshell
import qs.Common import qs.Common
import qs.Services import qs.Services
import qs.Widgets import qs.Widgets
@@ -382,6 +383,7 @@ 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 = "/";
@@ -400,6 +402,24 @@ Item {
setWidgetsForSection(sectionId, widgets); setWidgetsForSection(sectionId, widgets);
} }
function cloneWidgetData(widget) {
if (typeof widget === "string")
return {
"id": widget,
"enabled": true
};
var result = {
"id": widget.id,
"enabled": widget.enabled
};
var keys = ["size", "selectedGpuIndex", "pciId", "mountPath", "minimumWidth", "showSwap", "mediaSize", "clockCompactMode", "focusedWindowCompactMode", "runningAppsCompactMode", "keyboardLayoutNameCompactMode", "showNetworkIcon", "showBluetoothIcon", "showAudioIcon", "showAudioPercent", "showVpnIcon", "showBrightnessIcon", "showBrightnessPercent", "showMicIcon", "showMicPercent", "showBatteryIcon", "showPrinterIcon", "showScreenSharingIcon"];
for (var i = 0; i < keys.length; i++) {
if (widget[keys[i]] !== undefined)
result[keys[i]] = widget[keys[i]];
}
return result;
}
function handleItemEnabledChanged(sectionId, itemId, enabled) { function handleItemEnabledChanged(sectionId, itemId, enabled) {
var widgets = getWidgetsForSection(sectionId).slice(); var widgets = getWidgetsForSection(sectionId).slice();
for (var i = 0; i < widgets.length; i++) { for (var i = 0; i < widgets.length; i++) {
@@ -407,42 +427,8 @@ Item {
var widgetId = typeof widget === "string" ? widget : widget.id; var widgetId = typeof widget === "string" ? widget : widget.id;
if (widgetId !== itemId) if (widgetId !== itemId)
continue; continue;
var newWidget = cloneWidgetData(widget);
if (typeof widget === "string") { newWidget.enabled = enabled;
widgets[i] = {
"id": widget,
"enabled": enabled
};
break;
}
var newWidget = {
"id": widget.id,
"enabled": enabled
};
if (widget.size !== undefined)
newWidget.size = widget.size;
if (widget.selectedGpuIndex !== undefined)
newWidget.selectedGpuIndex = widget.selectedGpuIndex;
else if (widget.id === "gpuTemp")
newWidget.selectedGpuIndex = 0;
if (widget.pciId !== undefined)
newWidget.pciId = widget.pciId;
else if (widget.id === "gpuTemp")
newWidget.pciId = "";
if (widget.id === "controlCenterButton") {
newWidget.showNetworkIcon = widget.showNetworkIcon ?? SettingsData.controlCenterShowNetworkIcon;
newWidget.showBluetoothIcon = widget.showBluetoothIcon ?? SettingsData.controlCenterShowBluetoothIcon;
newWidget.showAudioIcon = widget.showAudioIcon ?? SettingsData.controlCenterShowAudioIcon;
newWidget.showAudioPercent = widget.showAudioPercent ?? SettingsData.controlCenterShowAudioPercent;
newWidget.showVpnIcon = widget.showVpnIcon ?? SettingsData.controlCenterShowVpnIcon;
newWidget.showBrightnessIcon = widget.showBrightnessIcon ?? SettingsData.controlCenterShowBrightnessIcon;
newWidget.showBrightnessPercent = widget.showBrightnessPercent ?? SettingsData.controlCenterShowBrightnessPercent;
newWidget.showMicIcon = widget.showMicIcon ?? SettingsData.controlCenterShowMicIcon;
newWidget.showMicPercent = widget.showMicPercent ?? SettingsData.controlCenterShowMicPercent;
newWidget.showBatteryIcon = widget.showBatteryIcon ?? SettingsData.controlCenterShowBatteryIcon;
newWidget.showPrinterIcon = widget.showPrinterIcon ?? SettingsData.controlCenterShowPrinterIcon;
}
widgets[i] = newWidget; widgets[i] = newWidget;
break; break;
} }
@@ -455,128 +441,36 @@ Item {
function handleSpacerSizeChanged(sectionId, widgetIndex, newSize) { function handleSpacerSizeChanged(sectionId, widgetIndex, newSize) {
var widgets = getWidgetsForSection(sectionId).slice(); var widgets = getWidgetsForSection(sectionId).slice();
if (widgetIndex < 0 || widgetIndex >= widgets.length) { if (widgetIndex < 0 || widgetIndex >= widgets.length)
setWidgetsForSection(sectionId, widgets);
return; return;
}
var widget = widgets[widgetIndex]; var widget = widgets[widgetIndex];
var widgetId = typeof widget === "string" ? widget : widget.id; var widgetId = typeof widget === "string" ? widget : widget.id;
if (widgetId !== "spacer") { if (widgetId !== "spacer")
setWidgetsForSection(sectionId, widgets);
return; return;
} var newWidget = cloneWidgetData(widget);
newWidget.size = newSize;
if (typeof widget === "string") {
widgets[widgetIndex] = {
"id": widget,
"enabled": true,
"size": newSize
};
setWidgetsForSection(sectionId, widgets);
return;
}
var newWidget = {
"id": widget.id,
"enabled": widget.enabled,
"size": newSize
};
if (widget.selectedGpuIndex !== undefined)
newWidget.selectedGpuIndex = widget.selectedGpuIndex;
if (widget.pciId !== undefined)
newWidget.pciId = widget.pciId;
if (widget.id === "controlCenterButton") {
newWidget.showNetworkIcon = widget.showNetworkIcon ?? SettingsData.controlCenterShowNetworkIcon;
newWidget.showBluetoothIcon = widget.showBluetoothIcon ?? SettingsData.controlCenterShowBluetoothIcon;
newWidget.showAudioIcon = widget.showAudioIcon ?? SettingsData.controlCenterShowAudioIcon;
newWidget.showAudioPercent = widget.showAudioPercent ?? SettingsData.controlCenterShowAudioPercent;
newWidget.showVpnIcon = widget.showVpnIcon ?? SettingsData.controlCenterShowVpnIcon;
newWidget.showBrightnessIcon = widget.showBrightnessIcon ?? SettingsData.controlCenterShowBrightnessIcon;
newWidget.showBrightnessPercent = widget.showBrightnessPercent ?? SettingsData.controlCenterShowBrightnessPercent;
newWidget.showMicIcon = widget.showMicIcon ?? SettingsData.controlCenterShowMicIcon;
newWidget.showMicPercent = widget.showMicPercent ?? SettingsData.controlCenterShowMicPercent;
newWidget.showBatteryIcon = widget.showBatteryIcon ?? SettingsData.controlCenterShowBatteryIcon;
newWidget.showPrinterIcon = widget.showPrinterIcon ?? SettingsData.controlCenterShowPrinterIcon;
}
widgets[widgetIndex] = newWidget; widgets[widgetIndex] = newWidget;
setWidgetsForSection(sectionId, widgets); setWidgetsForSection(sectionId, widgets);
} }
function handleGpuSelectionChanged(sectionId, widgetIndex, selectedGpuIndex) { function handleGpuSelectionChanged(sectionId, widgetIndex, selectedGpuIndex) {
var widgets = getWidgetsForSection(sectionId).slice(); var widgets = getWidgetsForSection(sectionId).slice();
if (widgetIndex < 0 || widgetIndex >= widgets.length) { if (widgetIndex < 0 || widgetIndex >= widgets.length)
setWidgetsForSection(sectionId, widgets);
return; return;
}
var pciId = DgopService.availableGpus && DgopService.availableGpus.length > selectedGpuIndex ? DgopService.availableGpus[selectedGpuIndex].pciId : ""; var pciId = DgopService.availableGpus && DgopService.availableGpus.length > selectedGpuIndex ? DgopService.availableGpus[selectedGpuIndex].pciId : "";
var widget = widgets[widgetIndex]; var newWidget = cloneWidgetData(widgets[widgetIndex]);
if (typeof widget === "string") { newWidget.selectedGpuIndex = selectedGpuIndex;
widgets[widgetIndex] = { newWidget.pciId = pciId;
"id": widget,
"enabled": true,
"selectedGpuIndex": selectedGpuIndex,
"pciId": pciId
};
setWidgetsForSection(sectionId, widgets);
return;
}
var newWidget = {
"id": widget.id,
"enabled": widget.enabled,
"selectedGpuIndex": selectedGpuIndex,
"pciId": pciId
};
if (widget.size !== undefined)
newWidget.size = widget.size;
widgets[widgetIndex] = newWidget; widgets[widgetIndex] = newWidget;
setWidgetsForSection(sectionId, widgets); setWidgetsForSection(sectionId, widgets);
} }
function handleDiskMountSelectionChanged(sectionId, widgetIndex, mountPath) { function handleDiskMountSelectionChanged(sectionId, widgetIndex, mountPath) {
var widgets = getWidgetsForSection(sectionId).slice(); var widgets = getWidgetsForSection(sectionId).slice();
if (widgetIndex < 0 || widgetIndex >= widgets.length) { if (widgetIndex < 0 || widgetIndex >= widgets.length)
setWidgetsForSection(sectionId, widgets);
return; return;
} var newWidget = cloneWidgetData(widgets[widgetIndex]);
newWidget.mountPath = mountPath;
var widget = widgets[widgetIndex];
if (typeof widget === "string") {
widgets[widgetIndex] = {
"id": widget,
"enabled": true,
"mountPath": mountPath
};
setWidgetsForSection(sectionId, widgets);
return;
}
var newWidget = {
"id": widget.id,
"enabled": widget.enabled,
"mountPath": mountPath
};
if (widget.size !== undefined)
newWidget.size = widget.size;
if (widget.selectedGpuIndex !== undefined)
newWidget.selectedGpuIndex = widget.selectedGpuIndex;
if (widget.pciId !== undefined)
newWidget.pciId = widget.pciId;
if (widget.id === "controlCenterButton") {
newWidget.showNetworkIcon = widget.showNetworkIcon ?? SettingsData.controlCenterShowNetworkIcon;
newWidget.showBluetoothIcon = widget.showBluetoothIcon ?? SettingsData.controlCenterShowBluetoothIcon;
newWidget.showAudioIcon = widget.showAudioIcon ?? SettingsData.controlCenterShowAudioIcon;
newWidget.showAudioPercent = widget.showAudioPercent ?? SettingsData.controlCenterShowAudioPercent;
newWidget.showVpnIcon = widget.showVpnIcon ?? SettingsData.controlCenterShowVpnIcon;
newWidget.showBrightnessIcon = widget.showBrightnessIcon ?? SettingsData.controlCenterShowBrightnessIcon;
newWidget.showBrightnessPercent = widget.showBrightnessPercent ?? SettingsData.controlCenterShowBrightnessPercent;
newWidget.showMicIcon = widget.showMicIcon ?? SettingsData.controlCenterShowMicIcon;
newWidget.showMicPercent = widget.showMicPercent ?? SettingsData.controlCenterShowMicPercent;
newWidget.showBatteryIcon = widget.showBatteryIcon ?? SettingsData.controlCenterShowBatteryIcon;
newWidget.showPrinterIcon = widget.showPrinterIcon ?? SettingsData.controlCenterShowPrinterIcon;
}
widgets[widgetIndex] = newWidget; widgets[widgetIndex] = newWidget;
setWidgetsForSection(sectionId, widgets); setWidgetsForSection(sectionId, widgets);
} }
@@ -585,32 +479,8 @@ Item {
var widgets = getWidgetsForSection(sectionId).slice(); var widgets = getWidgetsForSection(sectionId).slice();
if (widgetIndex < 0 || widgetIndex >= widgets.length) if (widgetIndex < 0 || widgetIndex >= widgets.length)
return; return;
var newWidget = cloneWidgetData(widgets[widgetIndex]);
var widget = widgets[widgetIndex];
if (typeof widget === "string") {
widget = {
"id": widget,
"enabled": true
};
}
var newWidget = {
"id": widget.id,
"enabled": widget.enabled !== undefined ? widget.enabled : true,
"showNetworkIcon": widget.showNetworkIcon ?? SettingsData.controlCenterShowNetworkIcon,
"showBluetoothIcon": widget.showBluetoothIcon ?? SettingsData.controlCenterShowBluetoothIcon,
"showAudioIcon": widget.showAudioIcon ?? SettingsData.controlCenterShowAudioIcon,
"showAudioPercent": widget.showAudioPercent ?? SettingsData.controlCenterShowAudioPercent,
"showVpnIcon": widget.showVpnIcon ?? SettingsData.controlCenterShowVpnIcon,
"showBrightnessIcon": widget.showBrightnessIcon ?? SettingsData.controlCenterShowBrightnessIcon,
"showBrightnessPercent": widget.showBrightnessPercent ?? SettingsData.controlCenterShowBrightnessPercent,
"showMicIcon": widget.showMicIcon ?? SettingsData.controlCenterShowMicIcon,
"showMicPercent": widget.showMicPercent ?? SettingsData.controlCenterShowMicPercent,
"showBatteryIcon": widget.showBatteryIcon ?? SettingsData.controlCenterShowBatteryIcon,
"showPrinterIcon": widget.showPrinterIcon ?? SettingsData.controlCenterShowPrinterIcon
};
newWidget[settingName] = value; newWidget[settingName] = value;
widgets[widgetIndex] = newWidget; widgets[widgetIndex] = newWidget;
setWidgetsForSection(sectionId, widgets); setWidgetsForSection(sectionId, widgets);
} }
@@ -635,46 +505,8 @@ Item {
setWidgetsForSection(sectionId, widgets); setWidgetsForSection(sectionId, widgets);
return; return;
} }
var newWidget = cloneWidgetData(widgets[widgetIndex]);
var widget = widgets[widgetIndex]; newWidget.minimumWidth = enabled;
if (typeof widget === "string") {
widgets[widgetIndex] = {
"id": widget,
"enabled": true,
"minimumWidth": enabled
};
setWidgetsForSection(sectionId, widgets);
return;
}
var newWidget = {
"id": widget.id,
"enabled": widget.enabled,
"minimumWidth": enabled
};
if (widget.size !== undefined)
newWidget.size = widget.size;
if (widget.selectedGpuIndex !== undefined)
newWidget.selectedGpuIndex = widget.selectedGpuIndex;
if (widget.pciId !== undefined)
newWidget.pciId = widget.pciId;
if (widget.mountPath !== undefined)
newWidget.mountPath = widget.mountPath;
if (widget.showSwap !== undefined)
newWidget.showSwap = widget.showSwap;
if (widget.id === "controlCenterButton") {
newWidget.showNetworkIcon = widget.showNetworkIcon ?? SettingsData.controlCenterShowNetworkIcon;
newWidget.showBluetoothIcon = widget.showBluetoothIcon ?? SettingsData.controlCenterShowBluetoothIcon;
newWidget.showAudioIcon = widget.showAudioIcon ?? SettingsData.controlCenterShowAudioIcon;
newWidget.showAudioPercent = widget.showAudioPercent ?? SettingsData.controlCenterShowAudioPercent;
newWidget.showVpnIcon = widget.showVpnIcon ?? SettingsData.controlCenterShowVpnIcon;
newWidget.showBrightnessIcon = widget.showBrightnessIcon ?? SettingsData.controlCenterShowBrightnessIcon;
newWidget.showBrightnessPercent = widget.showBrightnessPercent ?? SettingsData.controlCenterShowBrightnessPercent;
newWidget.showMicIcon = widget.showMicIcon ?? SettingsData.controlCenterShowMicIcon;
newWidget.showMicPercent = widget.showMicPercent ?? SettingsData.controlCenterShowMicPercent;
newWidget.showBatteryIcon = widget.showBatteryIcon ?? SettingsData.controlCenterShowBatteryIcon;
newWidget.showPrinterIcon = widget.showPrinterIcon ?? SettingsData.controlCenterShowPrinterIcon;
}
widgets[widgetIndex] = newWidget; widgets[widgetIndex] = newWidget;
setWidgetsForSection(sectionId, widgets); setWidgetsForSection(sectionId, widgets);
} }
@@ -685,141 +517,41 @@ Item {
setWidgetsForSection(sectionId, widgets); setWidgetsForSection(sectionId, widgets);
return; return;
} }
var newWidget = cloneWidgetData(widgets[widgetIndex]);
var widget = widgets[widgetIndex]; newWidget.showSwap = enabled;
if (typeof widget === "string") {
widgets[widgetIndex] = {
"id": widget,
"enabled": true,
"showSwap": enabled
};
setWidgetsForSection(sectionId, widgets);
return;
}
var newWidget = {
"id": widget.id,
"enabled": widget.enabled,
"showSwap": enabled
};
if (widget.size !== undefined)
newWidget.size = widget.size;
if (widget.selectedGpuIndex !== undefined)
newWidget.selectedGpuIndex = widget.selectedGpuIndex;
if (widget.pciId !== undefined)
newWidget.pciId = widget.pciId;
if (widget.mountPath !== undefined)
newWidget.mountPath = widget.mountPath;
if (widget.minimumWidth !== undefined)
newWidget.minimumWidth = widget.minimumWidth;
if (widget.mediaSize !== undefined)
newWidget.mediaSize = widget.mediaSize;
if (widget.clockCompactMode !== undefined)
newWidget.clockCompactMode = widget.clockCompactMode;
if (widget.focusedWindowCompactMode !== undefined)
newWidget.focusedWindowCompactMode = widget.focusedWindowCompactMode;
if (widget.runningAppsCompactMode !== undefined)
newWidget.runningAppsCompactMode = widget.runningAppsCompactMode;
if (widget.keyboardLayoutNameCompactMode !== undefined)
newWidget.keyboardLayoutNameCompactMode = widget.keyboardLayoutNameCompactMode;
if (widget.id === "controlCenterButton") {
newWidget.showNetworkIcon = widget.showNetworkIcon ?? SettingsData.controlCenterShowNetworkIcon;
newWidget.showBluetoothIcon = widget.showBluetoothIcon ?? SettingsData.controlCenterShowBluetoothIcon;
newWidget.showAudioIcon = widget.showAudioIcon ?? SettingsData.controlCenterShowAudioIcon;
newWidget.showAudioPercent = widget.showAudioPercent ?? SettingsData.controlCenterShowAudioPercent;
newWidget.showVpnIcon = widget.showVpnIcon ?? SettingsData.controlCenterShowVpnIcon;
newWidget.showBrightnessIcon = widget.showBrightnessIcon ?? SettingsData.controlCenterShowBrightnessIcon;
newWidget.showBrightnessPercent = widget.showBrightnessPercent ?? SettingsData.controlCenterShowBrightnessPercent;
newWidget.showMicIcon = widget.showMicIcon ?? SettingsData.controlCenterShowMicIcon;
newWidget.showMicPercent = widget.showMicPercent ?? SettingsData.controlCenterShowMicPercent;
newWidget.showBatteryIcon = widget.showBatteryIcon ?? SettingsData.controlCenterShowBatteryIcon;
newWidget.showPrinterIcon = widget.showPrinterIcon ?? SettingsData.controlCenterShowPrinterIcon;
}
widgets[widgetIndex] = newWidget; widgets[widgetIndex] = newWidget;
setWidgetsForSection(sectionId, widgets); setWidgetsForSection(sectionId, widgets);
} }
function handleCompactModeChanged(sectionId, widgetId, value) { function handleCompactModeChanged(sectionId, widgetId, value) {
var widgets = getWidgetsForSection(sectionId).slice(); var widgets = getWidgetsForSection(sectionId).slice();
for (var i = 0; i < widgets.length; i++) { for (var i = 0; i < widgets.length; i++) {
var widget = widgets[i]; var widget = widgets[i];
var currentId = typeof widget === "string" ? widget : widget.id; var currentId = typeof widget === "string" ? widget : widget.id;
if (currentId !== widgetId) if (currentId !== widgetId)
continue; continue;
if (typeof widget === "string") { var newWidget = cloneWidgetData(widget);
widgets[i] = {
"id": widget,
"enabled": true
};
widget = widgets[i];
} else {
var newWidget = {
"id": widget.id,
"enabled": widget.enabled
};
if (widget.size !== undefined)
newWidget.size = widget.size;
if (widget.selectedGpuIndex !== undefined)
newWidget.selectedGpuIndex = widget.selectedGpuIndex;
if (widget.pciId !== undefined)
newWidget.pciId = widget.pciId;
if (widget.mountPath !== undefined)
newWidget.mountPath = widget.mountPath;
if (widget.minimumWidth !== undefined)
newWidget.minimumWidth = widget.minimumWidth;
if (widget.showSwap !== undefined)
newWidget.showSwap = widget.showSwap;
if (widget.mediaSize !== undefined)
newWidget.mediaSize = widget.mediaSize;
if (widget.clockCompactMode !== undefined)
newWidget.clockCompactMode = widget.clockCompactMode;
if (widget.focusedWindowCompactMode !== undefined)
newWidget.focusedWindowCompactMode = widget.focusedWindowCompactMode;
if (widget.runningAppsCompactMode !== undefined)
newWidget.runningAppsCompactMode = widget.runningAppsCompactMode;
if (widget.keyboardLayoutNameCompactMode !== undefined)
newWidget.keyboardLayoutNameCompactMode = widget.keyboardLayoutNameCompactMode;
if (widget.id === "controlCenterButton") {
newWidget.showNetworkIcon = widget.showNetworkIcon ?? SettingsData.controlCenterShowNetworkIcon;
newWidget.showBluetoothIcon = widget.showBluetoothIcon ?? SettingsData.controlCenterShowBluetoothIcon;
newWidget.showAudioIcon = widget.showAudioIcon ?? SettingsData.controlCenterShowAudioIcon;
newWidget.showAudioPercent = widget.showAudioPercent ?? SettingsData.controlCenterShowAudioPercent;
newWidget.showVpnIcon = widget.showVpnIcon ?? SettingsData.controlCenterShowVpnIcon;
newWidget.showBrightnessIcon = widget.showBrightnessIcon ?? SettingsData.controlCenterShowBrightnessIcon;
newWidget.showBrightnessPercent = widget.showBrightnessPercent ?? SettingsData.controlCenterShowBrightnessPercent;
newWidget.showMicIcon = widget.showMicIcon ?? SettingsData.controlCenterShowMicIcon;
newWidget.showMicPercent = widget.showMicPercent ?? SettingsData.controlCenterShowMicPercent;
newWidget.showBatteryIcon = widget.showBatteryIcon ?? SettingsData.controlCenterShowBatteryIcon;
newWidget.showPrinterIcon = widget.showPrinterIcon ?? SettingsData.controlCenterShowPrinterIcon;
}
widgets[i] = newWidget;
widget = newWidget;
}
switch (widgetId) { switch (widgetId) {
case "music": case "music":
widget.mediaSize = value; newWidget.mediaSize = value;
break; break;
case "clock": case "clock":
widget.clockCompactMode = value; newWidget.clockCompactMode = value;
break; break;
case "focusedWindow": case "focusedWindow":
widget.focusedWindowCompactMode = value; newWidget.focusedWindowCompactMode = value;
break; break;
case "runningApps": case "runningApps":
widget.runningAppsCompactMode = value; newWidget.runningAppsCompactMode = value;
break; break;
case "keyboard_layout_name": case "keyboard_layout_name":
widget.keyboardLayoutNameCompactMode = value; newWidget.keyboardLayoutNameCompactMode = value;
break; break;
} }
widgets[i] = newWidget;
break; break;
} }
setWidgetsForSection(sectionId, widgets); setWidgetsForSection(sectionId, widgets);
} }
@@ -866,6 +598,8 @@ 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)
@@ -916,14 +650,28 @@ Item {
}); });
} }
WidgetSelectionPopup { LazyLoader {
id: widgetSelectionPopup id: widgetSelectionPopupLoader
parentModal: widgetsTab.parentModal active: false
onWidgetSelected: (widgetId, targetSection) => {
widgetsTab.addWidgetToSection(widgetId, targetSection); WidgetSelectionPopup {
id: widgetSelectionPopupItem
parentModal: widgetsTab.parentModal
onWidgetSelected: (widgetId, targetSection) => {
widgetsTab.addWidgetToSection(widgetId, targetSection);
}
} }
} }
function showWidgetSelectionPopup(sectionId) {
widgetSelectionPopupLoader.active = true;
if (!widgetSelectionPopupLoader.item)
return;
widgetSelectionPopupLoader.item.targetSection = sectionId;
widgetSelectionPopupLoader.item.allWidgets = widgetsTab.getWidgetsForPopup();
widgetSelectionPopupLoader.item.show();
}
DankFlickable { DankFlickable {
anchors.fill: parent anchors.fill: parent
clip: true clip: true
@@ -1113,9 +861,7 @@ Item {
widgetsTab.handleItemOrderChanged(sectionId, newOrder); widgetsTab.handleItemOrderChanged(sectionId, newOrder);
} }
onAddWidget: sectionId => { onAddWidget: sectionId => {
widgetSelectionPopup.targetSection = sectionId; showWidgetSelectionPopup(sectionId);
widgetSelectionPopup.allWidgets = widgetsTab.getWidgetsForPopup();
widgetSelectionPopup.show();
} }
onRemoveWidget: (sectionId, index) => { onRemoveWidget: (sectionId, index) => {
widgetsTab.removeWidgetFromSection(sectionId, index); widgetsTab.removeWidgetFromSection(sectionId, index);
@@ -1170,9 +916,7 @@ Item {
widgetsTab.handleItemOrderChanged(sectionId, newOrder); widgetsTab.handleItemOrderChanged(sectionId, newOrder);
} }
onAddWidget: sectionId => { onAddWidget: sectionId => {
widgetSelectionPopup.targetSection = sectionId; showWidgetSelectionPopup(sectionId);
widgetSelectionPopup.allWidgets = widgetsTab.getWidgetsForPopup();
widgetSelectionPopup.show();
} }
onRemoveWidget: (sectionId, index) => { onRemoveWidget: (sectionId, index) => {
widgetsTab.removeWidgetFromSection(sectionId, index); widgetsTab.removeWidgetFromSection(sectionId, index);
@@ -1227,9 +971,7 @@ Item {
widgetsTab.handleItemOrderChanged(sectionId, newOrder); widgetsTab.handleItemOrderChanged(sectionId, newOrder);
} }
onAddWidget: sectionId => { onAddWidget: sectionId => {
widgetSelectionPopup.targetSection = sectionId; showWidgetSelectionPopup(sectionId);
widgetSelectionPopup.allWidgets = widgetsTab.getWidgetsForPopup();
widgetSelectionPopup.show();
} }
onRemoveWidget: (sectionId, index) => { onRemoveWidget: (sectionId, index) => {
widgetsTab.removeWidgetFromSection(sectionId, index); widgetsTab.removeWidgetFromSection(sectionId, index);

View File

@@ -31,6 +31,19 @@ Column {
signal minimumWidthChanged(string sectionId, int widgetIndex, bool enabled) signal minimumWidthChanged(string sectionId, int widgetIndex, bool enabled)
signal showSwapChanged(string sectionId, int widgetIndex, bool enabled) signal showSwapChanged(string sectionId, int widgetIndex, bool enabled)
function cloneWidgetData(widget) {
var result = {
"id": widget.id,
"enabled": widget.enabled
};
var keys = ["size", "selectedGpuIndex", "pciId", "mountPath", "minimumWidth", "showSwap", "mediaSize", "clockCompactMode", "focusedWindowCompactMode", "runningAppsCompactMode", "keyboardLayoutNameCompactMode", "showNetworkIcon", "showBluetoothIcon", "showAudioIcon", "showAudioPercent", "showVpnIcon", "showBrightnessIcon", "showBrightnessPercent", "showMicIcon", "showMicPercent", "showBatteryIcon", "showPrinterIcon", "showScreenSharingIcon"];
for (var i = 0; i < keys.length; i++) {
if (widget[keys[i]] !== undefined)
result[keys[i]] = widget[keys[i]];
}
return result;
}
width: parent.width width: parent.width
height: implicitHeight height: implicitHeight
spacing: Theme.spacingM spacing: Theme.spacingM
@@ -727,13 +740,7 @@ Column {
var newItems = root.items.slice(); var newItems = root.items.slice();
var draggedItem = newItems.splice(index, 1)[0]; var draggedItem = newItems.splice(index, 1)[0];
newItems.splice(newIndex, 0, draggedItem); newItems.splice(newIndex, 0, draggedItem);
root.itemOrderChanged(newItems.map(item => { root.itemOrderChanged(newItems.map(item => root.cloneWidgetData(item)));
return ({
"id": item.id,
"enabled": item.enabled,
"size": item.size
});
}));
} }
} }
delegateItem.x = 0; delegateItem.x = 0;
@@ -875,6 +882,11 @@ 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"
} }
] ]
@@ -907,6 +919,8 @@ 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;
} }

View File

@@ -63,15 +63,15 @@ Item {
onToggled: checked => SettingsData.set("showWorkspaceApps", checked) onToggled: checked => SettingsData.set("showWorkspaceApps", checked)
} }
Row { Item {
width: parent.width - Theme.spacingL width: parent.width
spacing: Theme.spacingL height: maxAppsColumn.height
visible: SettingsData.showWorkspaceApps visible: SettingsData.showWorkspaceApps
opacity: visible ? 1 : 0 opacity: visible ? 1 : 0
anchors.left: parent.left
anchors.leftMargin: Theme.spacingL
Column { Column {
id: maxAppsColumn
x: Theme.spacingL
width: 120 width: 120
spacing: Theme.spacingS spacing: Theme.spacingS
@@ -80,14 +80,15 @@ Item {
font.pixelSize: Theme.fontSizeSmall font.pixelSize: Theme.fontSizeSmall
color: Theme.surfaceText color: Theme.surfaceText
font.weight: Font.Medium font.weight: Font.Medium
horizontalAlignment: Text.AlignLeft
} }
DankTextField { DankTextField {
width: 100 width: 100
height: 28 height: 28
placeholderText: "#ffffff" placeholderText: "3"
text: SettingsData.maxWorkspaceIcons text: SettingsData.maxWorkspaceIcons
maximumLength: 7 maximumLength: 2
font.pixelSize: Theme.fontSizeSmall font.pixelSize: Theme.fontSizeSmall
topPadding: Theme.spacingXS topPadding: Theme.spacingXS
bottomPadding: Theme.spacingXS bottomPadding: Theme.spacingXS

View File

@@ -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
@@ -37,7 +37,27 @@ Singleton {
Component.onCompleted: { Component.onCompleted: {
if (!changelogEnabled) if (!changelogEnabled)
return; return;
changelogCheckProcess.running = true; if (FirstLaunchService.checkComplete)
handleFirstLaunchResult();
}
function handleFirstLaunchResult() {
if (FirstLaunchService.isFirstLaunch) {
checkComplete = true;
changelogDismissed = true;
touchMarkerProcess.running = true;
} else {
changelogCheckProcess.running = true;
}
}
Connections {
target: FirstLaunchService
function onCheckCompleteChanged() {
if (FirstLaunchService.checkComplete && root.changelogEnabled && !root.checkComplete)
root.handleFirstLaunchResult();
}
} }
function showChangelog() { function showChangelog() {
@@ -66,9 +86,7 @@ Singleton {
root.changelogDismissed = true; root.changelogDismissed = true;
break; break;
case "show": case "show":
if (typeof FirstLaunchService === "undefined" || !FirstLaunchService.isFirstLaunch) { root.changelogRequested();
root.changelogRequested();
}
break; break;
} }
} }

View File

@@ -74,12 +74,10 @@ Singleton {
stdout: SplitParser { stdout: SplitParser {
onRead: data => { onRead: data => {
const result = data.trim(); const result = data.trim();
root.checkComplete = true;
if (result === "first") { if (result === "first") {
root.isFirstLaunch = true; root.isFirstLaunch = true;
console.info("FirstLaunchService: First launch detected, greeter will be shown"); console.info("FirstLaunchService: First launch detected, greeter will be shown");
root.greeterRequested();
} else if (result === "existing_user") { } else if (result === "existing_user") {
root.isFirstLaunch = false; root.isFirstLaunch = false;
console.info("FirstLaunchService: Existing user detected, silently creating marker"); console.info("FirstLaunchService: Existing user detected, silently creating marker");
@@ -87,6 +85,11 @@ Singleton {
} else { } else {
root.isFirstLaunch = false; root.isFirstLaunch = false;
} }
root.checkComplete = true;
if (root.isFirstLaunch)
root.greeterRequested();
} }
} }
} }

View File

@@ -501,8 +501,12 @@ Singleton {
return Actions.buildSpawnAction(command, args); return Actions.buildSpawnAction(command, args);
} }
function buildShellAction(shellCmd) { function buildShellAction(shellCmd, shell) {
return Actions.buildShellAction(currentProvider, shellCmd); return Actions.buildShellAction(currentProvider, shellCmd, shell);
}
function getShellFromAction(action) {
return Actions.getShellFromAction(action);
} }
function parseSpawnCommand(action) { function parseSpawnCommand(action) {

View File

@@ -27,6 +27,10 @@ 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: []
@@ -356,6 +360,15 @@ 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;
} }
} }
@@ -649,6 +662,28 @@ 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;

View File

@@ -32,7 +32,6 @@ Singleton {
property int maxIngressPerSecond: 20 property int maxIngressPerSecond: 20
property double _lastIngressSec: 0 property double _lastIngressSec: 0
property int _ingressCountThisSec: 0 property int _ingressCountThisSec: 0
property int maxStoredNotifications: SettingsData.notificationHistoryMaxCount
property var _dismissQueue: [] property var _dismissQueue: []
property int _dismissBatchSize: 8 property int _dismissBatchSize: 8
@@ -340,30 +339,6 @@ Singleton {
historyFileView.writeAdapter(); historyFileView.writeAdapter();
} }
function _trimStored() {
if (notifications.length > maxStoredNotifications) {
const overflow = notifications.length - maxStoredNotifications;
const toDrop = [];
for (var i = notifications.length - 1; i >= 0 && toDrop.length < overflow; --i) {
const w = notifications[i];
if (w && w.notification && w.urgency !== NotificationUrgency.Critical) {
toDrop.push(w);
}
}
for (var i = notifications.length - 1; i >= 0 && toDrop.length < overflow; --i) {
const w = notifications[i];
if (w && w.notification && toDrop.indexOf(w) === -1) {
toDrop.push(w);
}
}
for (const w of toDrop) {
try {
w.notification.dismiss();
} catch (e) {}
}
}
}
function onOverlayOpen() { function onOverlayOpen() {
popupsDisabled = true; popupsDisabled = true;
addGate.stop(); addGate.stop();
@@ -493,7 +468,6 @@ Singleton {
root.allWrappers.push(wrapper); root.allWrappers.push(wrapper);
if (!isTransient) { if (!isTransient) {
root.notifications.push(wrapper); root.notifications.push(wrapper);
_trimStored();
if (_shouldSaveToHistory(notif.urgency)) { if (_shouldSaveToHistory(notif.urgency)) {
root.addToHistory(wrapper); root.addToHistory(wrapper);
} }
@@ -529,10 +503,8 @@ Singleton {
readonly property Timer timer: Timer { readonly property Timer timer: Timer {
interval: { interval: {
if (!wrapper.notification) { if (!wrapper.notification)
return 5000; return 5000;
}
switch (wrapper.notification.urgency) { switch (wrapper.notification.urgency) {
case NotificationUrgency.Low: case NotificationUrgency.Low:
return SettingsData.notificationTimeoutLow; return SettingsData.notificationTimeoutLow;
@@ -601,37 +573,38 @@ Singleton {
} }
required property Notification notification required property Notification notification
readonly property string summary: notification.summary readonly property string summary: notification?.summary ?? ""
readonly property string body: notification.body readonly property string body: notification?.body ?? ""
readonly property string htmlBody: { readonly property string htmlBody: {
if (body && (body.includes('<') && body.includes('>'))) { if (!body)
return "";
if (body.includes('<') && body.includes('>'))
return body; return body;
}
return Markdown2Html.markdownToHtml(body); return Markdown2Html.markdownToHtml(body);
} }
readonly property string appIcon: notification.appIcon readonly property string appIcon: notification?.appIcon ?? ""
readonly property string appName: { readonly property string appName: {
if (!notification)
return "app";
if (notification.appName == "") { if (notification.appName == "") {
const entry = DesktopEntries.heuristicLookup(notification.desktopEntry); const entry = DesktopEntries.heuristicLookup(notification.desktopEntry);
if (entry && entry.name) { if (entry && entry.name)
return entry.name.toLowerCase(); return entry.name.toLowerCase();
}
} }
return notification.appName || "app"; return notification.appName || "app";
} }
readonly property string desktopEntry: notification.desktopEntry readonly property string desktopEntry: notification?.desktopEntry ?? ""
readonly property string image: notification.image readonly property string image: notification?.image ?? ""
readonly property string cleanImage: { readonly property string cleanImage: {
if (!image) { if (!image)
return ""; return "";
}
return Paths.strip(image); return Paths.strip(image);
} }
readonly property int urgency: notification.urgency readonly property int urgency: notification?.urgency ?? 1
readonly property list<NotificationAction> actions: notification.actions readonly property list<NotificationAction> actions: notification?.actions ?? []
readonly property Connections conn: Connections { readonly property Connections conn: Connections {
target: wrapper.notification.Retainable target: wrapper.notification?.Retainable ?? null
function onDropped(): void { function onDropped(): void {
root.allWrappers = root.allWrappers.filter(w => w !== wrapper); root.allWrappers = root.allWrappers.filter(w => w !== wrapper);
@@ -743,6 +716,8 @@ Singleton {
} }
const next = notificationQueue.shift(); const next = notificationQueue.shift();
if (!next)
return;
next.seq = ++seqCounter; next.seq = ++seqCounter;
visibleNotifications = [...visibleNotifications, next]; visibleNotifications = [...visibleNotifications, next];
@@ -805,7 +780,7 @@ Singleton {
const groups = {}; const groups = {};
for (const notif of notifications) { for (const notif of notifications) {
if (!notif) if (!notif || !notif.notification)
continue; continue;
const groupKey = getGroupKey(notif); const groupKey = getGroupKey(notif);
if (!groups[groupKey]) { if (!groups[groupKey]) {
@@ -823,14 +798,15 @@ Singleton {
groups[groupKey].latestNotification = groups[groupKey].notifications[0]; groups[groupKey].latestNotification = groups[groupKey].notifications[0];
groups[groupKey].count = groups[groupKey].notifications.length; groups[groupKey].count = groups[groupKey].notifications.length;
if (notif.notification.hasInlineReply) { if (notif.notification?.hasInlineReply)
groups[groupKey].hasInlineReply = true; groups[groupKey].hasInlineReply = true;
}
} }
return Object.values(groups).sort((a, b) => { return Object.values(groups).sort((a, b) => {
const aUrgency = a.latestNotification.urgency || NotificationUrgency.Low; if (!a.latestNotification || !b.latestNotification)
const bUrgency = b.latestNotification.urgency || NotificationUrgency.Low; return 0;
const aUrgency = a.latestNotification.urgency ?? NotificationUrgency.Low;
const bUrgency = b.latestNotification.urgency ?? NotificationUrgency.Low;
if (aUrgency !== bUrgency) { if (aUrgency !== bUrgency) {
return bUrgency - aUrgency; return bUrgency - aUrgency;
} }
@@ -842,7 +818,7 @@ Singleton {
const groups = {}; const groups = {};
for (const notif of popups) { for (const notif of popups) {
if (!notif) if (!notif || !notif.notification)
continue; continue;
const groupKey = getGroupKey(notif); const groupKey = getGroupKey(notif);
if (!groups[groupKey]) { if (!groups[groupKey]) {
@@ -860,12 +836,13 @@ Singleton {
groups[groupKey].latestNotification = groups[groupKey].notifications[0]; groups[groupKey].latestNotification = groups[groupKey].notifications[0];
groups[groupKey].count = groups[groupKey].notifications.length; groups[groupKey].count = groups[groupKey].notifications.length;
if (notif.notification.hasInlineReply) { if (notif.notification?.hasInlineReply)
groups[groupKey].hasInlineReply = true; groups[groupKey].hasInlineReply = true;
}
} }
return Object.values(groups).sort((a, b) => { return Object.values(groups).sort((a, b) => {
if (!a.latestNotification || !b.latestNotification)
return 0;
return b.latestNotification.time.getTime() - a.latestNotification.time.getTime(); return b.latestNotification.time.getTime() - a.latestNotification.time.getTime();
}); });
} }

View File

@@ -287,11 +287,14 @@ Singleton {
return false; return false;
} }
// MODIFICATION: Treat Launchers as persistent instances like Daemons if (isDaemon) {
if (isDaemon || isLauncher) { const newDaemons = Object.assign({}, pluginDaemonComponents);
newDaemons[pluginId] = comp;
pluginDaemonComponents = newDaemons;
} else if (isLauncher) {
const instance = comp.createObject(root, { const instance = comp.createObject(root, {
"pluginId": pluginId, "pluginId": pluginId,
"pluginService": root // Inject PluginService "pluginService": root
}); });
if (!instance) { if (!instance) {
console.error("PluginService: failed to instantiate plugin:", pluginId, comp.errorString()); console.error("PluginService: failed to instantiate plugin:", pluginId, comp.errorString());
@@ -302,15 +305,9 @@ Singleton {
newInstances[pluginId] = instance; newInstances[pluginId] = instance;
pluginInstances = newInstances; pluginInstances = newInstances;
if (isDaemon) { const newLaunchers = Object.assign({}, pluginLauncherComponents);
const newDaemons = Object.assign({}, pluginDaemonComponents); newLaunchers[pluginId] = comp;
newDaemons[pluginId] = comp; pluginLauncherComponents = newLaunchers;
pluginDaemonComponents = newDaemons;
} else {
const newLaunchers = Object.assign({}, pluginLauncherComponents);
newLaunchers[pluginId] = comp;
pluginLauncherComponents = newLaunchers;
}
} else if (isDesktop) { } else if (isDesktop) {
const newDesktop = Object.assign({}, pluginDesktopComponents); const newDesktop = Object.assign({}, pluginDesktopComponents);
newDesktop[pluginId] = comp; newDesktop[pluginId] = comp;

View File

@@ -27,7 +27,9 @@ 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
@@ -416,11 +418,17 @@ Singleton {
} }
function showWifiPasswordModal(ssid) { function showWifiPasswordModal(ssid) {
wifiPasswordModal?.show(ssid); if (wifiPasswordModalLoader)
wifiPasswordModalLoader.active = true;
if (wifiPasswordModal)
wifiPasswordModal.show(ssid);
} }
function showHiddenNetworkModal() { function showHiddenNetworkModal() {
wifiPasswordModal?.showHidden(); if (wifiPasswordModalLoader)
wifiPasswordModalLoader.active = true;
if (wifiPasswordModal)
wifiPasswordModal.showHidden();
} }
function hideWifiPasswordModal() { function hideWifiPasswordModal() {

View File

@@ -754,7 +754,7 @@ Singleton {
"humidity": Math.round(hourly.relative_humidity_2m?.[i] || 0), "humidity": Math.round(hourly.relative_humidity_2m?.[i] || 0),
"wind": Math.round(hourly.wind_speed_10m?.[i] || 0), "wind": Math.round(hourly.wind_speed_10m?.[i] || 0),
"pressure": Math.round(hourly.surface_pressure?.[i] || 0), "pressure": Math.round(hourly.surface_pressure?.[i] || 0),
"precipitationProbability": Math.round(hourly.precipitation_probability_max?.[0] || 0), "precipitationProbability": Math.round(hourly.precipitation_probability?.[i] || 0),
"visibility": Math.round(hourly.visibility?.[i] || 0), "visibility": Math.round(hourly.visibility?.[i] || 0),
"isDay": isDay "isDay": isDay
}); });

View File

@@ -1 +1 @@
v1.2-unstable v1.2.3

View File

@@ -34,7 +34,10 @@ Image {
return; return;
} }
Paths.mkdir(Paths.imagecache); Paths.mkdir(Paths.imagecache);
source = cachePath || encodedImagePath; const hash = djb2Hash(imagePath);
const cPath = hash ? `${Paths.stringify(Paths.imagecache)}/${hash}@${maxCacheSize}x${maxCacheSize}.png` : "";
const encoded = "file://" + imagePath.split('/').map(s => encodeURIComponent(s)).join('/');
source = cPath || encoded;
} }
onStatusChanged: { onStatusChanged: {

View File

@@ -94,10 +94,10 @@ Flow {
border.color: "transparent" border.color: "transparent"
border.width: 0 border.width: 0
topLeftRadius: (visualFirst || selected) ? Theme.cornerRadius : 4 topLeftRadius: (visualFirst || selected) ? Theme.cornerRadius : Math.min(4, Theme.cornerRadius)
bottomLeftRadius: (visualFirst || selected) ? Theme.cornerRadius : 4 bottomLeftRadius: (visualFirst || selected) ? Theme.cornerRadius : Math.min(4, Theme.cornerRadius)
topRightRadius: (visualLast || selected) ? Theme.cornerRadius : 4 topRightRadius: (visualLast || selected) ? Theme.cornerRadius : Math.min(4, Theme.cornerRadius)
bottomRightRadius: (visualLast || selected) ? Theme.cornerRadius : 4 bottomRightRadius: (visualLast || selected) ? Theme.cornerRadius : Math.min(4, Theme.cornerRadius)
Behavior on width { Behavior on width {
enabled: root.userInteracted enabled: root.userInteracted

View File

@@ -1273,6 +1273,7 @@ Item {
spacing: Theme.spacingM spacing: Theme.spacingM
RowLayout { RowLayout {
visible: optionsRow.argConfig?.base !== "screenshot-window"
spacing: Theme.spacingXS spacing: Theme.spacingXS
DankToggle { DankToggle {
@@ -1441,8 +1442,9 @@ Item {
onTextChanged: { onTextChanged: {
if (root._actionType !== "shell") if (root._actionType !== "shell")
return; return;
var shell = Actions.getShellFromAction(root.editAction);
root.updateEdit({ root.updateEdit({
"action": Actions.buildShellAction(KeybindsService.currentProvider, text) "action": Actions.buildShellAction(KeybindsService.currentProvider, text, shell)
}); });
} }
} }

View File

@@ -1,3 +1,4 @@
[templates.dmsmango] [templates.dmsmango]
input_path = 'SHELL_DIR/matugen/templates/mango-colors.conf' input_path = 'SHELL_DIR/matugen/templates/mango-colors.conf'
output_path = 'CONFIG_DIR/mango/dms/colors.conf' output_path = 'CONFIG_DIR/mango/dms/colors.conf'
post_hook = 'sh -c "mmsg -d reload_config 2>&1 || true"'

File diff suppressed because it is too large Load Diff

View File

@@ -239,6 +239,9 @@
"All displays": { "All displays": {
"All displays": "Todas las pantallas" "All displays": "Todas las pantallas"
}, },
"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+←/Backspace: Atrás • F1/I: Información del archivo • F10: Ayuda • Esc: Cerrar+" "Alt+←/Backspace: Back • F1/I: File Info • F10: Help • Esc: Close": "Alt+←/Backspace: Atrás • F1/I: Información del archivo • F10: Ayuda • Esc: Cerrar+"
}, },
@@ -275,6 +278,9 @@
"Anonymous Identity (optional)": { "Anonymous Identity (optional)": {
"Anonymous Identity (optional)": "Identidad anónima (opcional)" "Anonymous Identity (optional)": "Identidad anónima (opcional)"
}, },
"App ID Substitutions": {
"App ID Substitutions": ""
},
"App Launcher": { "App Launcher": {
"App Launcher": "Lanzador de aplicaciones" "App Launcher": "Lanzador de aplicaciones"
}, },
@@ -722,6 +728,9 @@
"Click Import to add a .ovpn or .conf": { "Click Import to add a .ovpn or .conf": {
"Click Import to add a .ovpn or .conf": "Clic en importar para añadir un archivo .ovpn o .conf" "Click Import to add a .ovpn or .conf": "Clic en importar para añadir un archivo .ovpn o .conf"
}, },
"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": "" "Click any shortcut to edit. Changes save to %1": ""
}, },
@@ -1787,6 +1796,9 @@
"Grid Columns": { "Grid Columns": {
"Grid Columns": "Columnas de cuadrícula" "Grid Columns": "Columnas de cuadrícula"
}, },
"Group": {
"Group": ""
},
"Group Workspace Apps": { "Group Workspace Apps": {
"Group Workspace Apps": "Aplicaciones del espacio de trabajo en grupo" "Group Workspace Apps": "Aplicaciones del espacio de trabajo en grupo"
}, },
@@ -1796,9 +1808,15 @@
"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 multiple windows of the same app together with a window count indicator": "Mostrar número de ventanas agrupadas en el icono de la aplicación" "Group multiple windows of the same app together with a window count indicator": "Mostrar número de ventanas agrupadas en el icono de la aplicación"
}, },
"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": "Agrupar iconos de aplicaciones repetidos en espacios de trabajo desenfocados" "Group repeated application icons in unfocused workspaces": "Agrupar iconos de aplicaciones repetidos en espacios de trabajo desenfocados"
}, },
"Groups": {
"Groups": ""
},
"HDR (EDID)": { "HDR (EDID)": {
"HDR (EDID)": "HDR (EDID)" "HDR (EDID)": "HDR (EDID)"
}, },
@@ -2195,6 +2213,9 @@
"Manual Show/Hide": { "Manual Show/Hide": {
"Manual Show/Hide": "Mostrar/Ocultar manualmente" "Manual Show/Hide": "Mostrar/Ocultar manualmente"
}, },
"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": "Margen" "Margin": "Margen"
}, },
@@ -2417,6 +2438,9 @@
"New York, NY": { "New York, NY": {
"New York, NY": "New York, NY" "New York, NY": "New York, NY"
}, },
"New group name...": {
"New group name...": ""
},
"Next Transition": { "Next Transition": {
"Next Transition": "Siguiente transicion" "Next Transition": "Siguiente transicion"
}, },
@@ -2648,6 +2672,9 @@
"Options": { "Options": {
"Options": "Opciones" "Options": "Opciones"
}, },
"Organize widgets into collapsible groups": {
"Organize widgets into collapsible groups": ""
},
"Other": { "Other": {
"Other": "Otro" "Other": "Otro"
}, },
@@ -2720,6 +2747,9 @@
"Password": { "Password": {
"Password": "Contraseña" "Password": "Contraseña"
}, },
"Pattern": {
"Pattern": ""
},
"Pause": { "Pause": {
"Pause": "Pausar" "Pause": "Pausar"
}, },
@@ -2981,6 +3011,9 @@
"Repeat": { "Repeat": {
"Repeat": "" "Repeat": ""
}, },
"Replacement": {
"Replacement": ""
},
"Report": { "Report": {
"Report": "Reporte" "Report": "Reporte"
}, },
@@ -3614,6 +3647,9 @@
"Sync Mode with Portal": { "Sync Mode with Portal": {
"Sync Mode with Portal": "Sincronizar modo con los portales" "Sync Mode with Portal": "Sincronizar modo con los portales"
}, },
"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": "Sincronizar el tema oscuro con las preferencias globales del sistema" "Sync dark mode with settings portals for system-wide theme hints": "Sincronizar el tema oscuro con las preferencias globales del sistema"
}, },
@@ -3839,6 +3875,9 @@
"Unfocused Color": { "Unfocused Color": {
"Unfocused Color": "" "Unfocused Color": ""
}, },
"Ungrouped": {
"Ungrouped": ""
},
"Uninstall Plugin": { "Uninstall Plugin": {
"Uninstall Plugin": "Desinstalar complemento" "Uninstall Plugin": "Desinstalar complemento"
}, },
@@ -3938,9 +3977,15 @@
"Use light theme instead of dark theme": { "Use light theme instead of dark theme": {
"Use light theme instead of dark theme": "Usar tema claro en lugar del tema oscuro" "Use light theme instead of dark theme": "Usar tema claro en lugar del tema oscuro"
}, },
"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": "Usar tema de sonidos del sistema" "Use sound theme from system settings": "Usar tema de sonidos del sistema"
}, },
"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": ""
}, },

View File

@@ -239,6 +239,9 @@
"All displays": { "All displays": {
"All displays": "همه نمایشگر‌ها" "All displays": "همه نمایشگر‌ها"
}, },
"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+←/Backspace: بازگشت • F1/I: اطلاعات فایل • F10: راهنما • Esc: بستن" "Alt+←/Backspace: Back • F1/I: File Info • F10: Help • Esc: Close": "Alt+←/Backspace: بازگشت • F1/I: اطلاعات فایل • F10: راهنما • Esc: بستن"
}, },
@@ -275,6 +278,9 @@
"Anonymous Identity (optional)": { "Anonymous Identity (optional)": {
"Anonymous Identity (optional)": "هویت ناشناس (اختیاری)" "Anonymous Identity (optional)": "هویت ناشناس (اختیاری)"
}, },
"App ID Substitutions": {
"App ID Substitutions": ""
},
"App Launcher": { "App Launcher": {
"App Launcher": "لانچر برنامه" "App Launcher": "لانچر برنامه"
}, },
@@ -722,6 +728,9 @@
"Click Import to add a .ovpn or .conf": { "Click Import to add a .ovpn or .conf": {
"Click Import to add a .ovpn or .conf": "برای افزودن یک فایل .conf یا .ovpn کلیک کنید" "Click Import to add a .ovpn or .conf": "برای افزودن یک فایل .conf یا .ovpn کلیک کنید"
}, },
"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": "" "Click any shortcut to edit. Changes save to %1": ""
}, },
@@ -1787,6 +1796,9 @@
"Grid Columns": { "Grid Columns": {
"Grid Columns": "ستون‌های جدول" "Grid Columns": "ستون‌های جدول"
}, },
"Group": {
"Group": ""
},
"Group Workspace Apps": { "Group Workspace Apps": {
"Group Workspace Apps": "گروه‌بندی برنامه‌های workspace" "Group Workspace Apps": "گروه‌بندی برنامه‌های workspace"
}, },
@@ -1796,9 +1808,15 @@
"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 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 repeated application icons in unfocused workspaces": { "Group repeated application icons in unfocused workspaces": {
"Group repeated application icons in unfocused workspaces": "برنامه‌های تکرارشده در workspaceهای فوکوس نشده را گروه‌بندی کن" "Group repeated application icons in unfocused workspaces": "برنامه‌های تکرارشده در workspaceهای فوکوس نشده را گروه‌بندی کن"
}, },
"Groups": {
"Groups": ""
},
"HDR (EDID)": { "HDR (EDID)": {
"HDR (EDID)": "HDR (EDID)" "HDR (EDID)": "HDR (EDID)"
}, },
@@ -2195,6 +2213,9 @@
"Manual Show/Hide": { "Manual Show/Hide": {
"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": ""
},
"Margin": { "Margin": {
"Margin": "فاصله بیرونی" "Margin": "فاصله بیرونی"
}, },
@@ -2417,6 +2438,9 @@
"New York, NY": { "New York, NY": {
"New York, NY": "New York, NY" "New York, NY": "New York, NY"
}, },
"New group name...": {
"New group name...": ""
},
"Next Transition": { "Next Transition": {
"Next Transition": "گذار بعدی" "Next Transition": "گذار بعدی"
}, },
@@ -2648,6 +2672,9 @@
"Options": { "Options": {
"Options": "گزینه‌ها" "Options": "گزینه‌ها"
}, },
"Organize widgets into collapsible groups": {
"Organize widgets into collapsible groups": ""
},
"Other": { "Other": {
"Other": "دیگر" "Other": "دیگر"
}, },
@@ -2720,6 +2747,9 @@
"Password": { "Password": {
"Password": "گذرواژه" "Password": "گذرواژه"
}, },
"Pattern": {
"Pattern": ""
},
"Pause": { "Pause": {
"Pause": "توقف" "Pause": "توقف"
}, },
@@ -2981,6 +3011,9 @@
"Repeat": { "Repeat": {
"Repeat": "" "Repeat": ""
}, },
"Replacement": {
"Replacement": ""
},
"Report": { "Report": {
"Report": "گزارش" "Report": "گزارش"
}, },
@@ -3614,6 +3647,9 @@
"Sync Mode with Portal": { "Sync Mode with Portal": {
"Sync Mode with Portal": "همگام‌سازی حالت با پورتال" "Sync Mode with Portal": "همگام‌سازی حالت با پورتال"
}, },
"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": "همگام‌سازی حالت تاریک با پورتال سیستم برای هماهنگی تم در سطح سیستم"
}, },
@@ -3839,6 +3875,9 @@
"Unfocused Color": { "Unfocused Color": {
"Unfocused Color": "" "Unfocused Color": ""
}, },
"Ungrouped": {
"Ungrouped": ""
},
"Uninstall Plugin": { "Uninstall Plugin": {
"Uninstall Plugin": "حذف افزونه" "Uninstall Plugin": "حذف افزونه"
}, },
@@ -3938,9 +3977,15 @@
"Use light theme instead of dark theme": { "Use light theme instead of dark theme": {
"Use light theme instead of dark theme": "استفاده از تم روشن به جای تم تاریک" "Use light theme instead of dark theme": "استفاده از تم روشن به جای تم تاریک"
}, },
"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 trigger prefix to activate": { "Use trigger prefix to activate": {
"Use trigger prefix to activate": "" "Use trigger prefix to activate": ""
}, },

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -239,6 +239,9 @@
"All displays": { "All displays": {
"All displays": "Tutti gli schermi" "All displays": "Tutti gli schermi"
}, },
"Allow clicks to pass through the widget": {
"Allow clicks to pass through the widget": "Consenti il passaggio dei clic attraverso il 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"
}, },
@@ -275,6 +278,9 @@
"Anonymous Identity (optional)": { "Anonymous Identity (optional)": {
"Anonymous Identity (optional)": "Identità anonima (facoltativa)" "Anonymous Identity (optional)": "Identità anonima (facoltativa)"
}, },
"App ID Substitutions": {
"App ID Substitutions": "Sostituzioni App ID"
},
"App Launcher": { "App Launcher": {
"App Launcher": "App Launcher" "App Launcher": "App Launcher"
}, },
@@ -303,7 +309,7 @@
"Apps are ordered by usage frequency, then last used, then alphabetically.": "Le applicazioni sono ordinate per frequenza d'uso, poi per ultimo utilizzo, e infine in ordine alfabetico." "Apps are ordered by usage frequency, then last used, then alphabetically.": "Le applicazioni sono ordinate per frequenza d'uso, poi per ultimo utilizzo, e infine in ordine alfabetico."
}, },
"Arrange displays and configure resolution, refresh rate, and VRR": { "Arrange displays and configure resolution, refresh rate, and VRR": {
"Arrange displays and configure resolution, refresh rate, and VRR": "Disponi gli schermi e configurare risoluzione, frequenza di aggiornamento e VRR" "Arrange displays and configure resolution, refresh rate, and VRR": "Disponi gli schermi e configura risoluzione, frequenza di aggiornamento e VRR"
}, },
"Audio": { "Audio": {
"Audio": "Audio" "Audio": "Audio"
@@ -621,7 +627,7 @@
"Caps Lock": "Blocco Maiuscole" "Caps Lock": "Blocco Maiuscole"
}, },
"Caps Lock Indicator": { "Caps Lock Indicator": {
"Caps Lock Indicator": "Indicatore Maiuscolo" "Caps Lock Indicator": "Indicatore Blocco Maiuscole"
}, },
"Center Section": { "Center Section": {
"Center Section": "Sezione Centrale" "Center Section": "Sezione Centrale"
@@ -722,6 +728,9 @@
"Click Import to add a .ovpn or .conf": { "Click Import to add a .ovpn or .conf": {
"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": "Clic passanti"
},
"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"
}, },
@@ -993,7 +1002,7 @@
"Custom Lock Command": "Comando Personalizzato per Blocco" "Custom Lock Command": "Comando Personalizzato per Blocco"
}, },
"Custom Logout Command": { "Custom Logout Command": {
"Custom Logout Command": "Comando Personalizzato per il Termina Sessione" "Custom Logout Command": "Comando Personalizzato di Termine Sessione"
}, },
"Custom Power Actions": { "Custom Power Actions": {
"Custom Power Actions": "Azioni Alimentazione Personalizzate" "Custom Power Actions": "Azioni Alimentazione Personalizzate"
@@ -1317,7 +1326,7 @@
"Edge Spacing": "Spaziatura del Bordo" "Edge Spacing": "Spaziatura del Bordo"
}, },
"Education": { "Education": {
"Education": "Educazione" "Education": "Istruzione"
}, },
"Empty": { "Empty": {
"Empty": "Vuoto" "Empty": "Vuoto"
@@ -1530,7 +1539,7 @@
"Failed to import VPN": "Impossibile importare la VPN" "Failed to import VPN": "Impossibile importare la VPN"
}, },
"Failed to load VPN config": { "Failed to load VPN config": {
"Failed to load VPN config": "Impossibile importare la configurazione VPN" "Failed to load VPN config": "Impossibile caricare la configurazione VPN"
}, },
"Failed to load clipboard configuration.": { "Failed to load clipboard configuration.": {
"Failed to load clipboard configuration.": "Impossibile caricare la configurazione degli appunti" "Failed to load clipboard configuration.": "Impossibile caricare la configurazione degli appunti"
@@ -1656,31 +1665,31 @@
"Flags": "Flag" "Flags": "Flag"
}, },
"Flipped": { "Flipped": {
"Flipped": "Ruotato" "Flipped": "Specchiato"
}, },
"Flipped 180°": { "Flipped 180°": {
"Flipped 180°": "Ruotato di 180°" "Flipped 180°": "Specchiato di 180°"
}, },
"Flipped 270°": { "Flipped 270°": {
"Flipped 270°": "Ruotato di 270°" "Flipped 270°": "Specchiato di 270°"
}, },
"Flipped 90°": { "Flipped 90°": {
"Flipped 90°": "Ruotato di 90°" "Flipped 90°": "Specchiato di 90°"
}, },
"Focus at Startup": { "Focus at Startup": {
"Focus at Startup": "Attiva all'Avvio" "Focus at Startup": "Attiva all'Avvio"
}, },
"Focused Border": { "Focused Border": {
"Focused Border": "" "Focused Border": "Bordo Attivo"
}, },
"Focused Color": { "Focused Color": {
"Focused Color": "" "Focused Color": "Colore Attivo"
}, },
"Focused Window": { "Focused Window": {
"Focused Window": "Finestra Attiva" "Focused Window": "Finestra Attiva"
}, },
"Follow Monitor Focus": { "Follow Monitor Focus": {
"Follow Monitor Focus": "" "Follow Monitor Focus": "Segui il Monitor Attivo"
}, },
"Follow focus": { "Follow focus": {
"Follow focus": "Segui il focus" "Follow focus": "Segui il focus"
@@ -1787,6 +1796,9 @@
"Grid Columns": { "Grid Columns": {
"Grid Columns": "Colonne Griglia" "Grid Columns": "Colonne Griglia"
}, },
"Group": {
"Group": "Gruppo"
},
"Group Workspace Apps": { "Group Workspace Apps": {
"Group Workspace Apps": "Raggruppa App per Spazio di Lavoro" "Group Workspace Apps": "Raggruppa App per Spazio di Lavoro"
}, },
@@ -1796,9 +1808,15 @@
"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 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": "Gruppo rimosso"
},
"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": "Gruppi"
},
"HDR (EDID)": { "HDR (EDID)": {
"HDR (EDID)": "HDR (EDID)" "HDR (EDID)": "HDR (EDID)"
}, },
@@ -1842,7 +1860,7 @@
"Hide When Windows Open": "Nascondi Quando le Finestre Sono Aperte" "Hide When Windows Open": "Nascondi Quando le Finestre Sono Aperte"
}, },
"Hide cursor after inactivity (0 = disabled)": { "Hide cursor after inactivity (0 = disabled)": {
"Hide cursor after inactivity (0 = disabled)": "Nascondi il cursore dopo inattività (0 = disabilitato)" "Hide cursor after inactivity (0 = disabled)": "Nascondi il cursore dopo un periodo di inattività (0 = disabilitato)"
}, },
"Hide cursor when pressing keyboard keys": { "Hide cursor when pressing keyboard keys": {
"Hide cursor when pressing keyboard keys": "Nascondi il cursore quando si premono i tasti della tastiera" "Hide cursor when pressing keyboard keys": "Nascondi il cursore quando si premono i tasti della tastiera"
@@ -1917,7 +1935,7 @@
"Icon Theme": "Tema Icona" "Icon Theme": "Tema Icona"
}, },
"Idle": { "Idle": {
"Idle": "Inattività" "Idle": "In Attesa"
}, },
"Idle Inhibitor": { "Idle Inhibitor": {
"Idle Inhibitor": "Blocco Sospensione" "Idle Inhibitor": "Blocco Sospensione"
@@ -2043,19 +2061,19 @@
"LED device": "Dispositivo LED" "LED device": "Dispositivo LED"
}, },
"Last launched %1": { "Last launched %1": {
"Last launched %1": "Ultimo avviato %1" "Last launched %1": "Ultimo avvio %1"
}, },
"Last launched %1 day%2 ago": { "Last launched %1 day%2 ago": {
"Last launched %1 day%2 ago": "Ultimo avviato %1 giorno%2 fa" "Last launched %1 day%2 ago": "Ultimo avvio %1 giorno%2 fa"
}, },
"Last launched %1 hour%2 ago": { "Last launched %1 hour%2 ago": {
"Last launched %1 hour%2 ago": "Ultimo avviato %1 ora%2 fa" "Last launched %1 hour%2 ago": "Ultimo avvio %1 ora%2 fa"
}, },
"Last launched %1 minute%2 ago": { "Last launched %1 minute%2 ago": {
"Last launched %1 minute%2 ago": "Ultimo avviato %1 minuto%2 fa" "Last launched %1 minute%2 ago": "Ultimo avvio %1 minuto%2 fa"
}, },
"Last launched just now": { "Last launched just now": {
"Last launched just now": "Ultimo avviato ora" "Last launched just now": "Ultimo avvio ora"
}, },
"Latitude": { "Latitude": {
"Latitude": "Latitudine" "Latitude": "Latitudine"
@@ -2195,6 +2213,9 @@
"Manual Show/Hide": { "Manual Show/Hide": {
"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": "Associa i nomi delle classi delle finestre ai nomi delle icone per una corretta visualizzazione"
},
"Margin": { "Margin": {
"Margin": "Margini" "Margin": "Margini"
}, },
@@ -2417,6 +2438,9 @@
"New York, NY": { "New York, NY": {
"New York, NY": "New York, NY" "New York, NY": "New York, NY"
}, },
"New group name...": {
"New group name...": "Nome del nuovo gruppo..."
},
"Next Transition": { "Next Transition": {
"Next Transition": "Prossima Transizione" "Next Transition": "Prossima Transizione"
}, },
@@ -2616,7 +2640,7 @@
"On-screen Displays": "Indicatori a Schermo" "On-screen Displays": "Indicatori a Schermo"
}, },
"Only adjust gamma based on time or location rules.": { "Only adjust gamma based on time or location rules.": {
"Only adjust gamma based on time or location rules.": "Regolare gamma solo in base alle regole di tempo o di posizione." "Only adjust gamma based on time or location rules.": "Regola la gamma solo in base alle regole di tempo o di posizione."
}, },
"Only show windows from the current monitor on each dock": { "Only show windows from the current monitor on each dock": {
"Only show windows from the current monitor on each dock": "Mostra solo le finestre del monitor corrente su ogni dock" "Only show windows from the current monitor on each dock": "Mostra solo le finestre del monitor corrente su ogni dock"
@@ -2648,6 +2672,9 @@
"Options": { "Options": {
"Options": "Opzioni" "Options": "Opzioni"
}, },
"Organize widgets into collapsible groups": {
"Organize widgets into collapsible groups": "Organizza i widget in gruppi comprimibili"
},
"Other": { "Other": {
"Other": "Altro" "Other": "Altro"
}, },
@@ -2720,6 +2747,9 @@
"Password": { "Password": {
"Password": "Password" "Password": "Password"
}, },
"Pattern": {
"Pattern": "Pattern"
},
"Pause": { "Pause": {
"Pause": "Pausa" "Pause": "Pausa"
}, },
@@ -2981,6 +3011,9 @@
"Repeat": { "Repeat": {
"Repeat": "Ripetizione" "Repeat": "Ripetizione"
}, },
"Replacement": {
"Replacement": "Sostituzione"
},
"Report": { "Report": {
"Report": "Riepilogo" "Report": "Riepilogo"
}, },
@@ -3396,7 +3429,7 @@
"Show all 9 tags instead of only occupied tags (DWL only)": "Mostra tutti i 9 tag invece di quelli occupati (solo DWL)" "Show all 9 tags instead of only occupied tags (DWL only)": "Mostra tutti i 9 tag invece di quelli occupati (solo DWL)"
}, },
"Show an outline ring around the focused workspace indicator": { "Show an outline ring around the focused workspace indicator": {
"Show an outline ring around the focused workspace indicator": "" "Show an outline ring around the focused workspace indicator": "Mostra un contorno attorno allindicatore dello spazio di lavoro attivo"
}, },
"Show cava audio visualizer in media widget": { "Show cava audio visualizer in media widget": {
"Show cava audio visualizer in media widget": "Mostra il visualizzatore audio cava nel widget multimediale" "Show cava audio visualizer in media widget": "Mostra il visualizzatore audio cava nel widget multimediale"
@@ -3429,7 +3462,7 @@
"Show on-screen display when brightness changes": "Visualizza un messaggio a schermo quando la luminosità cambia" "Show on-screen display when brightness changes": "Visualizza un messaggio a schermo quando la luminosità cambia"
}, },
"Show on-screen display when caps lock state changes": { "Show on-screen display when caps lock state changes": {
"Show on-screen display when caps lock state changes": "Visualizza un messaggio a schermo quando lo stato del maiuscolo cambia" "Show on-screen display when caps lock state changes": "Visualizza un messaggio a schermo quando lo stato del blocco maiuscole cambia"
}, },
"Show on-screen display when cycling audio output devices": { "Show on-screen display when cycling audio output devices": {
"Show on-screen display when cycling audio output devices": "Mostra un avviso sullo schermo quando si scorre tra i dispositivi di uscita audio" "Show on-screen display when cycling audio output devices": "Mostra un avviso sullo schermo quando si scorre tra i dispositivi di uscita audio"
@@ -3468,7 +3501,7 @@
"Show workspace name on horizontal bars, and first letter on vertical bars": "Mostra il nome dello spazio di lavoro nelle barre orizzontali e la prima lettera in quelle verticali" "Show workspace name on horizontal bars, and first letter on vertical bars": "Mostra il nome dello spazio di lavoro nelle barre orizzontali e la prima lettera in quelle verticali"
}, },
"Show workspaces of the currently focused monitor": { "Show workspaces of the currently focused monitor": {
"Show workspaces of the currently focused monitor": "" "Show workspaces of the currently focused monitor": "Mostra gli spazi di lavoro del monitor attualmente attivo"
}, },
"Shows all running applications with focus indication": { "Shows all running applications with focus indication": {
"Shows all running applications with focus indication": "Mostra tutte le applicazioni in esecuzione con indicazione focus" "Shows all running applications with focus indication": "Mostra tutte le applicazioni in esecuzione con indicazione focus"
@@ -3477,7 +3510,7 @@
"Shows current workspace and allows switching": "Visualizza lo spazio di lavoro attuale e consente di passare ad un altro" "Shows current workspace and allows switching": "Visualizza lo spazio di lavoro attuale e consente di passare ad un altro"
}, },
"Shows when caps lock is active": { "Shows when caps lock is active": {
"Shows when caps lock is active": "Indica quando il maiuscolo è attivo" "Shows when caps lock is active": "Indica quando il blocco maiuscole è attivo"
}, },
"Shows when microphone, camera, or screen sharing is active": { "Shows when microphone, camera, or screen sharing is active": {
"Shows when microphone, camera, or screen sharing is active": "Mostra quando microfono, videocamera, o condivisione schermo sono attivi" "Shows when microphone, camera, or screen sharing is active": "Mostra quando microfono, videocamera, o condivisione schermo sono attivi"
@@ -3614,6 +3647,9 @@
"Sync Mode with Portal": { "Sync Mode with Portal": {
"Sync Mode with Portal": "Modalità Sync con Portale" "Sync Mode with Portal": "Modalità Sync con Portale"
}, },
"Sync Position Across Screens": {
"Sync Position Across Screens": "Sincronizza la posizione tra gli schermi"
},
"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"
}, },
@@ -3636,7 +3672,7 @@
"System Update": "Aggiornamento Sistema" "System Update": "Aggiornamento Sistema"
}, },
"System Updater": { "System Updater": {
"System Updater": "Updater Sistema" "System Updater": "Aggiornamento Sistema"
}, },
"System Updates": { "System Updates": {
"System Updates": "Aggiornamenti Sistema" "System Updates": "Aggiornamenti Sistema"
@@ -3705,10 +3741,10 @@
"Thickness": "Spessore" "Thickness": "Spessore"
}, },
"Third-Party Plugin Warning": { "Third-Party Plugin Warning": {
"Third-Party Plugin Warning": "Avviso Plugin Terze-Parti" "Third-Party Plugin Warning": "Avviso Plugin di Terze Parti"
}, },
"Third-party plugins are created by the community and are not officially supported by DankMaterialShell.\\n\\nThese plugins may pose security and privacy risks - install at your own risk.": { "Third-party plugins are created by the community and are not officially supported by DankMaterialShell.\\n\\nThese plugins may pose security and privacy risks - install at your own risk.": {
"Third-party plugins are created by the community and are not officially supported by DankMaterialShell.\\n\\nThese plugins may pose security and privacy risks - install at your own risk.": "I plugin di terze parti sono creati dalla community e non sono ufficialmente supportati da DankMaterialShell.\\n\\nQuesti plugin possono comportare rischi per la sicurezza e la privacy - installa a proprio rischio." "Third-party plugins are created by the community and are not officially supported by DankMaterialShell.\\n\\nThese plugins may pose security and privacy risks - install at your own risk.": "I plugin di terze parti sono creati dalla community e non sono ufficialmente supportati da DankMaterialShell.\\n\\nQuesti plugin possono comportare rischi per la sicurezza e la privacy - l'installazione è a proprio rischio."
}, },
"This bind is overridden by config.kdl": { "This bind is overridden by config.kdl": {
"This bind is overridden by config.kdl": "Questa associazione di tasti è stata sovrascritta da config.kdl" "This bind is overridden by config.kdl": "Questa associazione di tasti è stata sovrascritta da config.kdl"
@@ -3837,7 +3873,10 @@
"Unavailable": "Non disponibile" "Unavailable": "Non disponibile"
}, },
"Unfocused Color": { "Unfocused Color": {
"Unfocused Color": "" "Unfocused Color": "Colore Inattivo"
},
"Ungrouped": {
"Ungrouped": "Non Raggruppato"
}, },
"Uninstall Plugin": { "Uninstall Plugin": {
"Uninstall Plugin": "Disinstalla Plugin" "Uninstall Plugin": "Disinstalla Plugin"
@@ -3882,7 +3921,7 @@
"Update Plugin": "Aggiorna Plugin" "Update Plugin": "Aggiorna Plugin"
}, },
"Urgent Color": { "Urgent Color": {
"Urgent Color": "" "Urgent Color": "Colore Urgente"
}, },
"Usage Tips": { "Usage Tips": {
"Usage Tips": "Suggerimenti d'Uso" "Usage Tips": "Suggerimenti d'Uso"
@@ -3938,9 +3977,15 @@
"Use light theme instead of dark theme": { "Use light theme instead of dark theme": {
"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": "Usa schede di notifica più piccole"
},
"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": "Usa la stessa posizione e dimensione su tutti gli schermi"
},
"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"
}, },
@@ -4178,7 +4223,7 @@
"Workspace": "Spazio di Lavoro" "Workspace": "Spazio di Lavoro"
}, },
"Workspace Appearance": { "Workspace Appearance": {
"Workspace Appearance": "" "Workspace Appearance": "Aspetto degli Spazi di Lavoro"
}, },
"Workspace Index Numbers": { "Workspace Index Numbers": {
"Workspace Index Numbers": "Numeri Indice Spazi di Lavoro" "Workspace Index Numbers": "Numeri Indice Spazi di Lavoro"
@@ -4508,7 +4553,7 @@
"No wallpaper selected": "Nessuno sfondo selezionato" "No wallpaper selected": "Nessuno sfondo selezionato"
}, },
"notification center tab": { "notification center tab": {
"Current": "Attuale", "Current": "Attuali",
"History": "Cronologia" "History": "Cronologia"
}, },
"notification history filter": { "notification history filter": {

View File

@@ -239,6 +239,9 @@
"All displays": { "All displays": {
"All displays": "すべてのディスプレイ" "All displays": "すべてのディスプレイ"
}, },
"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+←/Backspace: 戻る • F1/I: ファイル情報 • F10: ヘルプ • Esc: 閉じる" "Alt+←/Backspace: Back • F1/I: File Info • F10: Help • Esc: Close": "Alt+←/Backspace: 戻る • F1/I: ファイル情報 • F10: ヘルプ • Esc: 閉じる"
}, },
@@ -275,6 +278,9 @@
"Anonymous Identity (optional)": { "Anonymous Identity (optional)": {
"Anonymous Identity (optional)": "匿名 ID (オプション)" "Anonymous Identity (optional)": "匿名 ID (オプション)"
}, },
"App ID Substitutions": {
"App ID Substitutions": ""
},
"App Launcher": { "App Launcher": {
"App Launcher": "アプリランチャー" "App Launcher": "アプリランチャー"
}, },
@@ -722,6 +728,9 @@
"Click Import to add a .ovpn or .conf": { "Click Import to add a .ovpn or .conf": {
"Click Import to add a .ovpn or .conf": "" "Click Import to add a .ovpn or .conf": ""
}, },
"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": "" "Click any shortcut to edit. Changes save to %1": ""
}, },
@@ -1787,6 +1796,9 @@
"Grid Columns": { "Grid Columns": {
"Grid Columns": "グリッド列" "Grid Columns": "グリッド列"
}, },
"Group": {
"Group": ""
},
"Group Workspace Apps": { "Group Workspace Apps": {
"Group Workspace Apps": "" "Group Workspace Apps": ""
}, },
@@ -1796,9 +1808,15 @@
"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 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 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": ""
},
"HDR (EDID)": { "HDR (EDID)": {
"HDR (EDID)": "" "HDR (EDID)": ""
}, },
@@ -2195,6 +2213,9 @@
"Manual Show/Hide": { "Manual Show/Hide": {
"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": ""
},
"Margin": { "Margin": {
"Margin": "マージン" "Margin": "マージン"
}, },
@@ -2417,6 +2438,9 @@
"New York, NY": { "New York, NY": {
"New York, NY": "New York, NY" "New York, NY": "New York, NY"
}, },
"New group name...": {
"New group name...": ""
},
"Next Transition": { "Next Transition": {
"Next Transition": "" "Next Transition": ""
}, },
@@ -2648,6 +2672,9 @@
"Options": { "Options": {
"Options": "" "Options": ""
}, },
"Organize widgets into collapsible groups": {
"Organize widgets into collapsible groups": ""
},
"Other": { "Other": {
"Other": "他" "Other": "他"
}, },
@@ -2720,6 +2747,9 @@
"Password": { "Password": {
"Password": "パスワード" "Password": "パスワード"
}, },
"Pattern": {
"Pattern": ""
},
"Pause": { "Pause": {
"Pause": "一時停止" "Pause": "一時停止"
}, },
@@ -2981,6 +3011,9 @@
"Repeat": { "Repeat": {
"Repeat": "" "Repeat": ""
}, },
"Replacement": {
"Replacement": ""
},
"Report": { "Report": {
"Report": "報告" "Report": "報告"
}, },
@@ -3614,6 +3647,9 @@
"Sync Mode with Portal": { "Sync Mode with Portal": {
"Sync Mode with Portal": "ポータルとの同期モード" "Sync Mode with Portal": "ポータルとの同期モード"
}, },
"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": "ダークモードをシステム全体のテーマヒントの設定ポータルと同期"
}, },
@@ -3839,6 +3875,9 @@
"Unfocused Color": { "Unfocused Color": {
"Unfocused Color": "" "Unfocused Color": ""
}, },
"Ungrouped": {
"Ungrouped": ""
},
"Uninstall Plugin": { "Uninstall Plugin": {
"Uninstall Plugin": "プラグインをアンインストール" "Uninstall Plugin": "プラグインをアンインストール"
}, },
@@ -3938,9 +3977,15 @@
"Use light theme instead of dark theme": { "Use light theme instead of dark theme": {
"Use light theme instead of dark theme": "ダークテーマではなく、ライトテーマを使用" "Use light theme instead of dark theme": "ダークテーマではなく、ライトテーマを使用"
}, },
"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 trigger prefix to activate": { "Use trigger prefix to activate": {
"Use trigger prefix to activate": "" "Use trigger prefix to activate": ""
}, },

View File

@@ -239,6 +239,9 @@
"All displays": { "All displays": {
"All displays": "Wszystkie ekrany" "All displays": "Wszystkie ekrany"
}, },
"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+←/Backspace: Wstecz • F1/I: Informacje o pliku • F10: Pomoc • Esc: Zamknij" "Alt+←/Backspace: Back • F1/I: File Info • F10: Help • Esc: Close": "Alt+←/Backspace: Wstecz • F1/I: Informacje o pliku • F10: Pomoc • Esc: Zamknij"
}, },
@@ -275,6 +278,9 @@
"Anonymous Identity (optional)": { "Anonymous Identity (optional)": {
"Anonymous Identity (optional)": "Tożsamość anonimowa (opcjonalnie)" "Anonymous Identity (optional)": "Tożsamość anonimowa (opcjonalnie)"
}, },
"App ID Substitutions": {
"App ID Substitutions": ""
},
"App Launcher": { "App Launcher": {
"App Launcher": "Program Uruchamiający" "App Launcher": "Program Uruchamiający"
}, },
@@ -722,6 +728,9 @@
"Click Import to add a .ovpn or .conf": { "Click Import to add a .ovpn or .conf": {
"Click Import to add a .ovpn or .conf": "Kliknij Importuj, aby dodać plik .ovpn lub .conf" "Click Import to add a .ovpn or .conf": "Kliknij Importuj, aby dodać plik .ovpn lub .conf"
}, },
"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": "" "Click any shortcut to edit. Changes save to %1": ""
}, },
@@ -1787,6 +1796,9 @@
"Grid Columns": { "Grid Columns": {
"Grid Columns": "Kolumny siatki" "Grid Columns": "Kolumny siatki"
}, },
"Group": {
"Group": ""
},
"Group Workspace Apps": { "Group Workspace Apps": {
"Group Workspace Apps": "" "Group Workspace Apps": ""
}, },
@@ -1796,9 +1808,15 @@
"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 multiple windows of the same app together with a window count indicator": "Grupuj wiele okien tej samej aplikacji ze wskaźnikiem liczby okien" "Group multiple windows of the same app together with a window count indicator": "Grupuj wiele okien tej samej aplikacji ze wskaźnikiem liczby okien"
}, },
"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": ""
},
"HDR (EDID)": { "HDR (EDID)": {
"HDR (EDID)": "HDR (EDID)" "HDR (EDID)": "HDR (EDID)"
}, },
@@ -2195,6 +2213,9 @@
"Manual Show/Hide": { "Manual Show/Hide": {
"Manual Show/Hide": "Ręczne pokazywanie/ukrywanie" "Manual Show/Hide": "Ręczne pokazywanie/ukrywanie"
}, },
"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": "Margines" "Margin": "Margines"
}, },
@@ -2417,6 +2438,9 @@
"New York, NY": { "New York, NY": {
"New York, NY": "Nowy Jork, NY" "New York, NY": "Nowy Jork, NY"
}, },
"New group name...": {
"New group name...": ""
},
"Next Transition": { "Next Transition": {
"Next Transition": "Następne Przejście" "Next Transition": "Następne Przejście"
}, },
@@ -2648,6 +2672,9 @@
"Options": { "Options": {
"Options": "Opcje" "Options": "Opcje"
}, },
"Organize widgets into collapsible groups": {
"Organize widgets into collapsible groups": ""
},
"Other": { "Other": {
"Other": "Inne" "Other": "Inne"
}, },
@@ -2720,6 +2747,9 @@
"Password": { "Password": {
"Password": "Hasło" "Password": "Hasło"
}, },
"Pattern": {
"Pattern": ""
},
"Pause": { "Pause": {
"Pause": "Wstrzymaj" "Pause": "Wstrzymaj"
}, },
@@ -2981,6 +3011,9 @@
"Repeat": { "Repeat": {
"Repeat": "" "Repeat": ""
}, },
"Replacement": {
"Replacement": ""
},
"Report": { "Report": {
"Report": "Raport" "Report": "Raport"
}, },
@@ -3614,6 +3647,9 @@
"Sync Mode with Portal": { "Sync Mode with Portal": {
"Sync Mode with Portal": "Tryb synchronizacji z portalem" "Sync Mode with Portal": "Tryb synchronizacji z portalem"
}, },
"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": "Synchronizuj ciemny motyw z systemem" "Sync dark mode with settings portals for system-wide theme hints": "Synchronizuj ciemny motyw z systemem"
}, },
@@ -3839,6 +3875,9 @@
"Unfocused Color": { "Unfocused Color": {
"Unfocused Color": "" "Unfocused Color": ""
}, },
"Ungrouped": {
"Ungrouped": ""
},
"Uninstall Plugin": { "Uninstall Plugin": {
"Uninstall Plugin": "Odinstaluj wtyczkę" "Uninstall Plugin": "Odinstaluj wtyczkę"
}, },
@@ -3938,9 +3977,15 @@
"Use light theme instead of dark theme": { "Use light theme instead of dark theme": {
"Use light theme instead of dark theme": "Użyj jasnego motywu zamiast ciemnego" "Use light theme instead of dark theme": "Użyj jasnego motywu zamiast ciemnego"
}, },
"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": "Użyj motywu dźwiękowego z ustawień systemowych" "Use sound theme from system settings": "Użyj motywu dźwiękowego z ustawień systemowych"
}, },
"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": ""
}, },

View File

@@ -231,7 +231,7 @@
"All": "Todos" "All": "Todos"
}, },
"All Monitors": { "All Monitors": {
"All Monitors": "" "All Monitors": "Todos os Monitores"
}, },
"All day": { "All day": {
"All day": "O dia todo" "All day": "O dia todo"
@@ -239,6 +239,9 @@
"All displays": { "All displays": {
"All displays": "Todos as Telas" "All displays": "Todos as Telas"
}, },
"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+←/Backspace: Voltar • F1/I: Informações de Arquivo • F10: Ajuda • Esc: Fechar" "Alt+←/Backspace: Back • F1/I: File Info • F10: Help • Esc: Close": "Alt+←/Backspace: Voltar • F1/I: Informações de Arquivo • F10: Ajuda • Esc: Fechar"
}, },
@@ -275,6 +278,9 @@
"Anonymous Identity (optional)": { "Anonymous Identity (optional)": {
"Anonymous Identity (optional)": "Identidade Anônima (opcional)" "Anonymous Identity (optional)": "Identidade Anônima (opcional)"
}, },
"App ID Substitutions": {
"App ID Substitutions": ""
},
"App Launcher": { "App Launcher": {
"App Launcher": "Lançador de Apps" "App Launcher": "Lançador de Apps"
}, },
@@ -722,6 +728,9 @@
"Click Import to add a .ovpn or .conf": { "Click Import to add a .ovpn or .conf": {
"Click Import to add a .ovpn or .conf": "Clique em Importar para adicionar um arquivo .ovpn ou .conf" "Click Import to add a .ovpn or .conf": "Clique em Importar para adicionar um arquivo .ovpn ou .conf"
}, },
"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": "" "Click any shortcut to edit. Changes save to %1": ""
}, },
@@ -819,7 +828,7 @@
"Config Format": "" "Config Format": ""
}, },
"Config action: %1": { "Config action: %1": {
"Config action: %1": "" "Config action: %1": "Configurar ação: %1"
}, },
"Config validation failed": { "Config validation failed": {
"Config validation failed": "" "Config validation failed": ""
@@ -981,10 +990,10 @@
"Custom Color": "" "Custom Color": ""
}, },
"Custom Duration": { "Custom Duration": {
"Custom Duration": "" "Custom Duration": "Duração Personalizada"
}, },
"Custom Hibernate Command": { "Custom Hibernate Command": {
"Custom Hibernate Command": "" "Custom Hibernate Command": "Comando Personalizado Para Hibernar"
}, },
"Custom Location": { "Custom Location": {
"Custom Location": "Customizar Localização" "Custom Location": "Customizar Localização"
@@ -993,19 +1002,19 @@
"Custom Lock Command": "" "Custom Lock Command": ""
}, },
"Custom Logout Command": { "Custom Logout Command": {
"Custom Logout Command": "" "Custom Logout Command": "Comando Personalizado Para Sair"
}, },
"Custom Power Actions": { "Custom Power Actions": {
"Custom Power Actions": "Ações de Energia Customizadas" "Custom Power Actions": "Ações de Energia Customizadas"
}, },
"Custom Power Off Command": { "Custom Power Off Command": {
"Custom Power Off Command": "" "Custom Power Off Command": "Comando Personalizado Para Desligar"
}, },
"Custom Reboot Command": { "Custom Reboot Command": {
"Custom Reboot Command": "" "Custom Reboot Command": "Comando Personalizado Para Reiniciar"
}, },
"Custom Suspend Command": { "Custom Suspend Command": {
"Custom Suspend Command": "" "Custom Suspend Command": "Comando Personalizado Para Suspender"
}, },
"Custom Transparency": { "Custom Transparency": {
"Custom Transparency": "Transparência Customizada" "Custom Transparency": "Transparência Customizada"
@@ -1212,7 +1221,7 @@
"Display Settings": "" "Display Settings": ""
}, },
"Display a dock with pinned and running applications": { "Display a dock with pinned and running applications": {
"Display a dock with pinned and running applications": "" "Display a dock with pinned and running applications": "Exibir um dock com aplicativos fixados e abertos"
}, },
"Display all priorities over fullscreen apps": { "Display all priorities over fullscreen apps": {
"Display all priorities over fullscreen apps": "Exibir todas as prioridades em aplicativos de tela cheia" "Display all priorities over fullscreen apps": "Exibir todas as prioridades em aplicativos de tela cheia"
@@ -1242,13 +1251,13 @@
"Display power menu actions in a grid instead of a list": "Mostra as ações do menu de energia em uma grade ao invés de uma lista" "Display power menu actions in a grid instead of a list": "Mostra as ações do menu de energia em uma grade ao invés de uma lista"
}, },
"Display seconds in the clock": { "Display seconds in the clock": {
"Display seconds in the clock": "" "Display seconds in the clock": "Exibir segundos no relógio"
}, },
"Display the power system menu": { "Display the power system menu": {
"Display the power system menu": "Mostra o menu de energia do sistema" "Display the power system menu": "Mostra o menu de energia do sistema"
}, },
"Display volume and brightness percentage values in OSD popups": { "Display volume and brightness percentage values in OSD popups": {
"Display volume and brightness percentage values in OSD popups": "" "Display volume and brightness percentage values in OSD popups": "Exibir porcentagem de volume e brilho nos pop-ups OSD"
}, },
"Displays": { "Displays": {
"Displays": "Telas" "Displays": "Telas"
@@ -1266,7 +1275,7 @@
"Dock": "Dock" "Dock": "Dock"
}, },
"Dock & Launcher": { "Dock & Launcher": {
"Dock & Launcher": "" "Dock & Launcher": "Dock & Lançador"
}, },
"Dock Position": { "Dock Position": {
"Dock Position": "Posição da Dock" "Dock Position": "Posição da Dock"
@@ -1275,7 +1284,7 @@
"Dock Transparency": "Transparência da Dock" "Dock Transparency": "Transparência da Dock"
}, },
"Dock Visibility": { "Dock Visibility": {
"Dock Visibility": "" "Dock Visibility": "Visibilidade do Dock"
}, },
"Docs": { "Docs": {
"Docs": "" "Docs": ""
@@ -1335,7 +1344,7 @@
"Enable Desktop Clock": "" "Enable Desktop Clock": ""
}, },
"Enable Do Not Disturb": { "Enable Do Not Disturb": {
"Enable Do Not Disturb": "" "Enable Do Not Disturb": "Habilitar Não Perturbe"
}, },
"Enable GPU Temperature": { "Enable GPU Temperature": {
"Enable GPU Temperature": "Habilitar Temperatura da GPU" "Enable GPU Temperature": "Habilitar Temperatura da GPU"
@@ -1629,7 +1638,7 @@
"File Information": "Informação do Arquivo" "File Information": "Informação do Arquivo"
}, },
"Files": { "Files": {
"Files": "" "Files": "Arquivos"
}, },
"Filesystem usage monitoring": { "Filesystem usage monitoring": {
"Filesystem usage monitoring": "" "Filesystem usage monitoring": ""
@@ -1644,7 +1653,7 @@
"Fine-tune animation timing in milliseconds": "" "Fine-tune animation timing in milliseconds": ""
}, },
"First Time Setup": { "First Time Setup": {
"First Time Setup": "" "First Time Setup": "Configuração Inicial"
}, },
"Fix Now": { "Fix Now": {
"Fix Now": "Consertar Agora" "Fix Now": "Consertar Agora"
@@ -1787,6 +1796,9 @@
"Grid Columns": { "Grid Columns": {
"Grid Columns": "Colunas da Grade" "Grid Columns": "Colunas da Grade"
}, },
"Group": {
"Group": ""
},
"Group Workspace Apps": { "Group Workspace Apps": {
"Group Workspace Apps": "" "Group Workspace Apps": ""
}, },
@@ -1796,9 +1808,15 @@
"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 multiple windows of the same app together with a window count indicator": "Agrupar múltiplas janelas do mesmo app com um indicador de número de janelas" "Group multiple windows of the same app together with a window count indicator": "Agrupar múltiplas janelas do mesmo app com um indicador de número de janelas"
}, },
"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": ""
},
"HDR (EDID)": { "HDR (EDID)": {
"HDR (EDID)": "" "HDR (EDID)": ""
}, },
@@ -1836,7 +1854,7 @@
"Hide Delay": "" "Hide Delay": ""
}, },
"Hide When Typing": { "Hide When Typing": {
"Hide When Typing": "" "Hide When Typing": "Ocultar ao Digitar"
}, },
"Hide When Windows Open": { "Hide When Windows Open": {
"Hide When Windows Open": "" "Hide When Windows Open": ""
@@ -1944,7 +1962,7 @@
"Import VPN": "Importar VPN" "Import VPN": "Importar VPN"
}, },
"Inactive Monitor Color": { "Inactive Monitor Color": {
"Inactive Monitor Color": "" "Inactive Monitor Color": "Cor do Monitor Inativo"
}, },
"Include Transitions": { "Include Transitions": {
"Include Transitions": "Incluir Transições" "Include Transitions": "Incluir Transições"
@@ -2195,6 +2213,9 @@
"Manual Show/Hide": { "Manual Show/Hide": {
"Manual Show/Hide": "Mostrar/Esconder Manualmente" "Manual Show/Hide": "Mostrar/Esconder Manualmente"
}, },
"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": "Margem" "Margin": "Margem"
}, },
@@ -2417,6 +2438,9 @@
"New York, NY": { "New York, NY": {
"New York, NY": "Nova York, NY" "New York, NY": "Nova York, NY"
}, },
"New group name...": {
"New group name...": ""
},
"Next Transition": { "Next Transition": {
"Next Transition": "Próxima Transição" "Next Transition": "Próxima Transição"
}, },
@@ -2648,6 +2672,9 @@
"Options": { "Options": {
"Options": "Opções" "Options": "Opções"
}, },
"Organize widgets into collapsible groups": {
"Organize widgets into collapsible groups": ""
},
"Other": { "Other": {
"Other": "Outro" "Other": "Outro"
}, },
@@ -2720,6 +2747,9 @@
"Password": { "Password": {
"Password": "Senha" "Password": "Senha"
}, },
"Pattern": {
"Pattern": ""
},
"Pause": { "Pause": {
"Pause": "Pausar" "Pause": "Pausar"
}, },
@@ -2748,13 +2778,13 @@
"Personalization": "Personalização" "Personalization": "Personalização"
}, },
"Pin": { "Pin": {
"Pin": "" "Pin": "Fixar"
}, },
"Pin to Dock": { "Pin to Dock": {
"Pin to Dock": "Fixar ao Dock" "Pin to Dock": "Fixar ao Dock"
}, },
"Pinned": { "Pinned": {
"Pinned": "" "Pinned": "Fixado"
}, },
"Place plugin directories here. Each plugin should have a plugin.json manifest file.": { "Place plugin directories here. Each plugin should have a plugin.json manifest file.": {
"Place plugin directories here. Each plugin should have a plugin.json manifest file.": "Use este local para os diretórios de plugin. Cada plugin deve ter um arquivo de manifesto plugin.json." "Place plugin directories here. Each plugin should have a plugin.json manifest file.": "Use este local para os diretórios de plugin. Cada plugin deve ter um arquivo de manifesto plugin.json."
@@ -2981,6 +3011,9 @@
"Repeat": { "Repeat": {
"Repeat": "" "Repeat": ""
}, },
"Replacement": {
"Replacement": ""
},
"Report": { "Report": {
"Report": "Relatório" "Report": "Relatório"
}, },
@@ -3369,7 +3402,7 @@
"Show Restart DMS": "Mostrar Reiniciar DMS" "Show Restart DMS": "Mostrar Reiniciar DMS"
}, },
"Show Seconds": { "Show Seconds": {
"Show Seconds": "" "Show Seconds": "Mostrar Segundos"
}, },
"Show Sunrise/Sunset": { "Show Sunrise/Sunset": {
"Show Sunrise/Sunset": "" "Show Sunrise/Sunset": ""
@@ -3614,6 +3647,9 @@
"Sync Mode with Portal": { "Sync Mode with Portal": {
"Sync Mode with Portal": "Sincronizar Modo Com Portal" "Sync Mode with Portal": "Sincronizar Modo Com Portal"
}, },
"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": "Sincronize o modo escuro com os portais de configurações para ter indicações de temas em todo o sistema" "Sync dark mode with settings portals for system-wide theme hints": "Sincronize o modo escuro com os portais de configurações para ter indicações de temas em todo o sistema"
}, },
@@ -3839,6 +3875,9 @@
"Unfocused Color": { "Unfocused Color": {
"Unfocused Color": "" "Unfocused Color": ""
}, },
"Ungrouped": {
"Ungrouped": ""
},
"Uninstall Plugin": { "Uninstall Plugin": {
"Uninstall Plugin": "Desinstalar Plugin" "Uninstall Plugin": "Desinstalar Plugin"
}, },
@@ -3858,7 +3897,7 @@
"Unknown Network": "" "Unknown Network": ""
}, },
"Unpin": { "Unpin": {
"Unpin": "" "Unpin": "Desafixar"
}, },
"Unpin from Dock": { "Unpin from Dock": {
"Unpin from Dock": "Desafixar do Dock" "Unpin from Dock": "Desafixar do Dock"
@@ -3938,9 +3977,15 @@
"Use light theme instead of dark theme": { "Use light theme instead of dark theme": {
"Use light theme instead of dark theme": "Usar tema claro em vez de escuro" "Use light theme instead of dark theme": "Usar tema claro em vez de escuro"
}, },
"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": "Usar tema de som das configurações do sistema" "Use sound theme from system settings": "Usar tema de som das configurações do sistema"
}, },
"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": ""
}, },
@@ -4649,10 +4694,10 @@
"Use an external wallpaper manager like swww, hyprpaper, or swaybg.": "" "Use an external wallpaper manager like swww, hyprpaper, or swaybg.": ""
}, },
"wallpaper settings disable toggle": { "wallpaper settings disable toggle": {
"Disable Built-in Wallpapers": "" "Disable Built-in Wallpapers": "Desabilitar Papéis de Parede Embutidos"
}, },
"wallpaper settings external management": { "wallpaper settings external management": {
"External Wallpaper Management": "" "External Wallpaper Management": "Gerenciamento Externo de Papéis de Parede"
}, },
"wtype not available - install wtype for paste support": { "wtype not available - install wtype for paste support": {
"wtype not available - install wtype for paste support": "" "wtype not available - install wtype for paste support": ""

View File

@@ -239,6 +239,9 @@
"All displays": { "All displays": {
"All displays": "Tüm ekranlar" "All displays": "Tüm ekranlar"
}, },
"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+←/Backspace: Geri • F1/I: Dosya bilgisi • F10: Yardım • Esc: Kapat" "Alt+←/Backspace: Back • F1/I: File Info • F10: Help • Esc: Close": "Alt+←/Backspace: Geri • F1/I: Dosya bilgisi • F10: Yardım • Esc: Kapat"
}, },
@@ -275,6 +278,9 @@
"Anonymous Identity (optional)": { "Anonymous Identity (optional)": {
"Anonymous Identity (optional)": "Anonim Kimlik (isteğe bağlı)" "Anonymous Identity (optional)": "Anonim Kimlik (isteğe bağlı)"
}, },
"App ID Substitutions": {
"App ID Substitutions": ""
},
"App Launcher": { "App Launcher": {
"App Launcher": "Uygulama Başlatıcı" "App Launcher": "Uygulama Başlatıcı"
}, },
@@ -722,6 +728,9 @@
"Click Import to add a .ovpn or .conf": { "Click Import to add a .ovpn or .conf": {
"Click Import to add a .ovpn or .conf": ".ovpn veya .conf dosyası eklemek için İçe Aktar'ı tıklayın." "Click Import to add a .ovpn or .conf": ".ovpn veya .conf dosyası eklemek için İçe Aktar'ı tıklayın."
}, },
"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": "" "Click any shortcut to edit. Changes save to %1": ""
}, },
@@ -1787,6 +1796,9 @@
"Grid Columns": { "Grid Columns": {
"Grid Columns": "Izgara Sütunları" "Grid Columns": "Izgara Sütunları"
}, },
"Group": {
"Group": ""
},
"Group Workspace Apps": { "Group Workspace Apps": {
"Group Workspace Apps": "" "Group Workspace Apps": ""
}, },
@@ -1796,9 +1808,15 @@
"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 multiple windows of the same app together with a window count indicator": "Aynı uygulamanın birden fazla penceresini pencere sayısı göstergesi ile gruplayın" "Group multiple windows of the same app together with a window count indicator": "Aynı uygulamanın birden fazla penceresini pencere sayısı göstergesi ile gruplayın"
}, },
"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": ""
},
"HDR (EDID)": { "HDR (EDID)": {
"HDR (EDID)": "HDR (EDID)" "HDR (EDID)": "HDR (EDID)"
}, },
@@ -2195,6 +2213,9 @@
"Manual Show/Hide": { "Manual Show/Hide": {
"Manual Show/Hide": "Manuel Göster/Gizle" "Manual Show/Hide": "Manuel Göster/Gizle"
}, },
"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": "Kenar Boşluğu" "Margin": "Kenar Boşluğu"
}, },
@@ -2417,6 +2438,9 @@
"New York, NY": { "New York, NY": {
"New York, NY": "New York, NY" "New York, NY": "New York, NY"
}, },
"New group name...": {
"New group name...": ""
},
"Next Transition": { "Next Transition": {
"Next Transition": "Sonraki Geçiş" "Next Transition": "Sonraki Geçiş"
}, },
@@ -2648,6 +2672,9 @@
"Options": { "Options": {
"Options": "Seçenekler" "Options": "Seçenekler"
}, },
"Organize widgets into collapsible groups": {
"Organize widgets into collapsible groups": ""
},
"Other": { "Other": {
"Other": "Diğer" "Other": "Diğer"
}, },
@@ -2720,6 +2747,9 @@
"Password": { "Password": {
"Password": "Parola" "Password": "Parola"
}, },
"Pattern": {
"Pattern": ""
},
"Pause": { "Pause": {
"Pause": "Duraklat" "Pause": "Duraklat"
}, },
@@ -2981,6 +3011,9 @@
"Repeat": { "Repeat": {
"Repeat": "" "Repeat": ""
}, },
"Replacement": {
"Replacement": ""
},
"Report": { "Report": {
"Report": "Rapor" "Report": "Rapor"
}, },
@@ -3614,6 +3647,9 @@
"Sync Mode with Portal": { "Sync Mode with Portal": {
"Sync Mode with Portal": "Modu Portal ile Eşitle" "Sync Mode with Portal": "Modu Portal ile Eşitle"
}, },
"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": "Sistem genelindeki tema ipuçları için karanlık modu ayar portalları ile senkronize et" "Sync dark mode with settings portals for system-wide theme hints": "Sistem genelindeki tema ipuçları için karanlık modu ayar portalları ile senkronize et"
}, },
@@ -3839,6 +3875,9 @@
"Unfocused Color": { "Unfocused Color": {
"Unfocused Color": "" "Unfocused Color": ""
}, },
"Ungrouped": {
"Ungrouped": ""
},
"Uninstall Plugin": { "Uninstall Plugin": {
"Uninstall Plugin": "Eklentiyi Kaldır" "Uninstall Plugin": "Eklentiyi Kaldır"
}, },
@@ -3938,9 +3977,15 @@
"Use light theme instead of dark theme": { "Use light theme instead of dark theme": {
"Use light theme instead of dark theme": "Karanlık tema yerine aydınlık tema kullan" "Use light theme instead of dark theme": "Karanlık tema yerine aydınlık tema kullan"
}, },
"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": "Sistem ayarlarındaki ses temasını kullan" "Use sound theme from system settings": "Sistem ayarlarındaki ses temasını kullan"
}, },
"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": ""
}, },

View File

@@ -21,10 +21,10 @@
"%1 display(s)": "%1 显示" "%1 display(s)": "%1 显示"
}, },
"%1 exists but is not included in config. Custom keybinds will not work until this is fixed.": { "%1 exists but is not included in config. Custom keybinds will not work until this is fixed.": {
"%1 exists but is not included in config. Custom keybinds will not work until this is fixed.": "" "%1 exists but is not included in config. Custom keybinds will not work until this is fixed.": "%1存在但并未被包含至配置文件。在此问题修复前自定义快捷键绑定将不会生效。"
}, },
"%1 is now included in config": { "%1 is now included in config": {
"%1 is now included in config": "" "%1 is now included in config": "%1现在已被包含至配置文件"
}, },
"%1 job(s)": { "%1 job(s)": {
"%1 job(s)": "%1 个任务" "%1 job(s)": "%1 个任务"
@@ -239,6 +239,9 @@
"All displays": { "All displays": {
"All displays": "所有显示器" "All displays": "所有显示器"
}, },
"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: 关闭"
}, },
@@ -275,6 +278,9 @@
"Anonymous Identity (optional)": { "Anonymous Identity (optional)": {
"Anonymous Identity (optional)": "匿名身份(可选)" "Anonymous Identity (optional)": "匿名身份(可选)"
}, },
"App ID Substitutions": {
"App ID Substitutions": "应用ID替换"
},
"App Launcher": { "App Launcher": {
"App Launcher": "启动器" "App Launcher": "启动器"
}, },
@@ -708,7 +714,7 @@
"Clear at Startup": "启动时清除" "Clear at Startup": "启动时清除"
}, },
"Click 'Setup' to create %1 and add include to config.": { "Click 'Setup' to create %1 and add include to config.": {
"Click 'Setup' to create %1 and add include to config.": "" "Click 'Setup' to create %1 and add include to config.": "点击设置以创建%1并将其包含至配置文件。"
}, },
"Click 'Setup' to create cursor config and add include to your compositor config.": { "Click 'Setup' to create cursor config and add include to your compositor config.": {
"Click 'Setup' to create cursor config and add include to your compositor config.": "点击设置以创建光标配置,并导入至合成器配置文件。" "Click 'Setup' to create cursor config and add include to your compositor config.": "点击设置以创建光标配置,并导入至合成器配置文件。"
@@ -722,8 +728,11 @@
"Click Import to add a .ovpn or .conf": { "Click Import to add a .ovpn or .conf": {
"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 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": "" "Click any shortcut to edit. Changes save to %1": "点击任意快捷方式以编辑。更改将保存至%1。"
}, },
"Click any shortcut to edit. Changes save to dms/binds.kdl": { "Click any shortcut to edit. Changes save to dms/binds.kdl": {
"Click any shortcut to edit. Changes save to dms/binds.kdl": "点击任意快捷方式进行编辑。更改将保存到 dms/binds.kdl" "Click any shortcut to edit. Changes save to dms/binds.kdl": "点击任意快捷方式进行编辑。更改将保存到 dms/binds.kdl"
@@ -1653,7 +1662,7 @@
"Fixing...": "正在修复..." "Fixing...": "正在修复..."
}, },
"Flags": { "Flags": {
"Flags": "" "Flags": "标签"
}, },
"Flipped": { "Flipped": {
"Flipped": "翻转" "Flipped": "翻转"
@@ -1671,16 +1680,16 @@
"Focus at Startup": "启动时聚焦" "Focus at Startup": "启动时聚焦"
}, },
"Focused Border": { "Focused Border": {
"Focused Border": "" "Focused Border": "聚焦边框"
}, },
"Focused Color": { "Focused Color": {
"Focused Color": "" "Focused Color": "聚焦颜色"
}, },
"Focused Window": { "Focused Window": {
"Focused Window": "当前窗口" "Focused Window": "当前窗口"
}, },
"Follow Monitor Focus": { "Follow Monitor Focus": {
"Follow Monitor Focus": "" "Follow Monitor Focus": "遵守显示器聚焦"
}, },
"Follow focus": { "Follow focus": {
"Follow focus": "跟随焦点" "Follow focus": "跟随焦点"
@@ -1787,6 +1796,9 @@
"Grid Columns": { "Grid Columns": {
"Grid Columns": "网格列" "Grid Columns": "网格列"
}, },
"Group": {
"Group": "分组"
},
"Group Workspace Apps": { "Group Workspace Apps": {
"Group Workspace Apps": "分组工作区应用" "Group Workspace Apps": "分组工作区应用"
}, },
@@ -1796,9 +1808,15 @@
"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 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 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": "分组"
},
"HDR (EDID)": { "HDR (EDID)": {
"HDR (EDID)": "HDREDID" "HDR (EDID)": "HDREDID"
}, },
@@ -1827,7 +1845,7 @@
"Hibernate": "休眠" "Hibernate": "休眠"
}, },
"Hidden": { "Hidden": {
"Hidden": "" "Hidden": "已隐藏"
}, },
"Hidden Network": { "Hidden Network": {
"Hidden Network": "隐藏的网络" "Hidden Network": "隐藏的网络"
@@ -2148,7 +2166,7 @@
"Lock fade grace period": "锁定淡出时间" "Lock fade grace period": "锁定淡出时间"
}, },
"Locked": { "Locked": {
"Locked": "" "Locked": "已锁定"
}, },
"Log Out": { "Log Out": {
"Log Out": "注销" "Log Out": "注销"
@@ -2160,7 +2178,7 @@
"Long Text": "长文本" "Long Text": "长文本"
}, },
"Long press": { "Long press": {
"Long press": "" "Long press": "长按"
}, },
"Longitude": { "Longitude": {
"Longitude": "经度" "Longitude": "经度"
@@ -2195,6 +2213,9 @@
"Manual Show/Hide": { "Manual Show/Hide": {
"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": "将窗口类名称映射到图标名称以实现正确的图标显示"
},
"Margin": { "Margin": {
"Margin": "边距" "Margin": "边距"
}, },
@@ -2417,6 +2438,9 @@
"New York, NY": { "New York, NY": {
"New York, NY": "纽约,美国纽约州" "New York, NY": "纽约,美国纽约州"
}, },
"New group name...": {
"New group name...": "新分组名..."
},
"Next Transition": { "Next Transition": {
"Next Transition": "下一过渡" "Next Transition": "下一过渡"
}, },
@@ -2648,6 +2672,9 @@
"Options": { "Options": {
"Options": "选项" "Options": "选项"
}, },
"Organize widgets into collapsible groups": {
"Organize widgets into collapsible groups": "将部件组织成可折叠分组"
},
"Other": { "Other": {
"Other": "其他" "Other": "其他"
}, },
@@ -2720,6 +2747,9 @@
"Password": { "Password": {
"Password": "密码" "Password": "密码"
}, },
"Pattern": {
"Pattern": "模式"
},
"Pause": { "Pause": {
"Pause": "暂停" "Pause": "暂停"
}, },
@@ -2967,7 +2997,7 @@
"Reject Jobs": "拒绝任务" "Reject Jobs": "拒绝任务"
}, },
"Release": { "Release": {
"Release": "" "Release": "松开"
}, },
"Reload Plugin": { "Reload Plugin": {
"Reload Plugin": "重载插件" "Reload Plugin": "重载插件"
@@ -2979,7 +3009,10 @@
"Remove gaps and border when windows are maximized": "当窗口最大化时移除间距和边框" "Remove gaps and border when windows are maximized": "当窗口最大化时移除间距和边框"
}, },
"Repeat": { "Repeat": {
"Repeat": "" "Repeat": "重复"
},
"Replacement": {
"Replacement": "替换"
}, },
"Report": { "Report": {
"Report": "报告" "Report": "报告"
@@ -3396,7 +3429,7 @@
"Show all 9 tags instead of only occupied tags (DWL only)": "显示所有 9 个标签,而非仅占用的标签(仅限 DWL" "Show all 9 tags instead of only occupied tags (DWL only)": "显示所有 9 个标签,而非仅占用的标签(仅限 DWL"
}, },
"Show an outline ring around the focused workspace indicator": { "Show an outline ring around the focused workspace indicator": {
"Show an outline ring around the focused workspace indicator": "" "Show an outline ring around the focused workspace indicator": "在聚焦工作区指示器周围显示一个轮廓环"
}, },
"Show cava audio visualizer in media widget": { "Show cava audio visualizer in media widget": {
"Show cava audio visualizer in media widget": "在多媒体部件中显示cava音频可视化" "Show cava audio visualizer in media widget": "在多媒体部件中显示cava音频可视化"
@@ -3468,7 +3501,7 @@
"Show workspace name on horizontal bars, and first letter on vertical bars": "在水平状态栏上显示工作区名称,而在垂直状态栏上显示首字母。" "Show workspace name on horizontal bars, and first letter on vertical bars": "在水平状态栏上显示工作区名称,而在垂直状态栏上显示首字母。"
}, },
"Show workspaces of the currently focused monitor": { "Show workspaces of the currently focused monitor": {
"Show workspaces of the currently focused monitor": "" "Show workspaces of the currently focused monitor": "显示当前聚焦显示器的工作区"
}, },
"Shows all running applications with focus indication": { "Shows all running applications with focus indication": {
"Shows all running applications with focus indication": "显示所有正在运行应用程序,并标记焦点所在" "Shows all running applications with focus indication": "显示所有正在运行应用程序,并标记焦点所在"
@@ -3614,6 +3647,9 @@
"Sync Mode with Portal": { "Sync Mode with Portal": {
"Sync Mode with Portal": "同步系统深色模式" "Sync Mode with Portal": "同步系统深色模式"
}, },
"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": "随系统设置开启深色模式,以适配全局主题"
}, },
@@ -3837,7 +3873,10 @@
"Unavailable": "不可用" "Unavailable": "不可用"
}, },
"Unfocused Color": { "Unfocused Color": {
"Unfocused Color": "" "Unfocused Color": "未聚焦颜色"
},
"Ungrouped": {
"Ungrouped": "已解除分组"
}, },
"Uninstall Plugin": { "Uninstall Plugin": {
"Uninstall Plugin": "卸载插件" "Uninstall Plugin": "卸载插件"
@@ -3882,7 +3921,7 @@
"Update Plugin": "更新插件" "Update Plugin": "更新插件"
}, },
"Urgent Color": { "Urgent Color": {
"Urgent Color": "" "Urgent Color": "高亮颜色"
}, },
"Usage Tips": { "Usage Tips": {
"Usage Tips": "使用提示" "Usage Tips": "使用提示"
@@ -3938,9 +3977,15 @@
"Use light theme instead of dark theme": { "Use light theme instead of dark theme": {
"Use light theme instead of dark theme": "使用浅色主题替代深色主题" "Use light theme instead of dark theme": "使用浅色主题替代深色主题"
}, },
"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 trigger prefix to activate": { "Use trigger prefix to activate": {
"Use trigger prefix to activate": "使用触发前缀以激活" "Use trigger prefix to activate": "使用触发前缀以激活"
}, },
@@ -4178,7 +4223,7 @@
"Workspace": "工作区" "Workspace": "工作区"
}, },
"Workspace Appearance": { "Workspace Appearance": {
"Workspace Appearance": "" "Workspace Appearance": "工作区外观"
}, },
"Workspace Index Numbers": { "Workspace Index Numbers": {
"Workspace Index Numbers": "工作区序号" "Workspace Index Numbers": "工作区序号"
@@ -4367,7 +4412,7 @@
"Night mode & gamma": "夜间模式与伽玛", "Night mode & gamma": "夜间模式与伽玛",
"Per-screen config": "按屏幕区分设置", "Per-screen config": "按屏幕区分设置",
"Quick system toggles": "快速系统切换", "Quick system toggles": "快速系统切换",
"Security & privacy": "" "Security & privacy": "安全与隐私"
}, },
"greeter feature card title": { "greeter feature card title": {
"App Theming": "应用主题", "App Theming": "应用主题",
@@ -4631,7 +4676,7 @@
"update dms for NM integration.": "更新 DMS 以集成 NM" "update dms for NM integration.": "更新 DMS 以集成 NM"
}, },
"version requirement": { "version requirement": {
"Requires %1": "" "Requires %1": "需要%1"
}, },
"wallpaper directory file browser title": { "wallpaper directory file browser title": {
"Select Wallpaper Directory": "选择壁纸位置" "Select Wallpaper Directory": "选择壁纸位置"

View File

@@ -239,6 +239,9 @@
"All displays": { "All displays": {
"All displays": "所有螢幕" "All displays": "所有螢幕"
}, },
"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+←/Backspace: 返回 • F1/I: 檔案資訊 • F10: 幫助 • Esc: 關閉" "Alt+←/Backspace: Back • F1/I: File Info • F10: Help • Esc: Close": "Alt+←/Backspace: 返回 • F1/I: 檔案資訊 • F10: 幫助 • Esc: 關閉"
}, },
@@ -275,6 +278,9 @@
"Anonymous Identity (optional)": { "Anonymous Identity (optional)": {
"Anonymous Identity (optional)": "匿名身分 (可選)" "Anonymous Identity (optional)": "匿名身分 (可選)"
}, },
"App ID Substitutions": {
"App ID Substitutions": ""
},
"App Launcher": { "App Launcher": {
"App Launcher": "應用程式啟動器" "App Launcher": "應用程式啟動器"
}, },
@@ -722,6 +728,9 @@
"Click Import to add a .ovpn or .conf": { "Click Import to add a .ovpn or .conf": {
"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 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"
}, },
@@ -1787,6 +1796,9 @@
"Grid Columns": { "Grid Columns": {
"Grid Columns": "網格欄數" "Grid Columns": "網格欄數"
}, },
"Group": {
"Group": ""
},
"Group Workspace Apps": { "Group Workspace Apps": {
"Group Workspace Apps": "群組工作區應用程式" "Group Workspace Apps": "群組工作區應用程式"
}, },
@@ -1796,9 +1808,15 @@
"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 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 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": ""
},
"HDR (EDID)": { "HDR (EDID)": {
"HDR (EDID)": "HDR (EDID)" "HDR (EDID)": "HDR (EDID)"
}, },
@@ -2195,6 +2213,9 @@
"Manual Show/Hide": { "Manual Show/Hide": {
"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": ""
},
"Margin": { "Margin": {
"Margin": "邊距" "Margin": "邊距"
}, },
@@ -2417,6 +2438,9 @@
"New York, NY": { "New York, NY": {
"New York, NY": "紐約" "New York, NY": "紐約"
}, },
"New group name...": {
"New group name...": ""
},
"Next Transition": { "Next Transition": {
"Next Transition": "下一個轉場" "Next Transition": "下一個轉場"
}, },
@@ -2648,6 +2672,9 @@
"Options": { "Options": {
"Options": "選項" "Options": "選項"
}, },
"Organize widgets into collapsible groups": {
"Organize widgets into collapsible groups": ""
},
"Other": { "Other": {
"Other": "其他" "Other": "其他"
}, },
@@ -2720,6 +2747,9 @@
"Password": { "Password": {
"Password": "密碼" "Password": "密碼"
}, },
"Pattern": {
"Pattern": ""
},
"Pause": { "Pause": {
"Pause": "暫停" "Pause": "暫停"
}, },
@@ -2981,6 +3011,9 @@
"Repeat": { "Repeat": {
"Repeat": "重複" "Repeat": "重複"
}, },
"Replacement": {
"Replacement": ""
},
"Report": { "Report": {
"Report": "報告" "Report": "報告"
}, },
@@ -3614,6 +3647,9 @@
"Sync Mode with Portal": { "Sync Mode with Portal": {
"Sync Mode with Portal": "透過 Portal 同步主題模式" "Sync Mode with Portal": "透過 Portal 同步主題模式"
}, },
"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": "將暗模式與設定入口網站同步以取得系統範圍的主題提示"
}, },
@@ -3839,6 +3875,9 @@
"Unfocused Color": { "Unfocused Color": {
"Unfocused Color": "" "Unfocused Color": ""
}, },
"Ungrouped": {
"Ungrouped": ""
},
"Uninstall Plugin": { "Uninstall Plugin": {
"Uninstall Plugin": "解除安裝插件" "Uninstall Plugin": "解除安裝插件"
}, },
@@ -3938,9 +3977,15 @@
"Use light theme instead of dark theme": { "Use light theme instead of dark theme": {
"Use light theme instead of dark theme": "使用淺色主題而不是深色主題" "Use light theme instead of dark theme": "使用淺色主題而不是深色主題"
}, },
"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 trigger prefix to activate": { "Use trigger prefix to activate": {
"Use trigger prefix to activate": "使用觸發前綴啟用" "Use trigger prefix to activate": "使用觸發前綴啟用"
}, },

View File

@@ -580,6 +580,13 @@
"reference": "", "reference": "",
"comment": "" "comment": ""
}, },
{
"term": "Allow clicks to pass through the widget",
"translation": "",
"context": "",
"reference": "",
"comment": ""
},
{ {
"term": "Alt+←/Backspace: Back • F1/I: File Info • F10: Help • Esc: Close", "term": "Alt+←/Backspace: Back • F1/I: File Info • F10: Help • Esc: Close",
"translation": "", "translation": "",
@@ -678,6 +685,13 @@
"reference": "", "reference": "",
"comment": "" "comment": ""
}, },
{
"term": "App ID Substitutions",
"translation": "",
"context": "",
"reference": "",
"comment": ""
},
{ {
"term": "App Launcher", "term": "App Launcher",
"translation": "", "translation": "",
@@ -1756,6 +1770,13 @@
"reference": "", "reference": "",
"comment": "" "comment": ""
}, },
{
"term": "Click Through",
"translation": "",
"context": "",
"reference": "",
"comment": ""
},
{ {
"term": "Click any shortcut to edit. Changes save to %1", "term": "Click any shortcut to edit. Changes save to %1",
"translation": "", "translation": "",
@@ -4381,6 +4402,13 @@
"reference": "", "reference": "",
"comment": "" "comment": ""
}, },
{
"term": "Group",
"translation": "",
"context": "",
"reference": "",
"comment": ""
},
{ {
"term": "Group Workspace Apps", "term": "Group Workspace Apps",
"translation": "", "translation": "",
@@ -4402,6 +4430,13 @@
"reference": "", "reference": "",
"comment": "" "comment": ""
}, },
{
"term": "Group removed",
"translation": "",
"context": "",
"reference": "",
"comment": ""
},
{ {
"term": "Group repeated application icons in unfocused workspaces", "term": "Group repeated application icons in unfocused workspaces",
"translation": "", "translation": "",
@@ -4409,6 +4444,13 @@
"reference": "", "reference": "",
"comment": "" "comment": ""
}, },
{
"term": "Groups",
"translation": "",
"context": "",
"reference": "",
"comment": ""
},
{ {
"term": "HDR (EDID)", "term": "HDR (EDID)",
"translation": "", "translation": "",
@@ -5452,6 +5494,13 @@
"reference": "", "reference": "",
"comment": "" "comment": ""
}, },
{
"term": "Map window class names to icon names for proper icon display",
"translation": "",
"context": "",
"reference": "",
"comment": ""
},
{ {
"term": "Margin", "term": "Margin",
"translation": "", "translation": "",
@@ -6012,6 +6061,13 @@
"reference": "", "reference": "",
"comment": "" "comment": ""
}, },
{
"term": "New group name...",
"translation": "",
"context": "",
"reference": "",
"comment": ""
},
{ {
"term": "Next", "term": "Next",
"translation": "", "translation": "",
@@ -6642,6 +6698,13 @@
"reference": "", "reference": "",
"comment": "" "comment": ""
}, },
{
"term": "Organize widgets into collapsible groups",
"translation": "",
"context": "",
"reference": "",
"comment": ""
},
{ {
"term": "Other", "term": "Other",
"translation": "", "translation": "",
@@ -6810,6 +6873,13 @@
"reference": "", "reference": "",
"comment": "" "comment": ""
}, },
{
"term": "Pattern",
"translation": "",
"context": "",
"reference": "",
"comment": ""
},
{ {
"term": "Pause", "term": "Pause",
"translation": "", "translation": "",
@@ -7440,6 +7510,13 @@
"reference": "", "reference": "",
"comment": "" "comment": ""
}, },
{
"term": "Replacement",
"translation": "",
"context": "",
"reference": "",
"comment": ""
},
{ {
"term": "Report", "term": "Report",
"translation": "", "translation": "",
@@ -8686,13 +8763,6 @@
"reference": "", "reference": "",
"comment": "" "comment": ""
}, },
{
"term": "Show password",
"translation": "",
"context": "",
"reference": "",
"comment": ""
},
{ {
"term": "Show weather information in top bar and control center", "term": "Show weather information in top bar and control center",
"translation": "", "translation": "",
@@ -9071,6 +9141,13 @@
"reference": "", "reference": "",
"comment": "" "comment": ""
}, },
{
"term": "Sync Position Across Screens",
"translation": "",
"context": "",
"reference": "",
"comment": ""
},
{ {
"term": "Sync dark mode with settings portals for system-wide theme hints", "term": "Sync dark mode with settings portals for system-wide theme hints",
"translation": "", "translation": "",
@@ -9610,6 +9687,13 @@
"reference": "", "reference": "",
"comment": "" "comment": ""
}, },
{
"term": "Ungrouped",
"translation": "",
"context": "",
"reference": "",
"comment": ""
},
{ {
"term": "Uninstall", "term": "Uninstall",
"translation": "", "translation": "",
@@ -9876,6 +9960,13 @@
"reference": "", "reference": "",
"comment": "" "comment": ""
}, },
{
"term": "Use smaller notification cards",
"translation": "",
"context": "",
"reference": "",
"comment": ""
},
{ {
"term": "Use sound theme from system settings", "term": "Use sound theme from system settings",
"translation": "", "translation": "",
@@ -9883,6 +9974,13 @@
"reference": "", "reference": "",
"comment": "" "comment": ""
}, },
{
"term": "Use the same position and size on all displays",
"translation": "",
"context": "",
"reference": "",
"comment": ""
},
{ {
"term": "Use trigger prefix to activate", "term": "Use trigger prefix to activate",
"translation": "", "translation": "",