mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-10-26 21:17:47 -04:00
commit f9bcdfdce1ab4a028cd9ccc08bc5fc6748e2d9e8 Author: bbedward <[email protected]> Date: Thu Sep 17 16:37:31 2026 -0400 wallpaper: regenerate colors when the active light/dark wallpaper changes commit 0b2dd37971a7b360f26b1a302297335963282313 Author: bbedward <[email protected]> Date: Thu Sep 17 16:16:03 2026 -0400 lyrics: keep the active line in place when rows above resize, remember the lyrics view commit db56722c7af9cb50a9c779a39e12a54dc5a607a6 Author: bbedward <[email protected]> Date: Thu Sep 17 16:04:33 2026 -0400 lyrics: emphasize vocals per part instead of per group commit 934e0676d9d63f6a7cb314c693ac256c1b56e057 Author: bbedward <[email protected]> Date: Thu Sep 17 15:59:56 2026 -0400 lyrics: drop focus from overlapping lines when their vocals end commit 3fe092446b1f27d7acc1a0a2a2ecc5d19f455275 Author: bbedward <[email protected]> Date: Thu Sep 17 15:17:28 2026 -0400 media: add lyrics attribution, unison provider, shrink album art slightly when its low res commit f54b3e2c1dc589451f449218d4985758b88757b4 Author: bbedward <[email protected]> Date: Thu Sep 17 14:35:52 2026 -0400 media/zurvan: style changes commit 9ea5aecfba4c638e2f08ab288706d2fb3143ea0b Author: bbedward <[email protected]> Date: Thu Sep 17 14:02:03 2026 -0400 rebase fixes commit b2b04d12d2e9118346d0e5950b348aa222d58e50 Author: bbedward <[email protected]> Date: Thu Sep 17 13:46:03 2026 -0400 i18n: overhaul battery popout: redesign clipboard: fix style of pinned button and remove number sidebar commit 3057940bb28a29de22f90f5630a2c68113707d16 Author: bbedward <[email protected]> Date: Thu Sep 17 11:48:16 2026 -0400 displayconfig: show valid fractional scales only, fix custom setter commit 2bbe9e4b4c4278d1aca8632d650feba912a1c0af Author: bbedward <[email protected]> Date: Thu Sep 17 10:47:43 2026 -0400 media/zurvan: restyle commit 33299ef45261c4f0a7e8e663c1ed2f0996e3ac78 Author: purian23 <[email protected]> Date: Thu Sep 17 02:50:08 2026 -0400 refactor(clipboard): add click to open image previews & misc adjustments commit 9809aad3c466bf4974b887a37a806039e58b47ed Author: purian23 <[email protected]> Date: Thu Sep 17 02:35:20 2026 -0400 add(media): dynamic sizing - tests: start the fixture bus with dbus-broker or dbus-daemon commit 75a20eeb5a1299af1b0dd0d99cb374b4c5c8f15f Author: purian23 <[email protected]> Date: Thu Sep 17 00:30:04 2026 -0400 fix(dash): position bar-triggered popout once commit 1536691beb0bf2cd58fa3e1b2106eeeb9317a39c Author: purian23 <[email protected]> Date: Wed Sep 16 23:58:50 2026 -0400 dash & cc: operation freedom commit f3a2ae13bffbbdb92134af23138dc9a253f69e09 Author: bbedward <[email protected]> Date: Wed Sep 16 23:12:58 2026 -0400 lyrics: keep track identity independent of mpris length commit a59dd84908486f23e07172a6fca4c76eed27d31f Author: bbedward <[email protected]> Date: Wed Sep 16 22:41:44 2026 -0400 more zurvan changes commit fda890225576e6fc740946486c5c05cdc58ebd77 Author: bbedward <[email protected]> Date: Wed Sep 16 22:10:55 2026 -0400 media: more style changes commit 2170f055e3700466f87c0f6a072cb67e5e610574 Author: bbedward <[email protected]> Date: Wed Sep 16 20:00:36 2026 -0400 zurvan style tweaks commit 10795b2f2c41fcd1c24f5625324ff0ea7dd3e4ae Author: bbedward <[email protected]> Date: Wed Sep 16 18:32:48 2026 -0400 media: adjust styling of zurvan player commit 363eb10f7f53681d8f36fc6e9648205c9d5879d2 Author: bbedward <[email protected]> Date: Wed Sep 16 17:30:05 2026 -0400 lyrics: dont classify 401s as failures commit 0267c7110e14285fe4a611dbc78aee93e77e6ec8 Author: bbedward <[email protected]> Date: Wed Sep 16 17:07:34 2026 -0400 media: create the dank lyrics engine with multiple providers and priority support media: add zurvan style player and make it default commit 0aae835377cc96c5ec8383650df914058f604a42 Author: bbedward <[email protected]> Date: Wed Sep 16 10:22:36 2026 -0400 remove dumb test commit 8610121b1cb20b4b4b557170b7df52af39f4efff Author: bbedward <[email protected]> Date: Wed Sep 16 10:16:00 2026 -0400 notifications: redesign card header commit 868b73740a575d51577fa3aaff5abc1ccd53043c Author: bbedward <[email protected]> Date: Wed Sep 16 09:24:13 2026 -0400 clipboard: tweak image preview style commit 6de9a1ba7c306269889227b892703dc822049ac9 Author: purian23 <[email protected]> Date: Tue Sep 15 22:52:40 2026 -0400 clipboard: new size variants & image previews commit 05909190a2fb93a3a2c68fc711c07c3ffc09a529 Author: bbedward <[email protected]> Date: Tue Sep 15 19:14:41 2026 -0400 qs: drop the delegates the layout and output migrations left behind commit 6ca48caf7c2141e7e5f55a7d4634e0803a90c6b9 Author: bbedward <[email protected]> Date: Tue Sep 15 19:03:03 2026 -0400 config: one implementation of the compositor fragment mechanics commit 9f024c001e0c661a19c35b92bb36a6a9758f9d4d Author: bbedward <[email protected]> Date: Tue Sep 15 18:34:03 2026 -0400 compositor: name capabilities instead of checking identity in the ui commit 90067f14ed38e0cbf919e35cbf333f62240bc585 Author: bbedward <[email protected]> Date: Tue Sep 15 18:19:57 2026 -0400 settings: read every default from the spec commit 7f7ae95ed3093c5df7cb4bf5d23b718497a769ff Author: bbedward <[email protected]> Date: Tue Sep 15 15:47:13 2026 -0400 notifications: watch screen sharing from the service side commit a470ed448cbddb849922e80afdd2b13eb85f08f9 Author: bbedward <[email protected]> Date: Tue Sep 15 15:15:38 2026 -0400 rebase fix commit dc8f05fa0ca4650a40e32fb59614ca1b7df75f38 Author: bbedward <[email protected]> Date: Tue Sep 15 10:57:38 2026 -0400 dash: keep cards still when edit mode opens commit bc2001359613fd9b47ba0000a8f8f081d412a166 Author: bbedward <[email protected]> Date: Tue Sep 15 10:16:48 2026 -0400 settings: own the full spec again and merge the shared greeter keys settings: drop sidebar hints that repeat their own label cc/dash: change edit interface design slightly commit ee963f54b259eced7ec23701194539441b264db0 Author: purian23 <[email protected]> Date: Mon Sep 14 23:43:56 2026 -0400 settings: update island notification handling to use bar context commit 4d6f9fde4401001625f0352f97821ce5034a7e1c Author: bbedward <[email protected]> Date: Mon Sep 14 23:21:28 2026 -0400 greeter: read the shared settings schema instead of a duplicated one commit 70e4bdaec84efa3d68438ef235e46762cee38101 Author: bbedward <[email protected]> Date: Mon Sep 14 22:42:31 2026 -0400 osd, toast, launcher: start open motion after onFrameSwapped signal commit ddfd28b7be6dd4b0940512897d835107dbab1f23 Author: bbedward <[email protected]> Date: Mon Sep 14 21:12:37 2026 -0400 notifications: wait for onFrameSwapped signal before showing notification popup Lets the layer-surface map before rendering the body, resulting in better animation appearance commit 24efe6f8a18b36bb42c6b399086ffa5c5e2aa9c5 Author: purian23 <[email protected]> Date: Mon Sep 14 18:55:46 2026 -0400 notifications: adjust animation durations - Mapped the layer-shell surface - Fixed group chevron/dismiss button commit 52389ecf5cc586e912c26a345004814e37f4048a Author: bbedward <[email protected]> Date: Mon Sep 14 18:10:33 2026 -0400 dash: spacing tweak of tabbart commit 0285a70c1b07d09558c450c1eeb925a5c903069f Author: bbedward <[email protected]> Date: Mon Sep 14 17:55:43 2026 -0400 blah commit a1abc7a8df94032b01b51189b214aa21543f7218 Author: bbedward <[email protected]> Date: Mon Sep 14 17:40:10 2026 -0400 shrink window CSD height commit db20f7e9bb93c7dce503e410e82e15e7a03b1e7d Author: bbedward <[email protected]> Date: Mon Sep 14 17:16:16 2026 -0400 windows: center titles commit 7268712bdf58c5c1903606f24a392d64655a4ad5 Author: purian23 <[email protected]> Date: Mon Sep 14 16:45:44 2026 -0400 notifications: updated entry/exit paths - Added popout option in island mode - Fixed cards getting stuck & out of place when multiples arise at once commit 3a3f0b3061bd0a7ce895152ec5a056600e41e7e8 Author: bbedward <[email protected]> Date: Mon Sep 14 16:34:36 2026 -0400 battery: make cc variant consistent commit ee569ddef3bf2875d42347d18b57f493f492b243 Author: bbedward <[email protected]> Date: Mon Sep 14 16:15:42 2026 -0400 battery: remove bottom text footer thing commit 817c4e46eac52c95d91f418e3ddbafdab0888b5c Author: purian23 <[email protected]> Date: Mon Sep 14 15:34:18 2026 -0400 settings: rework interface style and bar hub layouts - Separate global surface styling from per-surface overrides on Interface style - Move bar management into the hub header and render island settings inline - Cut redirect banners down to one per page and point them at the right row commit 03a4e45d65aec83c927c7419a4a0f3f252e0e955 Author: bbedward <[email protected]> Date: Mon Sep 14 14:52:20 2026 -0400 launcher: fix inconsistency in niri overview variant commit e74246d058a5db215200606eb9f9c662706d8689 Author: bbedward <[email protected]> Date: Mon Sep 14 14:21:10 2026 -0400 plugins: eval symlinks in repo lookup commit 7dd2cddebf4819da51ff7da792560372f5d9a03e Author: bbedward <[email protected]> Date: Mon Sep 14 09:09:46 2026 -0400 update common commit a8c1f77fe2d952b1ec33e622b2951e5382860c9e Author: purian23 <[email protected]> Date: Mon Sep 14 02:05:09 2026 -0400 island: fix search input focus on launcher commit 2d1f8bf5338ca5e0a4a58f0f18b54b92dfe5e5ee Author: purian23 <[email protected]> Date: Mon Sep 14 01:29:05 2026 -0400 tooltips: add further label & accessibility parity commit 3ebfe85d57553b4803b52d5e5ea417b8abec5bcf Author: bbedward <[email protected]> Date: Sun Sep 13 23:28:29 2026 -0400 ui: drop tooltips from obvious icon buttons, keep labels on Accessible.name commit a8e7a072b2bad394c5c5d9fd60eaff5240ce37d4 Author: bbedward <[email protected]> Date: Sun Sep 13 22:55:28 2026 -0400 widgets: dim filled action buttons when disabled commit 0dc58825344ebfc5479d2a3bc75b5d2ae014131a Author: bbedward <[email protected]> Date: Sun Sep 13 22:45:34 2026 -0400 settings: one compositor include workflow for outputs, layout, input, window rules, cursor and binds commit 9fc8c8e53c18de18b33ccdfe1e1abed84e01b219 Author: purian23 <[email protected]> Date: Sun Sep 13 22:27:28 2026 -0400 theme: add focus ring settings & replace text fields w/search fields aligned to m3e specs commit 8359fea68230172b1c10df08831efdf944fbbd64 Author: bbedward <[email protected]> Date: Sun Sep 13 20:37:49 2026 -0400 auth: share one pam stack parser between the greeter, lock probe and polkit commit bf05136e78aada16e41a7d0b7164a7f543d65760 Author: bbedward <[email protected]> Date: Sun Sep 13 20:24:01 2026 -0400 tests: replace golden files and dump-only fixtures with hand-written assertions commit f2cd6a877b561a5078e7b6cbad8348e9165158ca Author: bbedward <[email protected]> Date: Sun Sep 13 19:15:02 2026 -0400 display: split DisplayService into brightness, night mode and refresh rate services commit fa7ce5fe836e4f00646c80eb3cb50ecc004f4524 Author: bbedward <[email protected]> Date: Sun Sep 13 18:19:26 2026 -0400 battery: m3e redesign commit 04576106158c009374d9564d18852cf7ea1f9284 Author: bbedward <[email protected]> Date: Sun Sep 13 17:21:32 2026 -0400 shell: one window model and one keyboard layout source hosts: put change handlers on the observed object instead of proxy properties commit e4750c767b27d4650b95d42930410ad090d6ca87 Author: bbedward <[email protected]> Date: Sun Sep 13 15:39:10 2026 -0400 shell: replace connections with bound property handlers in per-item and per-screen components commit 8efb05dc014f0d09b36d6112b03e6f4e1f60d1d2 Author: bbedward <[email protected]> Date: Sun Sep 13 13:43:10 2026 -0400 display config: move output parsing, identifiers and geometry into a pure model commit e9b8174812b2da316eeae42e3989f2f269ef5649 Author: bbedward <[email protected]> Date: Sun Sep 13 12:52:46 2026 -0400 slideout: build content on first open commit b899f307650cf5cc646de90ac666b6e1731bbc4f Author: bbedward <[email protected]> Date: Sun Sep 13 12:28:11 2026 -0400 services: stop using weakmap for workspace, window and term caches commit b90e9a4c2a72744685f79cf613ab80660721389f Author: bbedward <[email protected]> Date: Sun Sep 13 10:35:48 2026 -0400 workspaces: one model with per-compositor adapters, no compositor branches in widgets shell: stop hot reload while the session lock is held commit e200e17e96e06b4fd7e0dd596b50dcbbc254494a Author: purian23 <[email protected]> Date: Sun Sep 13 02:36:41 2026 -0400 dock: mix widgets between pinned apps - Pinned apps become individual units in edit mode with a saved per-dock order, while running windows stay one unit in compositor order. - Fix the Window.window Connections crash - Add right-click-to-edit empty dock space option and dock edit / editFor ipc commands commit cad3ba78727695419a4fe8a96c90146bbf5e6120 Author: bbedward <[email protected]> Date: Sun Sep 13 00:51:35 2026 -0400 launcher: create plugin instances only when a query needs them commit aed25c3c75d0c24a17a940c162a6956a372c4e0f Author: bbedward <[email protected]> Date: Sat Sep 12 23:45:19 2026 -0400 settings: rebuild about, printer, wifi, display and window rules pages on settings blocks popouts: drop inconsistent headers commit 3a20c2c9528fe1fed3464085492af3bebdcdf809 Author: bbedward <[email protected]> Date: Sat Sep 12 17:41:18 2026 -0400 launcher: consolidate host code and logic commit 4e53b470d5beaffa54687c8164e492ee41472e49 Author: bbedward <[email protected]> Date: Sat Sep 12 15:37:44 2026 -0400 surfaces: collapse connected/standalone popout and modal hosts typography: make font weight work and follow m3 weights settings: fix reset to default shifting rows commit ce71b5dc3ca0e96ee11b906b1ea3399d3d7d93ac Author: bbedward <[email protected]> Date: Sat Sep 12 15:02:25 2026 -0400 dock: move widgets, launcher, apps and trash as units in edit mode commit 6ebaef52d885744a45f3db7d48c3b6d0924993b2 Author: bbedward <[email protected]> Date: Sat Sep 12 13:24:31 2026 -0400 plugins: add examples for dash and dock commit 067cabc95991f5676a19746d3cad0700eb525082 Author: bbedward <[email protected]> Date: Sat Sep 12 12:25:59 2026 -0400 settings: fix v18 migration commit 55d07f3bba352972c768acdd7b6705f80fac4e0f Author: bbedward <[email protected]> Date: Sat Sep 12 12:09:56 2026 -0400 ci: fix fails commit 2e81531dd6980f0331af80fe5beca1d695c58f06 Author: bbedward <[email protected]> Date: Sat Sep 12 11:49:39 2026 -0400 surfaces: add windowRadius token to make surfaces actually follow settings and match the compositor windows surfaces: change default radius (Strength 50) from 12->16 settings: add result to default for everything settings: further re-organization and re-structuring position of things settings: remove dead keys dock: remove hardcoded border and respect border setting bar: add a third style and color options ci: hookup QML testing commit a2fd8abd37e0ff1ef67af9bfa4e7679e7aa338bd Author: bbedward <[email protected]> Date: Sat Sep 12 09:20:00 2026 -0400 dash: size surface width to the width of the largest tab commit 93394549a2cb3f7647b564ba71621e113c83e106 Author: bbedward <[email protected]> Date: Sat Sep 12 00:11:15 2026 -0400 bar/workspaces: restore old style, respect color choices, make pills default > segments commit 71f8351a3b11f8d06e45dd28db4d501e54a27f9a Author: purian23 <[email protected]> Date: Fri Sep 11 23:48:04 2026 -0400 dbar: initial M3E remaster pass on shared chrome w/dock & island commit 1711716073f660afd519ab0af88d3c8177f1a8c8 Author: bbedward <[email protected]> Date: Fri Sep 11 21:44:31 2026 -0400 dash: only show focus ring when KB navigating commit 6037de06471e7fa80ec36088e9e86cbf2e4d3941 Author: bbedward <[email protected]> Date: Fri Sep 11 21:41:53 2026 -0400 launcher: scope plugin and clipboard refreshes, paint the keystroke before plugin search commit 78c9ab990b7665e76762dadd65d1a1d23275a405 Author: bbedward <[email protected]> Date: Fri Sep 11 21:16:36 2026 -0400 launcher: one open-session reset, faster keystroke settle commit 01b15051363715bfb2bfe1d905b4b573fb4e49ac Author: bbedward <[email protected]> Date: Fri Sep 11 20:47:45 2026 -0400 dash: fix kb navigation on overview commit 27465074e1fa395a844cc3b804a362ee7a4e4f70 Author: bbedward <[email protected]> Date: Fri Sep 11 16:58:53 2026 -0400 dash: replace material shapes on resource cards with a ring gauge commit 5e41b85a1df69885c57a41ab44a43ef38b0c5560 Author: bbedward <[email protected]> Date: Fri Sep 11 16:33:48 2026 -0400 qml: share bases for registry browsers, fade windows and plugin list settings Fixes fade window focus, list setting load write-back and the missing Theme.onError commit be3542ab8fc1949a256d6498b5c4a0379b86e023 Author: bbedward <[email protected]> Date: Fri Sep 11 16:11:15 2026 -0400 popout: fix pixel jumps commit 2ad0e9e2f5b12f13f0acc9733c29c4c42d640df7 Author: bbedward <[email protected]> Date: Fri Sep 11 15:52:52 2026 -0400 popout: fade the surface fill with the content commit 4b11e21b1a09895f67ca1b6b858fe772500e4a2c Author: bbedward <[email protected]> Date: Fri Sep 11 15:13:14 2026 -0400 desktop widgets: read and write saved geometry through one path commit 21ed01bbb20627d4d68bbb704b9f2bb50b45c911 Author: bbedward <[email protected]> Date: Fri Sep 11 15:10:02 2026 -0400 surfaces: bind modal and popout backends to their handle commit 362859d810b768621061f0429c39b17ff3b00184 Author: bbedward <[email protected]> Date: Fri Sep 11 14:30:27 2026 -0400 notifications: move the popup context menu onto DankContextMenu commit 8942b622f5929e854fbcf145e7f34f4637904731 Author: bbedward <[email protected]> Date: Fri Sep 11 14:20:49 2026 -0400 colorpicker: design changes consolidate context menus commit 29be554d488aefd9a8f6e4e5f5d094147e3b214d Author: bbedward <[email protected]> Date: Fri Sep 11 12:48:02 2026 -0400 dash: add analog clock option commit 43748726983a466e19e4b642399ea040d4095de9 Author: bbedward <[email protected]> Date: Fri Sep 11 12:12:51 2026 -0400 popouts: fix spacing inconsistencies dash: redesign overview media card osd: more redesign dash/overview: remove row cap and make it dynamic commit 14a3a315d94336cac6e8eb77e08965503717d780 Author: bbedward <[email protected]> Date: Fri Sep 11 09:23:53 2026 -0400 shell: dedupe bar ipc handlers, weather resets, color options, launcher icons commit 9f2b6d4bbe6f5954a33b5853ecea0ef0ac4b483e Author: purian23 <[email protected]> Date: Thu Sep 10 23:52:39 2026 -0400 dock: add spacing option & update defaults commit 3e6cb55488a42ade23728bcf4d8608efab2e6e0f Author: bbedward <[email protected]> Date: Thu Sep 10 23:29:07 2026 -0400 session: collapse the monitor cycling setters onto one helper commit 613e756d8bf88b3c2e6ae7edcede4c680da72456 Author: bbedward <[email protected]> Date: Thu Sep 10 21:56:38 2026 -0400 dock: share the hover bounce animation across dock buttons commit 8d8f801874ddf5dcc3b299405de458183e758c7c Author: bbedward <[email protected]> Date: Thu Sep 10 21:46:44 2026 -0400 settings: share one picker window for bar and desktop widgets commit e3c90efbce4d7d11adf0cceefb8e9758e7d9099c Author: bbedward <[email protected]> Date: Thu Sep 10 21:24:10 2026 -0400 network: merge wired and wifi info modals commit 43f75e6a3dfc988f3adc8c7d659fff5529ed6db8 Author: purian23 <[email protected]> Date: Thu Sep 10 21:22:06 2026 -0400 island: unify new dashboard dynamic sizing & activities - New wallpaper carousel and Colum/Row options - Fixed island controller overlap in bar widget settings - Fixed island widgets click to hide activity - Expanded island IPC cyle targets commit 805611efca91bea029894436dad9baa6dd492461 Author: bbedward <[email protected]> Date: Thu Sep 10 19:40:27 2026 -0400 bar: share context menu window and tooltip offset across widgets also fix Media art glitches and things commit 17a08c4c7e56312d0b3a7732978223f569828aaf Author: bbedward <[email protected]> Date: Thu Sep 10 19:00:48 2026 -0400 osd/media: respect follow album accent option commit 6a753a7ab6304568f178bc3ec0910a9132020dd2 Author: bbedward <[email protected]> Date: Thu Sep 10 18:57:15 2026 -0400 theme: fix surface elevation commit af4f44eba649923bfb0928423a24fc6d115518c4 Author: bbedward <[email protected]> Date: Thu Sep 10 18:45:09 2026 -0400 m3e: redesign OSDs, Forms, etc. commit 1d2add180a661157b3c06a1221edae21bdbcb765 Author: bbedward <[email protected]> Date: Thu Sep 10 17:19:07 2026 -0400 rebase fixes commit ac39a7745cfe88bcfd3826f64cfd55ed41b18b3e Author: bbedward <[email protected]> Date: Thu Sep 10 16:51:16 2026 -0400 tray: share one item delegate and icon for both bar orientations commit 642eeb0f4b5d0a912fc44c134fc10adf8a5b5291 Author: bbedward <[email protected]> Date: Thu Sep 10 16:33:36 2026 -0400 bar: share one delegate for running apps in both orientations commit 7f69e42f3bef9025d411acfc768deb3865338922 Author: bbedward <[email protected]> Date: Thu Sep 10 15:56:33 2026 -0400 bar: share one monitor pill for cpu, ram, temp and disk widgets commit f5507dc3b2df6929521e87cd820eb45a3e3077ad Author: bbedward <[email protected]> Date: Thu Sep 10 14:03:00 2026 -0400 island: reuse widget model, surface palette and layout metrics in hosts commit aceac03ba0c9a2b0aa1a47f1b62a380fc785ec6d Author: bbedward <[email protected]> Date: Thu Sep 10 13:36:47 2026 -0400 osd: share one level osd for volume, brightness, mic and media commit 1b4a68d10c5b59f3ecf3e7c44974a2cb83964246 Author: bbedward <[email protected]> Date: Thu Sep 10 13:12:30 2026 -0400 shell: consolidate connected surface state into one slot store commit d7edc23cf14a10cd275fdf3888d24482d43a15f3 Author: bbedward <[email protected]> Date: Thu Sep 10 12:19:30 2026 -0400 shell: restore centered dash popout for center-section widgets commit d2f9405de9e7ade7db402826cfb0520249c58a2b Author: bbedward <[email protected]> Date: Thu Sep 10 12:11:29 2026 -0400 dash/media: always show placeholder player when no players are playing commit 55535082f53163914440e1e858aa78246bc4e40a Author: bbedward <[email protected]> Date: Thu Sep 10 12:08:10 2026 -0400 dock: fix sizing, exclusive zone, edit mode and multi-instance settings commit c82cc738ca2d20e7a4363b7abb86ad6d9e7bb172 Author: bbedward <[email protected]> Date: Thu Sep 10 11:08:40 2026 -0400 settings/plugins: redesign page commit 9c283e0f6c4b7d812362124fdd36fc15327ef03c Author: bbedward <[email protected]> Date: Wed Sep 9 20:44:26 2026 -0400 shell: route widget instances and support same-edge layouts commit 405a3b397c264688b2271d6acec881a4aea4864f Author: bbedward <[email protected]> Date: Wed Sep 9 18:05:37 2026 -0400 shell: share bar content and clock presentation commit 65a6d2df8e870af259b1542c896fce60be4f6cb6 Author: bbedward <[email protected]> Date: Wed Sep 9 15:49:23 2026 -0400 shell: centralize layout ownership commit 585aeb4e1cba737cc4007fc214ac1e109d3e0f19 Author: purian23 <[email protected]> Date: Wed Sep 9 18:05:13 2026 -0400 dock: initial m3e remaster commit a2e646f2fb364f042fb134e74e9014386b80971b Author: bbedward <[email protected]> Date: Wed Sep 9 14:58:38 2026 -0400 plugins: consolidate upgrade path commit 139253504c5f62d522fbc6109689c11ccaec7493 Author: bbedward <[email protected]> Date: Wed Sep 9 14:43:28 2026 -0400 settings: use icons on all outlined text fields commit a9c1e569b8428e4f3748da345200e8a62c90ba20 Author: bbedward <[email protected]> Date: Wed Sep 9 14:32:33 2026 -0400 launcher: fix KB navigation focus and modes commit ac64eb52d360322a0e952844b41b58532d5ae32f Author: bbedward <[email protected]> Date: Wed Sep 9 14:05:10 2026 -0400 m3e: remove inconsistent widget usage, adjust SystemUpdater rredesign, fix window decoration inconsistencies commit 0eac1d3e22cb879c7b7e9205fba0ed9c17b89dcd Author: bbedward <[email protected]> Date: Wed Sep 9 13:25:44 2026 -0400 server: consolidate ipc routing and subscription forwarding commit ed289e5c2c867eb2d6e1319d9517885e6e80d1a3 Author: bbedward <[email protected]> Date: Wed Sep 9 12:56:29 2026 -0400 plugins: redesign management and browsers with m3 expressive commit 7f3a526e2d38c24edbb5d51c4c9c550a0bc93752 Author: bbedward <[email protected]> Date: Wed Sep 9 11:00:07 2026 -0400 settings: fix inconsistent ripple effect radius commit 8f1fb8a11e92b1811808325c136199fef10d4a53 Author: bbedward <[email protected]> Date: Wed Sep 9 10:26:39 2026 -0400 aqueous: fix variant terms commit 2ba861947092cb657d983702c842e88ffc6fb0fa Author: bbedward <[email protected]> Date: Wed Sep 9 10:01:50 2026 -0400 running apps: fix delegate bug commit b37c925e85cb6902bbb3005d92a5b522e3648116 Author: bbedward <[email protected]> Date: Wed Sep 9 00:18:57 2026 -0400 bump dml-common commit 5e83c40c56c624df74306efc839d707ec8d6aa14 Author: bbedward <[email protected]> Date: Wed Sep 9 00:12:16 2026 -0400 settings: incorporate user & accounts tab, consolidate security, add M3E textfield commit 278370c7909226ca42f0a53cbd9ca2bd5f2fb4e7 Author: bbedward <[email protected]> Date: Tue Sep 8 18:17:25 2026 -0400 m3e: unify shell surfaces and refresh process monitoring commit e2d5860d3952da717ba9073e857133f2538a70b0 Author: bbedward <[email protected]> Date: Tue Sep 8 15:15:17 2026 -0400 notifications: fix expansion timing and simplify the header commit d8f29c221474c2884ec482d26c827de09d581539 Author: bbedward <[email protected]> Date: Tue Sep 8 14:53:11 2026 -0400 icon: install app icon under the conventional name (app id) commit ebeebb70fd4c7538ef5ea867116d9fa7118eee27 Author: bbedward <[email protected]> Date: Tue Sep 8 14:47:09 2026 -0400 notifications: refine card styling and separate app icons from image previews commit d6133d93ed314ca02a9a3b634872ee32484a0bb3 Author: bbedward <[email protected]> Date: Tue Sep 8 14:27:18 2026 -0400 settings: unify expressive rows and drag and drop commit 0a4d14752a2a1e8dd60b3056fd006d02d818d6a4 Author: bbedward <[email protected]> Date: Tue Sep 8 12:32:16 2026 -0400 settings: use native action button hover state commit dc8c4564cc964ab50ed28a3e9e4ca7b13ebfbcb1 Author: bbedward <[email protected]> Date: Tue Sep 8 09:55:42 2026 -0400 shell: refine weather, slider controls, and tooltips commit bec5c6ad0119e22a3cb69975d135d3b72654f77e Author: bbedward <[email protected]> Date: Mon Sep 7 18:43:39 2026 -0400 theme: tweak token values commit 8519cbc4bbb396a8b6779764ff0f5a0945156dcf Author: bbedward <[email protected]> Date: Mon Sep 7 13:43:53 2026 -0400 dankdash: fix grid sizing, controls, notifications, and popout blur commit f2405f2925aa63eba480cff4ddc55119818f8057 Author: bbedward <[email protected]> Date: Mon Sep 7 10:38:07 2026 -0400 dash: redesign media player and migrate its appearance options commit cb57ce04fbd50920a17d9a8ad33e4d20fc856021 Author: bbedward <[email protected]> Date: Mon Sep 7 09:07:01 2026 -0400 lock: add lock m3e redesign commit e89909e3743993dad1bdf17d57ab17f1122dfa3c Author: bbedward <[email protected]> Date: Sun Sep 6 21:24:48 2026 -0400 qs: more loaders, less repetition commit 288335fef67b523f51e22bb234c81bd8b88e7e2c Author: bbedward <[email protected]> Date: Sun Sep 6 20:16:41 2026 -0400 launcher: initial m3e redesign commit 5b7fc75c473491bf086b65a41416325697ae330c Author: purian23 <[email protected]> Date: Sun Sep 6 19:50:14 2026 -0400 feat(motion): new fluid animation variant - Refactored Popouts/Modals for performance passes commit 0fc4f51f4d0b1d297c1886b19be8062d279c505b Author: bbedward <[email protected]> Date: Sun Sep 6 15:36:22 2026 -0400 notifications: tweak animnation stacking behavior on popups commit 4369233794e3bebd890a2b830c6450d0a65eb31a Author: bbedward <[email protected]> Date: Sun Sep 6 15:15:55 2026 -0400 notifications: initial M3E redesign commit eb67a51779c543038ad885ecd406bfe21aecd1e2 Author: bbedward <[email protected]> Date: Sat Sep 5 15:10:37 2026 -0400 ddash: exhaustive overhaul of even more pieces of the system commit 14554a39effd677206f7a3c4b5944d2ae47c2b03 Author: bbedward <[email protected]> Date: Sat Sep 5 12:47:06 2026 -0400 settings: rebase fixes commit d6e0bb604bdb15ed94d77f9e1d85a26381ed6836 Author: bbedward <[email protected]> Date: Sat Sep 5 10:18:38 2026 -0400 ddash: initial rewrite commit 29903114d0d8849b25c6f6e9161765b0ad03da49 Author: bbedward <[email protected]> Date: Fri Sep 4 16:48:23 2026 -0400 cc: tweak s lider size commit 8d14a07864972e4b705e77b371d21f5fdb7c4c07 Author: bbedward <[email protected]> Date: Fri Sep 4 16:44:53 2026 -0400 cc: initial M3E re-design commit 976f968967166c61cec423f3bb3f7a28a5a9ac76 Author: bbedward <[email protected]> Date: Fri Sep 4 15:00:35 2026 -0400 settings: continue to iterate commit a99a1c5ad183e34435a20dd90f19ed84099a1070 Author: bbedward <[email protected]> Date: Fri Sep 4 09:44:55 2026 -0400 stash m3e work
916 lines
34 KiB
QML
916 lines
34 KiB
QML
pragma Singleton
|
|
pragma ComponentBehavior: Bound
|
|
|
|
import QtCore
|
|
import QtQuick
|
|
import Quickshell
|
|
import Quickshell.Io
|
|
import qs.Common
|
|
import qs.Services
|
|
import "../Common/ConfigIncludeResolve.js" as ConfigIncludeResolve
|
|
import "../Common/KeybindActions.js" as Actions
|
|
|
|
Singleton {
|
|
id: root
|
|
readonly property var log: Log.scoped("KeybindsService")
|
|
|
|
property bool available: CompositorService.isAqueous || CompositorService.isNiri || CompositorService.isHyprland || CompositorService.isMango
|
|
property string currentProvider: {
|
|
if (CompositorService.isAqueous)
|
|
return "aqueous";
|
|
if (CompositorService.isNiri)
|
|
return "niri";
|
|
if (CompositorService.isHyprland)
|
|
return "hyprland";
|
|
if (CompositorService.isMango)
|
|
return "mangowc";
|
|
return "";
|
|
}
|
|
|
|
readonly property string cheatsheetProvider: {
|
|
if (CompositorService.isAqueous)
|
|
return "aqueous";
|
|
if (CompositorService.isNiri)
|
|
return "niri";
|
|
if (CompositorService.isHyprland)
|
|
return "hyprland";
|
|
if (CompositorService.isMango)
|
|
return "mangowc";
|
|
return "";
|
|
}
|
|
property bool cheatsheetAvailable: cheatsheetProvider !== ""
|
|
property bool cheatsheetLoading: false
|
|
property var cheatsheet: ({})
|
|
|
|
property bool loading: false
|
|
property bool saving: false
|
|
property bool fixing: false
|
|
property string lastError: ""
|
|
property string modKey: "Super"
|
|
property bool dmsBindsIncluded: true
|
|
|
|
property var dmsStatus: ({
|
|
"exists": true,
|
|
"included": true,
|
|
"includePosition": -1,
|
|
"totalIncludes": 0,
|
|
"bindsAfterDms": 0,
|
|
"effective": true,
|
|
"overriddenBy": 0,
|
|
"statusMessage": "",
|
|
"configFormat": "",
|
|
"readOnly": false
|
|
})
|
|
|
|
property var _rawData: null
|
|
property var keybinds: ({})
|
|
property var _allBinds: ({})
|
|
property var _categories: []
|
|
property var _flatCache: []
|
|
property var displayList: []
|
|
property int _dataVersion: 0
|
|
property string _pendingSavedKey: ""
|
|
readonly property bool requiresBindReview: currentProvider === "aqueous"
|
|
readonly property string bindEditSession: requiresBindReview ? aqueousSession : currentProvider
|
|
readonly property bool bindMutationBusy: aqueousBusy || saving || removeProcess.running
|
|
property bool aqueousBusy: false
|
|
property bool _aqueousLoading: false
|
|
property bool _loadPending: false
|
|
property int _aqueousRequest: 0
|
|
readonly property string aqueousSession: currentProvider === "aqueous" ? AqueousService.session : ""
|
|
onCurrentProviderChanged: _pendingSavedKey = ""
|
|
|
|
onAqueousSessionChanged: {
|
|
_aqueousRequest++;
|
|
aqueousBusy = false;
|
|
_pendingSavedKey = "";
|
|
if (aqueousSession)
|
|
Qt.callLater(root.loadBinds, false);
|
|
}
|
|
|
|
readonly property var categoryOrder: Actions.getCategoryOrder()
|
|
readonly property string configDir: Paths.strip(StandardPaths.writableLocation(StandardPaths.ConfigLocation))
|
|
readonly property string compositorConfigDir: {
|
|
switch (currentProvider) {
|
|
case "niri":
|
|
return configDir + "/niri";
|
|
case "hyprland":
|
|
return configDir + "/hypr";
|
|
case "mangowc":
|
|
return configDir + "/mango";
|
|
default:
|
|
return "";
|
|
}
|
|
}
|
|
readonly property string includeCompositor: currentProvider === "mangowc" ? "mango" : currentProvider
|
|
readonly property var includePaths: ConfigIncludeResolve.includePaths("binds", includeCompositor, configDir)
|
|
readonly property string dmsBindsPath: includePaths?.fragmentFiles[0] ?? ""
|
|
readonly property string mainConfigPath: includePaths?.configFile ?? ""
|
|
readonly property bool readOnly: currentProvider === "hyprland" && dmsStatus.readOnly === true
|
|
readonly property var actionTypes: Actions.getActionTypes()
|
|
readonly property var dmsActions: getDmsActions()
|
|
|
|
signal bindsLoaded
|
|
signal bindSaved(string key)
|
|
signal bindSaveCompleted(bool success)
|
|
signal bindRemoved(string key)
|
|
signal dmsBindsFixed
|
|
signal cheatsheetLoaded
|
|
|
|
Connections {
|
|
target: CompositorService
|
|
function onCompositorChanged() {
|
|
if (!CompositorService.isNiri && !CompositorService.isMango && !CompositorService.isAqueous)
|
|
return;
|
|
Qt.callLater(root.loadBinds);
|
|
}
|
|
}
|
|
|
|
Connections {
|
|
target: NiriService
|
|
enabled: CompositorService.isNiri
|
|
function onConfigReloaded() {
|
|
Qt.callLater(root.loadBinds, false);
|
|
}
|
|
}
|
|
|
|
Process {
|
|
id: cheatsheetProcess
|
|
running: false
|
|
|
|
stdout: StdioCollector {
|
|
onStreamFinished: {
|
|
try {
|
|
root.cheatsheet = JSON.parse(text);
|
|
} catch (e) {
|
|
log.error("Failed to parse cheatsheet:", e);
|
|
root.cheatsheet = {};
|
|
}
|
|
root.cheatsheetLoading = false;
|
|
root.cheatsheetLoaded();
|
|
}
|
|
}
|
|
|
|
onExited: exitCode => {
|
|
if (exitCode === 0)
|
|
return;
|
|
log.warn("Cheatsheet load failed with code:", exitCode);
|
|
root.cheatsheetLoading = false;
|
|
}
|
|
}
|
|
|
|
Process {
|
|
id: loadProcess
|
|
running: false
|
|
property string provider: ""
|
|
|
|
stdout: StdioCollector {
|
|
onStreamFinished: {
|
|
if (loadProcess.provider !== root.currentProvider)
|
|
return;
|
|
try {
|
|
root._rawData = JSON.parse(text);
|
|
root._processData();
|
|
} catch (e) {
|
|
log.error("Failed to parse binds:", e);
|
|
}
|
|
root.loading = false;
|
|
}
|
|
}
|
|
|
|
onExited: exitCode => {
|
|
if (provider !== root.currentProvider)
|
|
return;
|
|
if (exitCode !== 0) {
|
|
log.warn("Load process failed with code:", exitCode);
|
|
root.loading = false;
|
|
}
|
|
}
|
|
}
|
|
|
|
Process {
|
|
id: saveProcess
|
|
running: false
|
|
property string savedKey: ""
|
|
property string provider: ""
|
|
|
|
stderr: StdioCollector {
|
|
onStreamFinished: {
|
|
if (saveProcess.provider !== root.currentProvider)
|
|
return;
|
|
if (!text.trim())
|
|
return;
|
|
root.lastError = text.trim();
|
|
ToastService.showError(I18n.tr("Failed to save keybind"), "", root.lastError, "keybinds");
|
|
}
|
|
}
|
|
|
|
onExited: exitCode => {
|
|
root.saving = false;
|
|
if (provider !== root.currentProvider) {
|
|
savedKey = "";
|
|
return;
|
|
}
|
|
if (exitCode !== 0) {
|
|
root._pendingSavedKey = "";
|
|
savedKey = "";
|
|
log.error("Save failed with code:", exitCode);
|
|
root.bindSaveCompleted(false);
|
|
return;
|
|
}
|
|
root.lastError = "";
|
|
root._pendingSavedKey = savedKey;
|
|
savedKey = "";
|
|
root.bindSaveCompleted(true);
|
|
if (CompositorService.isMango)
|
|
MangoService.reloadConfig();
|
|
root.loadBinds(false);
|
|
}
|
|
}
|
|
|
|
Process {
|
|
id: removeProcess
|
|
running: false
|
|
property string provider: ""
|
|
|
|
stderr: StdioCollector {
|
|
onStreamFinished: {
|
|
if (removeProcess.provider !== root.currentProvider)
|
|
return;
|
|
if (!text.trim())
|
|
return;
|
|
root.lastError = text.trim();
|
|
ToastService.showError(I18n.tr("Failed to remove keybind"), "", root.lastError, "keybinds");
|
|
}
|
|
}
|
|
|
|
onExited: exitCode => {
|
|
if (provider !== root.currentProvider)
|
|
return;
|
|
if (exitCode !== 0) {
|
|
log.error("Remove failed with code:", exitCode);
|
|
return;
|
|
}
|
|
root.lastError = "";
|
|
if (CompositorService.isMango)
|
|
MangoService.reloadConfig();
|
|
root.loadBinds(false);
|
|
}
|
|
}
|
|
|
|
Process {
|
|
id: fixProcess
|
|
running: false
|
|
|
|
stderr: StdioCollector {
|
|
onStreamFinished: {
|
|
if (!text.trim())
|
|
return;
|
|
root.lastError = text.trim();
|
|
ToastService.showError(I18n.tr("Failed to add binds include"), "", root.lastError, "keybinds");
|
|
}
|
|
}
|
|
|
|
onExited: exitCode => {
|
|
root.fixing = false;
|
|
if (exitCode !== 0) {
|
|
log.error("Fix failed with code:", exitCode);
|
|
return;
|
|
}
|
|
root.lastError = "";
|
|
root.dmsBindsIncluded = true;
|
|
root.dmsBindsFixed();
|
|
ToastService.showInfo(I18n.tr("Binds include added"), I18n.tr("%1 is now included in config", "keybinds toast, %1 is the binds file path").arg("dms/" + root.includePaths.fragmentFiles[0].split("/").pop()), "", "keybinds");
|
|
if (CompositorService.isMango)
|
|
MangoService.reloadConfig();
|
|
Qt.callLater(root.forceReload);
|
|
}
|
|
}
|
|
|
|
function fixDmsBindsInclude() {
|
|
if (fixing || dmsBindsIncluded || !compositorConfigDir)
|
|
return;
|
|
if (readOnly) {
|
|
showHyprlandReadOnlyWarning();
|
|
return;
|
|
}
|
|
const timestamp = Math.floor(Date.now() / 1000);
|
|
const backupPath = `${mainConfigPath}.dmsbackup${timestamp}`;
|
|
const script = ConfigIncludeResolve.repairScriptFor("binds", includeCompositor, configDir, backupPath);
|
|
if (!script)
|
|
return;
|
|
fixing = true;
|
|
fixProcess.command = ["sh", "-c", script];
|
|
fixProcess.running = true;
|
|
}
|
|
|
|
function forceReload() {
|
|
_allBinds = {};
|
|
_flatCache = [];
|
|
_categories = [];
|
|
loadBinds(true);
|
|
}
|
|
|
|
function loadCheatsheet(provider) {
|
|
if (cheatsheetProcess.running)
|
|
return;
|
|
const target = provider || cheatsheetProvider;
|
|
if (!target)
|
|
return;
|
|
cheatsheetLoading = true;
|
|
cheatsheetProcess.command = ["dms", "keybinds", "show", target];
|
|
cheatsheetProcess.running = true;
|
|
}
|
|
|
|
function loadBinds(showLoading) {
|
|
if (currentProvider === "aqueous") {
|
|
_loadPending = true;
|
|
if (_aqueousLoading || aqueousBusy)
|
|
return;
|
|
_loadPending = false;
|
|
_aqueousLoading = true;
|
|
loading = true;
|
|
readAqueousBinds((snapshot, error) => {
|
|
root._aqueousLoading = false;
|
|
root.loading = false;
|
|
if (snapshot) {
|
|
root.lastError = "";
|
|
root._rawData = snapshot;
|
|
root._processData();
|
|
} else {
|
|
root.lastError = error;
|
|
root._pendingSavedKey = "";
|
|
}
|
|
if (root._loadPending) {
|
|
root._loadPending = false;
|
|
Qt.callLater(root.loadBinds, false);
|
|
}
|
|
});
|
|
return;
|
|
}
|
|
if (loadProcess.running || !available)
|
|
return;
|
|
const hasData = Object.keys(_allBinds).length > 0;
|
|
loading = showLoading !== false && !hasData;
|
|
loadProcess.command = ["dms", "keybinds", "show", currentProvider];
|
|
loadProcess.provider = currentProvider;
|
|
loadProcess.running = true;
|
|
}
|
|
|
|
function readAqueousBinds(callback) {
|
|
const session = aqueousSession;
|
|
if (!session) {
|
|
callback(null, I18n.tr("Unavailable"));
|
|
return;
|
|
}
|
|
AqueousService.runJson(["dms", "keybinds", "show", "aqueous"], null, (snapshot, error) => {
|
|
if (session !== root.aqueousSession) {
|
|
callback(null, I18n.tr("Configuration changed. Refresh to continue.", "Aqueous keyboard shortcut editor, explaining a conflict or comparing an unsaved edit with current bindings"));
|
|
return;
|
|
}
|
|
try {
|
|
if (error)
|
|
throw new Error(error);
|
|
bindInventory(snapshot);
|
|
} catch (e) {
|
|
log.warn("Failed to read Aqueous keybindings:", e);
|
|
callback(null, AqueousService.errorMessage(String(e)));
|
|
return;
|
|
}
|
|
callback(snapshot, "");
|
|
});
|
|
}
|
|
|
|
function bindInventory(snapshot) {
|
|
if (snapshot?.provider !== "aqueous" || typeof snapshot.generation !== "string" || !snapshot.generation || !snapshot.binds || Array.isArray(snapshot.binds))
|
|
throw new Error("invalid Aqueous keybind snapshot");
|
|
if (!Array.isArray(snapshot.binds.Compositor) || !Array.isArray(snapshot.binds.Custom))
|
|
throw new Error("missing Aqueous keybind inventory");
|
|
return Object.keys(snapshot.binds).sort().map(category => {
|
|
if (!Array.isArray(snapshot.binds[category]))
|
|
throw new Error("invalid Aqueous keybind category");
|
|
return [category, snapshot.binds[category].map(bind => {
|
|
if (typeof bind.key !== "string" || typeof bind.action !== "string")
|
|
throw new Error("invalid Aqueous binding");
|
|
return [bind.key, bind.action, bind.source || ""];
|
|
})];
|
|
});
|
|
}
|
|
|
|
function bindInventoryChanges(baseline, current) {
|
|
const flatten = snapshot => bindInventory(snapshot).reduce((all, group) => all.concat(group[1].map(bind => [group[0], bind])), []);
|
|
const before = flatten(baseline);
|
|
const after = flatten(current);
|
|
const differences = [];
|
|
for (let i = 0; i < Math.max(before.length, after.length); i++) {
|
|
if (JSON.stringify(before[i]) === JSON.stringify(after[i]))
|
|
continue;
|
|
differences.push({
|
|
before: before[i]?.[1] || null,
|
|
after: after[i]?.[1] || null
|
|
});
|
|
}
|
|
return differences;
|
|
}
|
|
|
|
function bindingsForKey(snapshot, key) {
|
|
if (!key)
|
|
return [];
|
|
bindInventory(snapshot);
|
|
return Object.values(snapshot.binds).reduce((matches, category) => matches.concat(category.filter(bind => bind.key === key)), []);
|
|
}
|
|
|
|
function bindEditIssue(draft, current, reviewing) {
|
|
bindInventory(current);
|
|
if (!["set", "remove", "reset"].includes(draft.operation))
|
|
return "invalid_binding";
|
|
const original = bindingsForKey(current, draft.originalKey);
|
|
if (draft.originalKey && original.length !== 1)
|
|
return original.length ? "ambiguous_target" : "target_removed";
|
|
if (!reviewing && draft.originalKey && original[0].action !== draft.originalAction)
|
|
return "target_changed";
|
|
if (draft.operation !== "set")
|
|
return draft.originalKey ? "" : "target_removed";
|
|
const data = draft.data;
|
|
if (!data?.key || !data.action)
|
|
return "invalid_binding";
|
|
if (data.key !== draft.originalKey && bindingsForKey(current, data.key).length)
|
|
return "destination_occupied";
|
|
if (!data.action.startsWith("spawn ") && !current.binds.Compositor.some(bind => bind.action === data.action))
|
|
return "invalid_action";
|
|
return "";
|
|
}
|
|
|
|
function captureBindEdit(binding, key) {
|
|
if (!requiresBindReview)
|
|
return null;
|
|
bindInventory(_rawData);
|
|
if (!bindEditSession)
|
|
throw new Error(I18n.tr("Unavailable"));
|
|
return {
|
|
provider: currentProvider,
|
|
session: bindEditSession,
|
|
action: binding.action || "",
|
|
binding: JSON.parse(JSON.stringify(binding)),
|
|
baseline: JSON.parse(JSON.stringify(_rawData)),
|
|
originalKey: key || "",
|
|
originalAction: binding.action || "",
|
|
operation: "set",
|
|
data: {
|
|
key: key || "",
|
|
action: binding.action || "",
|
|
desc: binding.desc || ""
|
|
}
|
|
};
|
|
}
|
|
|
|
function updateBindEdit(draft, key, data, operation) {
|
|
const originals = bindingsForKey(draft.baseline, key);
|
|
return Object.assign({}, draft, {
|
|
operation: operation || draft.operation,
|
|
originalKey: key,
|
|
originalAction: originals.length ? originals[0].action : "",
|
|
data: JSON.parse(JSON.stringify(data || draft.data))
|
|
});
|
|
}
|
|
|
|
function loadBindReview(callback) {
|
|
if (requiresBindReview) {
|
|
readAqueousBinds(callback);
|
|
return;
|
|
}
|
|
callback(null, I18n.tr("Unavailable"));
|
|
}
|
|
|
|
function reconcileBindEdit(draft, snapshot) {
|
|
const issue = bindEditIssue(draft, snapshot, true);
|
|
if (issue)
|
|
return {
|
|
code: issue
|
|
};
|
|
const originals = bindingsForKey(snapshot, draft.originalKey);
|
|
return {
|
|
draft: Object.assign({}, draft, {
|
|
baseline: JSON.parse(JSON.stringify(snapshot)),
|
|
originalAction: originals.length ? originals[0].action : ""
|
|
})
|
|
};
|
|
}
|
|
|
|
function bindEditError(code) {
|
|
switch (code) {
|
|
case "external_change":
|
|
return I18n.tr("Keybindings changed. Refresh and review your edit before saving.", "Aqueous keyboard shortcut editor, explaining a conflict or comparing an unsaved edit with current bindings");
|
|
case "target_removed":
|
|
return I18n.tr("The original shortcut was removed. Discard this edit or add a new shortcut.", "Aqueous keyboard shortcut editor, explaining a conflict or comparing an unsaved edit with current bindings");
|
|
case "ambiguous_target":
|
|
return I18n.tr("Multiple bindings use the original shortcut. Resolve the duplicate bindings first.", "Aqueous keyboard shortcut editor, explaining a conflict or comparing an unsaved edit with current bindings");
|
|
case "destination_occupied":
|
|
return I18n.tr("The new shortcut is already in use. Choose another shortcut.", "Aqueous keyboard shortcut editor, explaining a conflict or comparing an unsaved edit with current bindings");
|
|
case "target_changed":
|
|
return I18n.tr("The original shortcut changed. Refresh and review your edit.", "Aqueous keyboard shortcut editor, explaining a conflict or comparing an unsaved edit with current bindings");
|
|
case "invalidated":
|
|
return I18n.tr("The compositor session changed. Discard this edit before starting a new one.", "Aqueous keyboard shortcut editor, explaining a conflict or comparing an unsaved edit with current bindings");
|
|
case "uncertain":
|
|
return I18n.tr("The save result is unknown. Refresh and check the current bindings.", "Aqueous keyboard shortcut editor, explaining a conflict or comparing an unsaved edit with current bindings");
|
|
case "invalid_action":
|
|
return I18n.tr("The selected action is no longer available.", "Aqueous keyboard shortcut editor, explaining a conflict or comparing an unsaved edit with current bindings");
|
|
default:
|
|
return I18n.tr("Failed to save keybind");
|
|
}
|
|
}
|
|
|
|
function describeBindReview(draft, current) {
|
|
if (!draft || !current)
|
|
return "";
|
|
const describe = (snapshot, key) => {
|
|
const matches = bindingsForKey(snapshot, key);
|
|
return matches.length ? matches.map(bind => bind.key + " → " + bind.action).join("\n") : I18n.tr("None");
|
|
};
|
|
const original = describe(draft.baseline, draft.originalKey);
|
|
const currentBind = describe(current, draft.originalKey);
|
|
const proposed = draft.operation === "set" ? draft.data.key + " → " + draft.data.action : I18n.tr("Remove");
|
|
const destination = draft.operation === "set" ? describe(current, draft.data.key) : I18n.tr("None");
|
|
const describeChange = bind => bind ? (bind[0] || I18n.tr("Not bound")) + " → " + bind[1] : I18n.tr("None");
|
|
const changes = bindInventoryChanges(draft.baseline, current).map(change => I18n.tr("Previous: %1\nCurrent: %2", "Aqueous keyboard shortcut editor, explaining a conflict or comparing an unsaved edit with current bindings").arg(describeChange(change.before)).arg(describeChange(change.after))).join("\n\n");
|
|
return I18n.tr("Original: %1\nCurrent: %2\nProposed: %3\nCurrent destination: %4", "Aqueous keyboard shortcut editor, explaining a conflict or comparing an unsaved edit with current bindings").arg(original).arg(currentBind).arg(proposed).arg(destination) + (changes ? "\n\n" + changes : "");
|
|
}
|
|
|
|
function _mutateAqueous(draft, callback) {
|
|
if (aqueousBusy || saving || removeProcess.running) {
|
|
callback({
|
|
success: false,
|
|
code: "busy"
|
|
});
|
|
return;
|
|
}
|
|
if (!draft?.baseline || !aqueousSession || draft.session !== aqueousSession) {
|
|
callback({
|
|
success: false,
|
|
code: "invalidated"
|
|
});
|
|
return;
|
|
}
|
|
const edit = JSON.parse(JSON.stringify(draft));
|
|
const request = ++_aqueousRequest;
|
|
aqueousBusy = true;
|
|
const complete = result => {
|
|
if (request !== root._aqueousRequest)
|
|
return;
|
|
root.aqueousBusy = false;
|
|
callback(result);
|
|
if (result.success || root._loadPending) {
|
|
root._loadPending = false;
|
|
Qt.callLater(root.loadBinds, false);
|
|
}
|
|
};
|
|
readAqueousBinds((snapshot, error) => {
|
|
if (request !== root._aqueousRequest)
|
|
return;
|
|
if (error) {
|
|
complete({
|
|
success: false,
|
|
code: "load_failed",
|
|
message: error
|
|
});
|
|
return;
|
|
}
|
|
try {
|
|
if (JSON.stringify(bindInventory(edit.baseline)) !== JSON.stringify(bindInventory(snapshot))) {
|
|
complete({
|
|
success: false,
|
|
code: "external_change",
|
|
snapshot: snapshot
|
|
});
|
|
return;
|
|
}
|
|
const issue = bindEditIssue(edit, snapshot, false);
|
|
if (issue) {
|
|
complete({
|
|
success: false,
|
|
code: issue,
|
|
snapshot: snapshot
|
|
});
|
|
return;
|
|
}
|
|
} catch (e) {
|
|
complete({
|
|
success: false,
|
|
code: "invalid_snapshot",
|
|
message: String(e)
|
|
});
|
|
return;
|
|
}
|
|
const args = ["dms", "keybinds", edit.operation, currentProvider, edit.operation === "set" ? edit.data.key : edit.originalKey];
|
|
if (edit.operation === "set") {
|
|
args.push(edit.data.action);
|
|
if (edit.originalKey && edit.originalKey !== edit.data.key)
|
|
args.push("--replace-key", edit.originalKey);
|
|
}
|
|
args.push("--expected-generation", snapshot.generation, "--json");
|
|
AqueousService.runJson(args, null, (result, error) => {
|
|
if (request !== root._aqueousRequest)
|
|
return;
|
|
if (error || result?.success !== true || !result.generation) {
|
|
complete({
|
|
success: false,
|
|
code: result?.success === false && result.code ? result.code : "uncertain",
|
|
message: result?.message || error
|
|
});
|
|
return;
|
|
}
|
|
if (edit.operation === "set")
|
|
root._pendingSavedKey = edit.data.key;
|
|
complete(result);
|
|
if (edit.operation === "set")
|
|
root.bindSaveCompleted(true);
|
|
else
|
|
root.bindRemoved(edit.originalKey);
|
|
});
|
|
});
|
|
}
|
|
|
|
function _processData() {
|
|
keybinds = _rawData || {};
|
|
modKey = currentProvider === "niri" ? (_rawData?.modKey || "Super") : "Super";
|
|
dmsBindsIncluded = _rawData?.dmsBindsIncluded ?? true;
|
|
const status = _rawData?.dmsStatus;
|
|
if (status) {
|
|
dmsStatus = {
|
|
"exists": status.exists ?? true,
|
|
"included": status.included ?? true,
|
|
"includePosition": status.includePosition ?? -1,
|
|
"totalIncludes": status.totalIncludes ?? 0,
|
|
"bindsAfterDms": status.bindsAfterDms ?? 0,
|
|
"effective": status.effective ?? true,
|
|
"overriddenBy": status.overriddenBy ?? 0,
|
|
"statusMessage": status.statusMessage ?? "",
|
|
"configFormat": status.configFormat ?? "",
|
|
"readOnly": status.readOnly === true
|
|
};
|
|
}
|
|
_maybeWarnHyprlandLegacyConf();
|
|
|
|
if (!_rawData?.binds) {
|
|
_allBinds = {};
|
|
_categories = [];
|
|
_flatCache = [];
|
|
displayList = [];
|
|
_dataVersion++;
|
|
bindsLoaded();
|
|
if (_pendingSavedKey) {
|
|
bindSaved(_pendingSavedKey);
|
|
_pendingSavedKey = "";
|
|
}
|
|
return;
|
|
}
|
|
|
|
const processed = {};
|
|
const bindsData = _rawData.binds;
|
|
for (const cat in bindsData) {
|
|
const binds = bindsData[cat];
|
|
for (var i = 0; i < binds.length; i++) {
|
|
const bind = binds[i];
|
|
if (currentProvider === "hyprland" && bind.action && bind.action.startsWith("exec "))
|
|
bind.action = "spawn " + bind.action.slice(5);
|
|
const targetCat = Actions.isDmsAction(bind.action) ? "DMS" : cat;
|
|
if (!processed[targetCat])
|
|
processed[targetCat] = [];
|
|
processed[targetCat].push(bind);
|
|
}
|
|
}
|
|
|
|
const sortedCats = Object.keys(processed).sort((a, b) => {
|
|
const ai = categoryOrder.indexOf(a);
|
|
const bi = categoryOrder.indexOf(b);
|
|
return (ai === -1 ? 999 : ai) - (bi === -1 ? 999 : bi);
|
|
});
|
|
|
|
const grouped = [];
|
|
const actionMap = {};
|
|
for (var ci = 0; ci < sortedCats.length; ci++) {
|
|
const category = sortedCats[ci];
|
|
const binds = processed[category];
|
|
if (!binds)
|
|
continue;
|
|
for (var i = 0; i < binds.length; i++) {
|
|
const bind = binds[i];
|
|
const action = bind.action || "";
|
|
const sourceStr = bind.source || "config";
|
|
const keyData = {
|
|
"key": bind.key || "",
|
|
"desc": bind.desc || "",
|
|
"source": sourceStr,
|
|
"isOverride": sourceStr === "dms",
|
|
"isDMSManaged": sourceStr === "dms" || sourceStr === "dms-default",
|
|
"hasDefault": bind.hasDefault === true,
|
|
"cooldownMs": bind.cooldownMs || 0,
|
|
"flags": bind.flags || "",
|
|
"allowWhenLocked": bind.allowWhenLocked || false,
|
|
"allowInhibiting": bind.allowInhibiting,
|
|
"repeat": bind.repeat
|
|
};
|
|
if (actionMap[action]) {
|
|
actionMap[action].keys.push(keyData);
|
|
if (!actionMap[action].desc && bind.desc)
|
|
actionMap[action].desc = bind.desc;
|
|
if (!actionMap[action].conflict && bind.conflict)
|
|
actionMap[action].conflict = bind.conflict;
|
|
} else {
|
|
const entry = {
|
|
"category": category,
|
|
"action": action,
|
|
"desc": bind.desc || "",
|
|
"keys": [keyData],
|
|
"conflict": bind.conflict || null
|
|
};
|
|
actionMap[action] = entry;
|
|
grouped.push(entry);
|
|
}
|
|
}
|
|
}
|
|
|
|
const list = [];
|
|
for (const cat of sortedCats) {
|
|
list.push({
|
|
"id": "cat:" + cat,
|
|
"type": "category",
|
|
"name": cat
|
|
});
|
|
const binds = processed[cat];
|
|
if (!binds)
|
|
continue;
|
|
for (const bind of binds)
|
|
list.push({
|
|
"id": "bind:" + bind.key,
|
|
"type": "bind",
|
|
"key": bind.key,
|
|
"desc": bind.desc
|
|
});
|
|
}
|
|
|
|
_allBinds = processed;
|
|
_categories = sortedCats;
|
|
_flatCache = grouped;
|
|
displayList = list;
|
|
_dataVersion++;
|
|
bindsLoaded();
|
|
if (_pendingSavedKey) {
|
|
bindSaved(_pendingSavedKey);
|
|
_pendingSavedKey = "";
|
|
}
|
|
}
|
|
|
|
function getCategories() {
|
|
return _categories;
|
|
}
|
|
|
|
function getFlatBinds() {
|
|
return _flatCache;
|
|
}
|
|
|
|
function keysForAction(actionId) {
|
|
if (!actionId)
|
|
return [];
|
|
for (let i = 0; i < _flatCache.length; i++) {
|
|
const group = _flatCache[i];
|
|
if (!group || group.action !== actionId || !Array.isArray(group.keys))
|
|
continue;
|
|
const keys = [];
|
|
for (let k = 0; k < group.keys.length; k++) {
|
|
const key = group.keys[k]?.key || "";
|
|
if (key)
|
|
keys.push(key);
|
|
}
|
|
return keys;
|
|
}
|
|
return [];
|
|
}
|
|
|
|
function saveBind(originalKey, bindData, draft, callback) {
|
|
if (currentProvider === "aqueous") {
|
|
_mutateAqueous(draft, callback || (() => {}));
|
|
return;
|
|
}
|
|
if (readOnly) {
|
|
showHyprlandReadOnlyWarning();
|
|
return;
|
|
}
|
|
if (!bindData.key || !Actions.isValidAction(bindData.action))
|
|
return;
|
|
saving = true;
|
|
const cmd = ["dms", "keybinds", "set", currentProvider, bindData.key, bindData.action];
|
|
cmd.push("--desc", bindData.desc || "");
|
|
if (originalKey && originalKey !== bindData.key)
|
|
cmd.push("--replace-key", originalKey);
|
|
if (bindData.cooldownMs > 0)
|
|
cmd.push("--cooldown-ms", String(bindData.cooldownMs));
|
|
if (bindData.allowWhenLocked)
|
|
cmd.push("--allow-when-locked");
|
|
if (bindData.repeat === false)
|
|
cmd.push("--no-repeat");
|
|
if (bindData.allowInhibiting === false)
|
|
cmd.push("--no-inhibiting");
|
|
if (bindData.flags)
|
|
cmd.push("--flags", bindData.flags);
|
|
saveProcess.command = cmd;
|
|
saveProcess.provider = currentProvider;
|
|
saveProcess.savedKey = bindData.key;
|
|
saveProcess.running = true;
|
|
}
|
|
|
|
property bool _hyprlandLegacyWarnShown: false
|
|
|
|
function _maybeWarnHyprlandLegacyConf() {
|
|
if (_hyprlandLegacyWarnShown)
|
|
return;
|
|
if (currentProvider !== "hyprland")
|
|
return;
|
|
if (readOnly) {
|
|
_hyprlandLegacyWarnShown = true;
|
|
showHyprlandReadOnlyWarning();
|
|
return;
|
|
}
|
|
if (!dmsStatus.exists || dmsStatus.included)
|
|
return;
|
|
_hyprlandLegacyWarnShown = true;
|
|
ToastService.showWarning(I18n.tr("Hyprland config include missing"), I18n.tr("DMS Settings writes Lua keybinds. Add the DMS include so edits apply."), "dms setup", "hyprland-migration");
|
|
}
|
|
|
|
function showHyprlandReadOnlyWarning() {
|
|
ToastService.showWarning(I18n.tr("Hyprland conf mode"), I18n.tr("This install is still using hyprland.conf. Run dms setup to migrate before changing these settings."), "dms setup", "hyprland-migration");
|
|
}
|
|
|
|
function removeBind(key, draft, callback) {
|
|
if (currentProvider === "aqueous") {
|
|
_mutateAqueous(draft, callback || (() => {}));
|
|
return;
|
|
}
|
|
if (readOnly) {
|
|
showHyprlandReadOnlyWarning();
|
|
return;
|
|
}
|
|
if (!key)
|
|
return;
|
|
removeProcess.command = ["dms", "keybinds", "remove", currentProvider, key];
|
|
removeProcess.provider = currentProvider;
|
|
removeProcess.running = true;
|
|
bindRemoved(key);
|
|
}
|
|
|
|
function resetBind(key, draft, callback) {
|
|
if (currentProvider === "aqueous") {
|
|
_mutateAqueous(draft, callback || (() => {}));
|
|
return;
|
|
}
|
|
if (readOnly) {
|
|
showHyprlandReadOnlyWarning();
|
|
return;
|
|
}
|
|
if (!key)
|
|
return;
|
|
removeProcess.command = ["dms", "keybinds", "reset", currentProvider, key];
|
|
removeProcess.provider = currentProvider;
|
|
removeProcess.running = true;
|
|
bindRemoved(key);
|
|
}
|
|
|
|
function getActionLabel(action) {
|
|
if (currentProvider === "aqueous")
|
|
return (_rawData?.binds?.Compositor || []).find(b => b.action === action)?.desc || Actions.getActionLabel(action, currentProvider);
|
|
return Actions.getActionLabel(action, currentProvider);
|
|
}
|
|
|
|
function isKnownCompositorAction(action) {
|
|
if (currentProvider === "aqueous")
|
|
return (_rawData?.binds?.Compositor || []).some(b => b.action === action);
|
|
return Actions.isKnownCompositorAction(currentProvider, action);
|
|
}
|
|
|
|
function getCompositorCategories() {
|
|
if (currentProvider === "aqueous")
|
|
return ["Compositor"];
|
|
return Actions.getCompositorCategories(currentProvider);
|
|
}
|
|
|
|
function getCompositorActions(category) {
|
|
if (currentProvider === "aqueous") {
|
|
const seen = new Set();
|
|
return (_rawData?.binds?.Compositor || []).filter(b => {
|
|
if (seen.has(b.action))
|
|
return false;
|
|
seen.add(b.action);
|
|
return true;
|
|
}).map(b => ({
|
|
id: b.action,
|
|
label: b.desc
|
|
}));
|
|
}
|
|
return Actions.getCompositorActions(currentProvider, category);
|
|
}
|
|
|
|
function getDmsActions() {
|
|
return Actions.getDmsActions(CompositorService.isNiri, CompositorService.isHyprland);
|
|
}
|
|
}
|