diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f80ae931a..a1af32be5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -304,7 +304,7 @@ jobs: - **`dankinstall-arm64.gz`** - Installer binary for ARM64 systems - **`dms-cli-.tar.gz`** - Go source code with vendored modules (for distro packaging) - **`dms-qml.tar.gz`** - QML source code only - - **`dms-source.tar.gz`** - Full repository source with bundled DankCommon (for distro packaging) + - **`dms-source.tar.gz`** - Full repository source with bundled DCommon (for distro packaging) ### Checksums - **`*.sha256`** - SHA256 checksums for verifying download integrity @@ -352,9 +352,9 @@ jobs: # Copy completions cp _core_assets/completion.* _release_assets/ 2>/dev/null || true - # Replace the DankCommon symlink with real submodule content for packaging - rm quickshell/DankCommon - cp -r dank-qml-common/DankCommon quickshell/DankCommon + # Replace the DCommon symlink with real submodule content for packaging + rm quickshell/DCommon + cp -r dank-qml-common/DCommon quickshell/DCommon # Create full source tarball (GitHub tag archives never contain submodule content) VERSION_NUM=${TAG#v} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9dba99fc9..68c728c50 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,7 +6,7 @@ To contribute fork this repository, make your changes, and open a pull request. ## Setup -Clone with submodules — the shared widget library ([dank-qml-common](https://github.com/AvengeMedia/dank-qml-common)) is vendored at `dank-qml-common/` and symlinked into `quickshell/DankCommon`: +Clone with submodules — the shared widget library ([dank-qml-common](https://github.com/AvengeMedia/dank-qml-common)) is vendored at `dank-qml-common/` and symlinked into `quickshell/DCommon`: ```bash git clone --recurse-submodules https://github.com/AvengeMedia/DankMaterialShell.git @@ -67,9 +67,9 @@ use ( ## Shared widgets (dank-qml-common) -Everything under `quickshell/DankCommon/` (core widgets, the file browser, scroll physics, bundled fonts) is shared across the DMS suite and lives in the `dank-qml-common` submodule. It is a normal git worktree: +Everything under `quickshell/DCommon/` (core widgets, the file browser, scroll physics, bundled fonts) is shared across the DMS suite and lives in the `dank-qml-common` submodule. It is a normal git worktree: -1. Edit files under `dank-qml-common/` (or through the `quickshell/DankCommon` symlink — same files) and test in the running shell; hot reload works as usual. For isolated widget work, the library is its own runnable config with a gallery: `qs -c dank-qml-common`. +1. Edit files under `dank-qml-common/` (or through the `quickshell/DCommon` symlink — same files) and test in the running shell; hot reload works as usual. For isolated widget work, the library is its own runnable config with a gallery: `qs -c dank-qml-common`. 2. Commit and PR those changes in the `dank-qml-common` repo: `cd dank-qml-common && git switch -c my-change`, push, open the PR there. 3. Once merged, bump the pointer here: `make update-common` (updates the submodule and the nix flake input together), then commit alongside any DMS-side changes. If you only bump the submodule, CI syncs `flake.lock` to it automatically on master. @@ -163,7 +163,7 @@ Preferably, try to keep new terms to a minimum and re-use existing terms where p Don't re-extract the translations. `en.json` and `template.json` are synced with POEditor by a maintainer script, so running `extract_translations.py` in your PR just makes a diff that fights the next sync. Add your `I18n.tr()` calls and leave the catalogs alone. (`settings_search_index.json` is the exception, the pre-commit hook regenerates that one when you touch settings QML.) -Strings inside `quickshell/DankCommon/` are owned by the dank-qml-common repo but stay in the DMS POEditor project — extraction here deliberately skips them, and `scripts/i18nsync.py sync` uploads the union of app terms and the submodule's terms instead (common terms carry the `dank-qml-common` tag). On download the sync splits the exports: app translations go to `quickshell/translations/poexports/`, common translations go to `dank-qml-common/DankCommon/translations/poexports/` for you to commit in that repo and bump. At runtime `I18n` merges both catalogs (app terms win). Other apps (dankcalendar) keep their own POEditor projects and merge the `dank-qml-common`-tagged terms from the DMS project. +Strings inside `quickshell/DCommon/` are owned by the dank-qml-common repo but stay in the DMS POEditor project — extraction here deliberately skips them, and `scripts/i18nsync.py sync` uploads the union of app terms and the submodule's terms instead (common terms carry the `dank-qml-common` tag). On download the sync splits the exports: app translations go to `quickshell/translations/poexports/`, common translations go to `dank-qml-common/DCommon/translations/poexports/` for you to commit in that repo and bump. At runtime `I18n` merges both catalogs (app terms win). Other apps (dankcalendar) keep their own POEditor projects and merge the `dank-qml-common`-tagged terms from the DMS project. ### GO (`core` directory) diff --git a/core/Makefile b/core/Makefile index a8c745c92..b6631508d 100644 --- a/core/Makefile +++ b/core/Makefile @@ -38,7 +38,7 @@ endif all: build sync-shell: - @test -e $(SHELL_SRC)/DankCommon/Widgets/DankIcon.qml || { echo "DankCommon missing: run git submodule update --init"; exit 1; } + @test -e $(SHELL_SRC)/DCommon/Widgets/DIcon.qml || { echo "DCommon missing: run git submodule update --init"; exit 1; } @rm -rf $(EMBED_DIR) @mkdir -p $(EMBED_DIR) @tar -C $(SHELL_SRC) --exclude=.qmlls.ini --exclude-from=../scripts/shell-test-excludes.txt -chf - . | tar -C $(EMBED_DIR) -xf - diff --git a/core/cmd/dms/commands_doctor.go b/core/cmd/dms/commands_doctor.go index 5e468e202..127a89402 100644 --- a/core/cmd/dms/commands_doctor.go +++ b/core/cmd/dms/commands_doctor.go @@ -1507,21 +1507,21 @@ const ( var bundledFontRelPaths = map[string][]string{ "google sans flex": { - "DankCommon/assets/fonts/google-sans-flex/GoogleSansFlex.ttf", + "DCommon/assets/fonts/google-sans-flex/GoogleSansFlex.ttf", }, "fira code": { - "DankCommon/assets/fonts/nerd-fonts/FiraCodeNerdFont-Regular.ttf", + "DCommon/assets/fonts/nerd-fonts/FiraCodeNerdFont-Regular.ttf", "assets/fonts/nerd-fonts/FiraCodeNerdFont-Regular.ttf", }, "firacode nerd font": { - "DankCommon/assets/fonts/nerd-fonts/FiraCodeNerdFont-Regular.ttf", + "DCommon/assets/fonts/nerd-fonts/FiraCodeNerdFont-Regular.ttf", "assets/fonts/nerd-fonts/FiraCodeNerdFont-Regular.ttf", }, "dm serif display": { - "DankCommon/assets/fonts/dm-serif-display/DMSerifDisplay-Regular.ttf", + "DCommon/assets/fonts/dm-serif-display/DMSerifDisplay-Regular.ttf", }, "notable": { - "DankCommon/assets/fonts/notable/Notable-Regular.ttf", + "DCommon/assets/fonts/notable/Notable-Regular.ttf", }, } @@ -1593,7 +1593,7 @@ func checkConfiguredFont(label, family, shellPath, fcCache string, fcListAvailab return checkResult{ catFonts, label, statusWarn, fmt.Sprintf("'%s' bundled file missing", family), - "Expected font file missing from shell install. Reinstall DMS or check DankCommon assets.", + "Expected font file missing from shell install. Reinstall DMS or check DCommon assets.", url, } } diff --git a/core/cmd/dms/commands_doctor_fonts_test.go b/core/cmd/dms/commands_doctor_fonts_test.go index a30f8d17f..7a67b5e10 100644 --- a/core/cmd/dms/commands_doctor_fonts_test.go +++ b/core/cmd/dms/commands_doctor_fonts_test.go @@ -8,7 +8,7 @@ import ( func TestCheckBundledGoogleSans(t *testing.T) { shellPath := t.TempDir() - fontPath := filepath.Join(shellPath, "DankCommon", "assets", "fonts", "google-sans-flex", "GoogleSansFlex.ttf") + fontPath := filepath.Join(shellPath, "DCommon", "assets", "fonts", "google-sans-flex", "GoogleSansFlex.ttf") missing := checkConfiguredFont("UI font", "Google Sans Flex", shellPath, "", false, "") if missing.status != statusWarn { t.Fatalf("missing bundled font status = %v, want %v", missing.status, statusWarn) diff --git a/dank-qml-common b/dank-qml-common index 44058322a..e9ec23320 160000 --- a/dank-qml-common +++ b/dank-qml-common @@ -1 +1 @@ -Subproject commit 44058322a4d3261293fa0f8d34933b1256cd5ba0 +Subproject commit e9ec2332004ca2e8b248bbe8fc96971f5df6b824 diff --git a/distro/fedora/dms-git.spec b/distro/fedora/dms-git.spec index 08d93f809..a468e5fca 100644 --- a/distro/fedora/dms-git.spec +++ b/distro/fedora/dms-git.spec @@ -76,7 +76,7 @@ Provides native DBus bindings, NetworkManager integration, and system utilities. {{{ git_repo_setup_macro }}} rm -rf dank-qml-common tar -xzf %{SOURCE3} -test -e quickshell/DankCommon/Widgets/DankIcon.qml || { echo "DankCommon missing after submodule unpack"; exit 1; } +test -e quickshell/DCommon/Widgets/DIcon.qml || { echo "DCommon missing after submodule unpack"; exit 1; } %build # Build DMS CLI from source (core/subdirectory) diff --git a/flake.lock b/flake.lock index dda2b9130..e85a7fbf6 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "dank-qml-common": { "flake": false, "locked": { - "lastModified": 1791221960, - "narHash": "sha256-TWWR8Gv0ZBT/+byucBMNKdcjotsymgIBysE2qn2sces=", + "lastModified": 1791232364, + "narHash": "sha256-pecYGeFoTFbCxS2ip9vBvrPaVhN7J5+e16GJUKwg2r8=", "owner": "AvengeMedia", "repo": "dank-qml-common", - "rev": "44058322a4d3261293fa0f8d34933b1256cd5ba0", + "rev": "e9ec2332004ca2e8b248bbe8fc96971f5df6b824", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 5ce041ce2..7ba5f1dad 100644 --- a/flake.nix +++ b/flake.nix @@ -131,8 +131,8 @@ tar -C ${rootSrc}/quickshell --mode=u+w --exclude-from=${rootSrc}/scripts/shell-test-excludes.txt -cf - . \ | tar -C $out/share/quickshell/dms -xf - - rm -f $out/share/quickshell/dms/DankCommon - tar -C ${dank-qml-common} --mode=u+w --exclude-from=${rootSrc}/scripts/shell-test-excludes.txt -cf - DankCommon \ + rm -f $out/share/quickshell/dms/DCommon + tar -C ${dank-qml-common} --mode=u+w --exclude-from=${rootSrc}/scripts/shell-test-excludes.txt -cf - DCommon \ | tar -C $out/share/quickshell/dms -xf - echo "${version}" > $out/share/quickshell/dms/VERSION diff --git a/quickshell/Common/Appearance.qml b/quickshell/Common/Appearance.qml index 902d209a0..68941bd61 100644 --- a/quickshell/Common/Appearance.qml +++ b/quickshell/Common/Appearance.qml @@ -1,11 +1,11 @@ pragma Singleton import Quickshell -import qs.DankCommon.Common as DankCommon +import qs.DCommon.Common as DCommon Singleton { - readonly property var rounding: DankCommon.Appearance.rounding - readonly property var spacing: DankCommon.Appearance.spacing - readonly property var fontSize: DankCommon.Appearance.fontSize - readonly property var anim: DankCommon.Appearance.anim + readonly property var rounding: DCommon.Appearance.rounding + readonly property var spacing: DCommon.Appearance.spacing + readonly property var fontSize: DCommon.Appearance.fontSize + readonly property var anim: DCommon.Appearance.anim } diff --git a/quickshell/Common/DankAnim.qml b/quickshell/Common/DankAnim.qml index 7c87d4332..5c4f823bf 100644 --- a/quickshell/Common/DankAnim.qml +++ b/quickshell/Common/DankAnim.qml @@ -1,3 +1,7 @@ -import qs.DankCommon.Common as DankCommon +import QtQuick +import qs.DCommon.Common as DCommon -DankCommon.DankAnim {} +DCommon.DAnim { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankAnim", "DAnim", "qs.DCommon.Common") +} diff --git a/quickshell/Common/DankColorAnim.qml b/quickshell/Common/DankColorAnim.qml index b62c9b4f2..7eb4153ba 100644 --- a/quickshell/Common/DankColorAnim.qml +++ b/quickshell/Common/DankColorAnim.qml @@ -1,3 +1,7 @@ -import qs.DankCommon.Common as DankCommon +import QtQuick +import qs.DCommon.Common as DCommon -DankCommon.DankColorAnim {} +DCommon.DColorAnim { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankColorAnim", "DColorAnim", "qs.DCommon.Common") +} diff --git a/quickshell/Common/DankSocket.qml b/quickshell/Common/DankSocket.qml index 6aa88ec82..a5afa7f4e 100644 --- a/quickshell/Common/DankSocket.qml +++ b/quickshell/Common/DankSocket.qml @@ -1,3 +1,7 @@ -import qs.DankCommon.Common as DankCommon +import QtQuick +import qs.DCommon.Common as DCommon -DankCommon.DankSocket {} +DCommon.DSocket { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankSocket", "DSocket", "qs.DCommon.Common") +} diff --git a/quickshell/Common/Deprecation.qml b/quickshell/Common/Deprecation.qml new file mode 100644 index 000000000..2f8d1fc6c --- /dev/null +++ b/quickshell/Common/Deprecation.qml @@ -0,0 +1,36 @@ +pragma Singleton + +import QtQuick +import Quickshell +import qs.Services + +Singleton { + readonly property var log: Log.scoped("Deprecation") + readonly property var _warned: ({}) + + function type(instance, oldName, newName, module) { + const plugin = _owningPlugin(instance); + const key = oldName + "@" + (plugin ? plugin.id : ""); + if (_warned[key]) + return; + _warned[key] = true; + const lines = [`${oldName} is deprecated and will be removed in a future release.`, `Replace it with ${newName} from ${module}.`]; + if (plugin) + lines.push(`Used by the "${plugin.name}" plugin (${plugin.id}, by ${plugin.author}). Contact the plugin author to update it.`); + log.error(lines.join("\n ")); + } + + function _owningPlugin(instance) { + for (let o = instance; o; o = o.parent ?? null) { + if (typeof o.pluginId !== "string" || !o.pluginId) + continue; + const info = PluginService.availablePlugins[o.pluginId]; + return { + id: o.pluginId, + name: info?.name ?? o.pluginId, + author: info?.author ?? "unknown" + }; + } + return null; + } +} diff --git a/quickshell/Common/ElevationShadow.qml b/quickshell/Common/ElevationShadow.qml index ea8d8d51c..2c78e87ed 100644 --- a/quickshell/Common/ElevationShadow.qml +++ b/quickshell/Common/ElevationShadow.qml @@ -1,3 +1,3 @@ -import qs.DankCommon.Common as DankCommon +import qs.DCommon.Common as DCommon -DankCommon.ElevationShadow {} +DCommon.ElevationShadow {} diff --git a/quickshell/Common/I18n.qml b/quickshell/Common/I18n.qml index adac79833..84b181239 100644 --- a/quickshell/Common/I18n.qml +++ b/quickshell/Common/I18n.qml @@ -25,7 +25,7 @@ Singleton { readonly property bool isRtl: _rtlLanguages.includes(_lang) readonly property url translationsFolder: Qt.resolvedUrl("../translations/poexports") - readonly property url commonTranslationsFolder: Qt.resolvedUrl("../DankCommon/translations/poexports") + readonly property url commonTranslationsFolder: Qt.resolvedUrl("../DCommon/translations/poexports") readonly property alias folder: dir.folder property var presentLocales: ({ @@ -97,9 +97,9 @@ Singleton { try { root.commonTranslations = JSON.parse(text()); root.commonTranslationsLoaded = true; - log.info(`I18n: Loaded DankCommon translations (${Object.keys(root.commonTranslations).length} contexts)`); + log.info(`I18n: Loaded DCommon translations (${Object.keys(root.commonTranslations).length} contexts)`); } catch (e) { - log.warn("I18n: Error parsing DankCommon translations:", e); + log.warn("I18n: Error parsing DCommon translations:", e); } } } diff --git a/quickshell/Common/ListViewTransitions.qml b/quickshell/Common/ListViewTransitions.qml index 466d6b292..fad7d3376 100644 --- a/quickshell/Common/ListViewTransitions.qml +++ b/quickshell/Common/ListViewTransitions.qml @@ -2,12 +2,12 @@ pragma Singleton import QtQuick import Quickshell -import qs.DankCommon.Common as DankCommon +import qs.DCommon.Common as DCommon Singleton { - readonly property bool enabled: DankCommon.ListViewTransitions.enabled - readonly property Transition add: DankCommon.ListViewTransitions.add - readonly property Transition remove: DankCommon.ListViewTransitions.remove - readonly property Transition displaced: DankCommon.ListViewTransitions.displaced - readonly property Transition move: DankCommon.ListViewTransitions.move + readonly property bool enabled: DCommon.ListViewTransitions.enabled + readonly property Transition add: DCommon.ListViewTransitions.add + readonly property Transition remove: DCommon.ListViewTransitions.remove + readonly property Transition displaced: DCommon.ListViewTransitions.displaced + readonly property Transition move: DCommon.ListViewTransitions.move } diff --git a/quickshell/Common/Proc.qml b/quickshell/Common/Proc.qml index c7704833f..33d163c04 100644 --- a/quickshell/Common/Proc.qml +++ b/quickshell/Common/Proc.qml @@ -1,17 +1,17 @@ pragma Singleton import Quickshell -import qs.DankCommon.Common as DankCommon +import qs.DCommon.Common as DCommon Singleton { - readonly property int noTimeout: DankCommon.Proc.noTimeout - readonly property string dmsBin: DankCommon.Proc.dmsBin + readonly property int noTimeout: DCommon.Proc.noTimeout + readonly property string dmsBin: DCommon.Proc.dmsBin function runCommand(id, command, callback, debounceMs, timeoutMs, owner) { - DankCommon.Proc.runCommand(id, command, callback, debounceMs, timeoutMs, owner); + DCommon.Proc.runCommand(id, command, callback, debounceMs, timeoutMs, owner); } function release(id) { - DankCommon.Proc.release(id); + DCommon.Proc.release(id); } } diff --git a/quickshell/Common/SessionData.qml b/quickshell/Common/SessionData.qml index 93a88305c..27953556a 100644 --- a/quickshell/Common/SessionData.qml +++ b/quickshell/Common/SessionData.qml @@ -8,9 +8,9 @@ import Quickshell.Io import qs.Common import qs.Services import "settings/SessionSpec.js" as Spec -import "../DankCommon/Common/MaterialWallpaper.js" as MaterialWallpaper +import "../DCommon/Common/MaterialWallpaper.js" as MaterialWallpaper import "settings/SessionStore.js" as Store -import "../DankCommon/Common/settings/SpecUtil.js" as SpecUtil +import "../DCommon/Common/settings/SpecUtil.js" as SpecUtil Singleton { id: root diff --git a/quickshell/Common/SettingsData.qml b/quickshell/Common/SettingsData.qml index 88376305e..eac70d32a 100644 --- a/quickshell/Common/SettingsData.qml +++ b/quickshell/Common/SettingsData.qml @@ -3,7 +3,7 @@ pragma ComponentBehavior: Bound import QtCore import QtQuick -import "../DankCommon/Common/Shape.js" as Shape +import "../DCommon/Common/Shape.js" as Shape import Quickshell import Quickshell.Io import qs.Common @@ -13,7 +13,7 @@ import "GSettings.js" as GSettings import "LayoutResolver.js" as LayoutResolver import "settings/SettingsSpec.js" as Spec import "settings/SettingsStore.js" as Store -import "../DankCommon/Common/settings/SpecUtil.js" as SpecUtil +import "../DCommon/Common/settings/SpecUtil.js" as SpecUtil import "settings/BarWidgetDefaults.js" as WidgetDefaults import "settings/DockConfig.js" as DockConfig diff --git a/quickshell/Common/SpringMotion.qml b/quickshell/Common/SpringMotion.qml index fcf919c27..5b563444a 100644 --- a/quickshell/Common/SpringMotion.qml +++ b/quickshell/Common/SpringMotion.qml @@ -1,3 +1,3 @@ -import qs.DankCommon.Common as DankCommon +import qs.DCommon.Common as DCommon -DankCommon.SpringMotion {} +DCommon.SpringMotion {} diff --git a/quickshell/Common/Theme.qml b/quickshell/Common/Theme.qml index 45cbd84ad..87fe639e0 100644 --- a/quickshell/Common/Theme.qml +++ b/quickshell/Common/Theme.qml @@ -3,15 +3,15 @@ pragma ComponentBehavior: Bound import QtCore import QtQuick -import "../DankCommon/Common/Shape.js" as Shape -import "../DankCommon/Common/Surface.js" as Surface -import "../DankCommon/Common/Contrast.js" as Contrast -import "../DankCommon/Common/Accents.js" as Accents -import "../DankCommon/Common/Tonal.js" as Tonal +import "../DCommon/Common/Shape.js" as Shape +import "../DCommon/Common/Surface.js" as Surface +import "../DCommon/Common/Contrast.js" as Contrast +import "../DCommon/Common/Accents.js" as Accents +import "../DCommon/Common/Tonal.js" as Tonal import Quickshell import Quickshell.Io import qs.Common -import qs.DankCommon.Common as DankCommon +import qs.DCommon.Common as DCommon import qs.Services import qs.Modules.Greetd import "StockThemes.js" as StockThemes @@ -1194,14 +1194,14 @@ Singleton { property string fontFamily: { if (typeof SettingsData === "undefined") - return DankCommon.Fonts.sans; + return DCommon.Fonts.sans; if (SettingsData.isGreeterMode && SettingsData.lockScreenFontFamily !== "") return resolvedFontFamily(SettingsData.lockScreenFontFamily); return resolvedFontFamily(SettingsData.fontFamily); } - property string monoFontFamily: typeof SettingsData !== "undefined" ? resolvedMonoFontFamily(SettingsData.monoFontFamily) : DankCommon.Fonts.mono - property string displayFontFamily: typeof SettingsData !== "undefined" ? resolvedDisplayFontFamily(SettingsData.displayFontFamily) : DankCommon.Fonts.display + property string monoFontFamily: typeof SettingsData !== "undefined" ? resolvedMonoFontFamily(SettingsData.monoFontFamily) : DCommon.Fonts.mono + property string displayFontFamily: typeof SettingsData !== "undefined" ? resolvedDisplayFontFamily(SettingsData.displayFontFamily) : DCommon.Fonts.display readonly property var fontChoices: [ { @@ -1212,26 +1212,26 @@ Singleton { "value": "display", "text": I18n.tr("Display", "Display font role option") } - ].concat(DankCommon.Fonts.bundledFamilies.map(family => ({ + ].concat(DCommon.Fonts.bundledFamilies.map(family => ({ "value": family, "text": family }))) function resolvedFontFamily(family) { if (family === defaultFontFamily) - return DankCommon.Fonts.sans; + return DCommon.Fonts.sans; return family; } function resolvedMonoFontFamily(family) { if (family === defaultMonoFontFamily) - return DankCommon.Fonts.mono; + return DCommon.Fonts.mono; return family; } function resolvedDisplayFontFamily(family) { if (family === defaultDisplayFontFamily) - return DankCommon.Fonts.display; + return DCommon.Fonts.display; return family; } diff --git a/quickshell/Common/settings/SessionSpec.js b/quickshell/Common/settings/SessionSpec.js index 1fc4851f0..6b42b345b 100644 --- a/quickshell/Common/settings/SessionSpec.js +++ b/quickshell/Common/settings/SessionSpec.js @@ -1,6 +1,6 @@ .pragma library -.import "../../DankCommon/Common/settings/SharedSessionSpec.js" as Shared -.import "../../DankCommon/Common/settings/SpecUtil.js" as Util +.import "../../DCommon/Common/settings/SharedSessionSpec.js" as Shared +.import "../../DCommon/Common/settings/SpecUtil.js" as Util var LOCAL_SPEC = { doNotDisturb: { diff --git a/quickshell/Common/settings/SessionStore.js b/quickshell/Common/settings/SessionStore.js index 37de96bc8..5ec114967 100644 --- a/quickshell/Common/settings/SessionStore.js +++ b/quickshell/Common/settings/SessionStore.js @@ -1,6 +1,6 @@ .pragma library .import "./SessionSpec.js" as SpecModule -.import "../../DankCommon/Common/settings/SpecUtil.js" as Util +.import "../../DCommon/Common/settings/SpecUtil.js" as Util function parse(root, jsonObj) { var SPEC = SpecModule.SPEC; @@ -110,23 +110,31 @@ function migrateToVersion(obj, targetVersion, settingsData) { console.info("SessionData: Tray keys now use a stable id (or id::instance) instead of id::tooltipTitle"); function stripTrayKeys(list) { - if (!list || list.constructor !== Array) return list; + if (!list || list.constructor !== Array) + return list; var out = []; for (var i = 0; i < list.length; i++) { var raw = list[i]; - if (typeof raw !== "string") continue; + if (typeof raw !== "string") + continue; var key = raw.includes("::") ? raw.split("::")[0] : raw; var hasDup = false; for (var j = 0; j < out.length; j++) { - if (out[j] === key) { hasDup = true; break; } + if (out[j] === key) { + hasDup = true; + break; + } } - if (key && !hasDup) out.push(key); + if (key && !hasDup) + out.push(key); } return out; } - if (session.hiddenTrayIds !== undefined) session.hiddenTrayIds = stripTrayKeys(session.hiddenTrayIds); - if (session.trayItemOrder !== undefined) session.trayItemOrder = stripTrayKeys(session.trayItemOrder); + if (session.hiddenTrayIds !== undefined) + session.hiddenTrayIds = stripTrayKeys(session.hiddenTrayIds); + if (session.trayItemOrder !== undefined) + session.trayItemOrder = stripTrayKeys(session.trayItemOrder); session.configVersion = 7; } return session; diff --git a/quickshell/Common/settings/SettingsSpec.js b/quickshell/Common/settings/SettingsSpec.js index 6fea1d166..876a05b1d 100644 --- a/quickshell/Common/settings/SettingsSpec.js +++ b/quickshell/Common/settings/SettingsSpec.js @@ -1,6 +1,6 @@ .pragma library -.import "../../DankCommon/Common/settings/SharedSettingsSpec.js" as Shared -.import "../../DankCommon/Common/settings/SpecUtil.js" as Util +.import "../../DCommon/Common/settings/SharedSettingsSpec.js" as Shared +.import "../../DCommon/Common/settings/SpecUtil.js" as Util .import "DockConfig.js" as DockConfig function lockWidgetDefaults() { diff --git a/quickshell/Common/settings/SettingsStore.js b/quickshell/Common/settings/SettingsStore.js index bffeb908f..e44f6f280 100644 --- a/quickshell/Common/settings/SettingsStore.js +++ b/quickshell/Common/settings/SettingsStore.js @@ -1,7 +1,7 @@ .pragma library .import "./SettingsSpec.js" as SpecModule -.import "../../DankCommon/Common/settings/SpecUtil.js" as Util -.import "../../DankCommon/Common/Shape.js" as Shape +.import "../../DCommon/Common/settings/SpecUtil.js" as Util +.import "../../DCommon/Common/Shape.js" as Shape .import "./BarWidgetDefaults.js" as WidgetDefaults .import "./DockConfig.js" as DockConfig diff --git a/quickshell/DCommon b/quickshell/DCommon new file mode 120000 index 000000000..a7e51860f --- /dev/null +++ b/quickshell/DCommon @@ -0,0 +1 @@ +../dank-qml-common/DCommon \ No newline at end of file diff --git a/quickshell/DankCommon b/quickshell/DankCommon deleted file mode 120000 index dfc1a27bb..000000000 --- a/quickshell/DankCommon +++ /dev/null @@ -1 +0,0 @@ -../dank-qml-common/DankCommon \ No newline at end of file diff --git a/quickshell/Modals/AppPickerModal.qml b/quickshell/Modals/AppPickerModal.qml index e206a6902..e1b9e298f 100644 --- a/quickshell/Modals/AppPickerModal.qml +++ b/quickshell/Modals/AppPickerModal.qml @@ -3,7 +3,7 @@ import Quickshell import qs.Common import qs.Modals.Common import qs.Modals.DankLauncherV2.Components -import qs.Widgets +import qs.DCommon.Widgets import qs.Services DankModal { @@ -313,7 +313,7 @@ DankModal { anchors.rightMargin: Theme.spacingS anchors.verticalCenter: parent.verticalCenter - DankActionButton { + DActionButton { buttonSize: 36 circular: false iconName: "view_list" @@ -326,7 +326,7 @@ DankModal { } } - DankActionButton { + DActionButton { buttonSize: 36 circular: false iconName: "grid_view" @@ -341,7 +341,7 @@ DankModal { } } - DankSearchField { + DSearchField { id: searchField width: parent.width - Theme.spacingS * 2 @@ -413,7 +413,7 @@ DankModal { radius: Theme.cornerRadius color: "transparent" - DankListView { + DListView { id: appList property int itemHeight: 60 @@ -471,7 +471,7 @@ DankModal { } } - DankGridView { + DGridView { id: appGrid function ensureVisible(index) { @@ -546,7 +546,7 @@ DankModal { visible: text.length > 0 } - DankTextField { + DTextField { id: targetDataField anchors.left: targetDataLabelText.visible ? targetDataLabelText.right : parent.left anchors.leftMargin: Theme.spacingS @@ -568,7 +568,7 @@ DankModal { } } - DankActionButton { + DActionButton { id: copyTargetButton anchors.right: parent.right anchors.rightMargin: Theme.spacingXS @@ -587,7 +587,7 @@ DankModal { height: 36 visible: root.mimeType.length > 0 - DankToggle { + DToggle { anchors.left: parent.left anchors.leftMargin: Theme.spacingM anchors.right: parent.right diff --git a/quickshell/Modals/BluetoothPairingModal.qml b/quickshell/Modals/BluetoothPairingModal.qml index 0e8dd3e1f..1a2df9975 100644 --- a/quickshell/Modals/BluetoothPairingModal.qml +++ b/quickshell/Modals/BluetoothPairingModal.qml @@ -2,7 +2,7 @@ import QtQuick import qs.Common import qs.Modals.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets DankModal { id: root @@ -161,7 +161,7 @@ DankModal { } } - DankTextField { + DTextField { id: pinInputField anchors.fill: parent @@ -196,7 +196,7 @@ DankModal { } } - DankTextField { + DTextField { id: passkeyInputField anchors.fill: parent @@ -349,7 +349,7 @@ DankModal { } } - DankActionButton { + DActionButton { anchors.top: parent.top anchors.right: parent.right anchors.topMargin: Theme.spacingM diff --git a/quickshell/Modals/Changelog/ChangelogContent.qml b/quickshell/Modals/Changelog/ChangelogContent.qml index 31fcab45b..fb6a9dbc0 100644 --- a/quickshell/Modals/Changelog/ChangelogContent.qml +++ b/quickshell/Modals/Changelog/ChangelogContent.qml @@ -2,6 +2,7 @@ import QtQuick import QtQuick.Effects import qs.Common import qs.Services +import qs.DCommon.Widgets import qs.Widgets import qs.Modules.Settings.Widgets @@ -222,7 +223,7 @@ Column { Row { spacing: Theme.spacingS - DankIcon { + DIcon { name: "warning" size: Theme.iconSizeSmall color: Theme.warning @@ -284,7 +285,7 @@ Column { Row { spacing: Theme.spacingS - DankIcon { + DIcon { name: "auto_awesome" size: Theme.iconSizeSmall color: Theme.primary diff --git a/quickshell/Modals/Changelog/ChangelogFeatureCard.qml b/quickshell/Modals/Changelog/ChangelogFeatureCard.qml index ffa3db5d6..fc017d50c 100644 --- a/quickshell/Modals/Changelog/ChangelogFeatureCard.qml +++ b/quickshell/Modals/Changelog/ChangelogFeatureCard.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets Rectangle { id: root @@ -40,7 +40,7 @@ Rectangle { color: Theme.primaryContainer anchors.verticalCenter: parent.verticalCenter - DankIcon { + DIcon { anchors.centerIn: parent name: root.iconName size: Theme.iconSize - 6 diff --git a/quickshell/Modals/Changelog/ChangelogModal.qml b/quickshell/Modals/Changelog/ChangelogModal.qml index c30b4405f..87251fc33 100644 --- a/quickshell/Modals/Changelog/ChangelogModal.qml +++ b/quickshell/Modals/Changelog/ChangelogModal.qml @@ -1,6 +1,7 @@ import QtQuick import qs.Common import qs.Services +import qs.DCommon.Widgets import qs.Widgets DankFloatingWindow { @@ -43,7 +44,7 @@ DankFloatingWindow { } } - DankWindowHeader { + DWindowHeader { id: headerRow anchors.left: parent.left anchors.right: parent.right @@ -52,7 +53,7 @@ DankFloatingWindow { onCloseRequested: root.dismiss() } - DankFlickable { + DFlickable { anchors.left: parent.left anchors.right: parent.right anchors.top: headerRow.bottom @@ -90,7 +91,7 @@ DankFloatingWindow { anchors.centerIn: parent spacing: Theme.spacingM - DankButton { + DButton { text: I18n.tr("Release notes", "settings page and card title, notes for a DMS release") iconName: "auto_awesome" backgroundColor: Theme.chipSurface @@ -101,7 +102,7 @@ DankFloatingWindow { } } - DankButton { + DButton { text: I18n.tr("OK") iconName: "check" backgroundColor: Theme.primary diff --git a/quickshell/Modals/Changelog/ChangelogUpgradeNote.qml b/quickshell/Modals/Changelog/ChangelogUpgradeNote.qml index 545eb9a23..9c7922892 100644 --- a/quickshell/Modals/Changelog/ChangelogUpgradeNote.qml +++ b/quickshell/Modals/Changelog/ChangelogUpgradeNote.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets Row { id: root @@ -9,7 +9,7 @@ Row { spacing: Theme.spacingS - DankIcon { + DIcon { name: "arrow_right" size: Theme.iconSizeSmall - 2 color: Theme.surfaceVariantText diff --git a/quickshell/Modals/Clipboard/ClipboardActions.qml b/quickshell/Modals/Clipboard/ClipboardActions.qml index c0d36df23..5ba9981d3 100644 --- a/quickshell/Modals/Clipboard/ClipboardActions.qml +++ b/quickshell/Modals/Clipboard/ClipboardActions.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets Item { id: actions @@ -17,7 +17,7 @@ Item { anchors.verticalCenter: parent.verticalCenter spacing: Theme.spacingXS - DankActionButton { + DActionButton { Keys.forwardTo: [actions.modal.modalFocusScope] iconName: "push_pin" iconColor: actions.modal.activeTab === "saved" ? Theme.onPrimary : Theme.onSurfaceVariant @@ -27,7 +27,7 @@ Item { onClicked: actions.modal.activeTab = actions.modal.activeTab === "saved" ? "recents" : "saved" } - DankActionButton { + DActionButton { Keys.forwardTo: [actions.modal.modalFocusScope] objectName: "keyboardHints" iconName: "info" @@ -44,14 +44,14 @@ Item { anchors.verticalCenter: parent.verticalCenter spacing: Theme.spacingXS - DankActionButton { + DActionButton { Keys.forwardTo: [actions.modal.modalFocusScope] iconName: "settings" tooltipText: I18n.tr("Settings") onClicked: actions.modal.openSettings() } - DankActionButton { + DActionButton { Keys.forwardTo: [actions.modal.modalFocusScope] iconName: "delete_sweep" iconColor: Theme.onSecondaryContainer @@ -60,7 +60,7 @@ Item { onClicked: actions.modal.confirmClearAll() } - DankActionButton { + DActionButton { Keys.forwardTo: [actions.modal.modalFocusScope] visible: !actions.modal.popout iconName: "close" diff --git a/quickshell/Modals/Clipboard/ClipboardContent.qml b/quickshell/Modals/Clipboard/ClipboardContent.qml index 7b84de918..c764c6e26 100644 --- a/quickshell/Modals/Clipboard/ClipboardContent.qml +++ b/quickshell/Modals/Clipboard/ClipboardContent.qml @@ -1,6 +1,7 @@ import QtQuick import Quickshell import qs.Common +import qs.DCommon.Widgets import qs.Widgets import qs.Services @@ -126,7 +127,7 @@ Item { modal: clipboardContent.modal } - DankSearchField { + DSearchField { id: searchField anchors.left: parent.left @@ -160,7 +161,7 @@ Item { } } - DankActionButton { + DActionButton { id: filterButton anchors.right: searchField.right @@ -217,7 +218,7 @@ Item { anchors.bottomMargin: keyboardHintsLoader.active ? PopoutMetrics.contentGap : 0 clip: true - DankListView { + DListView { id: clipboardListView reuseItems: true highlightSelection: clipboardContent.modal.keyboardNavigationActive && clipboardContent.modal.selectedIndex >= 0 diff --git a/quickshell/Modals/Clipboard/ClipboardEditor.qml b/quickshell/Modals/Clipboard/ClipboardEditor.qml index a168091ae..351aaa99d 100644 --- a/quickshell/Modals/Clipboard/ClipboardEditor.qml +++ b/quickshell/Modals/Clipboard/ClipboardEditor.qml @@ -5,7 +5,7 @@ import QtQuick.Controls import QtQuick.Layouts import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets Item { id: root @@ -263,7 +263,7 @@ Item { width: parent.width height: ClipboardConstants.headerHeight - DankActionButton { + DActionButton { iconName: "arrow_back" Accessible.name: I18n.tr("Back") iconSize: Theme.iconSize - 4 @@ -281,7 +281,7 @@ Item { anchors.centerIn: parent } - DankActionButton { + DActionButton { iconName: "close" Accessible.name: I18n.tr("Close") iconSize: Theme.iconSize - 4 @@ -292,7 +292,7 @@ Item { } } - DankTextEdit { + DTextEdit { id: editField width: parent.width height: Math.max(Theme.fontSizeMedium * 8, parent.height - editorHeader.height - editorActions.height - PopoutMetrics.contentGap * 2) @@ -335,7 +335,7 @@ Item { Layout.fillWidth: true } - DankButton { + DButton { id: cancelButton text: I18n.tr("Cancel") backgroundColor: Theme.chipSurface @@ -348,14 +348,14 @@ Item { spacing: Theme.spacingS opacity: root.textLoaded ? 1 : 0.6 - DankButton { + DButton { text: I18n.tr("Save") backgroundColor: Theme.primary textColor: Theme.onPrimary onClicked: root.saveEntry("history") } - DankIconButton { + DIconButton { variant: "filled" iconName: saveMenu.visible ? "expand_less" : "expand_more" tooltipText: I18n.tr("Save") @@ -397,7 +397,7 @@ Item { anchors.verticalCenter: parent.verticalCenter spacing: Theme.spacingS - DankIcon { + DIcon { name: "save" size: Theme.iconSizeSmall color: Theme.surfaceText @@ -435,7 +435,7 @@ Item { anchors.verticalCenter: parent.verticalCenter spacing: Theme.spacingS - DankIcon { + DIcon { name: "close" size: Theme.iconSizeSmall color: Theme.surfaceText @@ -474,7 +474,7 @@ Item { anchors.verticalCenter: parent.verticalCenter spacing: Theme.spacingS - DankIcon { + DIcon { name: "content_paste" size: Theme.iconSizeSmall color: Theme.surfaceText diff --git a/quickshell/Modals/Clipboard/ClipboardEntry.qml b/quickshell/Modals/Clipboard/ClipboardEntry.qml index 88afe8fc6..b639089fc 100644 --- a/quickshell/Modals/Clipboard/ClipboardEntry.qml +++ b/quickshell/Modals/Clipboard/ClipboardEntry.qml @@ -1,9 +1,9 @@ import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets -DankListItem { +DListItem { id: root required property var entry @@ -54,7 +54,7 @@ DankListItem { spacing: Theme.spacingXS visible: root.showAnyAction - DankActionButton { + DActionButton { Keys.forwardTo: [root.modal.modalFocusScope] objectName: "previewEntry" iconName: "preview" @@ -70,7 +70,7 @@ DankListItem { height: Theme.iconButtonSize visible: root.showPinnedIndicator - DankIcon { + DIcon { anchors.centerIn: parent name: "push_pin" size: Theme.iconSizeSmall @@ -78,7 +78,7 @@ DankListItem { } } - DankActionButton { + DActionButton { Keys.forwardTo: [root.modal.modalFocusScope] iconName: "content_copy" Accessible.name: I18n.tr("Copy") @@ -88,7 +88,7 @@ DankListItem { onClicked: copyRequested() } - DankActionButton { + DActionButton { Keys.forwardTo: [root.modal.modalFocusScope] iconName: "content_paste" Accessible.name: I18n.tr("Paste") @@ -98,7 +98,7 @@ DankListItem { onClicked: pasteRequested() } - DankActionButton { + DActionButton { Keys.forwardTo: [root.modal.modalFocusScope] iconName: "push_pin" Accessible.name: root.effectivePinned ? I18n.tr("Unpin") : I18n.tr("Pin", "verb, keep an item pinned in place") @@ -119,7 +119,7 @@ DankListItem { } } - DankActionButton { + DActionButton { Keys.forwardTo: [root.modal.modalFocusScope] iconName: "edit" Accessible.name: I18n.tr("Edit") @@ -136,7 +136,7 @@ DankListItem { } } - DankActionButton { + DActionButton { Keys.forwardTo: [root.modal.modalFocusScope] iconName: "close" Accessible.name: I18n.tr("Delete") diff --git a/quickshell/Modals/Clipboard/ClipboardHeader.qml b/quickshell/Modals/Clipboard/ClipboardHeader.qml index e029f6bcc..7aedd5224 100644 --- a/quickshell/Modals/Clipboard/ClipboardHeader.qml +++ b/quickshell/Modals/Clipboard/ClipboardHeader.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets Item { id: header diff --git a/quickshell/Modals/Clipboard/ClipboardImagePreview.qml b/quickshell/Modals/Clipboard/ClipboardImagePreview.qml index 9ee93adf5..f29833988 100644 --- a/quickshell/Modals/Clipboard/ClipboardImagePreview.qml +++ b/quickshell/Modals/Clipboard/ClipboardImagePreview.qml @@ -4,7 +4,7 @@ import QtQuick import Quickshell.Widgets import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets ClippingRectangle { id: root @@ -93,7 +93,7 @@ ClippingRectangle { onWheel: wheel => wheel.accepted = true } - DankWindowHeader { + DWindowHeader { id: header anchors.top: parent.top @@ -130,7 +130,7 @@ ClippingRectangle { visible: status === Image.Ready && source != "" } - DankIcon { + DIcon { anchors.centerIn: parent name: "image" size: Theme.iconSizeLarge diff --git a/quickshell/Modals/Clipboard/ClipboardThumbnail.qml b/quickshell/Modals/Clipboard/ClipboardThumbnail.qml index 77a5e6b73..49609169d 100644 --- a/quickshell/Modals/Clipboard/ClipboardThumbnail.qml +++ b/quickshell/Modals/Clipboard/ClipboardThumbnail.qml @@ -2,7 +2,7 @@ import QtQuick import Quickshell.Widgets import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets ClippingRectangle { id: thumbnail @@ -240,7 +240,7 @@ ClippingRectangle { } } - DankIcon { + DIcon { visible: !(entryType === "image" && thumbnailImage.status === Image.Ready && thumbnailImage.source != "") name: { switch (entryType) { diff --git a/quickshell/Modals/Common/ConfirmDialogContent.qml b/quickshell/Modals/Common/ConfirmDialogContent.qml index d600c0197..f0fcd4dcd 100644 --- a/quickshell/Modals/Common/ConfirmDialogContent.qml +++ b/quickshell/Modals/Common/ConfirmDialogContent.qml @@ -1,3 +1,3 @@ -import qs.Widgets +import qs.DCommon.Widgets -DankConfirmDialogContent {} +DConfirmDialogContent {} diff --git a/quickshell/Modals/Common/ConfirmModal.qml b/quickshell/Modals/Common/ConfirmModal.qml index 6356157e4..231033b91 100644 --- a/quickshell/Modals/Common/ConfirmModal.qml +++ b/quickshell/Modals/Common/ConfirmModal.qml @@ -1,7 +1,6 @@ import QtQuick import qs.Common import qs.Modals.Common -import qs.Widgets DankModal { id: root diff --git a/quickshell/Modals/Common/InputModal.qml b/quickshell/Modals/Common/InputModal.qml index 9334147f1..ab7c4d29b 100644 --- a/quickshell/Modals/Common/InputModal.qml +++ b/quickshell/Modals/Common/InputModal.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Common import qs.Modals.Common -import qs.Widgets +import qs.DCommon.Widgets DankModal { id: root @@ -75,7 +75,7 @@ DankModal { }); } - content: DankDialog { + content: DDialog { id: inputDialog property alias textInputRef: textInput @@ -84,7 +84,7 @@ DankModal { onAccepted: root.confirmAndClose() onRejected: root.cancelAndClose() - DankTextField { + DTextField { id: textInput width: parent.width @@ -98,7 +98,7 @@ DankModal { } actions: [ - DankButton { + DButton { maximumWidth: inputDialog.actionWidth wrapText: true text: root.cancelButtonText @@ -106,7 +106,7 @@ DankModal { textColor: Theme.primary onClicked: root.cancelAndClose() }, - DankButton { + DButton { maximumWidth: inputDialog.actionWidth wrapText: true text: root.confirmButtonText diff --git a/quickshell/Modals/DankLauncherV2/ActionPanel.qml b/quickshell/Modals/DankLauncherV2/ActionPanel.qml index cfe1fdf82..9b75408b6 100644 --- a/quickshell/Modals/DankLauncherV2/ActionPanel.qml +++ b/quickshell/Modals/DankLauncherV2/ActionPanel.qml @@ -3,7 +3,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets Rectangle { id: root @@ -145,7 +145,7 @@ Rectangle { anchors.fill: parent anchors.margins: Theme.spacingS - DankFlickable { + DFlickable { id: actionsFlickable anchors.left: parent.left anchors.right: tabHint.left @@ -167,7 +167,7 @@ Rectangle { id: actionRepeater model: root.actions - DankButton { + DButton { id: actionButton required property var modelData required property int index @@ -191,7 +191,7 @@ Rectangle { } } - DankKeycap { + DKeycap { id: tabHint anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter diff --git a/quickshell/Modals/DankLauncherV2/AppEditView.qml b/quickshell/Modals/DankLauncherV2/AppEditView.qml index 439f2c744..6c97929a8 100644 --- a/quickshell/Modals/DankLauncherV2/AppEditView.qml +++ b/quickshell/Modals/DankLauncherV2/AppEditView.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets FocusScope { id: root @@ -73,7 +73,7 @@ FocusScope { radius: Theme.cornerRadius color: backButtonArea.containsMouse ? Theme.surfaceHover : Theme.withAlpha(Theme.surfaceHover, 0) - DankIcon { + DIcon { anchors.centerIn: parent name: "arrow_back" size: Theme.iconSizeMedium @@ -124,7 +124,7 @@ FocusScope { color: Theme.outlineMedium } - DankFlickable { + DFlickable { width: parent.width height: parent.height - y - buttonsRow.height - Theme.spacingM contentHeight: editFieldsColumn.height @@ -147,7 +147,7 @@ FocusScope { font.weight: Theme.fontWeightMedium } - DankTextField { + DTextField { id: editNameField width: parent.width placeholderText: root.editingApp?.name || "" @@ -167,7 +167,7 @@ FocusScope { font.weight: Theme.fontWeightMedium } - DankTextField { + DTextField { id: editIconField width: parent.width placeholderText: root.editingApp?.icon || "" @@ -187,7 +187,7 @@ FocusScope { font.weight: Theme.fontWeightMedium } - DankTextField { + DTextField { id: editCommentField width: parent.width placeholderText: root.editingApp?.comment || "" @@ -213,7 +213,7 @@ FocusScope { color: Theme.onSurfaceVariant } - DankTextField { + DTextField { id: editEnvVarsField width: parent.width placeholderText: "VAR=value" @@ -233,7 +233,7 @@ FocusScope { font.weight: Theme.fontWeightMedium } - DankTextField { + DTextField { id: editExtraFlagsField width: parent.width placeholderText: "--flag --option=value" @@ -249,7 +249,7 @@ FocusScope { anchors.horizontalCenter: parent.horizontalCenter spacing: Theme.spacingM - DankButton { + DButton { text: I18n.tr("Reset", "verb, button that restores defaults") backgroundColor: Theme.chipSurface textColor: Theme.error @@ -257,14 +257,14 @@ FocusScope { onClicked: root.resetAppOverride() } - DankButton { + DButton { text: I18n.tr("Cancel") backgroundColor: Theme.chipSurface textColor: Theme.onSurface onClicked: root.closeRequested() } - DankButton { + DButton { text: I18n.tr("Save") onClicked: root.saveAppOverride() } diff --git a/quickshell/Modals/DankLauncherV2/ClipboardLauncherPreview.qml b/quickshell/Modals/DankLauncherV2/ClipboardLauncherPreview.qml index f84d989d7..5198ee8f2 100644 --- a/quickshell/Modals/DankLauncherV2/ClipboardLauncherPreview.qml +++ b/quickshell/Modals/DankLauncherV2/ClipboardLauncherPreview.qml @@ -3,7 +3,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets Rectangle { id: root @@ -79,7 +79,7 @@ Rectangle { visible: status === Image.Ready } - DankIcon { + DIcon { anchors.centerIn: parent name: "image" size: Math.min(Theme.iconSize, Math.max(Theme.iconSizeSmall, root.height / 2)) diff --git a/quickshell/Modals/DankLauncherV2/Components/LauncherHighlight.qml b/quickshell/Modals/DankLauncherV2/Components/LauncherHighlight.qml index 419b5a06b..9d5da0b45 100644 --- a/quickshell/Modals/DankLauncherV2/Components/LauncherHighlight.qml +++ b/quickshell/Modals/DankLauncherV2/Components/LauncherHighlight.qml @@ -1,3 +1,3 @@ -import qs.Widgets +import qs.DCommon.Widgets -DankListHighlight {} +DListHighlight {} diff --git a/quickshell/Modals/DankLauncherV2/Components/LauncherRow.qml b/quickshell/Modals/DankLauncherV2/Components/LauncherRow.qml index 7148dcba4..3bfdb5e97 100644 --- a/quickshell/Modals/DankLauncherV2/Components/LauncherRow.qml +++ b/quickshell/Modals/DankLauncherV2/Components/LauncherRow.qml @@ -2,11 +2,11 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets import qs.Modals.DankLauncherV2 import "../../../Common/htmlElide.js" as HtmlElide -DankListItem { +DListItem { id: root LayoutMirroring.enabled: I18n.isRtl @@ -156,7 +156,7 @@ DankListItem { anchors.verticalCenter: parent.verticalCenter spacing: Theme.spacingS - DankIcon { + DIcon { name: "push_pin" size: Theme.iconSizeSmall color: root.contentColor @@ -164,7 +164,7 @@ DankListItem { anchors.verticalCenter: parent.verticalCenter } - DankIcon { // dmenu --multi-select checkbox + DIcon { // dmenu --multi-select checkbox name: root.item?.data?.checked ? "check_box" : "check_box_outline_blank" size: Theme.iconSizeSmall color: root.item?.data?.checked ? Theme.primary : root.contentColor @@ -215,7 +215,7 @@ DankListItem { radius: Theme.fullRadius(width, height) color: allModeToggleArea.containsMouse ? Theme.surfaceHover : Theme.withAlpha(Theme.surfaceHover, 0) - DankIcon { + DIcon { anchors.centerIn: parent name: toggleButton.isAllowed ? "visibility" : "visibility_off" size: Theme.chipIconSize diff --git a/quickshell/Modals/DankLauncherV2/Components/LauncherSearchField.qml b/quickshell/Modals/DankLauncherV2/Components/LauncherSearchField.qml index 6ee88bb2d..430aff2b3 100644 --- a/quickshell/Modals/DankLauncherV2/Components/LauncherSearchField.qml +++ b/quickshell/Modals/DankLauncherV2/Components/LauncherSearchField.qml @@ -1,8 +1,8 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets -DankSearchField { +DSearchField { id: root property string mode: "all" @@ -74,7 +74,7 @@ DankSearchField { color: Theme.primaryContainer clip: true - DankIcon { + DIcon { id: pluginIconGlyph visible: root.pluginIconVisible anchors.left: parent.left @@ -103,7 +103,7 @@ DankSearchField { } } - DankFlickable { + DFlickable { id: modeViewport anchors.right: parent.right anchors.rightMargin: Theme.spacingM @@ -117,7 +117,7 @@ DankSearchField { flickableDirection: Flickable.HorizontalFlick clip: true - DankFilterChips { + DFilterChips { id: chips width: implicitWidth flow: Flow.TopToBottom diff --git a/quickshell/Modals/DankLauncherV2/Components/LauncherTile.qml b/quickshell/Modals/DankLauncherV2/Components/LauncherTile.qml index 0f5ca2fb4..b1065626f 100644 --- a/quickshell/Modals/DankLauncherV2/Components/LauncherTile.qml +++ b/quickshell/Modals/DankLauncherV2/Components/LauncherTile.qml @@ -2,7 +2,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets import qs.Modals.DankLauncherV2 Rectangle { @@ -65,7 +65,7 @@ Rectangle { visible: root.isHovered || itemArea.pressed } - DankRipple { + DRipple { id: rippleLayer rippleColor: root.contentColor cornerRadius: root.radius @@ -84,14 +84,14 @@ Rectangle { glyphSize: Theme.iconSizeSmall } - DankIcon { + DIcon { name: "push_pin" size: Theme.iconSizeSmall color: root.contentColor visible: root.item?.pinned === true } - DankIcon { // dmenu --multi-select checkbox + DIcon { // dmenu --multi-select checkbox name: root.item?.data?.checked ? "check_box" : "check_box_outline_blank" size: Theme.iconSizeSmall color: root.item?.data?.checked ? Theme.primary : root.contentColor diff --git a/quickshell/Modals/DankLauncherV2/LauncherContent.qml b/quickshell/Modals/DankLauncherV2/LauncherContent.qml index b1c6b4a2b..15306e43e 100644 --- a/quickshell/Modals/DankLauncherV2/LauncherContent.qml +++ b/quickshell/Modals/DankLauncherV2/LauncherContent.qml @@ -4,6 +4,7 @@ import QtQuick import QtQuick.Layouts import qs.Common import qs.Services +import qs.DCommon.Widgets import qs.Widgets import qs.Modals.DankLauncherV2.Components @@ -348,7 +349,7 @@ FocusScope { border.color: Theme.outlineMedium radius: Theme.windowRadius } - DankFilterChips { + DFilterChips { id: modeChips anchors.left: parent.left anchors.leftMargin: Theme.spacingM @@ -659,7 +660,7 @@ FocusScope { } } - DankTextField { + DTextField { id: extFilterField Layout.fillWidth: true Layout.preferredWidth: 1 diff --git a/quickshell/Modals/DankLauncherV2/ResultsList.qml b/quickshell/Modals/DankLauncherV2/ResultsList.qml index 00fb42b81..002be3051 100644 --- a/quickshell/Modals/DankLauncherV2/ResultsList.qml +++ b/quickshell/Modals/DankLauncherV2/ResultsList.qml @@ -4,7 +4,7 @@ import QtQuick import Quickshell import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modals.DankLauncherV2.Components Item { @@ -290,7 +290,7 @@ Item { anchors.bottomMargin: bottomSectionHeader.visible ? bottomSectionHeader.height + LauncherMetrics.resultsGap : 0 clip: true - DankListView { + DListView { id: mainListView y: -listClip.anchors.topMargin width: parent.width @@ -640,7 +640,7 @@ Item { id: emptyColumn spacing: Theme.spacingM - DankIcon { + DIcon { anchors.horizontalCenter: parent.horizontalCenter name: getEmptyIcon() size: LauncherMetrics.gridIconSize diff --git a/quickshell/Modals/DankLauncherV2/SectionHeader.qml b/quickshell/Modals/DankLauncherV2/SectionHeader.qml index 8d0dbecc8..fe43a7dfe 100644 --- a/quickshell/Modals/DankLauncherV2/SectionHeader.qml +++ b/quickshell/Modals/DankLauncherV2/SectionHeader.qml @@ -3,6 +3,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common import qs.Services +import qs.DCommon.Widgets import qs.Widgets import qs.Modals.DankLauncherV2.Components @@ -65,7 +66,7 @@ Item { readonly property string _iconType: root.section?.iconType ?? "material" readonly property bool _iconSpaceReserved: root.hasAppCategories || _iconVisible - DankIcon { + DIcon { anchors.verticalCenter: parent.verticalCenter visible: root.hasAppCategories || (labelContent._iconVisible && labelContent._iconType !== "image") name: root.hasAppCategories ? AppSearchService.getCategoryIcon(root.categoryLabel) : (root.section?.icon ?? "folder") @@ -103,7 +104,7 @@ Item { elide: Text.ElideRight } - DankIcon { + DIcon { id: chevron visible: root.hasAppCategories anchors.verticalCenter: parent.verticalCenter @@ -148,7 +149,7 @@ Item { anchors.verticalCenter: parent.verticalCenter spacing: Theme.groupedListGap - DankActionButton { + DActionButton { readonly property var current: root.viewModes.find(entry => entry.mode === root.viewMode) ?? root.viewModes[0] focusPolicy: Qt.NoFocus visible: root.canChangeViewMode && !root.section?.collapsed @@ -163,7 +164,7 @@ Item { } } - DankActionButton { + DActionButton { focusPolicy: Qt.NoFocus visible: root.canCollapse iconName: root.section?.collapsed ? "expand_more" : "expand_less" diff --git a/quickshell/Modals/DankLauncherV2/SpotlightLauncherContent.qml b/quickshell/Modals/DankLauncherV2/SpotlightLauncherContent.qml index 3b4205578..1fa83d66f 100644 --- a/quickshell/Modals/DankLauncherV2/SpotlightLauncherContent.qml +++ b/quickshell/Modals/DankLauncherV2/SpotlightLauncherContent.qml @@ -4,7 +4,7 @@ import QtQuick import Quickshell.Widgets import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modals.DankLauncherV2.Components FocusScope { diff --git a/quickshell/Modals/DankLauncherV2/TileItem.qml b/quickshell/Modals/DankLauncherV2/TileItem.qml index af5f86221..df8660d67 100644 --- a/quickshell/Modals/DankLauncherV2/TileItem.qml +++ b/quickshell/Modals/DankLauncherV2/TileItem.qml @@ -5,7 +5,7 @@ import Quickshell.Widgets import Quickshell.Wayland import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modals.DankLauncherV2.Components LauncherTile { @@ -124,7 +124,7 @@ LauncherTile { color: Theme.primary visible: root.isSelected - DankIcon { + DIcon { anchors.centerIn: parent name: "check" size: Theme.iconSizeSmall diff --git a/quickshell/Modals/DisplayConfirmationModal.qml b/quickshell/Modals/DisplayConfirmationModal.qml index 24cd5eacf..c48efec06 100644 --- a/quickshell/Modals/DisplayConfirmationModal.qml +++ b/quickshell/Modals/DisplayConfirmationModal.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Common import qs.Modals.Common -import qs.Widgets +import qs.DCommon.Widgets DankModal { id: root @@ -197,7 +197,7 @@ DankModal { } } - DankActionButton { + DActionButton { anchors.top: parent.top anchors.right: parent.right anchors.topMargin: Theme.spacingM diff --git a/quickshell/Modals/FileBrowser/FileBrowserModal.qml b/quickshell/Modals/FileBrowser/FileBrowserModal.qml index d368833a3..3ffcacc99 100644 --- a/quickshell/Modals/FileBrowser/FileBrowserModal.qml +++ b/quickshell/Modals/FileBrowser/FileBrowserModal.qml @@ -1,3 +1,3 @@ -import qs.DankCommon.FileBrowser as DankCommon +import qs.DCommon.FileBrowser as DCommon -DankCommon.FileBrowserModal {} +DCommon.FileBrowserModal {} diff --git a/quickshell/Modals/FileBrowser/FileBrowserSurfaceModal.qml b/quickshell/Modals/FileBrowser/FileBrowserSurfaceModal.qml index 59c9f2022..012b60636 100644 --- a/quickshell/Modals/FileBrowser/FileBrowserSurfaceModal.qml +++ b/quickshell/Modals/FileBrowser/FileBrowserSurfaceModal.qml @@ -1,7 +1,7 @@ import QtQuick import Quickshell.Wayland import qs.Common -import qs.DankCommon.FileBrowser +import qs.DCommon.FileBrowser import qs.Modals.Common DankModal { diff --git a/quickshell/Modals/Greeter/GreeterCompletePage.qml b/quickshell/Modals/Greeter/GreeterCompletePage.qml index 3e786c77e..45624a616 100644 --- a/quickshell/Modals/Greeter/GreeterCompletePage.qml +++ b/quickshell/Modals/Greeter/GreeterCompletePage.qml @@ -2,7 +2,7 @@ import QtQuick import qs.Common import qs.Modules.Settings.Widgets import qs.Services -import qs.Widgets +import qs.DCommon.Widgets Item { id: root @@ -65,7 +65,7 @@ Item { readonly property bool hasKeybinds: dmsKeybinds.length > 0 - DankFlickable { + DFlickable { anchors.fill: parent clip: true contentHeight: mainColumn.height + Theme.spacingL * 2 @@ -89,7 +89,7 @@ Item { color: Theme.withAlpha(Theme.success, 0.15) anchors.verticalCenter: parent.verticalCenter - DankIcon { + DIcon { anchors.centerIn: parent name: "check_circle" size: Theme.iconSize + 4 @@ -113,7 +113,7 @@ Item { width: parent.width spacing: Theme.spacingS - DankIcon { + DIcon { name: "toolbar" size: root.sectionIconSize color: Theme.primary @@ -150,7 +150,7 @@ Item { width: parent.width spacing: Theme.spacingS - DankIcon { + DIcon { name: "keyboard" size: root.sectionIconSize color: Theme.primary @@ -227,7 +227,7 @@ Item { Repeater { model: (modelData.key || "").split("+") - DankKeycap { + DKeycap { text: modelData } } @@ -268,7 +268,7 @@ Item { Row { spacing: Theme.spacingS - DankIcon { + DIcon { name: "keyboard" size: root.sectionIconSize color: Theme.surfaceVariantText @@ -300,7 +300,7 @@ Item { anchors.centerIn: parent spacing: Theme.spacingS - DankIcon { + DIcon { name: "menu_book" size: root.sectionIconSize color: Theme.primary @@ -315,7 +315,7 @@ Item { anchors.verticalCenter: parent.verticalCenter } - DankIcon { + DIcon { name: "open_in_new" size: Theme.iconSizeSmall - 2 color: Theme.surfaceVariantText @@ -359,7 +359,7 @@ Item { width: parent.width spacing: Theme.spacingS - DankIcon { + DIcon { name: "settings" size: root.sectionIconSize color: Theme.primary @@ -456,7 +456,7 @@ Item { width: parent.width spacing: Theme.spacingS - DankIcon { + DIcon { name: "explore" size: root.sectionIconSize color: Theme.primary diff --git a/quickshell/Modals/Greeter/GreeterDoctorPage.qml b/quickshell/Modals/Greeter/GreeterDoctorPage.qml index bf7195dcb..f44e8529a 100644 --- a/quickshell/Modals/Greeter/GreeterDoctorPage.qml +++ b/quickshell/Modals/Greeter/GreeterDoctorPage.qml @@ -2,7 +2,7 @@ import QtQuick import Quickshell.Io import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets Item { id: root @@ -117,7 +117,7 @@ Item { radius: root.centerIconContainerSize / 2 color: Theme.primaryContainer - DankIcon { + DIcon { anchors.centerIn: parent name: "vital_signs" size: Theme.iconSizeLarge @@ -198,7 +198,7 @@ Item { color: root.errorCount > 0 ? Theme.errorContainer : Theme.primaryContainer anchors.verticalCenter: parent.verticalCenter - DankIcon { + DIcon { anchors.centerIn: parent name: root.errorCount > 0 ? "warning" : "check_circle" size: Theme.iconSize + 4 @@ -299,7 +299,7 @@ Item { spacing: Theme.spacingS visible: root.filteredResults.length === 0 - DankIcon { + DIcon { name: { switch (root.selectedFilter) { case "error": @@ -336,7 +336,7 @@ Item { } } - DankFlickable { + DFlickable { anchors.fill: parent anchors.margins: Theme.spacingM clip: true @@ -368,7 +368,7 @@ Item { anchors.bottomMargin: Theme.spacingL spacing: Theme.spacingM - DankButton { + DButton { text: I18n.tr("Run Again", "greeter doctor page button") iconName: "refresh" backgroundColor: Theme.chipSurface diff --git a/quickshell/Modals/Greeter/GreeterDoctorResultItem.qml b/quickshell/Modals/Greeter/GreeterDoctorResultItem.qml index 710ff90d1..91f159846 100644 --- a/quickshell/Modals/Greeter/GreeterDoctorResultItem.qml +++ b/quickshell/Modals/Greeter/GreeterDoctorResultItem.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets Rectangle { id: root @@ -37,7 +37,7 @@ Rectangle { radius: Theme.cornerRadius color: Theme.withAlpha(statusColor, 0.08) - DankIcon { + DIcon { id: statusIcon anchors.left: parent.left anchors.leftMargin: Theme.spacingM @@ -95,7 +95,7 @@ Rectangle { } } - DankActionButton { + DActionButton { id: urlButton anchors.right: parent.right anchors.rightMargin: Theme.spacingM diff --git a/quickshell/Modals/Greeter/GreeterFeatureCard.qml b/quickshell/Modals/Greeter/GreeterFeatureCard.qml index efac2b27a..98675bcaa 100644 --- a/quickshell/Modals/Greeter/GreeterFeatureCard.qml +++ b/quickshell/Modals/Greeter/GreeterFeatureCard.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets Rectangle { id: root @@ -37,7 +37,7 @@ Rectangle { color: Theme.primaryContainer anchors.horizontalCenter: parent.horizontalCenter - DankIcon { + DIcon { anchors.centerIn: parent name: root.iconName size: Theme.iconSize - 4 diff --git a/quickshell/Modals/Greeter/GreeterModal.qml b/quickshell/Modals/Greeter/GreeterModal.qml index a9f4bb85b..a4e1218d5 100644 --- a/quickshell/Modals/Greeter/GreeterModal.qml +++ b/quickshell/Modals/Greeter/GreeterModal.qml @@ -2,6 +2,7 @@ import QtQuick import Quickshell.Io import qs.Common import qs.Services +import qs.DCommon.Widgets import qs.Widgets DankFloatingWindow { @@ -144,7 +145,7 @@ DankFloatingWindow { } } - DankWindowHeader { + DWindowHeader { id: headerRow anchors.left: parent.left anchors.right: parent.right @@ -185,7 +186,7 @@ DankFloatingWindow { color: dotColor.value anchors.verticalCenter: parent.verticalCenter - DankColorAnimation { + DColorAnimation { id: dotColor to: isActive ? Theme.primary : Theme.surfaceTextAlpha duration: Theme.shortDuration @@ -242,7 +243,7 @@ DankFloatingWindow { anchors.verticalCenter: parent.verticalCenter spacing: Theme.spacingM - DankButton { + DButton { visible: root.currentPage < root.totalPages - 1 text: I18n.tr("Skip", "greeter skip button") backgroundColor: "transparent" @@ -250,7 +251,7 @@ DankFloatingWindow { onClicked: root.currentPage === 1 ? root.nextPage() : root.skip() } - DankButton { + DButton { visible: root.currentPage > 0 text: I18n.tr("Back", "greeter back button") iconName: "arrow_back" @@ -259,7 +260,7 @@ DankFloatingWindow { onClicked: root.prevPage() } - DankButton { + DButton { visible: root.currentPage < root.totalPages - 1 enabled: !(root.currentPage === 1 && pageLoader.item && pageLoader.item.isRunning) text: root.currentPage === 0 ? I18n.tr("Get Started", "greeter first page button") : I18n.tr("Next", "greeter next button") @@ -269,7 +270,7 @@ DankFloatingWindow { onClicked: root.nextPage() } - DankButton { + DButton { visible: root.currentPage === root.totalPages - 1 text: I18n.tr("Finish", "greeter finish button") iconName: "check" diff --git a/quickshell/Modals/Greeter/GreeterPluginsPage.qml b/quickshell/Modals/Greeter/GreeterPluginsPage.qml index f9f3d1fb8..4c117f3cf 100644 --- a/quickshell/Modals/Greeter/GreeterPluginsPage.qml +++ b/quickshell/Modals/Greeter/GreeterPluginsPage.qml @@ -2,7 +2,7 @@ import QtQuick import qs.Common import qs.Modules.Settings import qs.Services -import qs.Widgets +import qs.DCommon.Widgets Item { id: root @@ -74,7 +74,7 @@ Item { } } - DankFlickable { + DFlickable { anchors.fill: parent clip: true contentHeight: mainColumn.height + Theme.spacingL * 2 @@ -98,7 +98,7 @@ Item { color: Theme.primaryContainer anchors.verticalCenter: parent.verticalCenter - DankIcon { + DIcon { anchors.centerIn: parent name: "extension" size: Theme.iconSize + 4 @@ -129,7 +129,7 @@ Item { height: Math.round(Theme.fontSizeMedium * 8) visible: root.isLoading - DankSpinner { + DSpinner { anchors.centerIn: parent running: root.isLoading } @@ -140,7 +140,7 @@ Item { spacing: Theme.spacingS visible: !root.isLoading && root.loadError !== "" - DankIcon { + DIcon { anchors.horizontalCenter: parent.horizontalCenter name: "cloud_off" size: Theme.iconSize + 16 @@ -161,7 +161,7 @@ Item { color: Theme.outline } - DankButton { + DButton { anchors.horizontalCenter: parent.horizontalCenter text: I18n.tr("Retry", "retry failed action button") iconName: "refresh" diff --git a/quickshell/Modals/Greeter/GreeterQuickLink.qml b/quickshell/Modals/Greeter/GreeterQuickLink.qml index f16634ae0..8d831fe2f 100644 --- a/quickshell/Modals/Greeter/GreeterQuickLink.qml +++ b/quickshell/Modals/Greeter/GreeterQuickLink.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets Rectangle { id: root @@ -28,7 +28,7 @@ Rectangle { anchors.centerIn: parent spacing: Theme.spacingS - DankIcon { + DIcon { name: root.iconName size: Theme.iconSizeSmall + 2 color: Theme.primary @@ -43,7 +43,7 @@ Rectangle { anchors.verticalCenter: parent.verticalCenter } - DankIcon { + DIcon { visible: root.isExternal name: "open_in_new" size: Theme.iconSizeSmall - 2 diff --git a/quickshell/Modals/Greeter/GreeterSettingsCard.qml b/quickshell/Modals/Greeter/GreeterSettingsCard.qml index e212910d9..5fd416c17 100644 --- a/quickshell/Modals/Greeter/GreeterSettingsCard.qml +++ b/quickshell/Modals/Greeter/GreeterSettingsCard.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets Rectangle { id: root @@ -40,7 +40,7 @@ Rectangle { color: Theme.primary anchors.verticalCenter: parent.verticalCenter - DankIcon { + DIcon { anchors.centerIn: parent name: root.iconName size: Theme.iconSize - 4 diff --git a/quickshell/Modals/Greeter/GreeterStatusCard.qml b/quickshell/Modals/Greeter/GreeterStatusCard.qml index bc6ce418c..bfcfd24a5 100644 --- a/quickshell/Modals/Greeter/GreeterStatusCard.qml +++ b/quickshell/Modals/Greeter/GreeterStatusCard.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets Rectangle { id: root @@ -49,7 +49,7 @@ Rectangle { anchors.horizontalCenter: parent.horizontalCenter spacing: Theme.spacingS - DankIcon { + DIcon { name: root.iconName size: Theme.iconSize - 4 color: root.iconColor diff --git a/quickshell/Modals/Greeter/GreeterWelcomePage.qml b/quickshell/Modals/Greeter/GreeterWelcomePage.qml index 71cba87ba..4cfa3333d 100644 --- a/quickshell/Modals/Greeter/GreeterWelcomePage.qml +++ b/quickshell/Modals/Greeter/GreeterWelcomePage.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Effects import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets Item { id: root diff --git a/quickshell/Modals/KeybindsContent.qml b/quickshell/Modals/KeybindsContent.qml index 8c33df6b4..f47c297f9 100644 --- a/quickshell/Modals/KeybindsContent.qml +++ b/quickshell/Modals/KeybindsContent.qml @@ -3,7 +3,7 @@ import QtQuick import QtQuick.Layouts import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import "../Common/KeyUtils.js" as KeyUtils import "../Common/KeybindActions.js" as Actions @@ -41,7 +41,7 @@ FocusScope { Component { id: keybindItemDelegate - DankListItem { + DListItem { id: keybindRow required property var modelData readonly property bool canExecute: !keybindRow.modelData.isRange && KeybindsService.canExecuteAction(keybindRow.modelData.action) @@ -79,7 +79,7 @@ FocusScope { wrapMode: Text.NoWrap } - // DankKeycap items (Trailing - stacked vertically if multiple combos) + // DKeycap items (Trailing - stacked vertically if multiple combos) Column { id: keycapsCol Layout.alignment: Qt.AlignVCenter | Qt.AlignRight @@ -95,7 +95,7 @@ FocusScope { Repeater { model: modelData - DankKeycap { + DKeycap { text: modelData textColor: Theme.primary } @@ -113,7 +113,7 @@ FocusScope { cursorShape: keybindRow.canExecute ? Qt.PointingHandCursor : Qt.ArrowCursor } - DankTooltipHost { + DTooltipHost { text: keybindRow.canExecute ? ((keybindRow.modelData.action || keybindRow.modelData.desc || "") + " • " + I18n.tr("Click to run", "cheatsheet action tooltip suffix")) : (keybindRow.modelData.label || keybindRow.modelData.action || keybindRow.modelData.desc || "") target: keybindRow hoverArea: rowHoverArea @@ -500,7 +500,7 @@ FocusScope { anchors.top: parent.top spacing: Theme.spacingS - DankSearchField { + DSearchField { id: searchField Layout.fillWidth: true placeholderText: I18n.tr("Search keybinds...", "keybinds cheatsheet search placeholder") @@ -520,7 +520,7 @@ FocusScope { } } - DankActionButton { + DActionButton { visible: content.showFloatingToggle buttonSize: Theme.iconButtonSize iconName: content.floating ? "close_fullscreen" : "open_in_new" @@ -530,7 +530,7 @@ FocusScope { } } - DankFlickable { + DFlickable { id: sidebarFlickable anchors.left: parent.left anchors.right: parent.right @@ -547,7 +547,7 @@ FocusScope { spacing: Theme.spacingXXS // "All" Category Tab - DankListItem { + DListItem { id: allTab width: sidebarCol.width implicitHeight: Theme.menuItemHeight @@ -568,7 +568,7 @@ FocusScope { anchors.rightMargin: Theme.spacingL spacing: Theme.spacingS - DankIcon { + DIcon { name: "apps" size: Theme.iconSizeSmall color: allTab.contentColor @@ -582,7 +582,7 @@ FocusScope { elide: Text.ElideRight } - DankBadge { + DBadge { text: content.dataModel.totalCount.toString() color: allTab.isSelected ? Theme.primary : Theme.surfaceVariant textColor: allTab.isSelected ? Theme.onPrimary : Theme.surfaceVariantText @@ -595,7 +595,7 @@ FocusScope { Repeater { model: content.dataModel.sortedKeys - DankListItem { + DListItem { id: catTab required property var modelData @@ -621,7 +621,7 @@ FocusScope { anchors.rightMargin: Theme.spacingL spacing: Theme.spacingS - DankIcon { + DIcon { name: content.getCategoryIcon(catTab.catName) size: Theme.iconSizeSmall color: catTab.contentColor @@ -635,7 +635,7 @@ FocusScope { elide: Text.ElideRight } - DankBadge { + DBadge { text: (catTab.catInfo?.count || 0).toString() color: catTab.isSelected ? Theme.primary : Theme.surfaceVariant textColor: catTab.isSelected ? Theme.onPrimary : Theme.surfaceVariantText @@ -657,7 +657,7 @@ FocusScope { anchors.top: parent.top anchors.bottom: parent.bottom - DankFlickable { + DFlickable { id: rightFlickable anchors.fill: parent contentWidth: width @@ -686,7 +686,7 @@ FocusScope { width: parent.width spacing: Theme.spacingS - DankIcon { + DIcon { name: content.getCategoryIcon(sectionCol.sectionCatName) size: Theme.iconSizeMedium color: Theme.primary @@ -767,7 +767,7 @@ FocusScope { spacing: Theme.spacingM visible: content.dataModel.totalCount === 0 - DankIcon { + DIcon { anchors.horizontalCenter: parent.horizontalCenter name: content.activeSearchQuery.trim() !== "" ? "search_off" : "keyboard" size: Theme.iconSizeLarge + Theme.spacingL diff --git a/quickshell/Modals/KeybindsModalWindow.qml b/quickshell/Modals/KeybindsModalWindow.qml index a9a9226bb..a854c883d 100644 --- a/quickshell/Modals/KeybindsModalWindow.qml +++ b/quickshell/Modals/KeybindsModalWindow.qml @@ -2,6 +2,7 @@ import QtQuick import qs.Common import qs.Modals import qs.Services +import qs.DCommon.Widgets import qs.Widgets DankFloatingWindow { @@ -47,7 +48,7 @@ DankFloatingWindow { anchors.fill: parent spacing: 0 - DankWindowHeader { + DWindowHeader { id: titleBar width: parent.width z: 10 @@ -55,7 +56,7 @@ DankFloatingWindow { title: KeybindsService.cheatsheet.title || I18n.tr("Keybinds") onCloseRequested: win.hide() - DankActionButton { + DActionButton { iconName: "close_fullscreen" buttonSize: Theme.buttonHeightXXS iconSize: Theme.iconSizeSmall diff --git a/quickshell/Modals/MuxModal.qml b/quickshell/Modals/MuxModal.qml index 9c74df39b..a12f550a8 100644 --- a/quickshell/Modals/MuxModal.qml +++ b/quickshell/Modals/MuxModal.qml @@ -7,6 +7,7 @@ import Quickshell import qs.Common import qs.Modals.Common import qs.Services +import qs.DCommon.Widgets import qs.Widgets DankModal { @@ -305,7 +306,7 @@ DankModal { } // Search field - DankSearchField { + DSearchField { id: searchField width: parent.width @@ -341,7 +342,7 @@ DankModal { radius: Theme.fullRadius(width, height) color: Theme.primaryContainer - DankIcon { + DIcon { anchors.centerIn: parent name: "add" size: Theme.iconSize @@ -384,7 +385,7 @@ DankModal { radius: Theme.cornerRadius color: "transparent" - DankFlickable { + DFlickable { anchors.fill: parent clip: true contentHeight: sessionsColumn.height @@ -476,7 +477,7 @@ DankModal { visible: MuxService.supportsRename color: renameMouse.containsMouse ? Theme.chipSurface : Theme.withAlpha(Theme.chipSurface, 0) - DankIcon { + DIcon { anchors.centerIn: parent name: "edit" size: Theme.iconSizeSmall @@ -501,7 +502,7 @@ DankModal { radius: Theme.fullRadius(width, height) color: deleteMouse.containsMouse ? Theme.errorContainer : Theme.withAlpha(Theme.errorContainer, 0) - DankIcon { + DIcon { anchors.centerIn: parent name: "delete" size: Theme.iconSizeSmall @@ -532,7 +533,7 @@ DankModal { anchors.centerIn: parent spacing: Theme.spacingM - DankIcon { + DIcon { name: muxModal.searchText.length > 0 ? "search_off" : "terminal" size: 48 color: Theme.surfaceVariantText diff --git a/quickshell/Modals/NetworkInfoModal.qml b/quickshell/Modals/NetworkInfoModal.qml index e1797c5a7..497ec7fad 100644 --- a/quickshell/Modals/NetworkInfoModal.qml +++ b/quickshell/Modals/NetworkInfoModal.qml @@ -2,7 +2,7 @@ import QtQuick import qs.Common import qs.Modals.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets DankModal { id: root @@ -79,7 +79,7 @@ DankModal { } } - DankActionButton { + DActionButton { iconName: "close" Accessible.name: I18n.tr("Close") iconSize: Theme.iconSize - 4 @@ -99,7 +99,7 @@ DankModal { border.width: Theme.layerOutlineWidth clip: true - DankFlickable { + DFlickable { anchors.fill: parent anchors.margins: Theme.spacingM contentHeight: detailsText.contentHeight diff --git a/quickshell/Modals/PolkitAuthContent.qml b/quickshell/Modals/PolkitAuthContent.qml index b1ec12191..a6544dc7c 100644 --- a/quickshell/Modals/PolkitAuthContent.qml +++ b/quickshell/Modals/PolkitAuthContent.qml @@ -2,10 +2,10 @@ import QtQuick import Quickshell.Io import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import "../Common/PamStack.js" as PamStack -DankDialog { +DDialog { id: root property var currentFlow: PolkitService.agent?.flow @@ -146,7 +146,7 @@ DankDialog { visible: text !== "" } - DankTextField { + DTextField { id: passwordField width: parent.width @@ -168,7 +168,7 @@ DankDialog { } actions: [ - DankButton { + DButton { maximumWidth: root.actionWidth wrapText: true text: I18n.tr("Cancel") @@ -176,7 +176,7 @@ DankDialog { textColor: Theme.primary onClicked: root.cancelAuth() }, - DankButton { + DButton { maximumWidth: root.actionWidth wrapText: true text: I18n.tr("Authenticate", "verb, polkit password dialog submit button") diff --git a/quickshell/Modals/PolkitAuthModal.qml b/quickshell/Modals/PolkitAuthModal.qml index b931f3929..3feb05820 100644 --- a/quickshell/Modals/PolkitAuthModal.qml +++ b/quickshell/Modals/PolkitAuthModal.qml @@ -1,6 +1,7 @@ import QtQuick import qs.Common import qs.Services +import qs.DCommon.Widgets import qs.Widgets DankFloatingWindow { diff --git a/quickshell/Modals/PowerMenuModal.qml b/quickshell/Modals/PowerMenuModal.qml index 905df33b3..2f77acc84 100644 --- a/quickshell/Modals/PowerMenuModal.qml +++ b/quickshell/Modals/PowerMenuModal.qml @@ -3,7 +3,7 @@ import qs.Common import qs.Modals.Common import qs.Services import qs.Modules.PowerMenu -import qs.DankCommon.Session +import qs.DCommon.Session DankModal { id: root diff --git a/quickshell/Modals/PowerProfileModal.qml b/quickshell/Modals/PowerProfileModal.qml index 0939ed526..19f9599f3 100644 --- a/quickshell/Modals/PowerProfileModal.qml +++ b/quickshell/Modals/PowerProfileModal.qml @@ -2,7 +2,7 @@ import QtQuick import qs.Common import qs.Modals.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import Quickshell.Services.UPower DankModal { @@ -156,7 +156,7 @@ DankModal { } } - DankActionButton { + DActionButton { iconName: "close" Accessible.name: I18n.tr("Close") iconSize: Theme.iconSize - 4 @@ -222,7 +222,7 @@ DankModal { anchors.centerIn: parent spacing: Theme.spacingS - DankIcon { + DIcon { name: Theme.getPowerProfileIcon(modelData) size: Theme.iconSize + 16 color: isActive ? Theme.accentOnSelectedContainer : Theme.surfaceText @@ -272,7 +272,7 @@ DankModal { spacing: Theme.spacingXS opacity: 0.5 - DankIcon { + DIcon { name: "keyboard" size: Theme.fontSizeSmall color: Theme.surfaceText diff --git a/quickshell/Modals/ProcessListModal.qml b/quickshell/Modals/ProcessListModal.qml index 2568adcf7..3a39a67b9 100644 --- a/quickshell/Modals/ProcessListModal.qml +++ b/quickshell/Modals/ProcessListModal.qml @@ -4,6 +4,7 @@ import Quickshell.Wayland import qs.Common import qs.Modules.ProcessList import qs.Services +import qs.DCommon.Widgets import qs.Widgets import "../Common/Format.js" as Format @@ -170,7 +171,7 @@ DankFloatingWindow { anchors.centerIn: parent spacing: Theme.spacingL - DankIcon { + DIcon { name: "error" size: 48 color: Theme.error @@ -201,14 +202,14 @@ DankFloatingWindow { spacing: 0 visible: DgopService.dgopAvailable - DankWindowHeader { + DWindowHeader { Layout.fillWidth: true controls: windowControls title: I18n.tr("System Monitor") onCloseRequested: processListModal.hide() } - DankNavigationBar { + DNavigationBar { id: viewNavigation Layout.fillWidth: true Layout.leftMargin: Theme.windowInset @@ -253,7 +254,7 @@ DankFloatingWindow { spacing: Theme.spacingM visible: currentTab === 0 - DankSearchField { + DSearchField { id: searchField Layout.fillWidth: true Layout.preferredHeight: Theme.buttonHeightS @@ -339,7 +340,7 @@ DankFloatingWindow { Row { spacing: Theme.spacingXS - DankIcon { + DIcon { name: "swap_horiz" size: Theme.iconSizeSmall color: Theme.info @@ -357,7 +358,7 @@ DankFloatingWindow { Row { spacing: Theme.spacingXS - DankIcon { + DIcon { name: "storage" size: Theme.iconSizeSmall color: Theme.warning @@ -375,7 +376,7 @@ DankFloatingWindow { Row { spacing: Theme.spacingXS - DankIcon { + DIcon { name: "memory" size: Theme.iconSizeSmall color: Theme.primary @@ -394,7 +395,7 @@ DankFloatingWindow { Row { spacing: Theme.spacingXS - DankIcon { + DIcon { name: "sd_card" size: Theme.iconSizeSmall color: Theme.secondary diff --git a/quickshell/Modals/QRGeneratorModal.qml b/quickshell/Modals/QRGeneratorModal.qml index b89d82380..6087227b3 100644 --- a/quickshell/Modals/QRGeneratorModal.qml +++ b/quickshell/Modals/QRGeneratorModal.qml @@ -6,7 +6,7 @@ import qs.Modals.Common import qs.Modals.FileBrowser import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets DankModal { id: root @@ -164,7 +164,7 @@ DankModal { Layout.fillWidth: true } - DankActionButton { + DActionButton { iconName: "close" Accessible.name: I18n.tr("Close") iconSize: Theme.iconSize - 4 @@ -174,7 +174,7 @@ DankModal { } } - DankTextField { + DTextField { id: textInput width: parent.width placeholderText: I18n.tr("Enter text to encode") @@ -234,7 +234,7 @@ DankModal { Layout.fillWidth: true } - DankButton { + DButton { text: I18n.tr("Save") iconName: "save" backgroundColor: Theme.chipSurface @@ -247,7 +247,7 @@ DankModal { } } - DankButton { + DButton { text: I18n.tr("Copy") iconName: "content_copy" backgroundColor: Theme.primary diff --git a/quickshell/Modals/Settings/SettingsContent.qml b/quickshell/Modals/Settings/SettingsContent.qml index 3d307c2c6..902cd2e55 100644 --- a/quickshell/Modals/Settings/SettingsContent.qml +++ b/quickshell/Modals/Settings/SettingsContent.qml @@ -3,7 +3,7 @@ import QtQuick.Controls import qs.Common import qs.Modules.Settings.Widgets import qs.Services -import qs.Widgets +import qs.DCommon.Widgets FocusScope { id: root @@ -451,7 +451,7 @@ FocusScope { width: root.showBack ? Theme.iconButtonSize + Theme.spacingM - glyphInset : 0 height: Theme.iconButtonSize - DankActionButton { + DActionButton { buttonSize: Theme.iconButtonSize iconName: I18n.isRtl ? "arrow_forward" : "arrow_back" Accessible.name: I18n.tr("Back") @@ -496,7 +496,7 @@ FocusScope { toX: pageStack.slideOffscreen } - DankSpinner { + DSpinner { id: pageSpinner readonly property bool loading: pageStack.currentItem?.presented === false diff --git a/quickshell/Modals/Settings/SettingsModal.qml b/quickshell/Modals/Settings/SettingsModal.qml index 0db2fb6b2..0454f0d68 100644 --- a/quickshell/Modals/Settings/SettingsModal.qml +++ b/quickshell/Modals/Settings/SettingsModal.qml @@ -3,6 +3,7 @@ import Quickshell import qs.Common import qs.Modals.FileBrowser import qs.Services +import qs.DCommon.Widgets import qs.Widgets import qs.Modules.Settings.Widgets @@ -293,7 +294,7 @@ DankFloatingWindow { anchors.fill: parent spacing: 0 - DankWindowHeader { + DWindowHeader { id: titleBar width: parent.width z: 10 @@ -341,7 +342,7 @@ DankFloatingWindow { anchors.rightMargin: body.paneInset + SettingsMetrics.panePadding spacing: Theme.spacingM - DankIcon { + DIcon { name: "info" size: Theme.iconSize color: Theme.warning @@ -359,7 +360,7 @@ DankFloatingWindow { wrapMode: Text.WordWrap } - DankButton { + DButton { id: copySettingsButton visible: SettingsData._isReadOnly && SettingsData._hasUnsavedChanges @@ -376,7 +377,7 @@ DankFloatingWindow { } } - DankButton { + DButton { id: copySessionButton visible: SessionData._isReadOnly && SessionData._hasUnsavedChanges diff --git a/quickshell/Modals/Settings/SettingsSidebar.qml b/quickshell/Modals/Settings/SettingsSidebar.qml index f59d561e6..70a664cad 100644 --- a/quickshell/Modals/Settings/SettingsSidebar.qml +++ b/quickshell/Modals/Settings/SettingsSidebar.qml @@ -4,7 +4,7 @@ import QtQuick import Quickshell import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets Item { @@ -218,7 +218,7 @@ Item { Component.onCompleted: GreeterService.refresh() - DankSearchField { + DSearchField { id: searchField property real sideInset: root.searchActive ? Theme.spacingS : SettingsMetrics.paneMargin @@ -318,7 +318,7 @@ Item { } } - DankActionButton { + DActionButton { id: avatarButton anchors.right: parent.right @@ -335,7 +335,7 @@ Item { } // Below the state layer so hover, press and focus tint the avatar - DankCircularImage { + DCircularImage { z: -1 anchors.fill: parent ringWidth: Theme.avatarRingWidth @@ -347,7 +347,7 @@ Item { } } - DankFlickable { + DFlickable { id: sidebarFlickable anchors.left: parent.left anchors.right: parent.right diff --git a/quickshell/Modals/SwitchUserModal.qml b/quickshell/Modals/SwitchUserModal.qml index 3cee65b50..67ee95d54 100644 --- a/quickshell/Modals/SwitchUserModal.qml +++ b/quickshell/Modals/SwitchUserModal.qml @@ -2,7 +2,7 @@ import QtQuick import qs.Common import qs.Modals.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets DankModal { id: root @@ -67,7 +67,7 @@ DankModal { } } - content: DankDialog { + content: DDialog { id: sessionDialog title: I18n.tr("Switch User") supportingText: SessionsService.otherSessions().length > 0 ? I18n.tr("Select an active session to switch to. The current session stays running in the background.") : "" @@ -97,7 +97,7 @@ DankModal { anchors.margins: Theme.spacingM spacing: Theme.spacingM - DankIcon { + DIcon { name: "account_circle" size: Theme.iconSize + 4 color: Theme.primary @@ -133,7 +133,7 @@ DankModal { } } - DankIcon { + DIcon { id: chevron name: I18n.isRtl ? "chevron_left" : "chevron_right" size: Theme.iconSize @@ -168,7 +168,7 @@ DankModal { anchors.margins: Theme.spacingM spacing: Theme.spacingM - DankIcon { + DIcon { name: "info" size: Theme.iconSize color: Theme.surfaceVariantText @@ -201,7 +201,7 @@ DankModal { } actions: [ - DankButton { + DButton { maximumWidth: sessionDialog.actionWidth wrapText: true text: I18n.tr("Close") @@ -209,7 +209,7 @@ DankModal { textColor: Theme.primary onClicked: root.close() }, - DankButton { + DButton { maximumWidth: sessionDialog.actionWidth wrapText: true visible: SessionsService.otherSessions().length === 0 && !root.lockOnSwitch diff --git a/quickshell/Modals/SystemUpdateModal.qml b/quickshell/Modals/SystemUpdateModal.qml index d5df481f3..534b1896a 100644 --- a/quickshell/Modals/SystemUpdateModal.qml +++ b/quickshell/Modals/SystemUpdateModal.qml @@ -3,6 +3,7 @@ import qs.Common import qs.Modules.Settings.Widgets import qs.Modules.SystemUpdate import qs.Services +import qs.DCommon.Widgets import qs.Widgets DankFloatingWindow { @@ -35,7 +36,7 @@ DankFloatingWindow { anchors.fill: parent spacing: 0 - DankWindowHeader { + DWindowHeader { id: titleBar width: parent.width controls: windowControls diff --git a/quickshell/Modals/WifiPasswordModal.qml b/quickshell/Modals/WifiPasswordModal.qml index a921fa18c..9160014ba 100644 --- a/quickshell/Modals/WifiPasswordModal.qml +++ b/quickshell/Modals/WifiPasswordModal.qml @@ -2,6 +2,7 @@ import QtQuick import qs.Common import qs.Modals.Common import qs.Services +import qs.DCommon.Widgets import qs.Widgets DankModal { @@ -293,7 +294,7 @@ DankModal { } } - DankDialog { + DDialog { id: contentFocusScope anchors.fill: parent @@ -365,7 +366,7 @@ DankModal { } } - DankTextField { + DTextField { id: ssidInput visible: isHiddenNetwork outlined: true @@ -385,7 +386,7 @@ DankModal { id: dynamicFieldsRepeater model: fieldsInfo - delegate: DankTextField { + delegate: DTextField { id: fieldInput required property var modelData required property int index @@ -472,7 +473,7 @@ DankModal { } } - DankTextField { + DTextField { id: usernameInput visible: showUsernameField outlined: true @@ -490,7 +491,7 @@ DankModal { onAccepted: passwordInput.forceActiveFocus() } - DankTextField { + DTextField { id: passwordInput visible: showPasswordField outlined: true @@ -518,7 +519,7 @@ DankModal { } } - DankTextField { + DTextField { id: anonInput visible: showAnonField outlined: true @@ -536,7 +537,7 @@ DankModal { onAccepted: domainMatchInput.forceActiveFocus() } - DankTextField { + DTextField { id: domainMatchInput visible: showDomainField outlined: true @@ -554,7 +555,7 @@ DankModal { onAccepted: submitCredentialsAndClose() } - DankToggle { + DToggle { id: savePasswordCheckbox width: parent.width @@ -565,7 +566,7 @@ DankModal { } actions: [ - DankButton { + DButton { maximumWidth: contentFocusScope.actionWidth wrapText: true text: I18n.tr("Cancel") @@ -573,7 +574,7 @@ DankModal { textColor: Theme.primary onClicked: clearAndClose() }, - DankButton { + DButton { id: connectButton maximumWidth: contentFocusScope.actionWidth wrapText: true diff --git a/quickshell/Modals/WifiQRCodeModal.qml b/quickshell/Modals/WifiQRCodeModal.qml index 3dca1a8c1..23adbe660 100644 --- a/quickshell/Modals/WifiQRCodeModal.qml +++ b/quickshell/Modals/WifiQRCodeModal.qml @@ -6,7 +6,7 @@ import qs.Modals.Common import qs.Modals.FileBrowser import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets DankModal { id: root @@ -111,7 +111,7 @@ DankModal { Layout.alignment: Qt.AlignLeft } - DankActionButton { + DActionButton { iconName: "save" Accessible.name: I18n.tr("Save QR Code") iconSize: Theme.iconSize - 4 @@ -125,7 +125,7 @@ DankModal { Layout.alignment: Qt.AlignRight } - DankActionButton { + DActionButton { iconName: "close" Accessible.name: I18n.tr("Close") iconSize: Theme.iconSize - 4 diff --git a/quickshell/Modals/WindowRuleModal.qml b/quickshell/Modals/WindowRuleModal.qml index 73829f86c..ba31244d0 100644 --- a/quickshell/Modals/WindowRuleModal.qml +++ b/quickshell/Modals/WindowRuleModal.qml @@ -3,6 +3,7 @@ import QtQuick.Window import qs.Common import qs.Modules.Settings import qs.Modules.Settings.Widgets +import qs.DCommon.Widgets import qs.Widgets DankFloatingWindow { diff --git a/quickshell/Modals/WorkspaceRenameModal.qml b/quickshell/Modals/WorkspaceRenameModal.qml index f29d3be34..87ae1f7ae 100644 --- a/quickshell/Modals/WorkspaceRenameModal.qml +++ b/quickshell/Modals/WorkspaceRenameModal.qml @@ -1,6 +1,7 @@ import QtQuick import qs.Common import qs.Services +import qs.DCommon.Widgets import qs.Widgets DankFloatingWindow { @@ -88,7 +89,7 @@ DankFloatingWindow { renaming = false; } - DankDialog { + DDialog { id: renameDialog anchors.fill: parent @@ -99,7 +100,7 @@ DankFloatingWindow { onAccepted: root.submitAndClose() onRejected: root.hide() - DankTextField { + DTextField { id: nameInput width: parent.width @@ -112,7 +113,7 @@ DankFloatingWindow { } actions: [ - DankButton { + DButton { maximumWidth: renameDialog.actionWidth wrapText: true text: I18n.tr("Cancel") @@ -120,7 +121,7 @@ DankFloatingWindow { textColor: Theme.primary onClicked: root.hide() }, - DankButton { + DButton { maximumWidth: renameDialog.actionWidth wrapText: true text: I18n.tr("Rename", "verb, rename button") diff --git a/quickshell/Modules/BuiltinDesktopPlugins/DesktopClockWidget.qml b/quickshell/Modules/BuiltinDesktopPlugins/DesktopClockWidget.qml index 1e85933c0..1e784fe61 100644 --- a/quickshell/Modules/BuiltinDesktopPlugins/DesktopClockWidget.qml +++ b/quickshell/Modules/BuiltinDesktopPlugins/DesktopClockWidget.qml @@ -2,9 +2,9 @@ import QtQuick import Quickshell import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets -DankClockWidget { +DClockWidget { id: root property real widgetWidth: 280 diff --git a/quickshell/Modules/BuiltinDesktopPlugins/SystemMonitorWidget.qml b/quickshell/Modules/BuiltinDesktopPlugins/SystemMonitorWidget.qml index fc4a21cee..21801ceac 100644 --- a/quickshell/Modules/BuiltinDesktopPlugins/SystemMonitorWidget.qml +++ b/quickshell/Modules/BuiltinDesktopPlugins/SystemMonitorWidget.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Layouts import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import "../../Common/Format.js" as Format Item { diff --git a/quickshell/Modules/ColorPicker/ColorPickerContent.qml b/quickshell/Modules/ColorPicker/ColorPickerContent.qml index 06d7dfea8..1ac6a01a6 100644 --- a/quickshell/Modules/ColorPicker/ColorPickerContent.qml +++ b/quickshell/Modules/ColorPicker/ColorPickerContent.qml @@ -5,11 +5,11 @@ import QtQuick.Layouts import Quickshell import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets -import qs.DankCommon.Widgets as CommonWidgets +import qs.DCommon.Widgets as CommonWidgets -DankDialog { +DDialog { id: root readonly property var log: Log.scoped("ColorPickerContent") @@ -140,7 +140,7 @@ DankDialog { width: parent.width spacing: Theme.spacingS - CommonWidgets.DankSaturationValuePicker { + CommonWidgets.DSaturationValuePicker { id: gradientPicker width: parent.width @@ -155,7 +155,7 @@ DankDialog { } } - DankSlider { + DSlider { id: hueSlider width: parent.width @@ -223,7 +223,7 @@ DankDialog { Layout.preferredWidth: Theme.fieldDefaultWidth spacing: Theme.spacingS - DankColorSwatch { + DColorSwatch { Layout.preferredWidth: hexInput.controlHeight Layout.preferredHeight: hexInput.controlHeight Layout.topMargin: hexInput.containerTop @@ -231,7 +231,7 @@ DankDialog { minPreviewAlpha: 0 } - DankTextField { + DTextField { id: hexInput Layout.fillWidth: true @@ -245,7 +245,7 @@ DankDialog { onEditingFinished: root.applyHex() } - DankActionButton { + DActionButton { Layout.topMargin: hexInput.containerTop iconName: "content_copy" Accessible.name: I18n.tr("Copy") @@ -256,7 +256,7 @@ DankDialog { } } - DankActionButton { + DActionButton { Layout.topMargin: hexInput.containerTop iconName: "colorize" Accessible.name: I18n.tr("Pick Color") @@ -288,7 +288,7 @@ DankDialog { } } - DankSlider { + DSlider { id: opacitySlider width: parent.width @@ -320,7 +320,7 @@ DankDialog { paddingH: Theme.spacingL paddingV: Theme.spacingS - DankActionButton { + DActionButton { iconName: "content_copy" Accessible.name: I18n.tr("Copy") onClicked: root.copyColor(root.rgbText) @@ -333,7 +333,7 @@ DankDialog { paddingH: Theme.spacingL paddingV: Theme.spacingS - DankActionButton { + DActionButton { iconName: "content_copy" Accessible.name: I18n.tr("Copy") onClicked: root.copyColor(root.hsvText) @@ -355,7 +355,7 @@ DankDialog { Repeater { model: root.standardColors - CommonWidgets.DankColorButton { + CommonWidgets.DColorButton { required property string modelData width: palette.width / palette.columns height: Theme.buttonHeightXS @@ -388,7 +388,7 @@ DankDialog { Repeater { model: SessionData.recentColors.slice(0, 5) - CommonWidgets.DankColorButton { + CommonWidgets.DColorButton { required property var modelData swatchColor: modelData selected: Qt.colorEqual(root.currentColor, swatchColor) @@ -398,7 +398,7 @@ DankDialog { } } - actions: DankButton { + actions: DButton { maximumWidth: root.actionWidth wrapText: true text: I18n.tr("Save") diff --git a/quickshell/Modules/ControlCenter/BuiltinPlugins/CupsWidget.qml b/quickshell/Modules/ControlCenter/BuiltinPlugins/CupsWidget.qml index 19d2c5cb1..9319cb211 100644 --- a/quickshell/Modules/ControlCenter/BuiltinPlugins/CupsWidget.qml +++ b/quickshell/Modules/ControlCenter/BuiltinPlugins/CupsWidget.qml @@ -1,6 +1,7 @@ import QtQuick import qs.Common import qs.Services +import qs.DCommon.Widgets import qs.Widgets import qs.Modules.ControlCenter import qs.Modules.ControlCenter.Widgets @@ -40,7 +41,7 @@ PluginComponent { settingsTab: "printers" } - DankFlickable { + DFlickable { anchors.fill: parent contentHeight: detailColumn.height clip: true @@ -79,7 +80,7 @@ PluginComponent { width: parent.width spacing: Theme.spacingS - DankButton { + DButton { buttonHeight: Theme.buttonHeightXS iconName: detailRoot.printerStopped ? "play_arrow" : "pause" iconSize: Theme.iconSizeSmall @@ -95,7 +96,7 @@ PluginComponent { } } - DankButton { + DButton { buttonHeight: Theme.buttonHeightXS iconName: "delete_forever" iconSize: Theme.iconSizeSmall @@ -133,7 +134,7 @@ PluginComponent { title: "#" + modelData.id + " • " + modelData.state subtitle: new Date(modelData.timeCreated).toLocaleString(Qt.locale(), Locale.ShortFormat) + " • " + I18n.tr("%1 KB", "print job size in kilobytes").arg(Math.round(modelData.size / 1024)) - DankActionButton { + DActionButton { anchors.verticalCenter: parent.verticalCenter buttonSize: Theme.buttonHeightXS iconSize: Theme.iconSizeMedium diff --git a/quickshell/Modules/ControlCenter/BuiltinPlugins/DisplayProfilesWidget.qml b/quickshell/Modules/ControlCenter/BuiltinPlugins/DisplayProfilesWidget.qml index 78bb4fa2f..4c82e76ff 100644 --- a/quickshell/Modules/ControlCenter/BuiltinPlugins/DisplayProfilesWidget.qml +++ b/quickshell/Modules/ControlCenter/BuiltinPlugins/DisplayProfilesWidget.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.ControlCenter import qs.Modules.ControlCenter.Widgets import qs.Modules.Plugins @@ -69,7 +69,7 @@ PluginComponent { settingsTab: "displays" } - DankFlickable { + DFlickable { anchors.fill: parent contentHeight: detailColumn.height clip: true @@ -120,7 +120,7 @@ PluginComponent { horizontalBarPill: Component { Row { spacing: Theme.spacingXS - DankIcon { + DIcon { name: "monitor" color: Theme.primary size: root.iconSize @@ -138,7 +138,7 @@ PluginComponent { verticalBarPill: Component { Column { spacing: Theme.spacingXXS - DankIcon { + DIcon { name: "monitor" color: Theme.primary size: root.iconSize diff --git a/quickshell/Modules/ControlCenter/BuiltinPlugins/TailscaleWidget.qml b/quickshell/Modules/ControlCenter/BuiltinPlugins/TailscaleWidget.qml index 55afee659..ac9ac36c7 100644 --- a/quickshell/Modules/ControlCenter/BuiltinPlugins/TailscaleWidget.qml +++ b/quickshell/Modules/ControlCenter/BuiltinPlugins/TailscaleWidget.qml @@ -2,6 +2,7 @@ import QtQuick import Quickshell import qs.Common import qs.Services +import qs.DCommon.Widgets import qs.Widgets import qs.Modules.ControlCenter import qs.Modules.ControlCenter.Widgets @@ -69,7 +70,7 @@ PluginComponent { return base; } - readonly property Item headerActions: DankActionButton { + readonly property Item headerActions: DActionButton { buttonSize: Theme.iconButtonSize iconSize: Theme.iconSize iconName: "sync" @@ -78,7 +79,7 @@ PluginComponent { onClicked: TailscaleService.refresh(null) } - DankFlickable { + DFlickable { anchors.fill: parent contentHeight: detailColumn.height clip: true @@ -145,7 +146,7 @@ PluginComponent { } } - DankSearchField { + DSearchField { width: parent.width visible: TailscaleService.available placeholderText: I18n.tr("Search devices...", "Tailscale device search placeholder") @@ -153,7 +154,7 @@ PluginComponent { onTextEdited: detailRoot.searchQuery = text } - DankFilterChips { + DFilterChips { width: parent.width visible: TailscaleService.available currentIndex: detailRoot.filterIndex @@ -218,7 +219,7 @@ PluginComponent { color: peerRow.modelData.online ? Theme.success : Theme.surfaceVariantText } - DankActionButton { + DActionButton { anchors.verticalCenter: parent.verticalCenter buttonSize: Theme.buttonHeightXS iconSize: Theme.iconSizeSmall @@ -247,7 +248,7 @@ PluginComponent { elide: Text.ElideRight } - DankActionButton { + DActionButton { id: copyDnsButton anchors.verticalCenter: parent.verticalCenter buttonSize: Theme.buttonHeightXS diff --git a/quickshell/Modules/ControlCenter/Components/CcDetailPage.qml b/quickshell/Modules/ControlCenter/Components/CcDetailPage.qml index 62091a9f1..6639032db 100644 --- a/quickshell/Modules/ControlCenter/Components/CcDetailPage.qml +++ b/quickshell/Modules/ControlCenter/Components/CcDetailPage.qml @@ -4,7 +4,7 @@ import QtQuick import qs.Common import qs.Modules.ControlCenter import qs.Modules.ControlCenter.Details -import qs.Widgets +import qs.DCommon.Widgets import "../utils/sections.js" as Sections FocusScope { @@ -278,7 +278,7 @@ FocusScope { height: childrenRect.height } - DankActionButton { + DActionButton { id: closeButton anchors.right: parent.right anchors.rightMargin: CcMetrics.headerEdgeInset diff --git a/quickshell/Modules/ControlCenter/Components/CcFooter.qml b/quickshell/Modules/ControlCenter/Components/CcFooter.qml index 3adc4687a..56d68e2f7 100644 --- a/quickshell/Modules/ControlCenter/Components/CcFooter.qml +++ b/quickshell/Modules/ControlCenter/Components/CcFooter.qml @@ -5,7 +5,7 @@ import Quickshell import qs.Common import qs.Modules.ControlCenter import qs.Modules.ControlCenter.Widgets -import qs.Widgets +import qs.DCommon.Widgets import "../utils/widgets.js" as WidgetUtils Item { @@ -440,7 +440,7 @@ Item { spacing: root.spacing visible: !root.dragging - DankActionButton { + DActionButton { buttonSize: Theme.iconButtonSize iconName: "add" iconSize: CcMetrics.iconBoxIconSize @@ -450,7 +450,7 @@ Item { onClicked: root.addWidgetRequested() } - DankActionButton { + DActionButton { id: moreButton buttonSize: Theme.iconButtonSize @@ -485,7 +485,7 @@ Item { } } - DankIcon { + DIcon { anchors.centerIn: parent name: "delete" size: CcMetrics.iconBoxIconSize @@ -494,7 +494,7 @@ Item { } } - DankActionButton { + DActionButton { anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter buttonSize: Theme.iconButtonSize diff --git a/quickshell/Modules/ControlCenter/Components/CcWidgetSheet.qml b/quickshell/Modules/ControlCenter/Components/CcWidgetSheet.qml index 43fa70f1d..6bf50e02f 100644 --- a/quickshell/Modules/ControlCenter/Components/CcWidgetSheet.qml +++ b/quickshell/Modules/ControlCenter/Components/CcWidgetSheet.qml @@ -4,10 +4,11 @@ import QtQuick import qs.Common import qs.Modules.ControlCenter import qs.Services +import qs.DCommon.Widgets import qs.Widgets import "../utils/widgets.js" as WidgetUtils -DankBottomSheet { +DBottomSheet { id: root property var widgets: [] @@ -99,7 +100,7 @@ DankBottomSheet { radius: item.modelData.id === "user" ? Theme.fullRadius(width, height) : Theme.cornerRadiusLIncreased color: CcMetrics.iconBoxInactiveColor - DankIcon { + DIcon { anchors.centerIn: parent name: item.modelData.icon size: Theme.iconSizeLarge @@ -107,7 +108,7 @@ DankBottomSheet { visible: item.modelData.id !== "user" || PortalService.profileImageUrl === "" } - DankCircularImage { + DCircularImage { anchors.fill: parent imageSource: PortalService.profileImageUrl fallbackIcon: "material:person" @@ -186,7 +187,7 @@ DankBottomSheet { radius: Theme.fullRadius(width, height) color: CcMetrics.iconBoxInactiveColor - DankIcon { + DIcon { anchors.centerIn: parent name: card.category.icon size: Theme.iconSize @@ -207,7 +208,7 @@ DankBottomSheet { elide: Text.ElideRight } - DankIcon { + DIcon { id: chevron anchors.right: parent.right anchors.rightMargin: Theme.spacingL @@ -248,7 +249,7 @@ DankBottomSheet { } } - DankSearchField { + DSearchField { id: searchField width: parent.width height: Theme.fieldHeightLarge diff --git a/quickshell/Modules/ControlCenter/ControlCenterContent.qml b/quickshell/Modules/ControlCenter/ControlCenterContent.qml index 037b88a4e..cdff16e5e 100644 --- a/quickshell/Modules/ControlCenter/ControlCenterContent.qml +++ b/quickshell/Modules/ControlCenter/ControlCenterContent.qml @@ -6,6 +6,7 @@ import qs.Services import qs.Modules.ControlCenter.Components import qs.Modules.ControlCenter.Models import qs.Modules.ControlCenter.Details +import qs.DCommon.Widgets import qs.Widgets import "./utils/sections.js" as Sections import "./utils/widgets.js" as WidgetUtils @@ -376,7 +377,7 @@ FocusScope { } } - DankFlickable { + DFlickable { id: contentFlickable anchors.left: parent.left diff --git a/quickshell/Modules/ControlCenter/Details/AudioInputDetail.qml b/quickshell/Modules/ControlCenter/Details/AudioInputDetail.qml index 1107f5950..6924c3b27 100644 --- a/quickshell/Modules/ControlCenter/Details/AudioInputDetail.qml +++ b/quickshell/Modules/ControlCenter/Details/AudioInputDetail.qml @@ -7,7 +7,7 @@ import qs.Common import qs.Modules.ControlCenter import qs.Modules.ControlCenter.Widgets import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import "../../../Common/QmlUtils.js" as QmlUtils Item { @@ -34,7 +34,7 @@ Item { return name.includes("bluez") || name.includes("usb") ? "headset" : "mic"; } - DankFlickable { + DFlickable { anchors.fill: parent contentHeight: column.height clip: true diff --git a/quickshell/Modules/ControlCenter/Details/AudioOutputDetail.qml b/quickshell/Modules/ControlCenter/Details/AudioOutputDetail.qml index ae1b29e19..a6d912fa7 100644 --- a/quickshell/Modules/ControlCenter/Details/AudioOutputDetail.qml +++ b/quickshell/Modules/ControlCenter/Details/AudioOutputDetail.qml @@ -7,7 +7,7 @@ import qs.Common import qs.Modules.ControlCenter import qs.Modules.ControlCenter.Widgets import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import "../../../Common/QmlUtils.js" as QmlUtils Item { @@ -36,7 +36,7 @@ Item { CacheData.set("audioOutputDevicePins", QmlUtils.togglePinEntry(CacheData.audioOutputDevicePins, "preferredOutput", name, CcMetrics.maxPins)); } - DankFlickable { + DFlickable { anchors.fill: parent contentHeight: column.height clip: true @@ -99,7 +99,7 @@ Item { AudioService.setDefaultSinkByName(modelData.name); } - DankActionButton { + DActionButton { anchors.verticalCenter: parent.verticalCenter visible: AudioService.sinkHasMultiplePorts(deviceRow.modelData) buttonSize: Theme.buttonHeightXS diff --git a/quickshell/Modules/ControlCenter/Details/BluetoothDetail.qml b/quickshell/Modules/ControlCenter/Details/BluetoothDetail.qml index 3b441f6af..b618c2b5c 100644 --- a/quickshell/Modules/ControlCenter/Details/BluetoothDetail.qml +++ b/quickshell/Modules/ControlCenter/Details/BluetoothDetail.qml @@ -7,6 +7,7 @@ import qs.Common import qs.Modules.ControlCenter import qs.Modules.ControlCenter.Widgets import qs.Services +import qs.DCommon.Widgets import qs.Widgets import "../../../Common/QmlUtils.js" as QmlUtils @@ -53,7 +54,7 @@ Item { } } - DankButton { + DButton { anchors.verticalCenter: parent.verticalCenter visible: root.adapterEnabled buttonHeight: Theme.buttonHeightXS @@ -197,7 +198,7 @@ Item { } } - DankFlickable { + DFlickable { anchors.fill: parent contentHeight: column.height clip: true @@ -291,7 +292,7 @@ Item { onToggled: root.togglePin(pairedRow.modelData.address) } - DankActionButton { + DActionButton { id: optionsButton anchors.verticalCenter: parent.verticalCenter buttonSize: Theme.buttonHeightXS diff --git a/quickshell/Modules/ControlCenter/Details/BrightnessDetail.qml b/quickshell/Modules/ControlCenter/Details/BrightnessDetail.qml index 210c117b9..dc400367a 100644 --- a/quickshell/Modules/ControlCenter/Details/BrightnessDetail.qml +++ b/quickshell/Modules/ControlCenter/Details/BrightnessDetail.qml @@ -6,7 +6,7 @@ import qs.Common import qs.Modules.ControlCenter import qs.Modules.ControlCenter.Widgets import qs.Services -import qs.Widgets +import qs.DCommon.Widgets Item { id: root @@ -126,7 +126,7 @@ Item { Component.onCompleted: currentDeviceName = resolveCurrentDevice() - DankFlickable { + DFlickable { anchors.fill: parent contentHeight: column.height clip: true @@ -202,7 +202,7 @@ Item { visible: deviceItem.active && deviceItem.exponential title: I18n.tr("Curve") - DankNumberStepper { + DNumberStepper { anchors.verticalCenter: parent.verticalCenter text: deviceItem.exponent.toFixed(1) decrementEnabled: deviceItem.exponent > CcMetrics.brightnessExponentMin diff --git a/quickshell/Modules/ControlCenter/Details/DiskUsageDetail.qml b/quickshell/Modules/ControlCenter/Details/DiskUsageDetail.qml index 438610313..24dc2627f 100644 --- a/quickshell/Modules/ControlCenter/Details/DiskUsageDetail.qml +++ b/quickshell/Modules/ControlCenter/Details/DiskUsageDetail.qml @@ -5,7 +5,7 @@ import qs.Common import qs.Modules.ControlCenter import qs.Modules.ControlCenter.Widgets import qs.Services -import qs.Widgets +import qs.DCommon.Widgets Item { id: root @@ -32,7 +32,7 @@ Item { return parseFloat((mount.percent || "0").replace("%", "")) || 0; } - DankFlickable { + DFlickable { anchors.fill: parent contentHeight: column.height clip: true diff --git a/quickshell/Modules/ControlCenter/Details/DoNotDisturbDetail.qml b/quickshell/Modules/ControlCenter/Details/DoNotDisturbDetail.qml index 58c1ed1b4..a6b2a0e06 100644 --- a/quickshell/Modules/ControlCenter/Details/DoNotDisturbDetail.qml +++ b/quickshell/Modules/ControlCenter/Details/DoNotDisturbDetail.qml @@ -4,7 +4,7 @@ import QtQuick import qs.Common import qs.Modules.ControlCenter import qs.Modules.ControlCenter.Widgets -import qs.Widgets +import qs.DCommon.Widgets import "../../../Common/Format.js" as Format Item { @@ -67,7 +67,7 @@ Item { return Math.max(1, Math.round((target.getTime() - now.getTime()) / 60000)); } - DankFlickable { + DFlickable { anchors.fill: parent contentHeight: column.height clip: true @@ -103,7 +103,7 @@ Item { Repeater { model: root.presets - DankButton { + DButton { required property var modelData buttonHeight: Theme.buttonHeightXS diff --git a/quickshell/Modules/ControlCenter/Details/IdleInhibitorDetail.qml b/quickshell/Modules/ControlCenter/Details/IdleInhibitorDetail.qml index 4b3720863..ad3851ec1 100644 --- a/quickshell/Modules/ControlCenter/Details/IdleInhibitorDetail.qml +++ b/quickshell/Modules/ControlCenter/Details/IdleInhibitorDetail.qml @@ -5,7 +5,7 @@ import qs.Common import qs.Modules.ControlCenter import qs.Modules.ControlCenter.Widgets import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import "../../../Common/Format.js" as Format Item { @@ -63,7 +63,7 @@ Item { return Format.formatRemaining(ms, "", I18n.tr("%1 min left"), I18n.tr("%1 h left"), I18n.tr("%1 h %2 m left")); } - DankFlickable { + DFlickable { anchors.fill: parent contentHeight: column.height clip: true @@ -99,7 +99,7 @@ Item { Repeater { model: root.presets - DankButton { + DButton { required property var modelData buttonHeight: Theme.buttonHeightXS diff --git a/quickshell/Modules/ControlCenter/Details/NetworkDetail.qml b/quickshell/Modules/ControlCenter/Details/NetworkDetail.qml index dac7d5bc6..226102475 100644 --- a/quickshell/Modules/ControlCenter/Details/NetworkDetail.qml +++ b/quickshell/Modules/ControlCenter/Details/NetworkDetail.qml @@ -9,6 +9,7 @@ import qs.Modules.ControlCenter import qs.Modules.ControlCenter.Widgets import qs.Modules.Network import qs.Services +import qs.DCommon.Widgets import qs.Widgets import "../../../Common/QmlUtils.js" as QmlUtils @@ -94,7 +95,7 @@ Item { onValueChanged: value => NetworkService.setWifiDeviceOverride(value === I18n.tr("Auto") ? "" : value) } - DankRefreshButton { + DRefreshButton { Accessible.name: I18n.tr("Scan") anchors.verticalCenter: parent.verticalCenter buttonSize: CcMetrics.headerActionSize @@ -299,7 +300,7 @@ Item { } } - DankListView { + DListView { id: pageList objectName: "networkList" @@ -316,7 +317,7 @@ Item { spacing: CcMetrics.detailContentGap bottomPadding: pageList.count > 0 ? CcMetrics.detailContentGap : 0 - DankButtonGroup { + DButtonGroup { readonly property var labelsByType: ({ "ethernet": I18n.tr("Ethernet"), "wifi": I18n.tr("Wi-Fi", "wireless network, page and section title"), @@ -378,7 +379,7 @@ Item { } subtitleColor: warnsWifiDrop ? Theme.warning : Theme.surfaceVariantText - DankSpinner { + DSpinner { anchors.verticalCenter: parent.verticalCenter size: Theme.iconSizeMedium strokeWidth: CcMetrics.spinnerStroke @@ -387,7 +388,7 @@ Item { running: visible } - DankToggle { + DToggle { anchors.verticalCenter: parent.verticalCenter hideText: true visible: !root.hotspotWorking @@ -452,7 +453,7 @@ Item { NetworkService.connectToSpecificWiredConfig(modelData.uuid); } - DankActionButton { + DActionButton { id: wiredOptionsButton anchors.verticalCenter: parent.verticalCenter buttonSize: Theme.buttonHeightXS @@ -512,7 +513,7 @@ Item { clickable: true onClicked: NetworkService.toggleNetworkConnection("cellular") - DankActionButton { + DActionButton { anchors.verticalCenter: parent.verticalCenter buttonSize: Theme.buttonHeightXS iconSize: Theme.iconSizeMedium @@ -540,7 +541,7 @@ Item { clickable: !active onClicked: NetworkService.connectToSpecificCellularConfig(modelData.uuid) - DankActionButton { + DActionButton { anchors.verticalCenter: parent.verticalCenter buttonSize: Theme.buttonHeightXS iconSize: Theme.iconSizeMedium @@ -614,7 +615,7 @@ Item { leading: Loader { active: wifiRow.isConnecting - sourceComponent: DankSpinner { + sourceComponent: DSpinner { size: Theme.iconSizeMedium strokeWidth: CcMetrics.spinnerStroke color: Theme.warning @@ -624,7 +625,7 @@ Item { Loader { anchors.verticalCenter: parent.verticalCenter active: wifiRow.sharesQrCode - sourceComponent: DankActionButton { + sourceComponent: DActionButton { buttonSize: Theme.buttonHeightXS iconSize: Theme.iconSizeMedium iconName: "qr_code" @@ -640,7 +641,7 @@ Item { onToggled: root.togglePin(wifiRow.modelData.ssid) } - DankActionButton { + DActionButton { id: wifiOptionsButton anchors.verticalCenter: parent.verticalCenter buttonSize: Theme.buttonHeightXS diff --git a/quickshell/Modules/ControlCenter/Details/RunningAppsDetail.qml b/quickshell/Modules/ControlCenter/Details/RunningAppsDetail.qml index ad529feb7..8bf20191f 100644 --- a/quickshell/Modules/ControlCenter/Details/RunningAppsDetail.qml +++ b/quickshell/Modules/ControlCenter/Details/RunningAppsDetail.qml @@ -6,7 +6,7 @@ import qs.Common import qs.Services import qs.Modules.ControlCenter import qs.Modules.ControlCenter.Widgets -import qs.Widgets +import qs.DCommon.Widgets Item { id: root @@ -28,7 +28,7 @@ Item { dismissRequested(); } - DankFlickable { + DFlickable { anchors.fill: parent contentHeight: column.height clip: true @@ -68,7 +68,7 @@ Item { iconSize: Theme.iconSizeLarge } - DankActionButton { + DActionButton { anchors.verticalCenter: parent.verticalCenter iconName: "close" iconColor: Theme.onSurfaceVariant diff --git a/quickshell/Modules/ControlCenter/Details/VpnDetailContent.qml b/quickshell/Modules/ControlCenter/Details/VpnDetailContent.qml index 7d002da6c..809ca7d49 100644 --- a/quickshell/Modules/ControlCenter/Details/VpnDetailContent.qml +++ b/quickshell/Modules/ControlCenter/Details/VpnDetailContent.qml @@ -8,7 +8,7 @@ import qs.Modals.FileBrowser import qs.Modules.ControlCenter import qs.Modules.ControlCenter.Widgets import qs.Services -import qs.Widgets +import qs.DCommon.Widgets Item { id: root @@ -27,7 +27,7 @@ Item { readonly property Item headerActions: Row { spacing: Theme.spacingS - DankButton { + DButton { anchors.verticalCenter: parent.verticalCenter buttonHeight: Theme.buttonHeightXS iconName: VPNService.importing ? "sync" : "add" @@ -109,7 +109,7 @@ Item { return I18n.tr("Active: %1 +%2", "vpn status, %1 is a connection name, %2 counts the others").arg(names[0]).arg(names.length - 1); } - DankButton { + DButton { anchors.verticalCenter: parent.verticalCenter visible: DMSNetworkService.connected buttonHeight: Theme.buttonHeightXS @@ -136,7 +136,7 @@ Item { subtitle: I18n.tr("Click Import to add a .ovpn or .conf") } - DankListView { + DListView { id: vpnListView anchors.fill: parent visible: root.hasProfiles diff --git a/quickshell/Modules/ControlCenter/Details/VpnProfileDelegate.qml b/quickshell/Modules/ControlCenter/Details/VpnProfileDelegate.qml index c36fd7334..9e8a6e7a9 100644 --- a/quickshell/Modules/ControlCenter/Details/VpnProfileDelegate.qml +++ b/quickshell/Modules/ControlCenter/Details/VpnProfileDelegate.qml @@ -3,7 +3,7 @@ import qs.Common import qs.Modules.ControlCenter import qs.Modules.ControlCenter.Widgets import qs.Services -import qs.Widgets +import qs.DCommon.Widgets CcListRow { id: root @@ -76,7 +76,7 @@ CcListRow { clickable: true onClicked: DMSNetworkService.toggle(profile.uuid) - leading: DankSpinner { + leading: DSpinner { size: Theme.iconSizeMedium strokeWidth: CcMetrics.spinnerStroke color: Theme.warning @@ -84,7 +84,7 @@ CcListRow { running: visible } - DankActionButton { + DActionButton { anchors.verticalCenter: parent.verticalCenter visible: root.isActive buttonSize: Theme.buttonHeightXS @@ -96,7 +96,7 @@ CcListRow { onClicked: DMSNetworkService.toggle(root.profile.uuid) } - DankActionButton { + DActionButton { anchors.verticalCenter: parent.verticalCenter visible: root.canExpand buttonSize: Theme.buttonHeightXS @@ -107,7 +107,7 @@ CcListRow { onClicked: root.toggleExpand() } - DankActionButton { + DActionButton { anchors.verticalCenter: parent.verticalCenter visible: root.canDelete buttonSize: Theme.buttonHeightXS @@ -123,7 +123,7 @@ CcListRow { spacing: Theme.spacingS visible: root.isExpanded - DankSpinner { + DSpinner { anchors.horizontalCenter: parent.horizontalCenter size: Theme.iconSizeMedium strokeWidth: CcMetrics.spinnerStroke @@ -139,7 +139,7 @@ CcListRow { Repeater { model: root.configFields - DankDetailChip { + DDetailChip { required property var modelData label: modelData.label @@ -150,7 +150,7 @@ CcListRow { } } - DankToggle { + DToggle { width: parent.width text: I18n.tr("Autoconnect") checked: root.configData ? (root.configData.autoconnect || false) : false @@ -171,14 +171,14 @@ CcListRow { color: root.hasError ? Theme.error : Theme.surfaceVariantText } - DankTextField { + DTextField { id: usernameField width: parent.width placeholderText: I18n.tr("Username") text: (root.configData && (root.configData.username || (root.configData.data && root.configData.data.username))) || "" } - DankTextField { + DTextField { id: passwordField width: parent.width placeholderText: I18n.tr("Password") @@ -187,7 +187,7 @@ CcListRow { normalBorderColor: root.hasError ? Theme.error : Theme.outlineMedium } - DankButton { + DButton { text: I18n.tr("Save credentials") buttonHeight: Theme.buttonHeightXS enabled: passwordField.text.length > 0 diff --git a/quickshell/Modules/ControlCenter/Widgets/AudioDeviceTile.qml b/quickshell/Modules/ControlCenter/Widgets/AudioDeviceTile.qml index df2fe9d2b..8f38e4a6c 100644 --- a/quickshell/Modules/ControlCenter/Widgets/AudioDeviceTile.qml +++ b/quickshell/Modules/ControlCenter/Widgets/AudioDeviceTile.qml @@ -2,7 +2,7 @@ import QtQuick import qs.Common import qs.Modules.ControlCenter import qs.Services -import qs.Widgets +import qs.DCommon.Widgets CcTile { id: root @@ -34,7 +34,7 @@ CcTile { available: widgetDef?.enabled ?? true tallContent: Component { Item { - DankRingGauge { + DRingGauge { anchors.left: parent.left anchors.verticalCenter: parent.verticalCenter width: Math.min(parent.width, parent.height) diff --git a/quickshell/Modules/ControlCenter/Widgets/CcAppIcon.qml b/quickshell/Modules/ControlCenter/Widgets/CcAppIcon.qml index cb15c7761..c1dbddf0c 100644 --- a/quickshell/Modules/ControlCenter/Widgets/CcAppIcon.qml +++ b/quickshell/Modules/ControlCenter/Widgets/CcAppIcon.qml @@ -2,7 +2,7 @@ import QtQuick import Quickshell import Quickshell.Widgets import qs.Common -import qs.Widgets +import qs.DCommon.Widgets Item { id: root @@ -23,7 +23,7 @@ Item { visible: status === Image.Ready } - DankIcon { + DIcon { anchors.centerIn: parent name: "apps" size: root.iconSize diff --git a/quickshell/Modules/ControlCenter/Widgets/CcEmptyState.qml b/quickshell/Modules/ControlCenter/Widgets/CcEmptyState.qml index 660276b6e..d7d039cbe 100644 --- a/quickshell/Modules/ControlCenter/Widgets/CcEmptyState.qml +++ b/quickshell/Modules/ControlCenter/Widgets/CcEmptyState.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Common import qs.Modules.ControlCenter -import qs.Widgets +import qs.DCommon.Widgets Item { id: root @@ -23,7 +23,7 @@ Item { width: parent.width - Theme.spacingL * 2 spacing: Theme.spacingS - DankSpinner { + DSpinner { anchors.horizontalCenter: parent.horizontalCenter size: CcMetrics.emptyStateIconSize strokeWidth: CcMetrics.spinnerStroke @@ -32,7 +32,7 @@ Item { running: visible } - DankIcon { + DIcon { anchors.horizontalCenter: parent.horizontalCenter name: root.iconName size: CcMetrics.emptyStateIconSize diff --git a/quickshell/Modules/ControlCenter/Widgets/CcPinChip.qml b/quickshell/Modules/ControlCenter/Widgets/CcPinChip.qml index f91be7730..682bfa9b5 100644 --- a/quickshell/Modules/ControlCenter/Widgets/CcPinChip.qml +++ b/quickshell/Modules/ControlCenter/Widgets/CcPinChip.qml @@ -1,6 +1,7 @@ import QtQuick import qs.Common import qs.Modules.ControlCenter +import qs.DCommon.Widgets import qs.Widgets Rectangle { @@ -62,7 +63,7 @@ Rectangle { anchors.centerIn: parent spacing: Theme.spacingS - DankIcon { + DIcon { name: "push_pin" size: Theme.chipIconSize color: root.contentColor diff --git a/quickshell/Modules/ControlCenter/Widgets/CcSettingsButton.qml b/quickshell/Modules/ControlCenter/Widgets/CcSettingsButton.qml index 2b35a8644..44ae8b757 100644 --- a/quickshell/Modules/ControlCenter/Widgets/CcSettingsButton.qml +++ b/quickshell/Modules/ControlCenter/Widgets/CcSettingsButton.qml @@ -2,9 +2,9 @@ import QtQuick import qs.Common import qs.Modules.ControlCenter import qs.Services -import qs.Widgets +import qs.DCommon.Widgets -DankActionButton { +DActionButton { property string settingsTab: "" buttonSize: CcMetrics.headerActionSize diff --git a/quickshell/Modules/ControlCenter/Widgets/CcSheetDialog.qml b/quickshell/Modules/ControlCenter/Widgets/CcSheetDialog.qml index 88744455e..740caf2a0 100644 --- a/quickshell/Modules/ControlCenter/Widgets/CcSheetDialog.qml +++ b/quickshell/Modules/ControlCenter/Widgets/CcSheetDialog.qml @@ -1,8 +1,9 @@ import QtQuick import qs.Common import qs.Modules.ControlCenter +import qs.DCommon.Widgets import qs.Widgets -import "../../../DankCommon/Common/FocusNavigation.js" as FocusNavigation +import "../../../DCommon/Common/FocusNavigation.js" as FocusNavigation Item { id: root @@ -147,7 +148,7 @@ Item { width: parent.width spacing: Theme.spacingM - DankIcon { + DIcon { name: root.iconName size: Theme.iconSizeLarge color: Theme.primary @@ -190,7 +191,7 @@ Item { visible: text !== "" } - DankFlickable { + DFlickable { id: contentFlickable width: parent.width height: Math.min(contentHeight, Math.max(0, root.height - Theme.spacingL * 4 - header.height - column.spacing - (status.visible ? status.height + column.spacing : 0))) diff --git a/quickshell/Modules/ControlCenter/Widgets/CcSliderRow.qml b/quickshell/Modules/ControlCenter/Widgets/CcSliderRow.qml index 5ab7229bb..a81f6aacb 100644 --- a/quickshell/Modules/ControlCenter/Widgets/CcSliderRow.qml +++ b/quickshell/Modules/ControlCenter/Widgets/CcSliderRow.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Common import qs.Modules.ControlCenter -import qs.Widgets +import qs.DCommon.Widgets Item { id: root @@ -57,7 +57,7 @@ Item { anchors.fill: parent anchors.margins: root.contentPadding - DankActionButton { + DActionButton { id: action objectName: "sliderAction" x: root.vertical ? (parent.width - width) / 2 : root.LayoutMirroring.enabled ? parent.width - width : 0 @@ -113,7 +113,7 @@ Item { y: root.vertical ? (root.showNumber ? labels.height + Theme.spacingS : 0) : root.tall ? action.height + Theme.spacingM : 0 height: Math.max(0, (root.vertical ? action.y - Theme.spacingS : parent.height) - y) - DankSlider { + DSlider { id: slider anchors.centerIn: parent width: root.vertical ? parent.height : parent.width diff --git a/quickshell/Modules/ControlCenter/Widgets/CcTile.qml b/quickshell/Modules/ControlCenter/Widgets/CcTile.qml index 2e7b169ab..2dfa9f462 100644 --- a/quickshell/Modules/ControlCenter/Widgets/CcTile.qml +++ b/quickshell/Modules/ControlCenter/Widgets/CcTile.qml @@ -1,6 +1,7 @@ import QtQuick import qs.Common import qs.Modules.ControlCenter +import qs.DCommon.Widgets import qs.Widgets Item { @@ -210,7 +211,7 @@ Item { visible: root.activeFocus } - DankIcon { + DIcon { id: compactIcon anchors.centerIn: parent name: root.iconName @@ -220,7 +221,7 @@ Item { rotation: root.iconRotation visible: root.compact && root.bodyContent === null && root.iconContent === null - DankBlink { + DBlink { target: compactIcon running: root.iconBlinking && root.compact && root.visible && root.live } @@ -285,7 +286,7 @@ Item { } } - DankIcon { + DIcon { id: tileIcon anchors.centerIn: parent name: root.iconName @@ -295,7 +296,7 @@ Item { rotation: root.iconRotation visible: root.iconContent === null - DankBlink { + DBlink { target: tileIcon running: root.iconBlinking && !root.compact && root.visible && root.live } @@ -371,7 +372,7 @@ Item { } } - DankIcon { + DIcon { id: chevron anchors.right: parent.right anchors.rightMargin: Theme.spacingXS diff --git a/quickshell/Modules/ControlCenter/Widgets/CcWidgetLibrary.qml b/quickshell/Modules/ControlCenter/Widgets/CcWidgetLibrary.qml index 64d4e0f25..d9c492697 100644 --- a/quickshell/Modules/ControlCenter/Widgets/CcWidgetLibrary.qml +++ b/quickshell/Modules/ControlCenter/Widgets/CcWidgetLibrary.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Common import qs.Modules.ControlCenter -import qs.Widgets +import qs.DCommon.Widgets import "../utils/widgets.js" as WidgetUtils Rectangle { @@ -43,7 +43,7 @@ Rectangle { anchors.right: parent.right spacing: Theme.spacingM - DankIcon { + DIcon { name: "add_circle" size: Theme.iconSize color: Theme.primary @@ -59,7 +59,7 @@ Rectangle { } } - DankSearchField { + DSearchField { id: searchField anchors.top: headerRow.bottom anchors.topMargin: Theme.spacingM @@ -81,7 +81,7 @@ Rectangle { } } - DankListView { + DListView { id: widgetList anchors.top: searchField.bottom @@ -106,7 +106,7 @@ Rectangle { bottomRadius: index === widgetList.count - 1 ? Theme.groupedListOuterRadius : Theme.groupedListInnerRadius onClicked: root.chosen(modelData.id) - DankIcon { + DIcon { name: "add" size: Theme.iconSize color: Theme.primary diff --git a/quickshell/Modules/ControlCenter/Widgets/ColorPickerTile.qml b/quickshell/Modules/ControlCenter/Widgets/ColorPickerTile.qml index 36e1ae9ed..7de367859 100644 --- a/quickshell/Modules/ControlCenter/Widgets/ColorPickerTile.qml +++ b/quickshell/Modules/ControlCenter/Widgets/ColorPickerTile.qml @@ -1,8 +1,8 @@ import QtQuick import qs.Common import Quickshell -import qs.Widgets -import qs.DankCommon.Widgets as CommonWidgets +import qs.DCommon.Widgets +import qs.DCommon.Widgets as CommonWidgets CcTile { id: root @@ -35,7 +35,7 @@ CcTile { Repeater { model: SessionData.recentColors.slice(0, colors.swatchColumns * colors.swatchRows) - CommonWidgets.DankColorButton { + CommonWidgets.DColorButton { required property var modelData width: Theme.minimumTouchTargetSize height: width @@ -52,7 +52,7 @@ CcTile { } } - DankButton { + DButton { text: I18n.tr("Choose color", "color picker title") maximumWidth: parent.width visible: SessionData.recentColors.length === 0 diff --git a/quickshell/Modules/ControlCenter/Widgets/DiskUsageTile.qml b/quickshell/Modules/ControlCenter/Widgets/DiskUsageTile.qml index 257f6bdcd..27f4646cf 100644 --- a/quickshell/Modules/ControlCenter/Widgets/DiskUsageTile.qml +++ b/quickshell/Modules/ControlCenter/Widgets/DiskUsageTile.qml @@ -2,7 +2,7 @@ import QtQuick import qs.Common import qs.Modules.ControlCenter import qs.Services -import qs.Widgets +import qs.DCommon.Widgets CcTile { id: root @@ -42,7 +42,7 @@ CcTile { available: DgopService.dgopAvailable tallContent: Component { Item { - DankRingGauge { + DRingGauge { anchors.left: parent.left anchors.verticalCenter: parent.verticalCenter width: Math.min(parent.width, parent.height) @@ -74,7 +74,7 @@ CcTile { onClicked: expandClicked() expandedContent: Component { Item { - DankRingGauge { + DRingGauge { anchors.centerIn: parent width: Math.min(parent.width, parent.height) height: width diff --git a/quickshell/Modules/ControlCenter/Widgets/NightModeTile.qml b/quickshell/Modules/ControlCenter/Widgets/NightModeTile.qml index 63f51f856..053d5a710 100644 --- a/quickshell/Modules/ControlCenter/Widgets/NightModeTile.qml +++ b/quickshell/Modules/ControlCenter/Widgets/NightModeTile.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets CcTile { id: root @@ -24,7 +24,7 @@ CcTile { elide: Text.ElideRight } - DankSlider { + DSlider { width: parent.width minimum: 1000 maximum: 6000 diff --git a/quickshell/Modules/ControlCenter/Widgets/RunningAppsTile.qml b/quickshell/Modules/ControlCenter/Widgets/RunningAppsTile.qml index a348851e8..c523ef4ed 100644 --- a/quickshell/Modules/ControlCenter/Widgets/RunningAppsTile.qml +++ b/quickshell/Modules/ControlCenter/Widgets/RunningAppsTile.qml @@ -4,7 +4,7 @@ import QtQuick import Quickshell import qs.Common import qs.Modules.ControlCenter -import qs.Widgets +import qs.DCommon.Widgets CcTile { id: root @@ -121,7 +121,7 @@ CcTile { visible: body.label !== "" } - DankIcon { + DIcon { id: chevron anchors.right: parent.right diff --git a/quickshell/Modules/ControlCenter/Widgets/UserTile.qml b/quickshell/Modules/ControlCenter/Widgets/UserTile.qml index 9e60492b8..38ba07b61 100644 --- a/quickshell/Modules/ControlCenter/Widgets/UserTile.qml +++ b/quickshell/Modules/ControlCenter/Widgets/UserTile.qml @@ -4,6 +4,7 @@ import qs.Common import qs.Modules.ControlCenter import qs.Modules.DankDash import qs.Services +import qs.DCommon.Widgets import qs.Widgets import "../utils/widgets.js" as WidgetUtils @@ -80,14 +81,14 @@ Item { height: root.avatarSide visible: !root.wide - DankMaterialShape { + DMaterialShape { anchors.fill: parent shape: root.shape color: Theme.primaryContainer visible: !root.hasImage } - DankIcon { + DIcon { anchors.centerIn: parent name: "person" size: Math.round(root.avatarSide * root.fallbackGlyphRatio) @@ -103,7 +104,7 @@ Item { layer.enabled: root.hasImage visible: false - DankMaterialShape { + DMaterialShape { anchors.fill: parent shape: root.shape } @@ -172,7 +173,7 @@ Item { } } - DankActionButton { + DActionButton { id: shapeButton anchors.bottom: avatar.bottom diff --git a/quickshell/Modules/DankBar/Popouts/BatteryHistoryChart.qml b/quickshell/Modules/DankBar/Popouts/BatteryHistoryChart.qml index c59930c3b..541bc0253 100644 --- a/quickshell/Modules/DankBar/Popouts/BatteryHistoryChart.qml +++ b/quickshell/Modules/DankBar/Popouts/BatteryHistoryChart.qml @@ -4,10 +4,11 @@ import QtQuick import QtQuick.Shapes import qs.Common import qs.Services +import qs.DCommon.Widgets import qs.Widgets import "BatteryHistory.js" as History -DankCard { +DCard { id: root property var samples: [] @@ -131,7 +132,7 @@ DankCard { LayoutMirroring.enabled: false LayoutMirroring.childrenInherit: true - DankActionButton { + DActionButton { buttonSize: Theme.buttonHeightXS iconName: "chevron_left" Accessible.name: I18n.tr("Previous") @@ -139,7 +140,7 @@ DankCard { onClicked: root.scrollTo(timeline.contentX - timeline.width) } - DankActionButton { + DActionButton { buttonSize: Theme.buttonHeightXS iconName: "today" Accessible.name: I18n.tr("Today") @@ -147,7 +148,7 @@ DankCard { onClicked: root.showLatest() } - DankActionButton { + DActionButton { buttonSize: Theme.buttonHeightXS iconName: "chevron_right" Accessible.name: I18n.tr("Next") @@ -176,7 +177,7 @@ DankCard { } } - DankFlickable { + DFlickable { id: timeline width: parent.width - percentLabel.implicitWidth - Theme.spacingS height: parent.height @@ -224,7 +225,7 @@ DankCard { Repeater { model: root.segments - DankSparkline { + DSparkline { required property var modelData anchors.fill: parent values: modelData.samples.map(sample => sample[1]) diff --git a/quickshell/Modules/DankBar/Popouts/BatteryPopoutContent.qml b/quickshell/Modules/DankBar/Popouts/BatteryPopoutContent.qml index 06a75260e..94bdb0868 100644 --- a/quickshell/Modules/DankBar/Popouts/BatteryPopoutContent.qml +++ b/quickshell/Modules/DankBar/Popouts/BatteryPopoutContent.qml @@ -7,7 +7,7 @@ import Quickshell.Services.UPower import qs.Common import qs.Modules.Settings.Widgets import qs.Services -import qs.Widgets +import qs.DCommon.Widgets Item { id: root @@ -148,7 +148,7 @@ Item { historyEnabled: false } - DankFlickable { + DFlickable { id: flickable anchors.fill: parent clip: true @@ -178,7 +178,7 @@ Item { width: parent.width - root.contentPadding * 2 spacing: PopoutMetrics.contentGap - DankCard { + DCard { width: parent.width height: heroRow.implicitHeight + pad * 2 restRadius: Theme.cornerRadiusL @@ -188,7 +188,7 @@ Item { width: parent.width spacing: Theme.spacingM - DankRingGauge { + DRingGauge { id: heroGauge width: Theme.iconButtonSize + Theme.spacingM height: width @@ -198,7 +198,7 @@ Item { ringColor: root.levelLow ? Theme.error : Theme.primary animated: root.active - DankIcon { + DIcon { anchors.centerIn: parent name: BatteryService.isCharging ? "bolt" : BatteryService.getBatteryIcon() size: Theme.iconSize @@ -229,7 +229,7 @@ Item { } } - DankActionButton { + DActionButton { id: settingsButton anchors.verticalCenter: parent.verticalCenter iconName: "settings" @@ -266,7 +266,7 @@ Item { } } - DankCard { + DCard { width: parent.width height: profileColumn.implicitHeight + pad * 2 restRadius: Theme.cornerRadiusL @@ -285,7 +285,7 @@ Item { color: Theme.primary } - DankButtonGroup { + DButtonGroup { id: profileGroup readonly property var profiles: PowerProfileWatcher.availableProfiles @@ -307,7 +307,7 @@ Item { } } - DankCard { + DCard { id: devicesCard readonly property int columns: Math.min(BatteryService.peripheralDevices.length, 4) width: parent.width @@ -363,7 +363,7 @@ Item { } } - DankCollapsibleSection { + DCollapsibleSection { width: parent.width visible: root.multipleBatteries title: I18n.tr("Individual Batteries") @@ -377,7 +377,7 @@ Item { values: root.multipleBatteries ? BatteryService.batteries : [] } - delegate: DankCard { + delegate: DCard { id: deviceCard required property var modelData required property int index @@ -472,7 +472,7 @@ Item { readonly property bool low: percentage <= SettingsData.batteryLowThreshold implicitHeight: deviceName.y + deviceName.implicitHeight - DankRingGauge { + DRingGauge { id: deviceRing width: Theme.iconButtonSize * 2 height: width @@ -485,7 +485,7 @@ Item { ringColor: device.low ? Theme.error : device.accent animated: device.animated - DankIcon { + DIcon { anchors.centerIn: parent name: device.iconName size: Theme.iconSize @@ -516,7 +516,7 @@ Item { } } - component StatTile: DankCard { + component StatTile: DCard { id: tile property string label: "" property string value: "" @@ -540,7 +540,7 @@ Item { width: parent.width spacing: Theme.spacingXS - DankRingGauge { + DRingGauge { width: Theme.buttonHeightXS height: width anchors.horizontalCenter: parent.horizontalCenter @@ -550,7 +550,7 @@ Item { ringColor: tile.valueColor === Theme.error ? Theme.error : Theme.primary animated: root.active - DankIcon { + DIcon { anchors.centerIn: parent name: tile.iconName size: tile.ratio >= 0 ? Theme.iconSizeSmall : Theme.iconSize diff --git a/quickshell/Modules/DankBar/Popouts/DWLLayoutPopout.qml b/quickshell/Modules/DankBar/Popouts/DWLLayoutPopout.qml index eafb8d00f..c0e8a086a 100644 --- a/quickshell/Modules/DankBar/Popouts/DWLLayoutPopout.qml +++ b/quickshell/Modules/DankBar/Popouts/DWLLayoutPopout.qml @@ -2,6 +2,7 @@ import QtQuick import qs.Common import qs.Modules.DankBar import qs.Services +import qs.DCommon.Widgets import qs.Widgets DankPopout { @@ -164,7 +165,7 @@ DankPopout { id: layoutRepeater model: MangoService.layouts - delegate: DankListItem { + delegate: DListItem { id: layoutRow required property string modelData required property int index @@ -190,7 +191,7 @@ DankPopout { anchors.verticalCenter: parent.verticalCenter spacing: Theme.spacingM - DankIcon { + DIcon { name: root.getLayoutIcon(layoutRow.modelData) size: Theme.iconSizeMedium color: layoutRow.contentColor diff --git a/quickshell/Modules/DankBar/Popouts/DurationPopout.qml b/quickshell/Modules/DankBar/Popouts/DurationPopout.qml index c19879734..1fbb25c24 100644 --- a/quickshell/Modules/DankBar/Popouts/DurationPopout.qml +++ b/quickshell/Modules/DankBar/Popouts/DurationPopout.qml @@ -2,6 +2,7 @@ import QtQuick import qs.Common import qs.Modules.DankBar.Widgets import qs.Modules.Notifications +import qs.DCommon.Widgets import qs.Widgets DankPopout { @@ -62,7 +63,7 @@ DankPopout { id: optionRepeater model: root.presets.presetOptions - DankListItem { + DListItem { required property var modelData required property int index @@ -89,7 +90,7 @@ DankPopout { } } - DankListItem { + DListItem { id: turnOffRow width: optionList.width implicitHeight: Theme.listItemTwoLineHeight @@ -111,7 +112,7 @@ DankPopout { anchors.verticalCenter: parent.verticalCenter spacing: Theme.spacingS - DankIcon { + DIcon { id: turnOffIcon name: "power_settings_new" size: Theme.iconSizeSmall diff --git a/quickshell/Modules/DankBar/SectionOverflow.qml b/quickshell/Modules/DankBar/SectionOverflow.qml index 5695708c5..777589994 100644 --- a/quickshell/Modules/DankBar/SectionOverflow.qml +++ b/quickshell/Modules/DankBar/SectionOverflow.qml @@ -3,6 +3,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common import qs.Modules.SurfaceWidgets +import qs.DCommon.Widgets import qs.Widgets import "OverflowLayout.js" as OverflowLayout @@ -96,7 +97,7 @@ Item { Item { implicitWidth: Math.max(0, root.button.widgetThickness - root.button.horizontalPadding * 2) implicitHeight: implicitWidth - DankIcon { + DIcon { anchors.centerIn: parent name: OverflowLayout.expanderIcon(root.sectionContext.axis?.edge, root.open) size: Theme.iconSizeSmall @@ -123,7 +124,7 @@ Item { readonly property var widgetHost: scroller.contentItem // A hosted widget holding focus would starve the popout's own Escape handler. Keys.onEscapePressed: root.popout?.close() - DankFlickable { + DFlickable { id: scroller anchors.fill: parent anchors.margins: Theme.spacingS diff --git a/quickshell/Modules/DankBar/Widgets/AppsDock.qml b/quickshell/Modules/DankBar/Widgets/AppsDock.qml index 8132d4109..dabcf17ac 100644 --- a/quickshell/Modules/DankBar/Widgets/AppsDock.qml +++ b/quickshell/Modules/DankBar/Widgets/AppsDock.qml @@ -2,7 +2,6 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common import qs.Services -import qs.Widgets import qs.Modules.Plugins import qs.Modules.Dock import qs.Modules.SurfaceWidgets diff --git a/quickshell/Modules/DankBar/Widgets/AudioVisualization.qml b/quickshell/Modules/DankBar/Widgets/AudioVisualization.qml index 8d1909d69..1f1128554 100644 --- a/quickshell/Modules/DankBar/Widgets/AudioVisualization.qml +++ b/quickshell/Modules/DankBar/Widgets/AudioVisualization.qml @@ -2,7 +2,7 @@ import QtQuick import Quickshell.Services.Mpris import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets Item { id: root @@ -74,7 +74,7 @@ Item { fragmentShader: Qt.resolvedUrl("../../../Shaders/qsb/viz_bars.frag.qsb") } - DankIcon { + DIcon { anchors.centerIn: parent visible: !root.showBars name: root.idleIconName diff --git a/quickshell/Modules/DankBar/Widgets/Battery.qml b/quickshell/Modules/DankBar/Widgets/Battery.qml index c8c8bbf91..27a1784e7 100644 --- a/quickshell/Modules/DankBar/Widgets/Battery.qml +++ b/quickshell/Modules/DankBar/Widgets/Battery.qml @@ -2,6 +2,7 @@ import QtQuick import qs.Common import qs.Modules.Plugins import qs.Services +import qs.DCommon.Widgets import qs.Widgets BasePill { @@ -173,7 +174,7 @@ BasePill { anchors.centerIn: parent spacing: 1 - DankIcon { + DIcon { name: BatteryService.getBatteryIcon() visible: !battery.pillStyle size: Theme.barIconSize(battery.barThickness, undefined, battery.barConfig?.maximizeWidgetIcons, battery.barConfig?.iconScale) @@ -231,7 +232,7 @@ BasePill { anchors.centerIn: parent spacing: (barConfig?.noBackground ?? false) ? 1 : 2 - DankIcon { + DIcon { name: BatteryService.getBatteryIcon() visible: !battery.pillStyle size: Theme.barIconSize(battery.barThickness, -4, battery.barConfig?.maximizeWidgetIcons, battery.barConfig?.iconScale) diff --git a/quickshell/Modules/DankBar/Widgets/CapsLockIndicator.qml b/quickshell/Modules/DankBar/Widgets/CapsLockIndicator.qml index 219cbb2ae..5992ec268 100644 --- a/quickshell/Modules/DankBar/Widgets/CapsLockIndicator.qml +++ b/quickshell/Modules/DankBar/Widgets/CapsLockIndicator.qml @@ -2,7 +2,7 @@ import QtQuick import qs.Common import qs.Modules.Plugins import qs.Services -import qs.Widgets +import qs.DCommon.Widgets BasePill { id: root @@ -50,7 +50,7 @@ BasePill { implicitWidth: icon.width implicitHeight: root.contentThickness - DankIcon { + DIcon { id: icon anchors.centerIn: parent name: "shift_lock" diff --git a/quickshell/Modules/DankBar/Widgets/ClipboardButton.qml b/quickshell/Modules/DankBar/Widgets/ClipboardButton.qml index 7987227c4..fc46470f3 100644 --- a/quickshell/Modules/DankBar/Widgets/ClipboardButton.qml +++ b/quickshell/Modules/DankBar/Widgets/ClipboardButton.qml @@ -2,6 +2,7 @@ import QtQuick import qs.Common import qs.Modules.Plugins import qs.Services +import qs.DCommon.Widgets import qs.Widgets BasePill { @@ -108,7 +109,7 @@ BasePill { } } - DankIcon { + DIcon { id: icon anchors.centerIn: parent name: root.dropConfirmed ? "check" : "content_paste" diff --git a/quickshell/Modules/DankBar/Widgets/Clock.qml b/quickshell/Modules/DankBar/Widgets/Clock.qml index 5e32bd17d..0d981518b 100644 --- a/quickshell/Modules/DankBar/Widgets/Clock.qml +++ b/quickshell/Modules/DankBar/Widgets/Clock.qml @@ -2,6 +2,7 @@ import QtQuick import qs.Common import qs.Modules.DankBar import qs.Modules.Plugins +import qs.DCommon.Widgets import qs.Widgets BasePill { diff --git a/quickshell/Modules/DankBar/Widgets/ColorPicker.qml b/quickshell/Modules/DankBar/Widgets/ColorPicker.qml index 61697e43c..12b863933 100644 --- a/quickshell/Modules/DankBar/Widgets/ColorPicker.qml +++ b/quickshell/Modules/DankBar/Widgets/ColorPicker.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Common import qs.Modules.Plugins -import qs.Widgets +import qs.DCommon.Widgets BasePill { id: root @@ -15,7 +15,7 @@ BasePill { implicitWidth: icon.width implicitHeight: root.contentThickness - DankIcon { + DIcon { id: icon anchors.centerIn: parent name: "palette" diff --git a/quickshell/Modules/DankBar/Widgets/ControlCenterButton.qml b/quickshell/Modules/DankBar/Widgets/ControlCenterButton.qml index 088982053..d43789ed9 100644 --- a/quickshell/Modules/DankBar/Widgets/ControlCenterButton.qml +++ b/quickshell/Modules/DankBar/Widgets/ControlCenterButton.qml @@ -4,7 +4,7 @@ import Quickshell import qs.Common import qs.Modules.Plugins import qs.Services -import qs.Widgets +import qs.DCommon.Widgets BasePill { id: root @@ -490,7 +490,7 @@ BasePill { root.refreshInteractionRefs(); } - DankIcon { + DIcon { id: vIconOnlyItem anchors.centerIn: parent visible: !verticalGroupItem.modelData.composite @@ -540,13 +540,13 @@ BasePill { } } - DankBlink { + DBlink { target: vIconOnlyItem running: root.surfaceLive && root.getIconBlinking(verticalGroupItem.modelData.id) } } - DankIcon { + DIcon { id: audioIconV visible: verticalGroupItem.modelData.id === "audio" name: AudioService.sinkVolumeIconName @@ -568,7 +568,7 @@ BasePill { anchors.topMargin: 2 } - DankIcon { + DIcon { id: micIconV visible: verticalGroupItem.modelData.id === "microphone" name: root.getMicIconName() @@ -590,7 +590,7 @@ BasePill { anchors.topMargin: 2 } - DankIcon { + DIcon { id: brightnessIconV visible: verticalGroupItem.modelData.id === "brightness" name: root.getBrightnessIconName() @@ -619,7 +619,7 @@ BasePill { height: root.vIconSize visible: root.hasNoVisibleIcons() - DankIcon { + DIcon { name: "settings" size: root.vIconSize color: root.isActive ? Theme.primary : Theme.widgetIconColor @@ -674,7 +674,7 @@ BasePill { root.refreshInteractionRefs(); } - DankIcon { + DIcon { id: iconOnlyItem anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left @@ -725,7 +725,7 @@ BasePill { } } - DankBlink { + DBlink { target: iconOnlyItem running: root.surfaceLive && root.getIconBlinking(horizontalGroupItem.modelData.id) } @@ -747,7 +747,7 @@ BasePill { anchors.verticalCenter: parent.verticalCenter spacing: Theme.spacingXXS - DankIcon { + DIcon { id: audioIcon name: AudioService.sinkVolumeIconName size: root.getControlCenterIconSize() @@ -784,7 +784,7 @@ BasePill { anchors.verticalCenter: parent.verticalCenter spacing: Theme.spacingXXS - DankIcon { + DIcon { id: micIcon name: root.getMicIconName() size: root.getControlCenterIconSize() @@ -821,7 +821,7 @@ BasePill { anchors.verticalCenter: parent.verticalCenter spacing: Theme.spacingXXS - DankIcon { + DIcon { id: brightnessIcon name: root.getBrightnessIconName() size: root.getControlCenterIconSize() @@ -844,7 +844,7 @@ BasePill { } } - DankIcon { + DIcon { name: "settings" size: root.getControlCenterIconSize() color: root.isActive ? Theme.primary : Theme.widgetIconColor diff --git a/quickshell/Modules/DankBar/Widgets/DWLLayout.qml b/quickshell/Modules/DankBar/Widgets/DWLLayout.qml index bae6b2ec1..12397543e 100644 --- a/quickshell/Modules/DankBar/Widgets/DWLLayout.qml +++ b/quickshell/Modules/DankBar/Widgets/DWLLayout.qml @@ -2,7 +2,7 @@ import QtQuick import qs.Common import qs.Modules.Plugins import qs.Services -import qs.Widgets +import qs.DCommon.Widgets BasePill { id: layout @@ -57,7 +57,7 @@ BasePill { anchors.centerIn: parent spacing: 1 - DankIcon { + DIcon { name: layout.getLayoutIcon(layout.currentLayoutSymbol) size: Theme.barIconSize(layout.barThickness, undefined, layout.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale) color: layout.contentColor @@ -78,7 +78,7 @@ BasePill { anchors.centerIn: parent spacing: (barConfig?.noBackground ?? false) ? 1 : 2 - DankIcon { + DIcon { name: layout.getLayoutIcon(layout.currentLayoutSymbol) size: Theme.barIconSize(layout.barThickness, -4, layout.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale) color: layout.contentColor diff --git a/quickshell/Modules/DankBar/Widgets/FocusedApp.qml b/quickshell/Modules/DankBar/Widgets/FocusedApp.qml index 2a47c3af6..40b088491 100644 --- a/quickshell/Modules/DankBar/Widgets/FocusedApp.qml +++ b/quickshell/Modules/DankBar/Widgets/FocusedApp.qml @@ -6,6 +6,7 @@ import Quickshell.Widgets import qs.Common import qs.Modules.Plugins import qs.Services +import qs.DCommon.Widgets import qs.Widgets BasePill { @@ -148,7 +149,7 @@ BasePill { } } - DankIcon { + DIcon { anchors.centerIn: parent size: 18 name: "sports_esports" @@ -208,7 +209,7 @@ BasePill { } } - DankIcon { + DIcon { id: horizontalSteamIcon width: contentRow.iconSize size: contentRow.iconSize diff --git a/quickshell/Modules/DankBar/Widgets/FocusedWindowContextMenu.qml b/quickshell/Modules/DankBar/Widgets/FocusedWindowContextMenu.qml index c1ec5a914..180b6c24d 100644 --- a/quickshell/Modules/DankBar/Widgets/FocusedWindowContextMenu.qml +++ b/quickshell/Modules/DankBar/Widgets/FocusedWindowContextMenu.qml @@ -4,6 +4,7 @@ import Quickshell.Widgets import qs.Common import qs.Modules.DankBar import qs.Services +import qs.DCommon.Widgets import qs.Widgets DankPopout { @@ -200,7 +201,7 @@ DankPopout { } ] - delegate: DankListRow { + delegate: DListRow { id: copyRow required property var modelData required property int index @@ -267,7 +268,7 @@ DankPopout { anchors.leftMargin: Theme.spacingS spacing: Theme.spacingS - DankIcon { + DIcon { name: "outbox" size: Theme.iconSizeSmall color: Theme.surfaceText @@ -305,7 +306,7 @@ DankPopout { anchors.leftMargin: Theme.spacingS spacing: Theme.spacingS - DankIcon { + DIcon { name: "inbox" size: Theme.iconSizeSmall color: Theme.surfaceText @@ -340,7 +341,7 @@ DankPopout { anchors.leftMargin: Theme.spacingS spacing: Theme.spacingS - DankIcon { + DIcon { name: root.hasMatchingRule ? "edit" : "rule" size: Theme.iconSizeSmall color: Theme.surfaceText @@ -370,7 +371,7 @@ DankPopout { anchors.leftMargin: Theme.spacingS spacing: Theme.spacingS - DankIcon { + DIcon { name: "close" size: Theme.iconSizeSmall color: Theme.error diff --git a/quickshell/Modules/DankBar/Widgets/IdleInhibitor.qml b/quickshell/Modules/DankBar/Widgets/IdleInhibitor.qml index 192e03162..9dcbe1a49 100644 --- a/quickshell/Modules/DankBar/Widgets/IdleInhibitor.qml +++ b/quickshell/Modules/DankBar/Widgets/IdleInhibitor.qml @@ -2,7 +2,7 @@ import QtQuick import qs.Common import qs.Modules.Plugins import qs.Services -import qs.Widgets +import qs.DCommon.Widgets BasePill { id: root @@ -15,7 +15,7 @@ BasePill { implicitWidth: icon.width implicitHeight: root.contentThickness - DankIcon { + DIcon { id: icon anchors.centerIn: parent name: SessionService.idleInhibited ? "motion_sensor_active" : "motion_sensor_idle" diff --git a/quickshell/Modules/DankBar/Widgets/KeyboardLayoutLabels.js b/quickshell/Modules/DankBar/Widgets/KeyboardLayoutLabels.js index ca1fed030..105bb4e17 100644 --- a/quickshell/Modules/DankBar/Widgets/KeyboardLayoutLabels.js +++ b/quickshell/Modules/DankBar/Widgets/KeyboardLayoutLabels.js @@ -1,5 +1,5 @@ .pragma library -.import "../../../DankCommon/Common/LayoutCodes.js" as LayoutCodes +.import "../../../DCommon/Common/LayoutCodes.js" as LayoutCodes // Overrides are keyed by whatever string would otherwise be displayed, so the same // map applies after any compositor-specific shortening (compact vs. vertical mode). diff --git a/quickshell/Modules/DankBar/Widgets/KeyboardLayoutName.qml b/quickshell/Modules/DankBar/Widgets/KeyboardLayoutName.qml index 70d4f4ef2..553364f68 100644 --- a/quickshell/Modules/DankBar/Widgets/KeyboardLayoutName.qml +++ b/quickshell/Modules/DankBar/Widgets/KeyboardLayoutName.qml @@ -2,7 +2,7 @@ import QtQuick import qs.Common import qs.Modules.Plugins import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import "KeyboardLayoutLabels.js" as KeyboardLayoutLabels BasePill { @@ -51,7 +51,7 @@ BasePill { anchors.centerIn: parent spacing: 1 - DankIcon { + DIcon { name: "keyboard" size: Theme.barIconSize(root.barThickness, undefined, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale) color: root.contentColor @@ -77,7 +77,7 @@ BasePill { anchors.centerIn: parent spacing: Theme.spacingS - DankIcon { + DIcon { name: "keyboard" size: Theme.barIconSize(root.barThickness, undefined, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale) color: root.contentColor diff --git a/quickshell/Modules/DankBar/Widgets/Media.qml b/quickshell/Modules/DankBar/Widgets/Media.qml index 94b265665..6f5273573 100644 --- a/quickshell/Modules/DankBar/Widgets/Media.qml +++ b/quickshell/Modules/DankBar/Widgets/Media.qml @@ -5,6 +5,7 @@ import qs.Common import qs.Modules.DankBar import qs.Modules.Plugins import qs.Services +import qs.DCommon.Widgets import qs.Widgets BasePill { @@ -191,7 +192,7 @@ BasePill { visible: root.visualizerEnabled } - DankIcon { + DIcon { anchors.fill: parent name: "music_note" size: parent.width @@ -205,7 +206,7 @@ BasePill { height: width visible: root.playerAvailable - DankIconButton { + DIconButton { anchors.centerIn: parent width: parent.width height: parent.height @@ -419,7 +420,7 @@ BasePill { visible: root.playerAvailable opacity: (activePlayer && activePlayer.canGoPrevious) ? 1 : 0.3 - DankIcon { + DIcon { anchors.centerIn: parent name: "skip_previous" size: 12 * root.contentScale @@ -447,7 +448,7 @@ BasePill { visible: playerAvailable opacity: (activePlayer && activePlayer.canGoNext) ? 1 : 0.3 - DankIcon { + DIcon { anchors.centerIn: parent name: "skip_next" size: 12 * root.contentScale diff --git a/quickshell/Modules/DankBar/Widgets/MediaLyricLine.qml b/quickshell/Modules/DankBar/Widgets/MediaLyricLine.qml index 54864471a..9ff9e83f8 100644 --- a/quickshell/Modules/DankBar/Widgets/MediaLyricLine.qml +++ b/quickshell/Modules/DankBar/Widgets/MediaLyricLine.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets Item { id: root diff --git a/quickshell/Modules/DankBar/Widgets/MonitorPill.qml b/quickshell/Modules/DankBar/Widgets/MonitorPill.qml index b8972e991..d2c295a8f 100644 --- a/quickshell/Modules/DankBar/Widgets/MonitorPill.qml +++ b/quickshell/Modules/DankBar/Widgets/MonitorPill.qml @@ -2,7 +2,7 @@ import QtQuick import qs.Common import qs.Modules.Plugins import qs.Services -import qs.Widgets +import qs.DCommon.Widgets BasePill { id: root @@ -51,7 +51,7 @@ BasePill { anchors.centerIn: parent spacing: Theme.hairline(root.dpr) - DankIcon { + DIcon { name: root.iconName size: root.iconSize color: root.levelColor @@ -85,7 +85,7 @@ BasePill { anchors.centerIn: parent spacing: Theme.spacingXS - DankIcon { + DIcon { name: root.iconName size: root.iconSize color: root.levelColor diff --git a/quickshell/Modules/DankBar/Widgets/NetworkMonitor.qml b/quickshell/Modules/DankBar/Widgets/NetworkMonitor.qml index 1f9d8d7e4..8c0b7f126 100644 --- a/quickshell/Modules/DankBar/Widgets/NetworkMonitor.qml +++ b/quickshell/Modules/DankBar/Widgets/NetworkMonitor.qml @@ -2,7 +2,7 @@ import QtQuick import qs.Common import qs.Modules.Plugins import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import "../../../Common/Format.js" as Format BasePill { @@ -25,7 +25,7 @@ BasePill { spacing: Theme.spacingXXS visible: root.isVerticalOrientation - DankIcon { + DIcon { name: "network_check" size: Theme.barIconSize(root.barThickness, undefined, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale) color: root.contentColor @@ -67,7 +67,7 @@ BasePill { spacing: Theme.spacingS visible: !root.isVerticalOrientation - DankIcon { + DIcon { name: "network_check" size: Theme.barIconSize(root.barThickness, undefined, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale) color: root.contentColor diff --git a/quickshell/Modules/DankBar/Widgets/NotepadButton.qml b/quickshell/Modules/DankBar/Widgets/NotepadButton.qml index b4aee4457..c569bf3b4 100644 --- a/quickshell/Modules/DankBar/Widgets/NotepadButton.qml +++ b/quickshell/Modules/DankBar/Widgets/NotepadButton.qml @@ -3,6 +3,7 @@ import Quickshell.Hyprland import qs.Common import qs.Modules.Plugins import qs.Services +import qs.DCommon.Widgets import qs.Widgets BasePill { @@ -91,7 +92,7 @@ BasePill { implicitWidth: notepadIcon.width implicitHeight: root.contentThickness - DankIcon { + DIcon { id: notepadIcon anchors.centerIn: parent diff --git a/quickshell/Modules/DankBar/Widgets/NotificationCenterButton.qml b/quickshell/Modules/DankBar/Widgets/NotificationCenterButton.qml index a31ab1471..edadf3f9f 100644 --- a/quickshell/Modules/DankBar/Widgets/NotificationCenterButton.qml +++ b/quickshell/Modules/DankBar/Widgets/NotificationCenterButton.qml @@ -2,7 +2,7 @@ import QtQuick import qs.Common import qs.Modules.Notifications import qs.Modules.Plugins -import qs.Widgets +import qs.DCommon.Widgets BasePill { id: root @@ -15,7 +15,7 @@ BasePill { implicitWidth: notifIcon.width implicitHeight: root.contentThickness - DankIcon { + DIcon { id: notifIcon anchors.centerIn: parent name: SessionData.doNotDisturb ? "notifications_off" : "notifications" diff --git a/quickshell/Modules/DankBar/Widgets/PowerMenuButton.qml b/quickshell/Modules/DankBar/Widgets/PowerMenuButton.qml index 70b23317a..da00a4ec0 100644 --- a/quickshell/Modules/DankBar/Widgets/PowerMenuButton.qml +++ b/quickshell/Modules/DankBar/Widgets/PowerMenuButton.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Common import qs.Modules.Plugins -import qs.Widgets +import qs.DCommon.Widgets BasePill { id: root @@ -13,7 +13,7 @@ BasePill { implicitWidth: icon.width implicitHeight: root.contentThickness - DankIcon { + DIcon { id: icon anchors.centerIn: parent name: "power_settings_new" diff --git a/quickshell/Modules/DankBar/Widgets/PrivacyIndicator.qml b/quickshell/Modules/DankBar/Widgets/PrivacyIndicator.qml index 2e97819ac..a33d0fd41 100644 --- a/quickshell/Modules/DankBar/Widgets/PrivacyIndicator.qml +++ b/quickshell/Modules/DankBar/Widgets/PrivacyIndicator.qml @@ -3,7 +3,7 @@ import qs.Common import qs.Modules.DankBar import qs.Modules.Plugins import qs.Services -import qs.Widgets +import qs.DCommon.Widgets BasePill { id: root @@ -75,7 +75,7 @@ BasePill { visible: root.showMicIcon || PrivacyService.microphoneActive anchors.horizontalCenter: parent.horizontalCenter - DankIcon { + DIcon { name: { const sourceAudio = AudioService.source?.audio; const muted = !sourceAudio || sourceAudio.muted || sourceAudio.volume === 0.0; @@ -96,7 +96,7 @@ BasePill { visible: root.showCameraIcon || PrivacyService.cameraActive anchors.horizontalCenter: parent.horizontalCenter - DankIcon { + DIcon { name: "camera_video" size: Theme.iconSizeSmall color: PrivacyService.cameraActive ? Theme.error : Theme.surfaceText @@ -123,7 +123,7 @@ BasePill { visible: root.showScreenSharingIcon || PrivacyService.screensharingActive anchors.horizontalCenter: parent.horizontalCenter - DankIcon { + DIcon { name: "screen_share" size: Theme.iconSizeSmall color: PrivacyService.screensharingActive ? Theme.warning : Theme.surfaceText @@ -144,7 +144,7 @@ BasePill { visible: root.showMicIcon || PrivacyService.microphoneActive anchors.verticalCenter: parent.verticalCenter - DankIcon { + DIcon { name: { const sourceAudio = AudioService.source?.audio; const muted = !sourceAudio || sourceAudio.muted || sourceAudio.volume === 0.0; @@ -165,7 +165,7 @@ BasePill { visible: root.showCameraIcon || PrivacyService.cameraActive anchors.verticalCenter: parent.verticalCenter - DankIcon { + DIcon { name: "camera_video" size: Theme.iconSizeSmall color: PrivacyService.cameraActive ? Theme.error : Theme.surfaceText @@ -192,7 +192,7 @@ BasePill { visible: root.showScreenSharingIcon || PrivacyService.screensharingActive anchors.verticalCenter: parent.verticalCenter - DankIcon { + DIcon { name: "screen_share" size: Theme.iconSizeSmall color: PrivacyService.screensharingActive ? Theme.warning : Theme.surfaceText diff --git a/quickshell/Modules/DankBar/Widgets/RunningApps.qml b/quickshell/Modules/DankBar/Widgets/RunningApps.qml index 741b1d550..2da55d5db 100644 --- a/quickshell/Modules/DankBar/Widgets/RunningApps.qml +++ b/quickshell/Modules/DankBar/Widgets/RunningApps.qml @@ -6,6 +6,7 @@ import qs.Common import qs.Modules.DankBar import qs.Modules.Plugins import qs.Services +import qs.DCommon.Widgets import qs.Widgets BasePill { @@ -321,7 +322,7 @@ BasePill { } } - DankIcon { + DIcon { anchors.left: parent.left anchors.leftMargin: root.compactMode ? Math.round((parent.width - root.appIconSize) / 2) : Theme.spacingXS anchors.verticalCenter: parent.verticalCenter @@ -383,7 +384,7 @@ BasePill { maximumLineCount: 1 } - DankRipple { + DRipple { id: itemRipple rippleColor: isFocused ? Theme.onSelectedContainer : Theme.onSurface cornerRadius: visualContent.radius diff --git a/quickshell/Modules/DankBar/Widgets/SystemTrayBar.qml b/quickshell/Modules/DankBar/Widgets/SystemTrayBar.qml index 71d88813a..dba6aa033 100644 --- a/quickshell/Modules/DankBar/Widgets/SystemTrayBar.qml +++ b/quickshell/Modules/DankBar/Widgets/SystemTrayBar.qml @@ -6,6 +6,7 @@ import qs.Common import qs.Modules.DankBar import qs.Modules.Plugins import qs.Services +import qs.DCommon.Widgets import qs.Widgets import "../OverflowLayout.js" as OverflowLayout @@ -596,14 +597,14 @@ BasePill { pressed: caretArea.pressed color: Theme.withAlpha(Theme.onSurface, caretArea.pressed ? Theme.stateLayerPressed : caretArea.containsMouse ? Theme.stateLayerHover : 0) - DankIcon { + DIcon { anchors.centerIn: parent name: root.toggleIconName() size: root.trayIconSize color: Theme.widgetTextColor } - DankRipple { + DRipple { id: caretRipple cornerRadius: caretButton.radius } @@ -695,7 +696,7 @@ BasePill { source: iconSource } - DankRipple { + DRipple { id: inlineItemRipple cornerRadius: inlineVisualContent.radius } @@ -811,7 +812,7 @@ BasePill { source: delegateRoot.iconSource } - DankRipple { + DRipple { id: itemRipple topLeftRadius: visualContent.topLeftRadius topRightRadius: visualContent.topRightRadius @@ -934,14 +935,14 @@ BasePill { pressed: caretAreaVert.pressed color: Theme.withAlpha(Theme.onSurface, caretAreaVert.pressed ? Theme.stateLayerPressed : caretAreaVert.containsMouse ? Theme.stateLayerHover : 0) - DankIcon { + DIcon { anchors.centerIn: parent name: root.toggleIconName() size: root.trayIconSize color: Theme.widgetTextColor } - DankRipple { + DRipple { id: caretRippleVert cornerRadius: caretButtonVert.radius } @@ -1265,7 +1266,7 @@ BasePill { trayMenuState.close(); } - DankFlickable { + DFlickable { id: menuFlickable anchors.fill: parent anchors.margins: Theme.spacingS @@ -1304,7 +1305,7 @@ BasePill { width: parent.width - Theme.spacingS * 2 - (Theme.iconSizeSmall + Theme.spacingS) } - DankIcon { + DIcon { anchors.right: parent.right anchors.rightMargin: Theme.spacingS anchors.verticalCenter: parent.verticalCenter @@ -1358,7 +1359,7 @@ BasePill { anchors.verticalCenter: parent.verticalCenter spacing: Theme.spacingXS - DankIcon { + DIcon { name: "arrow_back" size: Theme.iconSizeSmall color: Theme.widgetTextColor @@ -1455,7 +1456,7 @@ BasePill { visible: menuEntry?.checkState === 2 } - DankIcon { + DIcon { anchors.centerIn: parent name: "check" size: Theme.iconSizeSmall - Theme.spacingXS - Theme.spacingXXS @@ -1497,7 +1498,7 @@ BasePill { Layout.alignment: Qt.AlignVCenter visible: menuEntry?.hasChildren ?? false - DankIcon { + DIcon { anchors.centerIn: parent name: "chevron_right" size: Theme.iconSizeSmall - 2 diff --git a/quickshell/Modules/DankBar/Widgets/SystemUpdate.qml b/quickshell/Modules/DankBar/Widgets/SystemUpdate.qml index f3be98921..89951dcf7 100644 --- a/quickshell/Modules/DankBar/Widgets/SystemUpdate.qml +++ b/quickshell/Modules/DankBar/Widgets/SystemUpdate.qml @@ -3,7 +3,7 @@ import qs.Common import qs.Modules.DankBar import qs.Modules.Plugins import qs.Services -import qs.Widgets +import qs.DCommon.Widgets BasePill { id: root @@ -52,7 +52,7 @@ BasePill { implicitWidth: root.isVerticalOrientation ? root.widgetThickness : updaterIcon.implicitWidth implicitHeight: root.widgetThickness - DankIcon { + DIcon { id: statusIcon anchors.centerIn: parent visible: root.isVerticalOrientation @@ -108,7 +108,7 @@ BasePill { spacing: Theme.spacingXS visible: !root.isVerticalOrientation - DankIcon { + DIcon { id: statusIconHorizontal anchors.verticalCenter: parent.verticalCenter smoothTransform: root.isChecking diff --git a/quickshell/Modules/DankBar/Widgets/TrayItemIcon.qml b/quickshell/Modules/DankBar/Widgets/TrayItemIcon.qml index 288f96977..ed006525f 100644 --- a/quickshell/Modules/DankBar/Widgets/TrayItemIcon.qml +++ b/quickshell/Modules/DankBar/Widgets/TrayItemIcon.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Effects import Quickshell.Widgets import qs.Common -import qs.Widgets +import qs.DCommon.Widgets Item { id: root diff --git a/quickshell/Modules/DankBar/Widgets/Vpn.qml b/quickshell/Modules/DankBar/Widgets/Vpn.qml index 3e43a880e..5ff87aa1f 100644 --- a/quickshell/Modules/DankBar/Widgets/Vpn.qml +++ b/quickshell/Modules/DankBar/Widgets/Vpn.qml @@ -2,6 +2,7 @@ import QtQuick import qs.Common import qs.Modules.Plugins import qs.Services +import qs.DCommon.Widgets import qs.Widgets BasePill { @@ -20,7 +21,7 @@ BasePill { implicitWidth: icon.width implicitHeight: root.contentThickness - DankIcon { + DIcon { id: icon name: DMSNetworkService.connected ? "vpn_lock" : "vpn_key_off" diff --git a/quickshell/Modules/DankBar/Widgets/Weather.qml b/quickshell/Modules/DankBar/Widgets/Weather.qml index 44ce80982..d82731ea5 100644 --- a/quickshell/Modules/DankBar/Widgets/Weather.qml +++ b/quickshell/Modules/DankBar/Widgets/Weather.qml @@ -2,7 +2,7 @@ import QtQuick import qs.Common import qs.Modules.Plugins import qs.Services -import qs.Widgets +import qs.DCommon.Widgets BasePill { id: root @@ -29,7 +29,7 @@ BasePill { anchors.centerIn: parent spacing: 1 - DankIcon { + DIcon { name: WeatherService.getWeatherIcon(WeatherService.weather.wCode) size: Theme.barIconSize(root.barThickness, -6, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale) color: Theme.widgetIconColor @@ -56,7 +56,7 @@ BasePill { anchors.centerIn: parent spacing: Theme.spacingXS - DankIcon { + DIcon { name: WeatherService.getWeatherIcon(WeatherService.weather.wCode) size: Theme.barIconSize(root.barThickness, -6, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale) color: Theme.widgetIconColor diff --git a/quickshell/Modules/DankBar/Widgets/WorkspaceSwitcher.qml b/quickshell/Modules/DankBar/Widgets/WorkspaceSwitcher.qml index 3c5ae2242..544e83cd5 100644 --- a/quickshell/Modules/DankBar/Widgets/WorkspaceSwitcher.qml +++ b/quickshell/Modules/DankBar/Widgets/WorkspaceSwitcher.qml @@ -7,7 +7,7 @@ import qs.Common import qs.Modules.DankBar import qs.Modules.Plugins import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import "../../../Common/WorkspaceModel.js" as WorkspaceModel BasePill { @@ -467,7 +467,7 @@ BasePill { anchors.centerIn: parent spacing: Theme.spacingXS - DankIcon { + DIcon { anchors.verticalCenter: parent.verticalCenter name: "grid_view" size: overviewPill.labelSize + 2 @@ -781,7 +781,7 @@ BasePill { readonly property color displayColor: pillColor.value - DankColorAnimation { + DColorAnimation { id: pillColor to: delegateRoot.requestedColor animated: delegateRoot.colorAnimationReady @@ -1123,7 +1123,7 @@ BasePill { width: wsIcon.width height: root.appIconSize - DankIcon { + DIcon { id: wsIcon anchors.verticalCenter: parent.verticalCenter name: loadedIconData?.value ?? "" @@ -1212,7 +1212,7 @@ BasePill { border.color: appBorderColor opacity: appOpacity - DankIcon { + DIcon { anchors.centerIn: parent size: parent.width * 0.7 name: "sports_esports" @@ -1241,7 +1241,7 @@ BasePill { visible: modelData.isSteamApp && modelData.icon } - DankIcon { + DIcon { anchors.centerIn: parent size: root.appIconSize name: "sports_esports" @@ -1294,7 +1294,7 @@ BasePill { spacing: Theme.spacingXS visible: loadedIcons.length > 0 || root.opt("showWorkspaceIndex") || root.opt("showWorkspaceName") || loadedHasIcon - DankIcon { + DIcon { visible: loadedHasIcon && loadedIconData?.type === "icon" anchors.horizontalCenter: parent.horizontalCenter name: loadedIconData?.value ?? "" @@ -1370,7 +1370,7 @@ BasePill { border.color: appBorderColor opacity: appOpacity - DankIcon { + DIcon { anchors.centerIn: parent size: parent.width * 0.7 name: "sports_esports" @@ -1399,7 +1399,7 @@ BasePill { visible: modelData.isSteamApp && modelData.icon } - DankIcon { + DIcon { anchors.centerIn: parent size: root.appIconSize name: "sports_esports" diff --git a/quickshell/Modules/DankDash/DankDashPopout.qml b/quickshell/Modules/DankDash/DankDashPopout.qml index e4a0adb69..ed841668c 100644 --- a/quickshell/Modules/DankDash/DankDashPopout.qml +++ b/quickshell/Modules/DankDash/DankDashPopout.qml @@ -4,10 +4,11 @@ import QtQuick import Quickshell import qs.Common import qs.Services +import qs.DCommon.Widgets import qs.Widgets import qs.Modules.ControlCenter.Widgets import qs.Modules.DankDash.Overview -import "../../DankCommon/Common/FocusNavigation.js" as FocusNavigation +import "../../DCommon/Common/FocusNavigation.js" as FocusNavigation DankPopout { id: root @@ -619,7 +620,7 @@ DankPopout { width: root.verticalNavigation ? Theme.navigationRailWidth : parent.width height: root.verticalNavigation ? parent.height : mainContainer.horizontalChromeHeight - DashMetrics.contentGap - DankNavigationBar { + DNavigationBar { id: tabBar width: parent.width @@ -668,7 +669,7 @@ DankPopout { } } - DankFlickable { + DFlickable { id: pages enabled: !tabOptions.shown && !pageActions.menuOpen showScrollBar: false @@ -713,7 +714,7 @@ DankPopout { title: I18n.tr("No tabs enabled", "Dashboard empty state when all navigation tabs are hidden") } - DankButton { + DButton { id: emptySettings anchors.horizontalCenter: parent.horizontalCenter text: I18n.tr("Settings") diff --git a/quickshell/Modules/DankDash/DashPageActions.qml b/quickshell/Modules/DankDash/DashPageActions.qml index 0d0887f6e..c50fb7fc8 100644 --- a/quickshell/Modules/DankDash/DashPageActions.qml +++ b/quickshell/Modules/DankDash/DashPageActions.qml @@ -2,7 +2,6 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common -import qs.Widgets import qs.Modules.ControlCenter.Widgets import qs.Modules.DankDash.Overview import "utils/cards.js" as CardUtils diff --git a/quickshell/Modules/DankDash/DashPageTitle.qml b/quickshell/Modules/DankDash/DashPageTitle.qml index e972702cb..52587afbb 100644 --- a/quickshell/Modules/DankDash/DashPageTitle.qml +++ b/quickshell/Modules/DankDash/DashPageTitle.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets Item { id: root @@ -27,7 +27,7 @@ Item { enabled: root.editable onClicked: root.editRequested() - DankIcon { + DIcon { anchors.centerIn: parent name: root.editable && titleIcon.hovered ? "edit" : DashRegistry.entry(root.entryId)?.icon ?? "dashboard" size: Theme.iconSize diff --git a/quickshell/Modules/DankDash/DashSheetHandle.qml b/quickshell/Modules/DankDash/DashSheetHandle.qml index e097d3639..3a83c3eb1 100644 --- a/quickshell/Modules/DankDash/DashSheetHandle.qml +++ b/quickshell/Modules/DankDash/DashSheetHandle.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets // Every island dash face wears the M3 sheet handle instead of a title row: the compact pill already names the page. Item { diff --git a/quickshell/Modules/DankDash/DashTabHost.qml b/quickshell/Modules/DankDash/DashTabHost.qml index a964a0a25..004acab3b 100644 --- a/quickshell/Modules/DankDash/DashTabHost.qml +++ b/quickshell/Modules/DankDash/DashTabHost.qml @@ -3,7 +3,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets FocusScope { id: root @@ -155,7 +155,7 @@ FocusScope { } } - DankSpinner { + DSpinner { anchors.centerIn: parent size: DashMetrics.spinnerSize visible: root.isCurrent && root.loading diff --git a/quickshell/Modules/DankDash/DashWidgetGrid.qml b/quickshell/Modules/DankDash/DashWidgetGrid.qml index 9fc09e6a9..1b506f6d7 100644 --- a/quickshell/Modules/DankDash/DashWidgetGrid.qml +++ b/quickshell/Modules/DankDash/DashWidgetGrid.qml @@ -8,7 +8,7 @@ import qs.Modules.Settings.Widgets import qs.Modules.DankDash.Overview import "../../Common/GridLayout.js" as GridUtils import "utils/widgets.js" as WidgetUtils -import "../../DankCommon/Common/FocusNavigation.js" as FocusNavigation +import "../../DCommon/Common/FocusNavigation.js" as FocusNavigation Item { id: root diff --git a/quickshell/Modules/DankDash/Media/BentoChrome.qml b/quickshell/Modules/DankDash/Media/BentoChrome.qml index f59f49454..439f01b47 100644 --- a/quickshell/Modules/DankDash/Media/BentoChrome.qml +++ b/quickshell/Modules/DankDash/Media/BentoChrome.qml @@ -3,6 +3,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common import qs.Services +import qs.DCommon.Widgets import qs.Widgets import qs.Modules.DankDash import "../../../Common/Format.js" as Format @@ -96,7 +97,7 @@ MediaChromeBase { } } - DankButtonGroup { + DButtonGroup { id: viewToggle anchors.centerIn: parent @@ -393,7 +394,7 @@ MediaChromeBase { elide: Text.ElideRight } - DankButton { + DButton { id: playerButton readonly property string panelId: "players" diff --git a/quickshell/Modules/DankDash/Media/LyricsOverlay.qml b/quickshell/Modules/DankDash/Media/LyricsOverlay.qml index 3536a25d4..a867d907f 100644 --- a/quickshell/Modules/DankDash/Media/LyricsOverlay.qml +++ b/quickshell/Modules/DankDash/Media/LyricsOverlay.qml @@ -2,6 +2,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common +import qs.DCommon.Widgets import qs.Widgets import qs.Services import qs.Modules.DankDash @@ -233,7 +234,7 @@ FocusScope { visible: root.unsynced && !root.compact } - DankListView { + DListView { id: transcript showScrollBar: false anchors.left: parent.left @@ -341,7 +342,7 @@ FocusScope { } } - DankButton { + DButton { id: followButton objectName: "followPlayback" anchors.horizontalCenter: parent.horizontalCenter @@ -379,7 +380,7 @@ FocusScope { } } - sourceComponent: DankLoadingIndicator { + sourceComponent: DLoadingIndicator { contained: true containerColor: MediaAccentService.accentContainer color: MediaAccentService.onAccentContainer @@ -415,7 +416,7 @@ FocusScope { wrapMode: Text.WrapAtWordBoundaryOrAnywhere } - DankButton { + DButton { anchors.horizontalCenter: parent.horizontalCenter text: I18n.tr("Retry") visible: root.controller.state === "error" diff --git a/quickshell/Modules/DankDash/Media/LyricsVocal.qml b/quickshell/Modules/DankDash/Media/LyricsVocal.qml index a52e0efda..d76a2875b 100644 --- a/quickshell/Modules/DankDash/Media/LyricsVocal.qml +++ b/quickshell/Modules/DankDash/Media/LyricsVocal.qml @@ -2,7 +2,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.DankDash import "../../../Common/Format.js" as Format diff --git a/quickshell/Modules/DankDash/Media/MaterialChrome.qml b/quickshell/Modules/DankDash/Media/MaterialChrome.qml index 27e6372b1..b6bf47d7e 100644 --- a/quickshell/Modules/DankDash/Media/MaterialChrome.qml +++ b/quickshell/Modules/DankDash/Media/MaterialChrome.qml @@ -2,7 +2,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.DankDash import "../../../Common/Format.js" as Format diff --git a/quickshell/Modules/DankDash/Media/MaterialSourceGroup.qml b/quickshell/Modules/DankDash/Media/MaterialSourceGroup.qml index 39be9a36a..395d01137 100644 --- a/quickshell/Modules/DankDash/Media/MaterialSourceGroup.qml +++ b/quickshell/Modules/DankDash/Media/MaterialSourceGroup.qml @@ -3,8 +3,8 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common import qs.Services -import qs.Widgets -import "../../../DankCommon/Common/FocusNavigation.js" as FocusNavigation +import qs.DCommon.Widgets +import "../../../DCommon/Common/FocusNavigation.js" as FocusNavigation Row { id: root @@ -20,7 +20,7 @@ Row { Keys.onPressed: event => event.accepted = FocusNavigation.handleHorizontalKey(event, focusTargets, I18n.isRtl) - DankIconButton { + DIconButton { id: lyricsButton variant: "outlined" checkable: true @@ -64,7 +64,7 @@ Row { iconName: "assistant_device" } - component GroupButton: DankIconButton { + component GroupButton: DIconButton { required property string panelId readonly property bool active: root.player.panel === panelId diff --git a/quickshell/Modules/DankDash/Media/MaterialTransport.qml b/quickshell/Modules/DankDash/Media/MaterialTransport.qml index 6f4e6ec33..44a255ebd 100644 --- a/quickshell/Modules/DankDash/Media/MaterialTransport.qml +++ b/quickshell/Modules/DankDash/Media/MaterialTransport.qml @@ -3,8 +3,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common import qs.Services -import qs.Widgets -import "../../../DankCommon/Common/FocusNavigation.js" as FocusNavigation +import "../../../DCommon/Common/FocusNavigation.js" as FocusNavigation Item { id: root diff --git a/quickshell/Modules/DankDash/Media/MediaArtSurface.qml b/quickshell/Modules/DankDash/Media/MediaArtSurface.qml index 9a6e06d4f..c8c674ffb 100644 --- a/quickshell/Modules/DankDash/Media/MediaArtSurface.qml +++ b/quickshell/Modules/DankDash/Media/MediaArtSurface.qml @@ -6,7 +6,7 @@ import QtQuick.Shapes import Quickshell.Widgets import qs.Common import qs.Modules.DankDash -import "../../../DankCommon/Widgets/MaterialShapes.js" as Shapes +import "../../../DCommon/Widgets/MaterialShapes.js" as Shapes ClippingRectangle { id: root diff --git a/quickshell/Modules/DankDash/Media/MediaChromeBase.qml b/quickshell/Modules/DankDash/Media/MediaChromeBase.qml index 5b2f6bd58..6e043b1cc 100644 --- a/quickshell/Modules/DankDash/Media/MediaChromeBase.qml +++ b/quickshell/Modules/DankDash/Media/MediaChromeBase.qml @@ -4,7 +4,7 @@ import QtQuick import qs.Common import qs.Widgets import qs.Modules.DankDash -import "../../../DankCommon/Common/FocusNavigation.js" as FocusNavigation +import "../../../DCommon/Common/FocusNavigation.js" as FocusNavigation Item { id: root diff --git a/quickshell/Modules/DankDash/Media/MediaDeviceRow.qml b/quickshell/Modules/DankDash/Media/MediaDeviceRow.qml index a4d754902..2f750bcc7 100644 --- a/quickshell/Modules/DankDash/Media/MediaDeviceRow.qml +++ b/quickshell/Modules/DankDash/Media/MediaDeviceRow.qml @@ -4,7 +4,7 @@ import QtQuick import QtQuick.Layouts import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets SettingsRow { @@ -41,7 +41,7 @@ SettingsRow { radius: Theme.fullRadius(width, height) color: root.selected ? Theme.onPrimary : Theme.chipSurfaceNested - DankIcon { + DIcon { anchors.centerIn: parent name: AudioService.sinkIcon(root.node) size: Theme.iconSizeMedium @@ -57,7 +57,7 @@ SettingsRow { sourceComponent: RowLayout { spacing: Theme.spacingS - DankActionButton { + DActionButton { buttonSize: Theme.iconButtonSize iconName: volumeSlider.volumeIcon iconColor: root.titleColor diff --git a/quickshell/Modules/DankDash/Media/MediaEmptyState.qml b/quickshell/Modules/DankDash/Media/MediaEmptyState.qml index 578c55e02..6e5210310 100644 --- a/quickshell/Modules/DankDash/Media/MediaEmptyState.qml +++ b/quickshell/Modules/DankDash/Media/MediaEmptyState.qml @@ -3,8 +3,8 @@ pragma ComponentBehavior: Bound import QtQuick import QtQuick.Shapes import qs.Common -import qs.Widgets -import qs.DankCommon.Common as DankCommon +import qs.DCommon.Widgets +import qs.DCommon.Common as DCommon Item { id: root @@ -47,7 +47,7 @@ Item { width: parent.width text: I18n.tr("No media found.", "Media player empty state when no player is running") color: root.inkColor - fontToken: DankCommon.Fonts.gochiHand + fontToken: DCommon.Fonts.gochiHand font.pixelSize: root.textSize horizontalAlignment: Text.AlignHCenter } diff --git a/quickshell/Modules/DankDash/Media/MediaPanel.qml b/quickshell/Modules/DankDash/Media/MediaPanel.qml index afcba1799..a87e4e7de 100644 --- a/quickshell/Modules/DankDash/Media/MediaPanel.qml +++ b/quickshell/Modules/DankDash/Media/MediaPanel.qml @@ -3,10 +3,10 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.DankDash -DankBottomSheet { +DBottomSheet { id: root required property var player diff --git a/quickshell/Modules/DankDash/Media/MediaPanelRow.qml b/quickshell/Modules/DankDash/Media/MediaPanelRow.qml index 2fa206a70..5e5cc4cb1 100644 --- a/quickshell/Modules/DankDash/Media/MediaPanelRow.qml +++ b/quickshell/Modules/DankDash/Media/MediaPanelRow.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets import qs.Modules.DankDash @@ -20,7 +20,7 @@ SettingsRow { Accessible.selected: selected onClicked: activated() - DankIcon { + DIcon { name: "check" size: Theme.iconSizeMedium color: root.accent diff --git a/quickshell/Modules/DankDash/Media/MediaSourceGroup.qml b/quickshell/Modules/DankDash/Media/MediaSourceGroup.qml index 1aa63d279..525900563 100644 --- a/quickshell/Modules/DankDash/Media/MediaSourceGroup.qml +++ b/quickshell/Modules/DankDash/Media/MediaSourceGroup.qml @@ -3,9 +3,9 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.DankDash -import "../../../DankCommon/Common/FocusNavigation.js" as FocusNavigation +import "../../../DCommon/Common/FocusNavigation.js" as FocusNavigation Item { id: root @@ -26,7 +26,7 @@ Item { Keys.onPressed: event => event.accepted = FocusNavigation.handleHorizontalKey(event, focusTargets, I18n.isRtl) - DankRingGauge { + DRingGauge { id: volumeRing anchors.left: parent.left @@ -42,7 +42,7 @@ Item { trackColor: MediaAccentService.accentTrack animated: root.player.live - DankActionButton { + DActionButton { id: volumeButton readonly property string panelId: "volume" @@ -63,7 +63,7 @@ Item { } } - DankButton { + DButton { id: deviceChip readonly property string panelId: "devices" @@ -85,7 +85,7 @@ Item { MediaSinkWheel {} } - DankActionButton { + DActionButton { id: deviceIcon readonly property string panelId: "devices" diff --git a/quickshell/Modules/DankDash/Media/MediaTransport.qml b/quickshell/Modules/DankDash/Media/MediaTransport.qml index ef26750a4..65e61c031 100644 --- a/quickshell/Modules/DankDash/Media/MediaTransport.qml +++ b/quickshell/Modules/DankDash/Media/MediaTransport.qml @@ -4,9 +4,8 @@ import QtQuick import QtQuick.Layouts import qs.Common import qs.Services -import qs.Widgets import qs.Modules.DankDash -import "../../../DankCommon/Common/FocusNavigation.js" as FocusNavigation +import "../../../DCommon/Common/FocusNavigation.js" as FocusNavigation RowLayout { id: root diff --git a/quickshell/Modules/DankDash/Media/MediaTransportButton.qml b/quickshell/Modules/DankDash/Media/MediaTransportButton.qml index ac1b9ff22..c87293395 100644 --- a/quickshell/Modules/DankDash/Media/MediaTransportButton.qml +++ b/quickshell/Modules/DankDash/Media/MediaTransportButton.qml @@ -4,9 +4,9 @@ import QtQuick import Quickshell.Services.Mpris import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets -DankIconButton { +DIconButton { id: root required property var player diff --git a/quickshell/Modules/DankDash/Media/MediaVolumeSlider.qml b/quickshell/Modules/DankDash/Media/MediaVolumeSlider.qml index 1de6fcb97..c8e032c55 100644 --- a/quickshell/Modules/DankDash/Media/MediaVolumeSlider.qml +++ b/quickshell/Modules/DankDash/Media/MediaVolumeSlider.qml @@ -1,9 +1,9 @@ import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets -DankSlider { +DSlider { id: root required property real volume diff --git a/quickshell/Modules/DankDash/NotificationsTab.qml b/quickshell/Modules/DankDash/NotificationsTab.qml index af0afe2ec..704c1d8e3 100644 --- a/quickshell/Modules/DankDash/NotificationsTab.qml +++ b/quickshell/Modules/DankDash/NotificationsTab.qml @@ -1,6 +1,7 @@ import QtQuick import qs.Common import qs.Services +import qs.DCommon.Widgets import qs.Widgets import qs.Modules.Notifications import qs.Modules.Notifications.Center @@ -163,7 +164,7 @@ FocusScope { spacing: Theme.spacingS height: Theme.iconButtonSize - DankActionButton { + DActionButton { id: historyButton visible: SettingsData.notificationHistoryEnabled buttonSize: Theme.iconButtonSize @@ -174,7 +175,7 @@ FocusScope { onClicked: root.currentTab = root.currentTab === 0 ? 1 : 0 } - DankButton { + DButton { width: Math.max(0, footer.width - dndButton.width - (historyButton.visible ? historyButton.width + footer.spacing : 0) - footer.spacing) text: I18n.tr("Clear All") buttonHeight: Theme.iconButtonSize @@ -190,7 +191,7 @@ FocusScope { } } - DankActionButton { + DActionButton { id: dndButton buttonSize: Theme.iconButtonSize iconName: SessionData.doNotDisturb ? "notifications_off" : "notifications" diff --git a/quickshell/Modules/DankDash/Overview/BatteryCard.qml b/quickshell/Modules/DankDash/Overview/BatteryCard.qml index 07fa1adae..5b0c2108b 100644 --- a/quickshell/Modules/DankDash/Overview/BatteryCard.qml +++ b/quickshell/Modules/DankDash/Overview/BatteryCard.qml @@ -1,6 +1,7 @@ import QtQuick import qs.Common import qs.Services +import qs.DCommon.Widgets import qs.Widgets import qs.Modules.DankDash diff --git a/quickshell/Modules/DankDash/Overview/CalendarEventDetail.qml b/quickshell/Modules/DankDash/Overview/CalendarEventDetail.qml index cf0f748a2..b84badffd 100644 --- a/quickshell/Modules/DankDash/Overview/CalendarEventDetail.qml +++ b/quickshell/Modules/DankDash/Overview/CalendarEventDetail.qml @@ -1,6 +1,7 @@ import QtQuick import qs.Common import qs.Services +import qs.DCommon.Widgets import qs.Widgets import "../../../Common/Format.js" as Format @@ -184,13 +185,13 @@ Column { spacing: Theme.spacingS layoutDirection: Qt.RightToLeft - DankButton { + DButton { text: I18n.tr("Close") buttonHeight: Theme.buttonHeightS onClicked: root.closeRequested() } - DankButton { + DButton { text: I18n.tr("Delete") iconName: "delete" buttonHeight: Theme.buttonHeightS @@ -200,7 +201,7 @@ Column { onClicked: root.deleteRequested() } - DankButton { + DButton { text: I18n.tr("Edit") iconName: "edit" buttonHeight: Theme.buttonHeightS @@ -261,7 +262,7 @@ Column { anchors.rightMargin: Theme.spacingXS spacing: Theme.spacingXS - DankIcon { + DIcon { name: detailRow.iconName size: Theme.iconSizeSmall color: detailRow.link ? Theme.primary : Theme.onSurfaceVariant diff --git a/quickshell/Modules/DankDash/Overview/CalendarEventEditor.qml b/quickshell/Modules/DankDash/Overview/CalendarEventEditor.qml index 98f164400..9e6f61d2a 100644 --- a/quickshell/Modules/DankDash/Overview/CalendarEventEditor.qml +++ b/quickshell/Modules/DankDash/Overview/CalendarEventEditor.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets Column { @@ -162,13 +162,13 @@ Column { subtitle: Qt.formatDate(root.fDate, "ddd, MMM d yyyy") subtitleColor: Theme.surfaceText - DankActionButton { + DActionButton { iconName: I18n.isRtl ? "chevron_right" : "chevron_left" Accessible.name: I18n.tr("Previous") onClicked: root.shiftDate(-1) } - DankActionButton { + DActionButton { iconName: I18n.isRtl ? "chevron_left" : "chevron_right" Accessible.name: I18n.tr("Next") onClicked: root.shiftDate(1) @@ -240,14 +240,14 @@ Column { spacing: Theme.spacingS layoutDirection: Qt.RightToLeft - DankButton { + DButton { text: root.saving ? I18n.tr("Saving...") : I18n.tr("Save") iconName: "check" enabled: !root.saving onClicked: root.save() } - DankButton { + DButton { text: I18n.tr("Cancel") backgroundColor: "transparent" textColor: Theme.primary diff --git a/quickshell/Modules/DankDash/Overview/CalendarOverviewCard.qml b/quickshell/Modules/DankDash/Overview/CalendarOverviewCard.qml index 8394cadbd..a6d2e2f3c 100644 --- a/quickshell/Modules/DankDash/Overview/CalendarOverviewCard.qml +++ b/quickshell/Modules/DankDash/Overview/CalendarOverviewCard.qml @@ -4,6 +4,7 @@ import QtQuick import Quickshell import qs.Common import qs.Services +import qs.DCommon.Widgets import qs.Widgets import qs.Modules.DankDash import "../../../Common/DateOnly.js" as DateOnly @@ -212,7 +213,7 @@ Card { anchors.rightMargin: Theme.spacingS spacing: Theme.spacingS - DankIcon { + DIcon { name: "warning" size: Theme.iconSizeSmall color: Theme.warning @@ -228,7 +229,7 @@ Card { wrapMode: Text.Wrap } - DankButton { + DButton { id: launchButton anchors.verticalCenter: parent.verticalCenter visible: CalendarService.dankBinaryExists @@ -346,7 +347,7 @@ Card { anchors.topMargin: Theme.spacingS anchors.bottom: parent.bottom - DankMonthGrid { + DMonthGrid { id: calendarGrid anchors.fill: parent @@ -381,7 +382,7 @@ Card { visible: root.showEventDetails spacing: Theme.spacingS - DankFlickable { + DFlickable { id: flickableArea showScrollBar: false width: parent.width @@ -491,7 +492,7 @@ Card { } } - DankTextField { + DTextField { id: taskInput width: parent.width height: DashMetrics.taskInputHeight @@ -523,7 +524,7 @@ Card { } } - component NavButton: DankActionButton { + component NavButton: DActionButton { buttonSize: DashMetrics.monthNavSize iconSize: DashMetrics.monthNavIconSize iconColor: Theme.primary @@ -652,7 +653,7 @@ Card { color: taskItem.accentColor } - DankIcon { + DIcon { id: dragHandle anchors.left: parent.left anchors.leftMargin: Theme.spacingM + DashMetrics.eventAccentWidth + Theme.spacingM @@ -697,7 +698,7 @@ Card { } } - DankActionButton { + DActionButton { anchors.left: parent.left anchors.leftMargin: Theme.spacingM + DashMetrics.eventAccentWidth + Theme.spacingM + (taskItem.isLocalTask && !taskItem.isEditing ? DashMetrics.eventActionSize + Theme.spacingXS : 0) anchors.verticalCenter: parent.verticalCenter @@ -755,7 +756,7 @@ Card { } } - DankTextField { + DTextField { id: editInput anchors.left: parent.left anchors.right: parent.right @@ -784,7 +785,7 @@ Card { } } - DankActionButton { + DActionButton { anchors.right: parent.right anchors.rightMargin: Theme.spacingS anchors.verticalCenter: parent.verticalCenter @@ -798,7 +799,7 @@ Card { onClicked: Qt.openUrlExternally(taskItem.quickUrl) } - DankActionButton { + DActionButton { id: deleteButton anchors.right: parent.right anchors.rightMargin: Theme.spacingS @@ -819,7 +820,7 @@ Card { } } - DankActionButton { + DActionButton { anchors.right: deleteButton.left anchors.rightMargin: Theme.spacingXS anchors.verticalCenter: parent.verticalCenter diff --git a/quickshell/Modules/DankDash/Overview/Card.qml b/quickshell/Modules/DankDash/Overview/Card.qml index 7443a1283..c6643f7c8 100644 --- a/quickshell/Modules/DankDash/Overview/Card.qml +++ b/quickshell/Modules/DankDash/Overview/Card.qml @@ -1,9 +1,9 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.DankDash -DankCard { +DCard { id: root property Item focusTarget: clickable ? root : null diff --git a/quickshell/Modules/DankDash/Overview/ClockCard.qml b/quickshell/Modules/DankDash/Overview/ClockCard.qml index 4ec1cc0dc..e3e59be4c 100644 --- a/quickshell/Modules/DankDash/Overview/ClockCard.qml +++ b/quickshell/Modules/DankDash/Overview/ClockCard.qml @@ -2,7 +2,7 @@ import QtQuick import Quickshell import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.DankDash Card { @@ -37,7 +37,7 @@ Card { Component { id: digitalFace - DankClockFace { + DClockFace { hours: root.hourText minutes: root.minuteText seconds: root.showSeconds ? root.secondText : "" @@ -61,7 +61,7 @@ Card { readonly property real groupWidth: sideDate ? dialSize + Theme.spacingS + dateMetrics.advanceWidth : dialSize readonly property real groupHeight: belowDate ? dialSize + Theme.spacingS + root.supportLine : dialSize - DankAnalogClock { + DAnalogClock { id: dial x: (face.width - face.groupWidth) / 2 y: (face.height - face.groupHeight) / 2 diff --git a/quickshell/Modules/DankDash/Overview/DashCardGrid.qml b/quickshell/Modules/DankDash/Overview/DashCardGrid.qml index 3e2826226..a50341b01 100644 --- a/quickshell/Modules/DankDash/Overview/DashCardGrid.qml +++ b/quickshell/Modules/DankDash/Overview/DashCardGrid.qml @@ -6,7 +6,7 @@ import qs.Widgets import qs.Modules.DankDash import "../../../Common/GridLayout.js" as GridUtils import "../utils/cards.js" as CardUtils -import "../../../DankCommon/Common/FocusNavigation.js" as FocusNavigation +import "../../../DCommon/Common/FocusNavigation.js" as FocusNavigation DankEditableGrid { id: root diff --git a/quickshell/Modules/DankDash/Overview/DashCardSlot.qml b/quickshell/Modules/DankDash/Overview/DashCardSlot.qml index 799fade76..a1f67f8bf 100644 --- a/quickshell/Modules/DankDash/Overview/DashCardSlot.qml +++ b/quickshell/Modules/DankDash/Overview/DashCardSlot.qml @@ -1,6 +1,7 @@ import QtQuick import qs.Common import qs.Services +import qs.DCommon.Widgets import qs.Widgets import qs.Modules.DankDash import "../utils/cards.js" as CardUtils @@ -130,7 +131,7 @@ DankEditableGridSlot { } } - DankSpinner { + DSpinner { anchors.centerIn: parent size: DashMetrics.spinnerSize visible: cardLoader.status === Loader.Loading diff --git a/quickshell/Modules/DankDash/Overview/DashEditControls.qml b/quickshell/Modules/DankDash/Overview/DashEditControls.qml index b80895b0a..61ce11184 100644 --- a/quickshell/Modules/DankDash/Overview/DashEditControls.qml +++ b/quickshell/Modules/DankDash/Overview/DashEditControls.qml @@ -2,8 +2,8 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common -import qs.Widgets -import "../../../DankCommon/Common/FocusNavigation.js" as FocusNavigation +import qs.DCommon.Widgets +import "../../../DCommon/Common/FocusNavigation.js" as FocusNavigation Item { id: root @@ -56,7 +56,7 @@ Item { onVisibleChanged: cancelConfirmation() - component EditButton: DankButton { + component EditButton: DButton { property string label: "" text: root.vertical ? "" : label tooltipText: root.vertical ? label : null @@ -100,7 +100,7 @@ Item { event.accepted = true; } - DankFlickable { + DFlickable { id: viewport anchors.fill: parent anchors.margins: -root.focusPadding diff --git a/quickshell/Modules/DankDash/Overview/DashOptionRow.qml b/quickshell/Modules/DankDash/Overview/DashOptionRow.qml index a0c5c2457..64e97e236 100644 --- a/quickshell/Modules/DankDash/Overview/DashOptionRow.qml +++ b/quickshell/Modules/DankDash/Overview/DashOptionRow.qml @@ -1,5 +1,6 @@ import QtQuick import qs.Common +import qs.DCommon.Widgets import qs.Widgets import qs.Modules.Settings.Widgets import qs.Modules.DankDash @@ -42,7 +43,7 @@ SettingsRow { Component { id: toggleControl - DankToggle { + DToggle { hideText: true checked: root.value === true onToggled: checked => root.commit(checked) @@ -67,7 +68,7 @@ SettingsRow { Component { id: numberControl - DankNumberStepper { + DNumberStepper { readonly property real step: root.spec.step ?? 1 readonly property real current: Number(root.value) || 0 diff --git a/quickshell/Modules/DankDash/Overview/DashOptionsSheet.qml b/quickshell/Modules/DankDash/Overview/DashOptionsSheet.qml index 367ee84df..deaed3930 100644 --- a/quickshell/Modules/DankDash/Overview/DashOptionsSheet.qml +++ b/quickshell/Modules/DankDash/Overview/DashOptionsSheet.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Services import qs.Common -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets import qs.Modules.ControlCenter.Widgets import qs.Modules.DankDash @@ -60,7 +60,7 @@ CcSheetDialog { } } - DankButton { + DButton { anchors.right: parent.right text: I18n.tr("Reset to default") iconName: "restart_alt" diff --git a/quickshell/Modules/DankDash/Overview/MediaOverviewCard.qml b/quickshell/Modules/DankDash/Overview/MediaOverviewCard.qml index 79ae074dc..b13593111 100644 --- a/quickshell/Modules/DankDash/Overview/MediaOverviewCard.qml +++ b/quickshell/Modules/DankDash/Overview/MediaOverviewCard.qml @@ -4,10 +4,11 @@ import QtQuick import Quickshell.Services.Mpris import qs.Common import qs.Services +import qs.DCommon.Widgets import qs.Widgets import qs.Modules.DankDash import qs.Modules.DankDash.Media -import "../../../DankCommon/Common/FocusNavigation.js" as FocusNavigation +import "../../../DCommon/Common/FocusNavigation.js" as FocusNavigation Card { id: root @@ -71,7 +72,7 @@ Card { spacing: Theme.spacingXS visible: !root.activePlayer - DankIcon { + DIcon { anchors.horizontalCenter: parent.horizontalCenter name: "music_note" size: Theme.iconSizeLarge @@ -177,7 +178,7 @@ Card { height: stacked ? buttonHeight * 2 + spacing : buttonHeight y: root.tiny ? (parent.height - height) / 2 : parent.height - height - DankIconButton { + DIconButton { id: playButton x: transport.centered ? previousButton.width + transport.spacing : 0 anchors.top: parent.top @@ -203,7 +204,7 @@ Card { onClicked: root.activePlayer.togglePlaying() } - DankIconButton { + DIconButton { id: previousButton x: transport.stacked || transport.centered ? 0 : playButton.width + transport.spacing anchors.bottom: parent.bottom @@ -221,7 +222,7 @@ Card { onClicked: MprisController.previousOrRewind() } - DankIconButton { + DIconButton { id: nextButton anchors.right: parent.right anchors.bottom: parent.bottom diff --git a/quickshell/Modules/DankDash/Overview/MetricCard.qml b/quickshell/Modules/DankDash/Overview/MetricCard.qml index 88c800602..0facb0290 100644 --- a/quickshell/Modules/DankDash/Overview/MetricCard.qml +++ b/quickshell/Modules/DankDash/Overview/MetricCard.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.DankDash Card { @@ -63,7 +63,7 @@ Card { component MetricBadge: Row { spacing: Theme.spacingXXS - DankIcon { + DIcon { anchors.verticalCenter: parent.verticalCenter name: root.badgeIcon size: Theme.iconSizeSmall @@ -82,7 +82,7 @@ Card { } } - DankSparkline { + DSparkline { anchors.left: root.wide ? valueText.right : parent.left anchors.leftMargin: root.wide ? Theme.spacingM : -root.pad anchors.right: parent.right diff --git a/quickshell/Modules/DankDash/Overview/MetricGauge.qml b/quickshell/Modules/DankDash/Overview/MetricGauge.qml index b7a33775a..827c17419 100644 --- a/quickshell/Modules/DankDash/Overview/MetricGauge.qml +++ b/quickshell/Modules/DankDash/Overview/MetricGauge.qml @@ -1,9 +1,9 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.DankDash -DankRingGauge { +DRingGauge { id: root property real usage: -1 @@ -28,7 +28,7 @@ DankRingGauge { color: root.discColor } - DankIcon { + DIcon { anchors.centerIn: parent name: root.iconName size: root.iconSize diff --git a/quickshell/Modules/DankDash/Overview/SystemMonitorCard.qml b/quickshell/Modules/DankDash/Overview/SystemMonitorCard.qml index 84a0456c5..b67aa579f 100644 --- a/quickshell/Modules/DankDash/Overview/SystemMonitorCard.qml +++ b/quickshell/Modules/DankDash/Overview/SystemMonitorCard.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.DankDash Card { @@ -88,13 +88,13 @@ Card { Component.onCompleted: syncDgopRef(live) Component.onDestruction: syncDgopRef(false) - DankTooltipHost { + DTooltipHost { id: meterTooltip text: target ? root.meterLabel(target.meter) : "" side: root.horizontal ? "bottom" : "top" } - component MeterIcon: DankIcon { + component MeterIcon: DIcon { id: icon property string meter: "" diff --git a/quickshell/Modules/DankDash/Overview/WeatherOverviewCard.qml b/quickshell/Modules/DankDash/Overview/WeatherOverviewCard.qml index c0e11a332..291e7afaa 100644 --- a/quickshell/Modules/DankDash/Overview/WeatherOverviewCard.qml +++ b/quickshell/Modules/DankDash/Overview/WeatherOverviewCard.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.DankDash import qs.Modules.DankDash.Weather import "../Weather/WeatherVisuals.js" as Visuals @@ -87,7 +87,7 @@ Card { width: Math.min(parent.height, parent.width * DashMetrics.weatherCompactIconRatio) height: width - DankIcon { + DIcon { anchors.centerIn: parent name: root.iconName size: parent.width @@ -95,7 +95,7 @@ Card { visible: root.available || !WeatherService.weather.loading } - DankSpinner { + DSpinner { anchors.centerIn: parent size: parent.width color: root.contentColor @@ -135,14 +135,14 @@ Card { anchors.fill: parent visible: root.stacked && !root.compact && !root.heroLayout - DankMaterialShape { + DMaterialShape { id: stackedChip width: Math.min(parent.width * 0.5, parent.height * 0.42) height: width shape: Visuals.conditionShape(WeatherService.weather.wCode, WeatherService.weather.isDay) color: root.chipColor - DankIcon { + DIcon { anchors.centerIn: parent name: root.iconName size: parent.width * 0.55 @@ -150,7 +150,7 @@ Card { visible: root.available || !WeatherService.weather.loading } - DankSpinner { + DSpinner { anchors.centerIn: parent size: parent.width * 0.55 color: root.contentColor @@ -240,7 +240,7 @@ Card { spacing: Theme.spacingM visible: !root.stacked - DankMaterialShape { + DMaterialShape { id: iconChip anchors.verticalCenter: parent.verticalCenter width: Math.min(DashMetrics.weatherChipSize, root.height - root.pad * 2) @@ -248,7 +248,7 @@ Card { shape: Visuals.conditionShape(WeatherService.weather.wCode, WeatherService.weather.isDay) color: root.chipColor - DankIcon { + DIcon { anchors.centerIn: parent name: root.iconName size: Theme.iconSize diff --git a/quickshell/Modules/DankDash/Overview/WellbeingOverviewCard.qml b/quickshell/Modules/DankDash/Overview/WellbeingOverviewCard.qml index 2fc092b1c..939770598 100644 --- a/quickshell/Modules/DankDash/Overview/WellbeingOverviewCard.qml +++ b/quickshell/Modules/DankDash/Overview/WellbeingOverviewCard.qml @@ -3,7 +3,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.DankDash import qs.Modules.DankDash.Wellbeing import qs.Modules.ControlCenter.Widgets @@ -35,7 +35,7 @@ Card { anchors.top: parent.top spacing: Theme.spacingS - DankIcon { + DIcon { anchors.verticalCenter: parent.verticalCenter name: "digital_wellbeing" size: Theme.iconSizeMedium diff --git a/quickshell/Modules/DankDash/OverviewTab.qml b/quickshell/Modules/DankDash/OverviewTab.qml index 169bd7ab7..541be2aa0 100644 --- a/quickshell/Modules/DankDash/OverviewTab.qml +++ b/quickshell/Modules/DankDash/OverviewTab.qml @@ -3,7 +3,6 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common import qs.Services -import qs.Widgets import qs.Modules.DankDash.Overview import qs.Modules.ControlCenter.Widgets import "utils/cards.js" as CardUtils diff --git a/quickshell/Modules/DankDash/WallpaperCarousel.qml b/quickshell/Modules/DankDash/WallpaperCarousel.qml index 06b7f1469..f2f7b9e39 100644 --- a/quickshell/Modules/DankDash/WallpaperCarousel.qml +++ b/quickshell/Modules/DankDash/WallpaperCarousel.qml @@ -3,7 +3,7 @@ pragma ComponentBehavior: Bound import QtQuick import Quickshell.Widgets import qs.Common -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.DankDash Item { @@ -167,7 +167,7 @@ Item { color: Theme.primary visible: slide.selected - DankIcon { + DIcon { anchors.centerIn: parent name: "check" size: Theme.iconSizeSmall diff --git a/quickshell/Modules/DankDash/WallpaperTab.qml b/quickshell/Modules/DankDash/WallpaperTab.qml index 7e5e003a2..c690934c5 100644 --- a/quickshell/Modules/DankDash/WallpaperTab.qml +++ b/quickshell/Modules/DankDash/WallpaperTab.qml @@ -4,11 +4,12 @@ import Quickshell import Quickshell.Widgets import qs.Common import qs.Modals.FileBrowser -import qs.DankCommon.FileBrowser as FB +import qs.DCommon.FileBrowser as FB +import qs.DCommon.Widgets import qs.Widgets import qs.Modules.ControlCenter.Widgets import qs.Modules.DankDash -import "../../DankCommon/Common/FocusNavigation.js" as FocusNavigation +import "../../DCommon/Common/FocusNavigation.js" as FocusNavigation Item { id: root @@ -721,7 +722,7 @@ Item { } } - DankSpinner { + DSpinner { anchors.centerIn: parent size: DashMetrics.spinnerSize visible: wallpaperFolderModel.status === FolderListModel.Loading && wallpaperFolderModel.count === 0 @@ -733,7 +734,7 @@ Item { iconName: root.searchQuery.trim() !== "" ? "search_off" : "wallpaper" title: root.searchQuery.trim() !== "" ? I18n.tr("No results found") : I18n.tr("No wallpapers") - DankButton { + DButton { anchors.horizontalCenter: parent.horizontalCenter text: I18n.tr("Choose wallpaper folder") visible: root.searchQuery.trim() === "" @@ -765,7 +766,7 @@ Item { onClicked: root.currentPage = (root.currentPage - 1 + root.totalPages) % root.totalPages } - DankButton { + DButton { id: pageButton anchors.verticalCenter: parent.verticalCenter text: root.wallpaperCount > 0 ? (root.wallpaperCount === 1 ? I18n.tr("%1 wallpaper • %2 / %3", "singular, %1 is 1, %2 current page, %3 total pages").arg(root.wallpaperCount).arg(root.currentPage + 1).arg(root.totalPages) : I18n.tr("%1 wallpapers • %2 / %3", "plural, %1 is a count, %2 current page, %3 total pages").arg(root.wallpaperCount).arg(root.currentPage + 1).arg(root.totalPages)) : I18n.tr("No wallpapers") @@ -866,7 +867,7 @@ Item { onClicked: root.focusSearch() } - DankSearchField { + DSearchField { id: wallpaperSearchField anchors.fill: parent @@ -979,7 +980,7 @@ Item { color: Theme.onSurfaceVariant } - DankTextField { + DTextField { id: pageJumpField width: parent.width placeholderText: "1 - " + root.totalPages @@ -995,14 +996,14 @@ Item { } } - component FooterButton: DankActionButton { + component FooterButton: DActionButton { anchors.verticalCenter: parent.verticalCenter iconSize: DashMetrics.wallpaperControlIconSize buttonSize: DashMetrics.wallpaperControlSize tooltipSide: "top" } - component SearchButton: DankActionButton { + component SearchButton: DActionButton { anchors.verticalCenter: parent.verticalCenter z: 2 iconSize: Theme.iconSizeSmall diff --git a/quickshell/Modules/DankDash/Weather/WeatherForecastCard.qml b/quickshell/Modules/DankDash/Weather/WeatherForecastCard.qml index 940896154..c94cfd414 100644 --- a/quickshell/Modules/DankDash/Weather/WeatherForecastCard.qml +++ b/quickshell/Modules/DankDash/Weather/WeatherForecastCard.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.DankDash Rectangle { @@ -76,7 +76,7 @@ Rectangle { elide: Text.ElideRight } - DankIcon { + DIcon { anchors.horizontalCenter: parent.horizontalCenter name: root.forecastData ? WeatherService.getWeatherIcon(root.forecastData.wCode || 0, root.forecastData.isDay ?? true) : "cloud" size: Theme.iconSizeLarge @@ -113,7 +113,7 @@ Rectangle { anchors.horizontalCenter: detailRows.horizontalCenter spacing: Theme.spacingXS - DankIcon { + DIcon { anchors.verticalCenter: parent.verticalCenter name: parent.modelData.icon size: Theme.iconSizeSmall diff --git a/quickshell/Modules/DankDash/Weather/WeatherForecastChart.qml b/quickshell/Modules/DankDash/Weather/WeatherForecastChart.qml index e187ffdd0..d29d60388 100644 --- a/quickshell/Modules/DankDash/Weather/WeatherForecastChart.qml +++ b/quickshell/Modules/DankDash/Weather/WeatherForecastChart.qml @@ -3,7 +3,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.DankDash Item { @@ -116,7 +116,7 @@ Item { elide: Text.ElideRight } - DankIcon { + DIcon { anchors.horizontalCenter: parent.horizontalCenter name: WeatherService.getWeatherIcon(column.modelData.wCode || 0, column.modelData.isDay ?? true) size: Theme.iconSize @@ -139,7 +139,7 @@ Item { } } - DankSparkline { + DSparkline { x: Theme.spacingM + root.columnWidth / 2 y: root.chartTop width: Math.max(0, root.width - Theme.spacingM * 2 - root.columnWidth) @@ -183,7 +183,7 @@ Item { anchors.centerIn: parent spacing: Theme.spacingXXS - DankIcon { + DIcon { visible: !root.daily name: "rainy" size: Theme.iconSizeSmall diff --git a/quickshell/Modules/DankDash/Weather/WeatherForecastWidget.qml b/quickshell/Modules/DankDash/Weather/WeatherForecastWidget.qml index d15652b96..31101b54d 100644 --- a/quickshell/Modules/DankDash/Weather/WeatherForecastWidget.qml +++ b/quickshell/Modules/DankDash/Weather/WeatherForecastWidget.qml @@ -3,7 +3,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.DankDash Rectangle { @@ -50,7 +50,7 @@ Rectangle { anchors.verticalCenter: parent.verticalCenter spacing: Theme.spacingS - DankIcon { + DIcon { anchors.verticalCenter: parent.verticalCenter name: root.daily ? "calendar_month" : "schedule" size: Theme.iconSize @@ -75,7 +75,7 @@ Rectangle { anchors.verticalCenter: parent.verticalCenter spacing: Theme.spacingXS - DankActionButton { + DActionButton { buttonSize: Theme.buttonHeightS iconName: I18n.isRtl ? "chevron_right" : "chevron_left" Accessible.name: I18n.tr("Previous") @@ -83,14 +83,14 @@ Rectangle { onClicked: root.step(-1) } - DankActionButton { + DActionButton { buttonSize: Theme.buttonHeightS iconName: "today" Accessible.name: I18n.tr("Today") onClicked: root.startIndex = root.daily ? 0 : (WeatherService.weather.currentHourIndex ?? new Date().getHours()) } - DankActionButton { + DActionButton { buttonSize: Theme.buttonHeightS iconName: I18n.isRtl ? "chevron_left" : "chevron_right" Accessible.name: I18n.tr("Next") diff --git a/quickshell/Modules/DankDash/Weather/WeatherHero.qml b/quickshell/Modules/DankDash/Weather/WeatherHero.qml index 12bd5ffa1..b2ae92483 100644 --- a/quickshell/Modules/DankDash/Weather/WeatherHero.qml +++ b/quickshell/Modules/DankDash/Weather/WeatherHero.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import "WeatherVisuals.js" as Visuals Rectangle { @@ -22,7 +22,7 @@ Rectangle { border.width: flat ? 0 : Theme.layerOutlineWidth border.color: Theme.outlineMedium - DankTone { + DTone { id: toneColors tone: root.tone floatingWindow: Theme.isFloatingWindow(root) @@ -96,7 +96,7 @@ Rectangle { Accessible.role: Accessible.StaticText Accessible.name: modelData.label + " " + (modelData.time || "--") - DankNFIcon { + DNFIcon { anchors.verticalCenter: parent.verticalCenter name: sunTime.modelData.icon size: Theme.iconSizeSmall @@ -140,7 +140,7 @@ Rectangle { }) } - DankMaterialShape { + DMaterialShape { id: emblem anchors.right: parent.right anchors.rightMargin: Theme.spacingL @@ -151,7 +151,7 @@ Rectangle { shape: Visuals.conditionShape(root.weather.wCode, root.weather.isDay) color: Theme.primary - DankIcon { + DIcon { anchors.centerIn: parent name: WeatherService.getWeatherIcon(root.weather.wCode, root.weather.isDay) size: parent.width / 2 diff --git a/quickshell/Modules/DankDash/Weather/WeatherMetricCard.qml b/quickshell/Modules/DankDash/Weather/WeatherMetricCard.qml index 6ff4ff301..9c577c2e4 100644 --- a/quickshell/Modules/DankDash/Weather/WeatherMetricCard.qml +++ b/quickshell/Modules/DankDash/Weather/WeatherMetricCard.qml @@ -4,7 +4,7 @@ import QtQuick import QtQuick.Shapes import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.DankDash import "WeatherVisuals.js" as Visuals @@ -124,7 +124,7 @@ Rectangle { Accessible.name: reading.label + " " + (hasValue ? reading.value : I18n.tr("Not available")) + " " + (reading.detail ?? "") Accessible.description: graphicDescription - DankTone { + DTone { id: toneColors tone: root.widgetOptions.tone ?? "" } @@ -138,7 +138,7 @@ Rectangle { tooltipText: root.graphicDescription } - DankMaterialShape { + DMaterialShape { anchors.centerIn: parent readonly property real aspectRatio: root.widgetId === "wind" && Theme.shapeScale > 0 ? 17 / 20 : 1 readonly property real artworkSize: Math.max(0, Math.min(parent.width, parent.height) - (root.widgetId === "uv" ? 0 : root.widgetId === "wind" ? Theme.spacingXS * 2 : Theme.spacingS * 2)) * (root.widgetId === "wind" && Theme.shapeScale > 0 ? rotationScaleForAspectRatio(aspectRatio) : 1) @@ -213,7 +213,7 @@ Rectangle { width: Math.min(implicitWidth, parent.width - Theme.spacingXL * 2) spacing: Theme.spacingXS - DankIcon { + DIcon { anchors.verticalCenter: parent.verticalCenter name: root.reading.icon ?? "cloud_off" size: Theme.iconSize diff --git a/quickshell/Modules/DankDash/Weather/WeatherSky.qml b/quickshell/Modules/DankDash/Weather/WeatherSky.qml index 85ac378f0..8cacacad1 100644 --- a/quickshell/Modules/DankDash/Weather/WeatherSky.qml +++ b/quickshell/Modules/DankDash/Weather/WeatherSky.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Shapes import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.DankDash Rectangle { @@ -44,7 +44,7 @@ Rectangle { border.width: Theme.layerOutlineWidth border.color: Theme.outlineMedium - DankTone { + DTone { id: toneColors tone: root.widgetOptions.tone ?? "" } @@ -55,7 +55,7 @@ Rectangle { anchors.margins: Theme.spacingM spacing: Theme.spacingS - DankIcon { + DIcon { name: root.moon ? "dark_mode" : "light_mode" size: Theme.iconSize color: toneColors.contentColor @@ -114,7 +114,7 @@ Rectangle { color: Theme.outlineVariant } - DankMaterialShape { + DMaterialShape { readonly property real progress: I18n.isRtl ? 1 - root.dayProgress : root.dayProgress x: arc.width * progress - width / 2 y: arc.height * (1 - 4 * progress * (1 - progress)) - height / 2 @@ -125,7 +125,7 @@ Rectangle { visible: !root.moon && root.hasSunTimes && root.currentDate.getTime() >= root.sunriseTime && root.currentDate.getTime() <= root.sunsetTime } - DankSparkline { + DSparkline { anchors.fill: parent visible: root.moon values: I18n.isRtl ? (root.moonTrack?.values ?? []).slice().reverse() : (root.moonTrack?.values ?? []) @@ -138,7 +138,7 @@ Rectangle { fillOpacity: Theme.stateLayerDrag } - DankNFIcon { + DNFIcon { readonly property real progress: root.moonTrack?.progress ?? 0 x: arc.width * (I18n.isRtl ? 1 - progress : progress) - width / 2 y: arc.height * (1 - (root.moonTrack?.altitude ?? 0)) / 2 - height / 2 diff --git a/quickshell/Modules/DankDash/WeatherTab.qml b/quickshell/Modules/DankDash/WeatherTab.qml index b9680cd39..3ffd0e890 100644 --- a/quickshell/Modules/DankDash/WeatherTab.qml +++ b/quickshell/Modules/DankDash/WeatherTab.qml @@ -3,7 +3,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.DankDash import qs.Modules.DankDash.Weather import qs.Modules.ControlCenter.Widgets @@ -292,14 +292,14 @@ Item { anchors.horizontalCenter: parent.horizontalCenter spacing: Theme.spacingS - DankRefreshButton { + DRefreshButton { id: refreshButton busy: WeatherService.weather.loading Accessible.name: I18n.tr("Refresh Weather") onClicked: WeatherService.forceRefresh() } - DankButton { + DButton { text: I18n.tr("Settings") iconName: "settings" onClicked: { diff --git a/quickshell/Modules/DankDash/Wellbeing/AppLimitSheet.qml b/quickshell/Modules/DankDash/Wellbeing/AppLimitSheet.qml index 7392b86bc..23c86fbac 100644 --- a/quickshell/Modules/DankDash/Wellbeing/AppLimitSheet.qml +++ b/quickshell/Modules/DankDash/Wellbeing/AppLimitSheet.qml @@ -1,7 +1,6 @@ import QtQuick import qs.Common import qs.Services -import qs.Widgets import qs.Modules.Settings.Widgets import qs.Modules.ControlCenter.Widgets import qs.Modules.DankDash diff --git a/quickshell/Modules/DankDash/Wellbeing/AppUsageList.qml b/quickshell/Modules/DankDash/Wellbeing/AppUsageList.qml index 63d2fdc85..f6877e5cc 100644 --- a/quickshell/Modules/DankDash/Wellbeing/AppUsageList.qml +++ b/quickshell/Modules/DankDash/Wellbeing/AppUsageList.qml @@ -3,12 +3,12 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.DankDash import qs.Modules.ControlCenter.Widgets import "Wellbeing.js" as Wellbeing -DankCard { +DCard { id: root property var days: [] @@ -63,7 +63,7 @@ DankCard { elide: Text.ElideRight } - DankButtonGroup { + DButtonGroup { id: periodGroup anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter @@ -119,7 +119,7 @@ DankCard { Component { id: scrolling - DankListView { + DListView { clip: true spacing: Theme.groupedListGap showScrollBar: false @@ -131,7 +131,7 @@ DankCard { } } - component AppRow: DankListItem { + component AppRow: DListItem { id: row required property var modelData @@ -210,7 +210,7 @@ DankCard { color: row.overLimit ? Theme.error : row.contentColor } - DankActionButton { + DActionButton { id: limitButton anchors.right: parent.right anchors.rightMargin: Theme.spacingS diff --git a/quickshell/Modules/DankDash/Wellbeing/DurationSteppers.qml b/quickshell/Modules/DankDash/Wellbeing/DurationSteppers.qml index 4a056b380..606bde108 100644 --- a/quickshell/Modules/DankDash/Wellbeing/DurationSteppers.qml +++ b/quickshell/Modules/DankDash/Wellbeing/DurationSteppers.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets Row { id: root @@ -18,7 +18,7 @@ Row { spacing: Theme.spacingS - DankNumberStepper { + DNumberStepper { text: I18n.tr("%1h", "hours abbreviation, %1 is a number").arg(root.hours) incrementEnabled: root.minutes + 60 <= root.maxMinutes decrementEnabled: root.hours > 0 @@ -26,7 +26,7 @@ Row { onDecrement: () => root.commit(root.minutes - 60) } - DankNumberStepper { + DNumberStepper { text: I18n.tr("%1m").arg(root.remainder) incrementEnabled: root.minutes < root.maxMinutes decrementEnabled: root.minutes > 0 diff --git a/quickshell/Modules/DankDash/Wellbeing/WeeklyChart.qml b/quickshell/Modules/DankDash/Wellbeing/WeeklyChart.qml index 1d6ab1678..b66839e6a 100644 --- a/quickshell/Modules/DankDash/Wellbeing/WeeklyChart.qml +++ b/quickshell/Modules/DankDash/Wellbeing/WeeklyChart.qml @@ -4,11 +4,11 @@ import QtQuick import QtQuick.Shapes import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.DankDash import "Wellbeing.js" as Wellbeing -DankCard { +DCard { id: root property var days: [] @@ -143,7 +143,7 @@ DankCard { width: parent.width - x height: totalLabel.height - DankActionButton { + DActionButton { anchors.right: rangeLabel.left anchors.verticalCenter: parent.verticalCenter buttonSize: Theme.buttonHeightXS @@ -170,7 +170,7 @@ DankCard { elide: Text.ElideRight } - DankActionButton { + DActionButton { id: nextButton anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter @@ -213,7 +213,7 @@ DankCard { } } - DankFlickable { + DFlickable { id: pager anchors.left: plot.left anchors.right: plot.right diff --git a/quickshell/Modules/DankDash/WellbeingTab.qml b/quickshell/Modules/DankDash/WellbeingTab.qml index 038309e1a..6f54709bb 100644 --- a/quickshell/Modules/DankDash/WellbeingTab.qml +++ b/quickshell/Modules/DankDash/WellbeingTab.qml @@ -3,7 +3,6 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common import qs.Services -import qs.Widgets import qs.Modules.DankDash import qs.Modules.DankDash.Wellbeing import qs.Modules.ControlCenter.Widgets diff --git a/quickshell/Modules/DankIsland/Activities/DashTabFace.qml b/quickshell/Modules/DankIsland/Activities/DashTabFace.qml index ba86cd8ba..b2e9db94b 100644 --- a/quickshell/Modules/DankIsland/Activities/DashTabFace.qml +++ b/quickshell/Modules/DankIsland/Activities/DashTabFace.qml @@ -3,6 +3,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common import qs.Services +import qs.DCommon.Widgets import qs.Widgets import qs.Modules.DankDash import qs.Modules.DankDash.Overview @@ -178,7 +179,7 @@ FocusScope { } } - DankFlickable { + DFlickable { id: pages enabled: !tabOptions.shown && !pageActions.menuOpen showScrollBar: false @@ -241,7 +242,7 @@ FocusScope { onResizeCanceled: root.panelResizer.cancel() } - DankSpinner { + DSpinner { anchors.centerIn: pages size: DashMetrics.spinnerSize visible: !tabLoader.visible diff --git a/quickshell/Modules/DankIsland/Activities/DestinationCompact.qml b/quickshell/Modules/DankIsland/Activities/DestinationCompact.qml index 405e293dc..17e979225 100644 --- a/quickshell/Modules/DankIsland/Activities/DestinationCompact.qml +++ b/quickshell/Modules/DankIsland/Activities/DestinationCompact.qml @@ -2,7 +2,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets Item { id: root @@ -40,7 +40,7 @@ Item { sourceComponent: root.leading } - DankIcon { + DIcon { anchors.verticalCenter: parent.verticalCenter visible: root.iconName !== "" name: root.iconName @@ -82,7 +82,7 @@ Item { sourceComponent: root.leading } - DankIcon { + DIcon { anchors.horizontalCenter: parent.horizontalCenter visible: root.iconName !== "" name: root.iconName diff --git a/quickshell/Modules/DankIsland/Activities/DotCompact.qml b/quickshell/Modules/DankIsland/Activities/DotCompact.qml index efe0d5d18..2aa5420ca 100644 --- a/quickshell/Modules/DankIsland/Activities/DotCompact.qml +++ b/quickshell/Modules/DankIsland/Activities/DotCompact.qml @@ -2,7 +2,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets Item { id: root @@ -12,7 +12,7 @@ Item { readonly property real diameter: Math.min(width, height) - DankIcon { + DIcon { anchors.centerIn: parent name: root.iconName size: Math.max(Theme.fontSizeSmall, Math.round(root.diameter * 0.46)) diff --git a/quickshell/Modules/DankIsland/Activities/HomeCompact.qml b/quickshell/Modules/DankIsland/Activities/HomeCompact.qml index b7a754731..405dfdc28 100644 --- a/quickshell/Modules/DankIsland/Activities/HomeCompact.qml +++ b/quickshell/Modules/DankIsland/Activities/HomeCompact.qml @@ -4,6 +4,7 @@ import QtQuick import qs.Common import qs.Modules.DankBar.Widgets import qs.Services +import qs.DCommon.Widgets import qs.Widgets Item { @@ -216,7 +217,7 @@ Item { height: root.iconSize opacity: root.connectivityIconOpacity(connectivityIcon.type) - DankIcon { + DIcon { id: connectivityGlyph anchors.centerIn: parent @@ -224,14 +225,14 @@ Item { size: root.statusIconSize color: root.connectivityIconColor(connectivityIcon.type) - DankBlink { + DBlink { target: connectivityGlyph running: connectivityIcon.visible && root.connectivityBusy(connectivityIcon.type) } } } - component PrivacyIcon: DankIcon { + component PrivacyIcon: DIcon { required property bool active visible: active @@ -339,14 +340,14 @@ Item { visible: group.isMedia && root.controller.mediaAvailable } - DankIcon { + DIcon { visible: group.isMedia && !root.controller.mediaAvailable name: "search" size: root.iconSize color: Theme.surfaceTextMedium } - DankIcon { + DIcon { visible: group.isWeather name: WeatherService.getWeatherIcon(WeatherService.weather.wCode) size: root.statusIconSize @@ -360,7 +361,7 @@ Item { font.pixelSize: root.textSize } - DankIcon { + DIcon { visible: group.isNotifications name: "notifications" size: root.statusIconSize @@ -374,7 +375,7 @@ Item { font.pixelSize: root.textSize } - DankIcon { + DIcon { visible: group.isSystemLevel && (group.vertical || group.levelDisplay !== "percentage") name: group.isVolume ? AudioService.sinkVolumeIconName : BrightnessService.brightnessIconName(root.brightnessDevice, BrightnessService.brightnessLevel) size: root.statusIconSize @@ -434,7 +435,7 @@ Item { } } - DankIcon { + DIcon { visible: group.isStatus && !group.usesBattery && !group.usesConnectivity name: "tune" size: root.iconSize diff --git a/quickshell/Modules/DankIsland/Activities/NotificationCompact.qml b/quickshell/Modules/DankIsland/Activities/NotificationCompact.qml index 3c2eb2ec1..5267d2ab3 100644 --- a/quickshell/Modules/DankIsland/Activities/NotificationCompact.qml +++ b/quickshell/Modules/DankIsland/Activities/NotificationCompact.qml @@ -2,7 +2,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets Item { id: root @@ -26,7 +26,7 @@ Item { Component.onCompleted: root.pushMeasuredLength() // A side strip only fits the sender's icon; the text lives in the expanded face. - DankCircularImage { + DCircularImage { anchors.centerIn: parent visible: root.isVertical width: root.iconSize @@ -46,7 +46,7 @@ Item { } spacing: Theme.spacingS - DankCircularImage { + DCircularImage { anchors.verticalCenter: parent.verticalCenter width: root.iconSize height: width diff --git a/quickshell/Modules/DankIsland/Activities/NotificationExpanded.qml b/quickshell/Modules/DankIsland/Activities/NotificationExpanded.qml index fb1d2c191..46dad91a5 100644 --- a/quickshell/Modules/DankIsland/Activities/NotificationExpanded.qml +++ b/quickshell/Modules/DankIsland/Activities/NotificationExpanded.qml @@ -2,7 +2,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets Item { id: root @@ -26,7 +26,7 @@ Item { height: 46 spacing: Theme.spacingM - DankCircularImage { + DCircularImage { anchors.verticalCenter: parent.verticalCenter width: 46 height: 46 @@ -59,7 +59,7 @@ Item { } } - DankActionButton { + DActionButton { id: closeButton anchors.verticalCenter: parent.verticalCenter @@ -115,7 +115,7 @@ Item { height: 34 spacing: Theme.spacingS - DankButton { + DButton { height: parent.height radius: Theme.fullRadius(width, height) text: I18n.tr("Dismiss", "island notification face: dismiss button") @@ -128,7 +128,7 @@ Item { onClicked: root.notificationModel.dismiss() } - DankButton { + DButton { visible: root.notificationModel.hasAction height: parent.height radius: Theme.fullRadius(width, height) diff --git a/quickshell/Modules/DankIsland/Activities/SystemLevelCompact.qml b/quickshell/Modules/DankIsland/Activities/SystemLevelCompact.qml index 946ebdc64..b70f91c86 100644 --- a/quickshell/Modules/DankIsland/Activities/SystemLevelCompact.qml +++ b/quickshell/Modules/DankIsland/Activities/SystemLevelCompact.qml @@ -3,7 +3,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common import qs.Modules.OSD -import qs.Widgets +import qs.DCommon.Widgets Item { id: root @@ -14,7 +14,7 @@ Item { readonly property int maximum: Math.max(root.systemModel.minimum + 1, Math.round(root.systemModel.maximum)) readonly property real fillRatio: Math.max(0, Math.min(1, (root.systemModel.value - root.systemModel.minimum) / Math.max(1, root.maximum - root.systemModel.minimum))) - // DankSlider's own metrics, transposed, so the two orientations read as the same control. + // DSlider's own metrics, transposed, so the two orientations read as the same control. readonly property real trackThickness: 12 readonly property real handleThickness: 4 readonly property real handleBreadth: 20 @@ -49,7 +49,7 @@ Item { onSliderValueChanged: newValue => root.systemModel.setRatio(newValue / Math.max(1, root.maximum)) } - // DankSlider is horizontal only, so a side strip gets its own stacked track. + // DSlider is horizontal only, so a side strip gets its own stacked track. Item { id: verticalFace @@ -58,7 +58,7 @@ Item { anchors.bottomMargin: Theme.spacingS visible: root.isVertical - DankIcon { + DIcon { id: levelIcon anchors.horizontalCenter: parent.horizontalCenter diff --git a/quickshell/Modules/DankIsland/Activities/SystemLevelExpanded.qml b/quickshell/Modules/DankIsland/Activities/SystemLevelExpanded.qml index 6ffb14d92..3c19c4487 100644 --- a/quickshell/Modules/DankIsland/Activities/SystemLevelExpanded.qml +++ b/quickshell/Modules/DankIsland/Activities/SystemLevelExpanded.qml @@ -2,7 +2,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets Item { id: root @@ -50,7 +50,7 @@ Item { } } - DankSlider { + DSlider { id: levelSlider width: parent.width diff --git a/quickshell/Modules/DankIsland/IslandFreeHostWindow.qml b/quickshell/Modules/DankIsland/IslandFreeHostWindow.qml index e6bfee700..18fcab5f5 100644 --- a/quickshell/Modules/DankIsland/IslandFreeHostWindow.qml +++ b/quickshell/Modules/DankIsland/IslandFreeHostWindow.qml @@ -5,7 +5,6 @@ import Quickshell import Quickshell.Wayland import qs.Common import qs.Services -import qs.Widgets PanelWindow { id: root diff --git a/quickshell/Modules/Dock/DockAppButton.qml b/quickshell/Modules/Dock/DockAppButton.qml index 825244adc..292b34f56 100644 --- a/quickshell/Modules/Dock/DockAppButton.qml +++ b/quickshell/Modules/Dock/DockAppButton.qml @@ -3,7 +3,7 @@ import QtQuick.Effects import Quickshell.Widgets import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets Item { id: root @@ -527,7 +527,7 @@ Item { } } - DankIcon { + DIcon { anchors.centerIn: parent size: actualIconSize name: "sports_esports" @@ -584,7 +584,8 @@ Item { Rectangle { readonly property bool dotFocused: { - if (!appData) return false; + if (!appData) + return false; if (appData.type !== "grouped" || appData.windowCount === 1) return isWindowFocused; const groupToplevels = getGroupedToplevels(); @@ -612,7 +613,9 @@ Item { } } Behavior on color { - ColorAnimation { duration: Theme.shortDuration } + ColorAnimation { + duration: Theme.shortDuration + } } } } @@ -641,7 +644,8 @@ Item { Rectangle { readonly property bool dotFocused: { - if (!appData) return false; + if (!appData) + return false; if (appData.type !== "grouped" || appData.windowCount === 1) return isWindowFocused; const groupToplevels = getGroupedToplevels(); @@ -669,7 +673,9 @@ Item { } } Behavior on color { - ColorAnimation { duration: Theme.shortDuration } + ColorAnimation { + duration: Theme.shortDuration + } } } } diff --git a/quickshell/Modules/Dock/DockContextMenu.qml b/quickshell/Modules/Dock/DockContextMenu.qml index 9f4a1c7b8..b0f648f96 100644 --- a/quickshell/Modules/Dock/DockContextMenu.qml +++ b/quickshell/Modules/Dock/DockContextMenu.qml @@ -2,7 +2,7 @@ import QtQuick import Quickshell.Widgets import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets DockContextMenuBase { id: root @@ -66,7 +66,7 @@ DockContextMenuBase { radius: Theme.cornerRadiusS color: minimizeMouseArea.containsMouse ? BlurService.hoverColor(Theme.widgetBaseHoverColor) : "transparent" - DankIcon { + DIcon { anchors.centerIn: parent name: modelData.minimized ? "expand_content" : "minimize" size: 12 @@ -101,7 +101,7 @@ DockContextMenuBase { radius: Theme.cornerRadiusS color: closeMouseArea.containsMouse ? Theme.errorPressed : Theme.withAlpha(Theme.errorPressed, 0) - DankIcon { + DIcon { anchors.centerIn: parent name: "close" size: 12 @@ -122,7 +122,7 @@ DockContextMenuBase { } } - DankRipple { + DRipple { id: windowRipple rippleColor: Theme.surfaceText cornerRadius: Theme.cornerRadius @@ -199,7 +199,7 @@ DockContextMenuBase { wrapMode: Text.NoWrap } - DankRipple { + DRipple { id: actionRipple rippleColor: Theme.surfaceText cornerRadius: Theme.cornerRadius @@ -241,7 +241,7 @@ DockContextMenuBase { radius: Theme.cornerRadius color: pinArea.containsMouse ? BlurService.hoverColor(Theme.widgetBaseHoverColor) : Theme.withAlpha(BlurService.hoverColor(Theme.widgetBaseHoverColor), 0) - DankIcon { + DIcon { id: pinIcon anchors.left: parent.left anchors.leftMargin: Theme.spacingS @@ -267,7 +267,7 @@ DockContextMenuBase { wrapMode: Text.NoWrap } - DankRipple { + DRipple { id: pinRipple rippleColor: Theme.surfaceText cornerRadius: Theme.cornerRadius @@ -314,7 +314,7 @@ DockContextMenuBase { radius: Theme.cornerRadius color: nvidiaArea.containsMouse ? BlurService.hoverColor(Theme.widgetBaseHoverColor) : Theme.withAlpha(BlurService.hoverColor(Theme.widgetBaseHoverColor), 0) - DankIcon { + DIcon { id: nvidiaIcon anchors.left: parent.left anchors.leftMargin: Theme.spacingS @@ -340,7 +340,7 @@ DockContextMenuBase { wrapMode: Text.NoWrap } - DankRipple { + DRipple { id: nvidiaRipple rippleColor: Theme.surfaceText cornerRadius: Theme.cornerRadius @@ -369,7 +369,7 @@ DockContextMenuBase { radius: Theme.cornerRadius color: closeArea.containsMouse ? Theme.errorHover : Theme.withAlpha(Theme.errorHover, 0) - DankIcon { + DIcon { id: closeIcon anchors.left: parent.left anchors.leftMargin: Theme.spacingS @@ -395,7 +395,7 @@ DockContextMenuBase { wrapMode: Text.NoWrap } - DankRipple { + DRipple { id: closeRipple rippleColor: Theme.error cornerRadius: Theme.cornerRadius diff --git a/quickshell/Modules/Dock/DockEditChrome.qml b/quickshell/Modules/Dock/DockEditChrome.qml index 51f494478..67f524e30 100644 --- a/quickshell/Modules/Dock/DockEditChrome.qml +++ b/quickshell/Modules/Dock/DockEditChrome.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets Rectangle { id: root @@ -44,7 +44,7 @@ Rectangle { elide: Text.ElideRight } - DankButton { + DButton { id: addButton anchors.verticalCenter: parent.verticalCenter buttonHeight: Theme.buttonHeightS @@ -58,7 +58,7 @@ Rectangle { onClicked: root.addRequested(addButton) } - DankActionButton { + DActionButton { id: settingsButton anchors.verticalCenter: parent.verticalCenter buttonSize: Theme.buttonHeightS @@ -69,7 +69,7 @@ Rectangle { onClicked: root.settingsRequested() } - DankButton { + DButton { id: finishButton anchors.verticalCenter: parent.verticalCenter buttonHeight: Theme.buttonHeightS diff --git a/quickshell/Modules/Dock/DockOverflowButton.qml b/quickshell/Modules/Dock/DockOverflowButton.qml index c89d1f20f..d692a1fd7 100644 --- a/quickshell/Modules/Dock/DockOverflowButton.qml +++ b/quickshell/Modules/Dock/DockOverflowButton.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets Item { id: root @@ -35,7 +35,7 @@ Item { } } - DankIcon { + DIcon { id: arrowIcon anchors.centerIn: parent size: actualIconSize * 0.6 diff --git a/quickshell/Modules/Dock/DockTrashButton.qml b/quickshell/Modules/Dock/DockTrashButton.qml index e8f6c36dc..2bb6e7798 100644 --- a/quickshell/Modules/Dock/DockTrashButton.qml +++ b/quickshell/Modules/Dock/DockTrashButton.qml @@ -2,7 +2,7 @@ import QtQuick import Quickshell.Widgets import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets Item { id: root @@ -86,7 +86,7 @@ Item { visible: status === Image.Ready } - DankIcon { + DIcon { anchors.centerIn: parent visible: parent.iconPath === "" || trashIcon.status !== Image.Ready name: "delete" diff --git a/quickshell/Modules/Dock/DockTrashMenuItem.qml b/quickshell/Modules/Dock/DockTrashMenuItem.qml index 537857e6d..0a632083a 100644 --- a/quickshell/Modules/Dock/DockTrashMenuItem.qml +++ b/quickshell/Modules/Dock/DockTrashMenuItem.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets Rectangle { id: root @@ -31,7 +31,7 @@ Rectangle { anchors.verticalCenter: parent.verticalCenter spacing: Theme.spacingXS - DankIcon { + DIcon { anchors.verticalCenter: parent.verticalCenter name: root.iconName size: 14 @@ -50,7 +50,7 @@ Rectangle { } } - DankRipple { + DRipple { id: ripple rippleColor: root.isDestructive ? Theme.error : Theme.surfaceText cornerRadius: Theme.cornerRadius diff --git a/quickshell/Modules/Frame/FrameWindow.qml b/quickshell/Modules/Frame/FrameWindow.qml index a90588a9b..232212f2a 100644 --- a/quickshell/Modules/Frame/FrameWindow.qml +++ b/quickshell/Modules/Frame/FrameWindow.qml @@ -6,7 +6,6 @@ import Quickshell.Wayland import qs.Common import qs.Modules.DankIsland import qs.Services -import qs.Widgets import "../../Common/ConnectorGeometry.js" as ConnectorGeometry import "../../Common/ConnectedSurfaceGeometry.js" as SurfaceGeometry diff --git a/quickshell/Modules/Greetd/GreeterContent.qml b/quickshell/Modules/Greetd/GreeterContent.qml index 6e585fedc..b70d4c5bc 100644 --- a/quickshell/Modules/Greetd/GreeterContent.qml +++ b/quickshell/Modules/Greetd/GreeterContent.qml @@ -8,8 +8,9 @@ import Quickshell.Services.Greetd import qs.Common import qs.Modules.Lock import qs.Services +import qs.DCommon.Widgets import qs.Widgets -import qs.DankCommon.Session +import qs.DCommon.Session import "../../Common/PamStack.js" as PamStack Item { @@ -833,7 +834,7 @@ Item { Layout.preferredHeight: 60 visible: SettingsData.lockScreenShowProfileImage || root.pickerAvailable - DankCircularImage { + DCircularImage { anchors.fill: parent ringWidth: Theme.avatarRingWidth ringColor: Theme.avatarRingColor @@ -883,7 +884,7 @@ Item { } } - DankIcon { + DIcon { anchors.centerIn: parent name: "switch_account" size: 24 @@ -941,7 +942,7 @@ Item { onManualEntryRequested: root.enterManualUsernameEntry() } - DankIcon { + DIcon { id: lockIcon anchors.left: parent.left @@ -1095,7 +1096,7 @@ Item { } } - DankActionButton { + DActionButton { id: revealButton anchors.right: externalAuthButton.visible ? externalAuthButton.left : (virtualKeyboardButton.visible ? virtualKeyboardButton.left : (enterButton.visible ? enterButton.left : parent.right)) @@ -1108,7 +1109,7 @@ Item { enabled: visible onClicked: parent.showPassword = !parent.showPassword } - DankActionButton { + DActionButton { id: externalAuthButton anchors.right: virtualKeyboardButton.visible ? virtualKeyboardButton.left : (enterButton.visible ? enterButton.left : parent.right) @@ -1121,7 +1122,7 @@ Item { enabled: visible onClicked: root.startAuthSession(false) } - DankActionButton { + DActionButton { id: virtualKeyboardButton anchors.right: enterButton.visible ? enterButton.left : parent.right @@ -1141,7 +1142,7 @@ Item { } } - DankActionButton { + DActionButton { id: enterButton anchors.right: parent.right @@ -1243,7 +1244,7 @@ Item { useFahrenheit: SettingsData.useFahrenheit } - DankActionButton { + DActionButton { anchors.bottom: parent.bottom anchors.left: parent.left anchors.margins: Theme.spacingXL diff --git a/quickshell/Modules/Greetd/GreeterUserPicker.qml b/quickshell/Modules/Greetd/GreeterUserPicker.qml index 031ba2a74..bd63b1721 100644 --- a/quickshell/Modules/Greetd/GreeterUserPicker.qml +++ b/quickshell/Modules/Greetd/GreeterUserPicker.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Layouts import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets Item { id: root @@ -76,7 +76,7 @@ Item { elide: Text.ElideRight } - DankIcon { + DIcon { Layout.alignment: Qt.AlignVCenter name: "expand_more" size: 20 @@ -99,7 +99,7 @@ Item { visible: expanded spacing: Theme.spacingXS - DankListView { + DListView { id: userListView width: parent.width @@ -132,7 +132,7 @@ Item { Layout.preferredWidth: 36 Layout.preferredHeight: 36 - DankCircularImage { + DCircularImage { anchors.fill: parent ringWidth: Theme.avatarRingWidth ringColor: Theme.avatarRingColor @@ -174,7 +174,7 @@ Item { anchors.rightMargin: Theme.spacingS spacing: Theme.spacingM - DankIcon { + DIcon { Layout.alignment: Qt.AlignVCenter name: "person_add" size: 20 @@ -213,7 +213,7 @@ Item { anchors.rightMargin: Theme.spacingS spacing: Theme.spacingM - DankIcon { + DIcon { Layout.alignment: Qt.AlignVCenter name: root.autoLoginChecked ? "check_box" : "check_box_outline_blank" size: 20 diff --git a/quickshell/Modules/Lock/LockScreenBackground.qml b/quickshell/Modules/Lock/LockScreenBackground.qml index 05333742f..cc1638c36 100644 --- a/quickshell/Modules/Lock/LockScreenBackground.qml +++ b/quickshell/Modules/Lock/LockScreenBackground.qml @@ -6,7 +6,7 @@ import Quickshell import qs.Common import qs.Services import qs.Widgets -import qs.DankCommon.Session +import qs.DCommon.Session Item { id: root diff --git a/quickshell/Modules/Lock/LockScreenContent.qml b/quickshell/Modules/Lock/LockScreenContent.qml index 4b0e33220..023b95d18 100644 --- a/quickshell/Modules/Lock/LockScreenContent.qml +++ b/quickshell/Modules/Lock/LockScreenContent.qml @@ -6,8 +6,7 @@ import qs.Common import qs.Modals import qs.Modules.Plugins import qs.Services -import qs.Widgets -import qs.DankCommon.Session +import qs.DCommon.Session FocusScope { id: root diff --git a/quickshell/Modules/Lock/LockStatusRow.qml b/quickshell/Modules/Lock/LockStatusRow.qml index 2807a75e6..8c246c463 100644 --- a/quickshell/Modules/Lock/LockStatusRow.qml +++ b/quickshell/Modules/Lock/LockStatusRow.qml @@ -3,9 +3,9 @@ import QtQuick.Window import Quickshell.Services.Mpris import qs.Common import qs.Services -import qs.Widgets -import qs.DankCommon.Session -import "../../DankCommon/Common/LayoutCodes.js" as LayoutCodes +import qs.DCommon.Widgets +import qs.DCommon.Session +import "../../DCommon/Common/LayoutCodes.js" as LayoutCodes Row { id: root @@ -60,7 +60,7 @@ Row { id: keyboardLayoutRow spacing: Theme.spacingXS - DankIcon { + DIcon { name: "keyboard" size: Theme.iconSize color: root.contentColor @@ -183,7 +183,7 @@ Row { color: prevArea.containsMouse ? root.dividerColor : "transparent" opacity: prevArea.enabled ? 1 : Theme.onSurface_38.a - DankIcon { + DIcon { anchors.centerIn: parent name: "skip_previous" size: Theme.iconSizeSmall @@ -210,7 +210,7 @@ Row { anchors.verticalCenter: parent.verticalCenter color: playing ? root.contentColor : root.dividerColor - DankIcon { + DIcon { anchors.centerIn: parent name: parent.playing ? "pause" : "play_arrow" size: Theme.iconSizeSmall @@ -236,7 +236,7 @@ Row { color: nextArea.containsMouse ? root.dividerColor : "transparent" opacity: nextArea.enabled ? 1 : Theme.onSurface_38.a - DankIcon { + DIcon { anchors.centerIn: parent name: "skip_next" size: Theme.iconSizeSmall @@ -266,7 +266,7 @@ Row { visible: root.weatherVisible anchors.verticalCenter: parent.verticalCenter - DankIcon { + DIcon { name: WeatherService.getWeatherIcon(WeatherService.weather.wCode) size: Theme.iconSize color: root.contentColor @@ -292,7 +292,7 @@ Row { anchors.verticalCenter: parent.verticalCenter visible: NetworkService.networkAvailable || (BluetoothService.available && BluetoothService.enabled) || (AudioService.sink && AudioService.sink.audio) - DankIcon { + DIcon { name: "screen_record" size: Theme.iconSizeSmall color: NiriService.hasActiveCast ? root.contentColor : root.dimColor @@ -300,7 +300,7 @@ Row { visible: NiriService.hasCasts } - DankIcon { + DIcon { id: networkIcon name: { if (NetworkService.wifiToggling) @@ -321,13 +321,13 @@ Row { anchors.verticalCenter: parent.verticalCenter visible: NetworkService.networkAvailable - DankBlink { + DBlink { target: networkIcon running: NetworkService.isWifiConnecting } } - DankIcon { + DIcon { name: "vpn_lock" size: Theme.iconSizeSmall color: root.contentColor @@ -335,7 +335,7 @@ Row { visible: NetworkService.vpnAvailable && NetworkService.vpnConnected } - DankIcon { + DIcon { id: bluetoothIcon name: "bluetooth" size: Theme.iconSizeSmall @@ -343,13 +343,13 @@ Row { anchors.verticalCenter: parent.verticalCenter visible: BluetoothService.available && BluetoothService.enabled - DankBlink { + DBlink { target: bluetoothIcon running: BluetoothService.connecting } } - DankIcon { + DIcon { name: AudioService.sinkVolumeIconName size: Theme.iconSizeSmall color: AudioService.sinkSilent ? root.dimColor : root.contentColor @@ -368,7 +368,7 @@ Row { visible: BatteryService.batteryAvailable anchors.verticalCenter: parent.verticalCenter - DankIcon { + DIcon { name: BatteryService.getBatteryIcon() size: Theme.iconSize color: root.batteryColor diff --git a/quickshell/Modules/Lock/Widgets/GreeterSessionWidget.qml b/quickshell/Modules/Lock/Widgets/GreeterSessionWidget.qml index fe14dc4f3..5e568a5d6 100644 --- a/quickshell/Modules/Lock/Widgets/GreeterSessionWidget.qml +++ b/quickshell/Modules/Lock/Widgets/GreeterSessionWidget.qml @@ -1,8 +1,9 @@ import QtQuick import qs.Common import qs.Services +import qs.DCommon.Widgets import qs.Widgets -import qs.DankCommon.Session +import qs.DCommon.Session // Settings preview of the greeter session picker. The greeter renders the real dropdown. Item { diff --git a/quickshell/Modules/Lock/Widgets/LockAuthWidget.qml b/quickshell/Modules/Lock/Widgets/LockAuthWidget.qml index e72f70b63..d57179fc4 100644 --- a/quickshell/Modules/Lock/Widgets/LockAuthWidget.qml +++ b/quickshell/Modules/Lock/Widgets/LockAuthWidget.qml @@ -5,8 +5,8 @@ import QtQuick.Layouts import QtQuick.Shapes import qs.Common import qs.Services -import qs.Widgets -import qs.DankCommon.Session +import qs.DCommon.Widgets +import qs.DCommon.Session import "../../../Common/KeyUtils.js" as KeyUtils Item { @@ -291,7 +291,7 @@ Item { } } - DankCircularImage { + DCircularImage { anchors.centerIn: parent width: root.ringSize - root.ringStroke * 4 height: width @@ -306,7 +306,7 @@ Item { fallbackIcon: "material:person" } - DankIcon { + DIcon { anchors.centerIn: parent visible: !root.showProfileImage name: root.unlocking ? "lock_open" : "lock" @@ -327,7 +327,7 @@ Item { spacing: Theme.spacingM Layout.fillWidth: true - DankCircularImage { + DCircularImage { Layout.preferredWidth: LockMetrics.avatarSize ringWidth: Theme.avatarRingWidth ringColor: Theme.avatarRingColor @@ -454,7 +454,7 @@ Item { width: !visible ? 0 : (root.morph ? LockMetrics.fieldHeight - Theme.spacingS * 2 : Theme.iconSizeSmall) height: root.morph ? width : Theme.iconSizeSmall - DankMaterialShape { + DMaterialShape { id: morphContainer anchors.fill: parent visible: root.morph @@ -490,7 +490,7 @@ Item { } } - DankLoadingIndicator { + DLoadingIndicator { anchors.centerIn: parent size: parent.width contained: true @@ -498,7 +498,7 @@ Item { running: visible } - DankIcon { + DIcon { id: lockIcon anchors.centerIn: parent @@ -957,7 +957,7 @@ Item { } } - DankTextCursor { + DTextCursor { id: passwordCursor x: passwordDisplay.x + passwordDisplay.cursorRectangle.x @@ -1045,7 +1045,7 @@ Item { height: Theme.iconSize visible: !root.demoMode && !root.ring && !root.morph && ((root.pam?.passwd.active ?? false) || root.unlocking) - DankIcon { + DIcon { anchors.centerIn: parent name: "check_circle" size: Theme.iconSizeSmall @@ -1062,7 +1062,7 @@ Item { } } - DankLoadingIndicator { + DLoadingIndicator { anchors.centerIn: parent size: Theme.iconSize contained: root.style === "expressive" @@ -1147,7 +1147,7 @@ Item { spacing: Theme.spacingXS opacity: DMSService.capsLockState ? 1 : 0 - DankIcon { + DIcon { name: "shift_lock" size: Theme.iconSizeSmall color: Theme.error diff --git a/quickshell/Modules/Lock/Widgets/LockDateWidget.qml b/quickshell/Modules/Lock/Widgets/LockDateWidget.qml index 1b0a07f45..2eb66f0fc 100644 --- a/quickshell/Modules/Lock/Widgets/LockDateWidget.qml +++ b/quickshell/Modules/Lock/Widgets/LockDateWidget.qml @@ -1,7 +1,7 @@ import QtQuick import Quickshell import qs.Common -import qs.Widgets +import qs.DCommon.Widgets Item { id: root diff --git a/quickshell/Modules/Lock/Widgets/LockNotificationsWidget.qml b/quickshell/Modules/Lock/Widgets/LockNotificationsWidget.qml index 067d199aa..cef49d9c2 100644 --- a/quickshell/Modules/Lock/Widgets/LockNotificationsWidget.qml +++ b/quickshell/Modules/Lock/Widgets/LockNotificationsWidget.qml @@ -5,8 +5,8 @@ import Quickshell.Widgets import qs.Common import qs.Modules.Notifications as Notifications import qs.Services -import qs.Widgets -import qs.DankCommon.Session +import qs.DCommon.Widgets +import qs.DCommon.Session Item { id: root @@ -245,7 +245,7 @@ Item { anchors.centerIn: parent spacing: Theme.spacingS - DankIcon { + DIcon { name: "notifications" size: Theme.iconSizeSmall + Theme.spacingXXS color: Theme.onSurfaceVariant @@ -279,7 +279,7 @@ Item { radius: Theme.groupedListOuterRadius color: "transparent" - DankFlickable { + DFlickable { anchors.fill: parent contentHeight: notificationColumn.implicitHeight clip: true diff --git a/quickshell/Modules/Lock/Widgets/LockPowerWidget.qml b/quickshell/Modules/Lock/Widgets/LockPowerWidget.qml index 210112d0c..c4d240952 100644 --- a/quickshell/Modules/Lock/Widgets/LockPowerWidget.qml +++ b/quickshell/Modules/Lock/Widgets/LockPowerWidget.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Common -import qs.Widgets -import qs.DankCommon.Session +import qs.DCommon.Widgets +import qs.DCommon.Session Item { id: root @@ -18,7 +18,7 @@ Item { implicitWidth: powerButton.width implicitHeight: powerButton.height - DankMaterialShape { + DMaterialShape { anchors.fill: powerButton visible: !root.round shape: root.shape diff --git a/quickshell/Modules/Notepad/Notepad.qml b/quickshell/Modules/Notepad/Notepad.qml index 289dc76a9..67182ed03 100644 --- a/quickshell/Modules/Notepad/Notepad.qml +++ b/quickshell/Modules/Notepad/Notepad.qml @@ -7,7 +7,7 @@ import qs.Common import qs.Modals.Common import qs.Modals.FileBrowser import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import "../../Common/Format.js" as Format Item { @@ -343,7 +343,7 @@ Item { Layout.fillWidth: true spacing: Theme.spacingM - DankIcon { + DIcon { Layout.alignment: Qt.AlignVCenter name: "sync_problem" size: Theme.iconSize - 2 @@ -361,7 +361,7 @@ Item { elide: Text.ElideRight } - DankActionButton { + DActionButton { Layout.alignment: Qt.AlignVCenter iconName: "close" Accessible.name: I18n.tr("Dismiss") @@ -835,7 +835,7 @@ Item { } } - DankActionButton { + DActionButton { anchors.top: parent.top anchors.right: parent.right anchors.topMargin: Theme.spacingM diff --git a/quickshell/Modules/Notepad/NotepadPopoutWindow.qml b/quickshell/Modules/Notepad/NotepadPopoutWindow.qml index d5399ddf9..e9893d6cd 100644 --- a/quickshell/Modules/Notepad/NotepadPopoutWindow.qml +++ b/quickshell/Modules/Notepad/NotepadPopoutWindow.qml @@ -1,6 +1,7 @@ import QtQuick import qs.Common import qs.Services +import qs.DCommon.Widgets import qs.Widgets import qs.Modules.Notepad @@ -42,7 +43,7 @@ DankFloatingWindow { Item { anchors.fill: parent - DankWindowHeader { + DWindowHeader { id: titleBar anchors.top: parent.top anchors.left: parent.left diff --git a/quickshell/Modules/Notepad/NotepadSettings.qml b/quickshell/Modules/Notepad/NotepadSettings.qml index e35f59b87..6415d8c0d 100644 --- a/quickshell/Modules/Notepad/NotepadSettings.qml +++ b/quickshell/Modules/Notepad/NotepadSettings.qml @@ -1,6 +1,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common +import qs.DCommon.Widgets import qs.Widgets Item { @@ -106,7 +107,7 @@ Item { z: parent.z - 1 } - DankFlickable { + DFlickable { id: settingsFlickable anchors.fill: parent clip: true @@ -142,7 +143,7 @@ Item { color: Theme.outlineHeavy } - DankToggle { + DToggle { anchors.left: parent.left anchors.leftMargin: -Theme.spacingM width: parent.width + Theme.spacingM @@ -154,7 +155,7 @@ Item { } } - DankToggle { + DToggle { anchors.left: parent.left anchors.leftMargin: -Theme.spacingM width: parent.width + Theme.spacingM @@ -166,7 +167,7 @@ Item { } } - DankToggle { + DToggle { anchors.left: parent.left anchors.leftMargin: -Theme.spacingM width: parent.width + Theme.spacingM @@ -201,7 +202,7 @@ Item { anchors.verticalCenter: parent.verticalCenter spacing: Theme.spacingM - DankIcon { + DIcon { name: "search" size: Theme.iconSize - 2 color: Theme.primary @@ -292,7 +293,7 @@ Item { spacing: Theme.spacingS anchors.verticalCenter: parent.verticalCenter - DankActionButton { + DActionButton { buttonSize: 32 iconName: "remove" Accessible.name: I18n.tr("Decrease") @@ -323,7 +324,7 @@ Item { } } - DankActionButton { + DActionButton { buttonSize: 32 iconName: "add" Accessible.name: I18n.tr("Increase") @@ -350,7 +351,7 @@ Item { width: parent.width spacing: Theme.spacingS - DankToggle { + DToggle { anchors.left: parent.left anchors.leftMargin: -Theme.spacingM width: parent.width + Theme.spacingM @@ -366,7 +367,7 @@ Item { } } - DankSlider { + DSlider { anchors.left: parent.left anchors.leftMargin: -Theme.spacingM width: parent.width + Theme.spacingM @@ -407,7 +408,7 @@ Item { color: Theme.surfaceText } - DankButtonGroup { + DButtonGroup { model: [I18n.tr("Slideout", "noun, notepad default mode option, side panel"), I18n.tr("Popout", "noun, option to open in a popout window")] size: "small" currentIndex: SettingsData.notepadDefaultMode === "popout" ? 1 : 0 @@ -431,7 +432,7 @@ Item { color: Theme.surfaceText } - DankButtonGroup { + DButtonGroup { model: [I18n.tr("Right"), I18n.tr("Left")] size: "small" currentIndex: SettingsData.notepadSlideoutSide === "left" ? 1 : 0 @@ -443,7 +444,7 @@ Item { } } - DankToggle { + DToggle { anchors.left: parent.left anchors.leftMargin: -Theme.spacingM width: parent.width + Theme.spacingM @@ -463,7 +464,7 @@ Item { color: Theme.surfaceText } - DankSlider { + DSlider { anchors.left: parent.left anchors.leftMargin: Theme.spacingXS width: parent.width - Theme.spacingXS * 2 @@ -515,7 +516,7 @@ Item { height: 36 spacing: Theme.spacingS - DankIcon { + DIcon { name: root.shortcutsExpanded ? "expand_less" : "expand_more" size: Theme.iconSizeSmall color: Theme.surfaceText diff --git a/quickshell/Modules/Notepad/NotepadTabs.qml b/quickshell/Modules/Notepad/NotepadTabs.qml index 32a4550ca..1cd2a8000 100644 --- a/quickshell/Modules/Notepad/NotepadTabs.qml +++ b/quickshell/Modules/Notepad/NotepadTabs.qml @@ -3,7 +3,7 @@ import QtQuick import QtQuick.Controls import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets Column { id: root @@ -172,7 +172,7 @@ Column { anchors.verticalCenter: parent.verticalCenter } - DankTextField { + DTextField { id: renameField visible: delegateItem.editing enabled: delegateItem.editing @@ -231,7 +231,7 @@ Column { visible: NotepadStorageService.tabs.length > 1 && !delegateItem.editing anchors.verticalCenter: parent.verticalCenter - DankIcon { + DIcon { name: "close" size: 14 color: Theme.surfaceTextMedium @@ -338,7 +338,7 @@ Column { } } - DankTooltipHost { + DTooltipHost { text: tabText.truncated ? (delegateItem.modelData.title || "Untitled") : "" target: delegateItem hoverArea: tabMouseArea @@ -348,7 +348,7 @@ Column { } } - DankActionButton { + DActionButton { id: newTabButton width: 32 height: 32 diff --git a/quickshell/Modules/Notepad/NotepadTextEditor.qml b/quickshell/Modules/Notepad/NotepadTextEditor.qml index b1b536ca5..7ee4ad57c 100644 --- a/quickshell/Modules/Notepad/NotepadTextEditor.qml +++ b/quickshell/Modules/Notepad/NotepadTextEditor.qml @@ -6,7 +6,7 @@ import QtQuick.Layouts import Quickshell.Io import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets Column { id: root @@ -390,7 +390,7 @@ Column { anchors.rightMargin: Theme.spacingM spacing: Theme.spacingS - DankSearchField { + DSearchField { id: searchField Layout.fillWidth: true Layout.alignment: Qt.AlignVCenter @@ -458,7 +458,7 @@ Column { } // Navigation buttons - DankActionButton { + DActionButton { id: prevButton Layout.alignment: Qt.AlignVCenter iconName: "keyboard_arrow_up" @@ -469,7 +469,7 @@ Column { onClicked: root.findPrevious() } - DankActionButton { + DActionButton { id: nextButton Layout.alignment: Qt.AlignVCenter iconName: "keyboard_arrow_down" @@ -480,7 +480,7 @@ Column { onClicked: root.findNext() } - DankActionButton { + DActionButton { id: closeSearchButton Layout.alignment: Qt.AlignVCenter iconName: "close" @@ -514,7 +514,7 @@ Column { Layout.preferredWidth: inlinePreviewVisible ? parent.width * 0.55 : parent.width clip: true - DankFlickable { + DFlickable { id: flickable anchors.fill: parent clip: true @@ -594,7 +594,7 @@ Column { topPadding: Theme.spacingM rightPadding: Theme.spacingM bottomPadding: Theme.spacingM - cursorDelegate: DankTextCursor { + cursorDelegate: DTextCursor { id: notepadCursor width: 1.5 color: Theme.surfaceText @@ -742,7 +742,7 @@ Column { spacing: Theme.spacingS // Copy plain text button - DankActionButton { + DActionButton { iconName: "content_copy" Accessible.name: I18n.tr("Copy Text") iconSize: Theme.iconSize - 4 @@ -765,7 +765,7 @@ Column { } // Copy HTML button - DankActionButton { + DActionButton { iconName: "code" Accessible.name: I18n.tr("Copy HTML") iconSize: Theme.iconSize - 4 @@ -782,7 +782,7 @@ Column { } } - DankFlickable { + DFlickable { id: previewFlickable anchors.top: previewHeader.bottom anchors.left: parent.left @@ -829,7 +829,7 @@ Column { Row { spacing: Theme.spacingS - DankActionButton { + DActionButton { iconName: "save" Accessible.name: I18n.tr("Save") iconSize: Theme.iconSize - 2 @@ -847,7 +847,7 @@ Column { Row { spacing: Theme.spacingS - DankActionButton { + DActionButton { iconName: "folder_open" Accessible.name: I18n.tr("Open") iconSize: Theme.iconSize - 2 @@ -864,7 +864,7 @@ Column { Row { spacing: Theme.spacingS - DankActionButton { + DActionButton { iconName: "note_add" Accessible.name: I18n.tr("New") iconSize: Theme.iconSize - 2 @@ -882,7 +882,7 @@ Column { Row { spacing: Theme.spacingS visible: PluginService.isPluginLoaded("dankNotepadModule") - DankActionButton { + DActionButton { iconName: inlinePreviewVisible ? "visibility" : "visibility_off" Accessible.name: I18n.tr("Preview") iconSize: Theme.iconSize - 2 @@ -905,7 +905,7 @@ Column { anchors.verticalCenter: parent.verticalCenter spacing: Theme.spacingS - DankActionButton { + DActionButton { visible: !root.inPopout iconName: "open_in_new" tooltipText: I18n.tr("Open as window") @@ -914,7 +914,7 @@ Column { onClicked: root.popoutRequested() } - DankActionButton { + DActionButton { visible: root.inPopout iconName: "dock_to_right" tooltipText: I18n.tr("Dock") @@ -923,7 +923,7 @@ Column { onClicked: root.dockRequested() } - DankActionButton { + DActionButton { iconName: "more_horiz" tooltipText: I18n.tr("Settings") iconSize: Theme.iconSize - 2 @@ -955,7 +955,7 @@ Column { anchors.rightMargin: Theme.spacingM spacing: Theme.spacingS - DankIcon { + DIcon { name: currentTab && currentTab.isTemporary ? "draft" : "description" size: Theme.iconSize - 4 color: Theme.surfaceVariantText @@ -971,7 +971,7 @@ Column { anchors.verticalCenter: parent.verticalCenter } - DankActionButton { + DActionButton { id: copyPathButton iconName: "content_copy" Accessible.name: I18n.tr("Copy path") @@ -1049,7 +1049,7 @@ Column { } } - DankActionButton { + DActionButton { anchors.verticalCenter: parent.verticalCenter iconName: "info" tooltipText: I18n.tr("File info") diff --git a/quickshell/Modules/Notifications/Center/HistoryNotificationList.qml b/quickshell/Modules/Notifications/Center/HistoryNotificationList.qml index 6d71fe8e4..4698c446d 100644 --- a/quickshell/Modules/Notifications/Center/HistoryNotificationList.qml +++ b/quickshell/Modules/Notifications/Center/HistoryNotificationList.qml @@ -1,10 +1,10 @@ import QtQuick import qs.Modules.Notifications -import qs.DankCommon.Common as DC +import qs.DCommon.Common as DC import Quickshell import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets Item { id: root @@ -223,7 +223,7 @@ Item { anchors.fill: parent spacing: Theme.spacingS - DankFilterChips { + DFilterChips { id: filterChips width: parent.width currentIndex: root.getChipIndex() @@ -236,7 +236,7 @@ Item { } } - DankListView { + DListView { id: historyListView x: -root.swipeBleed width: parent.width + root.swipeBleed * 2 diff --git a/quickshell/Modules/Notifications/Center/KeyboardNavigatedNotificationList.qml b/quickshell/Modules/Notifications/Center/KeyboardNavigatedNotificationList.qml index 838c651b9..44de44ea2 100644 --- a/quickshell/Modules/Notifications/Center/KeyboardNavigatedNotificationList.qml +++ b/quickshell/Modules/Notifications/Center/KeyboardNavigatedNotificationList.qml @@ -2,12 +2,12 @@ import QtQuick import "." as Center import Quickshell import qs.Modules.Notifications -import qs.DankCommon.Common as DC +import qs.DCommon.Common as DC import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets -DankListView { +DListView { id: listView property var keyboardController: null diff --git a/quickshell/Modules/Notifications/Center/NotificationCard.qml b/quickshell/Modules/Notifications/Center/NotificationCard.qml index ef83b6033..4e4788d9a 100644 --- a/quickshell/Modules/Notifications/Center/NotificationCard.qml +++ b/quickshell/Modules/Notifications/Center/NotificationCard.qml @@ -2,6 +2,7 @@ import QtQuick import Quickshell import qs.Common import qs.Services +import qs.DCommon.Widgets import qs.Widgets import qs.Modules.Notifications import qs.Modules.Notifications as Notifications @@ -146,7 +147,7 @@ Item { anchors.rightMargin: NotificationMetrics.cardPadding anchors.verticalCenter: parent.verticalCenter spacing: Theme.spacingXS - DankButton { + DButton { anchors.verticalCenter: parent.verticalCenter text: I18n.tr("Dismiss") buttonHeight: NotificationMetrics.controlSize @@ -155,7 +156,7 @@ Item { textColor: Theme.primary onClicked: NotificationService.dismissGroup(root.notificationGroup?.key || "") } - DankButton { + DButton { anchors.verticalCenter: parent.verticalCenter text: (root.notificationGroup?.count || 0).toString() iconName: "expand_less" diff --git a/quickshell/Modules/Notifications/Center/NotificationEmptyState.qml b/quickshell/Modules/Notifications/Center/NotificationEmptyState.qml index 6a5a81112..57cb4ec12 100644 --- a/quickshell/Modules/Notifications/Center/NotificationEmptyState.qml +++ b/quickshell/Modules/Notifications/Center/NotificationEmptyState.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets Item { id: root @@ -14,7 +14,7 @@ Item { width: parent.width spacing: Theme.spacingM - DankIcon { + DIcon { anchors.horizontalCenter: parent.horizontalCenter name: "emoji_events" size: Theme.iconSizeLarge + Theme.spacingL diff --git a/quickshell/Modules/Notifications/Center/NotificationHeader.qml b/quickshell/Modules/Notifications/Center/NotificationHeader.qml index db47ac8e0..cbbcdd3e1 100644 --- a/quickshell/Modules/Notifications/Center/NotificationHeader.qml +++ b/quickshell/Modules/Notifications/Center/NotificationHeader.qml @@ -1,6 +1,7 @@ import QtQuick import qs.Common import qs.Services +import qs.DCommon.Widgets import qs.Widgets import qs.Modules.Notifications @@ -63,7 +64,7 @@ Item { anchors.verticalCenter: parent.verticalCenter spacing: Theme.spacingXS - DankActionButton { + DActionButton { id: dndButton iconName: SessionData.doNotDisturb ? "notifications_off" : "notifications" buttonSize: Theme.buttonHeightXS @@ -76,7 +77,7 @@ Item { } } - DankActionButton { + DActionButton { readonly property bool hintsShown: root.hintsOwner?.showKeyboardHints ?? false visible: root.hintsOwner !== null @@ -89,7 +90,7 @@ Item { } } - DankButtonGroup { + DButtonGroup { id: tabs anchors.left: leadingActions.right anchors.right: actions.left @@ -124,13 +125,13 @@ Item { anchors.verticalCenter: parent.verticalCenter spacing: Theme.spacingXS - DankActionButton { + DActionButton { iconName: "settings" buttonSize: Theme.buttonHeightXS tooltipText: I18n.tr("Settings") onClicked: root.settingsRequested() } - DankActionButton { + DActionButton { iconName: "delete_sweep" buttonSize: Theme.buttonHeightXS tooltipText: I18n.tr("Clear All") @@ -145,7 +146,7 @@ Item { NotificationService.clearHistory(); } } - DankActionButton { + DActionButton { visible: root.modal iconName: "close" buttonSize: Theme.buttonHeightXS diff --git a/quickshell/Modules/Notifications/NotificationCard.qml b/quickshell/Modules/Notifications/NotificationCard.qml index e50c3094d..01ecfb6be 100644 --- a/quickshell/Modules/Notifications/NotificationCard.qml +++ b/quickshell/Modules/Notifications/NotificationCard.qml @@ -3,7 +3,7 @@ import Quickshell.Widgets import Quickshell.Services.Notifications import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets Rectangle { id: root @@ -241,7 +241,7 @@ Rectangle { } } - DankButton { + DButton { visible: root.interactive && root.groupCount > 1 text: root.groupCount.toString() iconName: root.groupExpanded ? "expand_less" : "expand_more" @@ -253,7 +253,7 @@ Rectangle { onClicked: root.groupToggleRequested() } - DankActionButton { + DActionButton { visible: root.interactive && root.canExpand && root.groupCount <= 1 iconName: root.descriptionExpanded ? "expand_less" : "expand_more" backgroundColor: root.chipColor @@ -264,7 +264,7 @@ Rectangle { onClicked: root.expandRequested() } - DankActionButton { + DActionButton { visible: root.interactive && root.showClose iconName: "close" buttonSize: NotificationMetrics.controlSize @@ -391,7 +391,7 @@ Rectangle { Repeater { model: root.showActions ? (root.notificationData?.actions || []) : [] - DankButton { + DButton { required property var modelData required property int index text: (modelData.text || I18n.tr("Open")) + (root.keyboardHints && index < 9 ? " (" + (index + 1) + ")" : "") @@ -406,7 +406,7 @@ Rectangle { } } - DankButton { + DButton { visible: root.showDismiss text: root.dismissText maximumWidth: actions.width diff --git a/quickshell/Modules/Notifications/Popup/NotificationPopup.qml b/quickshell/Modules/Notifications/Popup/NotificationPopup.qml index cfe7c5e82..4c176dc0d 100644 --- a/quickshell/Modules/Notifications/Popup/NotificationPopup.qml +++ b/quickshell/Modules/Notifications/Popup/NotificationPopup.qml @@ -6,7 +6,9 @@ import Quickshell.Services.Notifications import qs.Common import qs.Modules.Notifications import qs.Services +import qs.DCommon.Widgets import qs.Widgets +import qs.DCommon.Common as DCommon PanelWindow { id: win @@ -690,7 +692,7 @@ PanelWindow { radius: cardSurface.radius color: "transparent" - DankFlickable { + DFlickable { anchors.fill: parent anchors.bottomMargin: win.timeoutRailClearance contentHeight: notificationCard.targetHeight @@ -890,7 +892,7 @@ PanelWindow { ] } - DankAnim { + DCommon.DAnim { id: enterAnimation target: win property: "presentationProgress" @@ -906,7 +908,7 @@ PanelWindow { SequentialAnimation { id: exitAnim - DankAnim { + DCommon.DAnim { target: win property: "presentationProgress" to: 0 @@ -914,7 +916,7 @@ PanelWindow { easing.bezierCurve: NotificationMetrics.exitCurve } - DankAnim { + DCommon.DAnim { target: win property: "chromeRelease" to: 1 diff --git a/quickshell/Modules/OSD/AudioOutputOSD.qml b/quickshell/Modules/OSD/AudioOutputOSD.qml index 5f9a8e041..09f6d8382 100644 --- a/quickshell/Modules/OSD/AudioOutputOSD.qml +++ b/quickshell/Modules/OSD/AudioOutputOSD.qml @@ -1,6 +1,7 @@ import QtQuick import qs.Common import qs.Services +import qs.DCommon.Widgets import qs.Widgets DankOSD { diff --git a/quickshell/Modules/OSD/MediaPlaybackOSD.qml b/quickshell/Modules/OSD/MediaPlaybackOSD.qml index 3a74c3b43..2476c5d1b 100644 --- a/quickshell/Modules/OSD/MediaPlaybackOSD.qml +++ b/quickshell/Modules/OSD/MediaPlaybackOSD.qml @@ -2,6 +2,7 @@ import QtQuick import QtQuick.Effects import qs.Common import qs.Services +import qs.DCommon.Widgets import qs.Widgets import Quickshell.Services.Mpris import Quickshell.Widgets @@ -274,7 +275,7 @@ DankOSD { anchors.verticalCenter: parent.verticalCenter spacing: Theme.spacingXXS - DankActionButton { + DActionButton { buttonSize: Theme.buttonHeightXS anchors.verticalCenter: parent.verticalCenter objectName: "previousTrack" @@ -289,7 +290,7 @@ DankOSD { } } - DankIconButton { + DIconButton { width: Theme.buttonHeightS buttonSize: Theme.buttonHeightS variant: "filled" @@ -308,7 +309,7 @@ DankOSD { } } - DankActionButton { + DActionButton { buttonSize: Theme.buttonHeightXS anchors.verticalCenter: parent.verticalCenter iconName: "skip_next" @@ -357,7 +358,7 @@ DankOSD { Component { id: verticalContent - DankIconButton { + DIconButton { anchors.fill: parent size: "m" round: false diff --git a/quickshell/Modules/OSD/OsdDetailSheet.qml b/quickshell/Modules/OSD/OsdDetailSheet.qml index 9625a1341..057f836f9 100644 --- a/quickshell/Modules/OSD/OsdDetailSheet.qml +++ b/quickshell/Modules/OSD/OsdDetailSheet.qml @@ -5,7 +5,7 @@ import qs.Common import qs.Modules.ControlCenter import qs.Modules.ControlCenter.Details import qs.Services -import qs.Widgets +import qs.DCommon.Widgets FocusScope { id: root @@ -47,7 +47,7 @@ FocusScope { horizontalAlignment: Text.AlignLeft } - DankActionButton { + DActionButton { id: settingsButton anchors.right: parent.right diff --git a/quickshell/Modules/OSD/OsdIcon.qml b/quickshell/Modules/OSD/OsdIcon.qml index 95e49c287..c9979c108 100644 --- a/quickshell/Modules/OSD/OsdIcon.qml +++ b/quickshell/Modules/OSD/OsdIcon.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets Loader { id: root @@ -24,7 +24,7 @@ Loader { Component { id: action - DankActionButton { + DActionButton { buttonSize: root.width iconName: root.iconName iconSize: root.glyphSize @@ -43,7 +43,7 @@ Loader { radius: Theme.fullRadius(width, height) color: !root.tonal ? "transparent" : root.available ? root.backgroundColor : Theme.onSurface_12 - DankIcon { + DIcon { anchors.centerIn: parent name: root.iconName size: root.glyphSize diff --git a/quickshell/Modules/OSD/OsdLevelRow.qml b/quickshell/Modules/OSD/OsdLevelRow.qml index 19d6a468c..57d1a597f 100644 --- a/quickshell/Modules/OSD/OsdLevelRow.qml +++ b/quickshell/Modules/OSD/OsdLevelRow.qml @@ -2,7 +2,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets Item { id: root @@ -77,7 +77,7 @@ Item { width: Math.max(0, root.vertical ? parent.width - root.effectiveHorizontalPadding * 2 : parent.width - root.endPadding * 2 - icon.width - root.itemSpacing - root.valueExtent) height: Math.max(0, root.vertical ? parent.height - y - root.endPadding - root.valueExtent : parent.height) - DankSlider { + DSlider { id: levelSlider anchors.centerIn: parent diff --git a/quickshell/Modules/OSD/WorkspaceOSD.qml b/quickshell/Modules/OSD/WorkspaceOSD.qml index 85b14802c..ce80ff3f2 100644 --- a/quickshell/Modules/OSD/WorkspaceOSD.qml +++ b/quickshell/Modules/OSD/WorkspaceOSD.qml @@ -4,6 +4,7 @@ import Quickshell import Quickshell.WindowManager import qs.Common import qs.Services +import qs.DCommon.Widgets import qs.Widgets DankOSD { diff --git a/quickshell/Modules/Plugins/ColorSetting.qml b/quickshell/Modules/Plugins/ColorSetting.qml index eb203b452..c7b48316d 100644 --- a/quickshell/Modules/Plugins/ColorSetting.qml +++ b/quickshell/Modules/Plugins/ColorSetting.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import "../../Common/QmlUtils.js" as QmlUtils Column { diff --git a/quickshell/Modules/Plugins/DesktopWidgetGridHint.qml b/quickshell/Modules/Plugins/DesktopWidgetGridHint.qml index 4edb6c000..6feebc67f 100644 --- a/quickshell/Modules/Plugins/DesktopWidgetGridHint.qml +++ b/quickshell/Modules/Plugins/DesktopWidgetGridHint.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets Rectangle { id: root @@ -23,7 +23,7 @@ Rectangle { spacing: Theme.spacingS anchors.verticalCenter: parent.verticalCenter - DankIcon { + DIcon { name: "grid_on" size: Theme.iconSizeSmall color: root.gridEnabled ? Theme.primary : Theme.surfaceText @@ -38,7 +38,7 @@ Rectangle { anchors.verticalCenter: parent.verticalCenter } - DankKeycap { + DKeycap { text: "G" anchors.verticalCenter: parent.verticalCenter } @@ -55,7 +55,7 @@ Rectangle { spacing: Theme.spacingS anchors.verticalCenter: parent.verticalCenter - DankKeycap { + DKeycap { text: "Z" anchors.verticalCenter: parent.verticalCenter } @@ -70,7 +70,7 @@ Rectangle { anchors.verticalCenter: parent.verticalCenter } - DankKeycap { + DKeycap { text: "X" anchors.verticalCenter: parent.verticalCenter } diff --git a/quickshell/Modules/Plugins/ListSetting.qml b/quickshell/Modules/Plugins/ListSetting.qml index a3684c6a5..d089e1794 100644 --- a/quickshell/Modules/Plugins/ListSetting.qml +++ b/quickshell/Modules/Plugins/ListSetting.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets import "../../Common/QmlUtils.js" as QmlUtils Column { diff --git a/quickshell/Modules/Plugins/ListSettingRemoveButton.qml b/quickshell/Modules/Plugins/ListSettingRemoveButton.qml index 61396dba0..f3fefe0ae 100644 --- a/quickshell/Modules/Plugins/ListSettingRemoveButton.qml +++ b/quickshell/Modules/Plugins/ListSettingRemoveButton.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets Rectangle { id: root diff --git a/quickshell/Modules/Plugins/ListSettingWithInput.qml b/quickshell/Modules/Plugins/ListSettingWithInput.qml index 60af5ff3a..86ec436ac 100644 --- a/quickshell/Modules/Plugins/ListSettingWithInput.qml +++ b/quickshell/Modules/Plugins/ListSettingWithInput.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets ListSetting { id: root @@ -36,7 +36,7 @@ ListSetting { Repeater { model: root.fields - DankTextField { + DTextField { width: modelData.width || 200 placeholderText: modelData.placeholder || "" @@ -46,7 +46,7 @@ ListSetting { } } - DankButton { + DButton { id: addButton width: 50 height: 36 diff --git a/quickshell/Modules/Plugins/PluginComponent.qml b/quickshell/Modules/Plugins/PluginComponent.qml index 813c09ff6..f70dafb1a 100644 --- a/quickshell/Modules/Plugins/PluginComponent.qml +++ b/quickshell/Modules/Plugins/PluginComponent.qml @@ -366,6 +366,7 @@ Item { PluginPopout { id: pluginPopout + pluginId: root.pluginId contentWidth: root.popoutWidth contentHeight: root.popoutHeight pluginContent: root.popoutContent diff --git a/quickshell/Modules/Plugins/PluginPopout.qml b/quickshell/Modules/Plugins/PluginPopout.qml index 8fcf31669..9aa8787bc 100644 --- a/quickshell/Modules/Plugins/PluginPopout.qml +++ b/quickshell/Modules/Plugins/PluginPopout.qml @@ -7,6 +7,7 @@ DankPopout { layerNamespace: "dms:plugins:" + layerNamespacePlugin + property string pluginId: "" property var triggerScreen: null property Component pluginContent: null property real contentWidth: 400 @@ -59,6 +60,7 @@ DankPopout { Loader { id: popoutContentLoader + property string pluginId: root.pluginId width: parent.width sourceComponent: root.pluginContent diff --git a/quickshell/Modules/Plugins/PluginSettings.qml b/quickshell/Modules/Plugins/PluginSettings.qml index 9b1d3c1fc..ae1640b5d 100644 --- a/quickshell/Modules/Plugins/PluginSettings.qml +++ b/quickshell/Modules/Plugins/PluginSettings.qml @@ -2,7 +2,7 @@ import QtQuick import Quickshell import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets Item { id: root @@ -252,7 +252,7 @@ Item { wrapMode: Text.WordWrap } - DankToggle { + DToggle { width: parent.width text: I18n.tr("All displays") checked: { @@ -279,7 +279,7 @@ Item { Repeater { model: Quickshell.screens - DankToggle { + DToggle { required property var modelData width: parent.width text: SettingsData.getScreenDisplayName(modelData) diff --git a/quickshell/Modules/Plugins/PopoutComponent.qml b/quickshell/Modules/Plugins/PopoutComponent.qml index 2f3e04660..fe14674eb 100644 --- a/quickshell/Modules/Plugins/PopoutComponent.qml +++ b/quickshell/Modules/Plugins/PopoutComponent.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets Column { id: root diff --git a/quickshell/Modules/Plugins/SliderSetting.qml b/quickshell/Modules/Plugins/SliderSetting.qml index 15fd586c3..fa289acd4 100644 --- a/quickshell/Modules/Plugins/SliderSetting.qml +++ b/quickshell/Modules/Plugins/SliderSetting.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets import "../../Common/QmlUtils.js" as QmlUtils Column { @@ -57,7 +57,7 @@ Column { visible: root.description !== "" } - DankSlider { + DSlider { upDownKeysStep: false width: parent.width value: root.value diff --git a/quickshell/Modules/Plugins/StringSetting.qml b/quickshell/Modules/Plugins/StringSetting.qml index da0dc42d7..c8d6d561c 100644 --- a/quickshell/Modules/Plugins/StringSetting.qml +++ b/quickshell/Modules/Plugins/StringSetting.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets import "../../Common/QmlUtils.js" as QmlUtils Column { @@ -61,7 +61,7 @@ Column { visible: root.description !== "" } - DankTextField { + DTextField { id: textField width: parent.width placeholderText: root.placeholder diff --git a/quickshell/Modules/Plugins/ToggleSetting.qml b/quickshell/Modules/Plugins/ToggleSetting.qml index 03955975e..dac0efeca 100644 --- a/quickshell/Modules/Plugins/ToggleSetting.qml +++ b/quickshell/Modules/Plugins/ToggleSetting.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets import "../../Common/QmlUtils.js" as QmlUtils Row { @@ -61,7 +61,7 @@ Row { } } - DankToggle { + DToggle { id: toggle anchors.verticalCenter: parent.verticalCenter checked: root.value diff --git a/quickshell/Modules/Plugins/WidgetEditLayer.qml b/quickshell/Modules/Plugins/WidgetEditLayer.qml index dbcbc2d2c..919ba9e81 100644 --- a/quickshell/Modules/Plugins/WidgetEditLayer.qml +++ b/quickshell/Modules/Plugins/WidgetEditLayer.qml @@ -5,7 +5,7 @@ import Quickshell import qs.Common import qs.Services import "../../Common/WidgetPlacement.js" as Placement -import qs.DankCommon.Session +import qs.DCommon.Session FocusScope { id: root diff --git a/quickshell/Modules/Plugins/WidgetEditorOverlay.qml b/quickshell/Modules/Plugins/WidgetEditorOverlay.qml index d763f3927..5155c6b6d 100644 --- a/quickshell/Modules/Plugins/WidgetEditorOverlay.qml +++ b/quickshell/Modules/Plugins/WidgetEditorOverlay.qml @@ -3,7 +3,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.ControlCenter.Widgets import qs.Modules.DankDash.Overview import qs.Modules.Settings.DesktopWidgetSettings @@ -108,7 +108,7 @@ FocusScope { } } - DankBottomSheet { + DBottomSheet { id: optionsSheet property string instanceId: "" @@ -150,7 +150,7 @@ FocusScope { anchors.centerIn: parent spacing: Theme.spacingS - DankIcon { + DIcon { anchors.verticalCenter: parent.verticalCenter name: root.greeter ? "login" : "lock" size: Theme.iconSizeMedium diff --git a/quickshell/Modules/PowerMenu/PowerMenuContent.qml b/quickshell/Modules/PowerMenu/PowerMenuContent.qml index 41dfc3449..3f3ce0bd1 100644 --- a/quickshell/Modules/PowerMenu/PowerMenuContent.qml +++ b/quickshell/Modules/PowerMenu/PowerMenuContent.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Common import qs.Services -import qs.DankCommon.Session +import qs.DCommon.Session FocusScope { id: root diff --git a/quickshell/Modules/ProcessList/DisksView.qml b/quickshell/Modules/ProcessList/DisksView.qml index 434fd9f60..59d942a64 100644 --- a/quickshell/Modules/ProcessList/DisksView.qml +++ b/quickshell/Modules/ProcessList/DisksView.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Layouts import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import "../../Common/Format.js" as Format Item { @@ -38,7 +38,7 @@ Item { Row { spacing: Theme.spacingS - DankIcon { + DIcon { name: "storage" size: Theme.iconSize color: Theme.primary @@ -113,7 +113,7 @@ Item { Row { spacing: Theme.spacingS - DankIcon { + DIcon { name: "folder" size: Theme.iconSize - 2 color: Theme.secondary @@ -135,7 +135,7 @@ Item { color: Theme.outlineLight } - DankListView { + DListView { id: mountListView Layout.fillWidth: true @@ -177,7 +177,7 @@ Item { Row { spacing: Theme.spacingS - DankIcon { + DIcon { name: { const mp = modelData?.mount ?? ""; if (mp === "/") @@ -317,7 +317,7 @@ Item { anchors.centerIn: parent spacing: Theme.spacingM - DankIcon { + DIcon { name: "storage" size: 32 color: Theme.surfaceVariantText diff --git a/quickshell/Modules/ProcessList/PerformanceCard.qml b/quickshell/Modules/ProcessList/PerformanceCard.qml index 7567b8b42..5a4568186 100644 --- a/quickshell/Modules/ProcessList/PerformanceCard.qml +++ b/quickshell/Modules/ProcessList/PerformanceCard.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Layouts import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets Rectangle { id: card @@ -129,7 +129,7 @@ Rectangle { Layout.fillWidth: true spacing: Theme.spacingS - DankIcon { + DIcon { name: card.icon size: Theme.iconSize color: card.accentColor diff --git a/quickshell/Modules/ProcessList/PerformanceView.qml b/quickshell/Modules/ProcessList/PerformanceView.qml index 28bacd0f7..051ded2fd 100644 --- a/quickshell/Modules/ProcessList/PerformanceView.qml +++ b/quickshell/Modules/ProcessList/PerformanceView.qml @@ -2,7 +2,6 @@ import QtQuick import QtQuick.Layouts import qs.Common import qs.Services -import qs.Widgets import "../../Common/Format.js" as Format Item { diff --git a/quickshell/Modules/ProcessList/ProcessContextMenu.qml b/quickshell/Modules/ProcessList/ProcessContextMenu.qml index 21b0eb630..b32214ec9 100644 --- a/quickshell/Modules/ProcessList/ProcessContextMenu.qml +++ b/quickshell/Modules/ProcessList/ProcessContextMenu.qml @@ -3,7 +3,7 @@ import QtQuick.Controls import Quickshell import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modals.Common Popup { @@ -374,7 +374,7 @@ Popup { anchors.verticalCenter: parent.verticalCenter spacing: Theme.spacingS - DankIcon { + DIcon { name: modelData.icon || "" size: Theme.iconSizeSmall color: { @@ -406,7 +406,7 @@ Popup { } } - DankRipple { + DRipple { id: menuItemRipple rippleColor: modelData.dangerous ? Theme.error : Theme.surfaceText cornerRadius: menuItem.radius diff --git a/quickshell/Modules/ProcessList/ProcessFilterChips.qml b/quickshell/Modules/ProcessList/ProcessFilterChips.qml index 03e56397a..7cbe01a8e 100644 --- a/quickshell/Modules/ProcessList/ProcessFilterChips.qml +++ b/quickshell/Modules/ProcessList/ProcessFilterChips.qml @@ -1,8 +1,8 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets -DankFilterChips { +DFilterChips { multiSelect: true model: [ { diff --git a/quickshell/Modules/ProcessList/ProcessListPopout.qml b/quickshell/Modules/ProcessList/ProcessListPopout.qml index 3769df4df..e7474066e 100644 --- a/quickshell/Modules/ProcessList/ProcessListPopout.qml +++ b/quickshell/Modules/ProcessList/ProcessListPopout.qml @@ -3,6 +3,7 @@ import QtQuick.Layouts import qs.Common import qs.Modules.ProcessList import qs.Services +import qs.DCommon.Widgets import qs.Widgets DankPopout { @@ -130,7 +131,7 @@ DankPopout { Layout.fillWidth: true spacing: Theme.spacingM - DankSearchField { + DSearchField { id: searchField Layout.fillWidth: true Layout.minimumWidth: Theme.fontSizeMedium * 8 diff --git a/quickshell/Modules/ProcessList/ProcessRow.qml b/quickshell/Modules/ProcessList/ProcessRow.qml index dbacabf36..06061b852 100644 --- a/quickshell/Modules/ProcessList/ProcessRow.qml +++ b/quickshell/Modules/ProcessList/ProcessRow.qml @@ -3,10 +3,10 @@ import QtQuick.Layouts import Quickshell import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import "../../Common/Format.js" as Format -DankListItem { +DListItem { id: root required property var process @@ -50,7 +50,7 @@ DankListItem { height: root.rowHeight spacing: Theme.spacingS - DankIcon { + DIcon { name: root.processIcon(root.command) size: Theme.iconSize color: root.contentColor @@ -131,7 +131,7 @@ DankListItem { Layout.maximumWidth: ProcessListMetrics.actionColumnWidth Layout.preferredHeight: Theme.iconButtonSize - DankActionButton { + DActionButton { anchors.centerIn: parent iconName: "close" iconColor: root.contentColor @@ -167,7 +167,7 @@ DankListItem { wrapMode: Text.WrapAnywhere } - DankActionButton { + DActionButton { iconName: "content_copy" iconColor: root.contentColor tooltipText: I18n.tr("Copy Full Command") diff --git a/quickshell/Modules/ProcessList/ProcessSystemHeader.qml b/quickshell/Modules/ProcessList/ProcessSystemHeader.qml index 7824e140b..147d5bd9b 100644 --- a/quickshell/Modules/ProcessList/ProcessSystemHeader.qml +++ b/quickshell/Modules/ProcessList/ProcessSystemHeader.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Layouts import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets RowLayout { spacing: Theme.spacingS diff --git a/quickshell/Modules/ProcessList/ProcessesView.qml b/quickshell/Modules/ProcessList/ProcessesView.qml index 5e54a872b..1b9b209f9 100644 --- a/quickshell/Modules/ProcessList/ProcessesView.qml +++ b/quickshell/Modules/ProcessList/ProcessesView.qml @@ -3,9 +3,9 @@ import QtQuick.Layouts import Quickshell import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets -DankCard { +DCard { id: root pad: Theme.spacingS @@ -285,7 +285,7 @@ DankCard { Layout.preferredHeight: ProcessListMetrics.headerHeight spacing: Theme.spacingS - DankButtonGroup { + DButtonGroup { id: sortChips Layout.fillWidth: true readonly property var sortKeys: ["name", "cpu", "memory", "pid"] @@ -309,7 +309,7 @@ DankCard { } } - DankActionButton { + DActionButton { id: sortDirection KeyNavigation.tab: processListView.currentItem ?? processListView iconName: parent.ascending ? "arrow_upward" : "arrow_downward" @@ -318,7 +318,7 @@ DankCard { } } - DankListView { + DListView { id: processListView Layout.fillWidth: true Layout.fillHeight: true diff --git a/quickshell/Modules/ProcessList/SystemView.qml b/quickshell/Modules/ProcessList/SystemView.qml index cbe9d200b..3c79f26fc 100644 --- a/quickshell/Modules/ProcessList/SystemView.qml +++ b/quickshell/Modules/ProcessList/SystemView.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Layouts import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets Item { id: root @@ -34,7 +34,7 @@ Item { Row { spacing: Theme.spacingS - DankIcon { + DIcon { name: "computer" size: Theme.iconSize color: Theme.primary @@ -108,7 +108,7 @@ Item { Row { spacing: Theme.spacingS - DankIcon { + DIcon { name: "developer_board" size: Theme.iconSize color: Theme.secondary @@ -130,7 +130,7 @@ Item { color: Theme.outlineLight } - DankListView { + DListView { id: gpuListView Layout.fillWidth: true @@ -181,7 +181,7 @@ Item { anchors.margins: Theme.spacingM spacing: Theme.spacingM - DankIcon { + DIcon { name: "developer_board" size: Theme.iconSize + 4 color: { @@ -253,7 +253,7 @@ Item { anchors.centerIn: parent spacing: Theme.spacingXS - DankIcon { + DIcon { name: "thermostat" size: 16 color: { @@ -341,7 +341,7 @@ Item { anchors.centerIn: parent spacing: Theme.spacingM - DankIcon { + DIcon { name: "developer_board_off" size: 32 color: Theme.surfaceVariantText diff --git a/quickshell/Modules/Settings/AboutTab.qml b/quickshell/Modules/Settings/AboutTab.qml index e368089cf..ba59eb62f 100644 --- a/quickshell/Modules/Settings/AboutTab.qml +++ b/quickshell/Modules/Settings/AboutTab.qml @@ -1,9 +1,9 @@ import QtQuick import QtQuick.Effects import qs.Common -import qs.DankCommon.Common as DankCommon +import qs.DCommon.Common as DCommon import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets Item { @@ -176,7 +176,7 @@ Item { text: "DANK LINUX" font.pixelSize: parent.compactLogo ? 32 : 48 font.weight: Theme.fontWeightMedium - font.family: DankCommon.Fonts.sans + font.family: DCommon.Fonts.sans color: Theme.surfaceText antialiasing: true } @@ -217,7 +217,7 @@ Item { property bool compactMode: parent.width < 450 - DankButton { + DButton { id: docsButton tooltipText: resourceButtonsRow.compactMode ? I18n.tr("Docs") + " - " + Site.domain + "/docs" : Site.domain + "/docs" text: resourceButtonsRow.compactMode ? "" : I18n.tr("Docs") @@ -228,7 +228,7 @@ Item { onClicked: Qt.openUrlExternally(Site.docs) } - DankButton { + DButton { id: pluginsButton tooltipText: resourceButtonsRow.compactMode ? I18n.tr("Plugins") + " - plugins." + Site.domain : "plugins." + Site.domain text: resourceButtonsRow.compactMode ? "" : I18n.tr("Plugins") @@ -239,7 +239,7 @@ Item { onClicked: Qt.openUrlExternally(Site.plugins) } - DankButton { + DButton { id: githubButton tooltipText: resourceButtonsRow.compactMode ? "GitHub - AvengeMedia/DankMaterialShell" : "github.com/AvengeMedia/DankMaterialShell" text: resourceButtonsRow.compactMode ? "" : "GitHub" @@ -250,7 +250,7 @@ Item { onClicked: Qt.openUrlExternally("https://github.com/AvengeMedia/DankMaterialShell") } - DankButton { + DButton { id: kofiButton tooltipText: resourceButtonsRow.compactMode ? "Ko-fi" + " - ko-fi.com/danklinux" : "ko-fi.com/danklinux" text: resourceButtonsRow.compactMode ? "" : "Ko-fi" @@ -267,7 +267,7 @@ Item { anchors.horizontalCenter: parent.horizontalCenter spacing: Theme.spacingXS - DankActionButton { + DActionButton { tooltipText: compositorTooltip tooltipSide: "top" onClicked: { @@ -287,7 +287,7 @@ Item { } } - DankActionButton { + DActionButton { visible: showMatrix tooltipText: I18n.tr("niri Matrix chat") tooltipSide: "top" @@ -309,7 +309,7 @@ Item { } } - DankActionButton { + DActionButton { visible: showIrc iconName: "forum" iconSize: Theme.iconSizeMedium @@ -319,7 +319,7 @@ Item { onClicked: Qt.openUrlExternally(ircUrl) } - DankActionButton { + DActionButton { tooltipText: dmsDiscordTooltip tooltipSide: "top" onClicked: Qt.openUrlExternally(dmsDiscordUrl) @@ -335,7 +335,7 @@ Item { } } - DankActionButton { + DActionButton { visible: showCompositorDiscord tooltipText: compositorDiscordTooltip tooltipSide: "top" @@ -352,7 +352,7 @@ Item { } } - DankActionButton { + DActionButton { visible: showReddit tooltipText: redditTooltip tooltipSide: "top" @@ -415,7 +415,7 @@ Item { title: I18n.tr("Status") trailingBadge: I18n.tr("Connected") - DankBadge { + DBadge { color: Theme.success } } @@ -430,7 +430,7 @@ Item { Repeater { model: DMSService.capabilities - DankBadge { + DBadge { text: modelData color: Theme.primaryHover textColor: Theme.primary diff --git a/quickshell/Modules/Settings/AudioTab.qml b/quickshell/Modules/Settings/AudioTab.qml index 65dddd739..032833d80 100644 --- a/quickshell/Modules/Settings/AudioTab.qml +++ b/quickshell/Modules/Settings/AudioTab.qml @@ -2,7 +2,7 @@ import QtQuick import Quickshell.Services.Pipewire import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets Item { @@ -221,7 +221,7 @@ Item { horizontalAlignment: Text.AlignLeft } - DankSlider { + DSlider { id: maxVolSlider upDownKeysStep: false anchors.left: maxVolLabel.right @@ -277,7 +277,7 @@ Item { anchors.verticalCenter: parent.verticalCenter spacing: Theme.spacingS - DankIcon { + DIcon { name: "visibility_off" size: Theme.iconSizeMedium color: Theme.surfaceVariantText @@ -292,7 +292,7 @@ Item { } } - DankIcon { + DIcon { name: root.showHiddenOutputDevices ? "expand_less" : "expand_more" size: Theme.iconSizeMedium color: Theme.surfaceVariantText @@ -395,7 +395,7 @@ Item { anchors.verticalCenter: parent.verticalCenter spacing: Theme.spacingS - DankIcon { + DIcon { name: "visibility_off" size: Theme.iconSizeMedium color: Theme.surfaceVariantText @@ -410,7 +410,7 @@ Item { } } - DankIcon { + DIcon { name: root.showHiddenInputDevices ? "expand_less" : "expand_more" size: Theme.iconSizeMedium color: Theme.surfaceVariantText @@ -463,7 +463,7 @@ Item { anchors.centerIn: parent spacing: Theme.spacingL - DankLoadingIndicator { + DLoadingIndicator { contained: true anchors.horizontalCenter: parent.horizontalCenter } @@ -490,7 +490,6 @@ Item { } } } - } SettingsRenameDialog { diff --git a/quickshell/Modules/Settings/AutoStartTab.qml b/quickshell/Modules/Settings/AutoStartTab.qml index a9ce33ed8..ea9def828 100644 --- a/quickshell/Modules/Settings/AutoStartTab.qml +++ b/quickshell/Modules/Settings/AutoStartTab.qml @@ -5,7 +5,7 @@ import Quickshell import Quickshell.Io import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets Item { @@ -353,7 +353,7 @@ Item { desktopApps = []; } - DankFlickable { + DFlickable { anchors.fill: parent clip: true contentHeight: mainColumn.height + Theme.spacingXL @@ -413,7 +413,7 @@ Item { SettingsRow { visible: root.newEntryType === "desktop" - body: DankTextField { + body: DTextField { outlined: true leftIconName: "terminal" labelText: I18n.tr("Command") @@ -431,7 +431,7 @@ Item { width: parent.width spacing: Theme.spacingM - DankTextField { + DTextField { outlined: true leftIconName: "badge" labelText: I18n.tr("Name") @@ -441,7 +441,7 @@ Item { onTextChanged: root.newEntryName = text } - DankTextField { + DTextField { outlined: true leftIconName: "terminal" labelText: I18n.tr("Command", "noun, text field label for a shell command") @@ -464,7 +464,7 @@ Item { } } - DankButton { + DButton { anchors.horizontalCenter: parent.horizontalCenter text: I18n.tr("Add to autostart") iconName: "add" @@ -500,7 +500,7 @@ Item { anchors.verticalCenter: parent.verticalCenter } - DankActionButton { + DActionButton { id: clearAllButton iconName: "delete_sweep" tooltipText: I18n.tr("Clear All") @@ -536,14 +536,14 @@ Item { fallbackText: (entryRow.modelData.name || "?").charAt(0).toUpperCase() } - DankToggle { + DToggle { hideText: true text: entryRow.title checked: !entryRow.modelData.hidden onToggled: checked => root.setHidden(entryRow.modelData, !checked) } - DankActionButton { + DActionButton { iconName: "delete" iconColor: Theme.error tooltipText: I18n.tr("Remove") @@ -579,7 +579,7 @@ Item { wrapMode: Text.WordWrap } - DankButton { + DButton { anchors.horizontalCenter: parent.horizontalCenter text: I18n.tr("Generate override") iconName: "build" diff --git a/quickshell/Modules/Settings/BarHubHeader.qml b/quickshell/Modules/Settings/BarHubHeader.qml index bd9be32ed..7aab55f85 100644 --- a/quickshell/Modules/Settings/BarHubHeader.qml +++ b/quickshell/Modules/Settings/BarHubHeader.qml @@ -3,7 +3,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets Column { @@ -99,7 +99,7 @@ Column { title: I18n.tr("Bars", "plural noun, the shell bars or panels, settings title") settingKey: "barConfigurations" tags: ["bar", "configuration", "add", "remove", "enable", "multiple", "name"] - headerActions: DankButton { + headerActions: DButton { text: I18n.tr("Add") iconName: "add" buttonHeight: Theme.buttonHeightXS @@ -140,7 +140,7 @@ Column { title: I18n.tr("Name") subtitle: root.editingBarId ? "" : bar.selectedBarName - DankActionButton { + DActionButton { iconName: root.editingBarId ? "check" : "edit" Accessible.name: root.editingBarId ? I18n.tr("Save") : I18n.tr("Rename") onClicked: { @@ -152,7 +152,7 @@ Column { root.editingBarId = bar.selectedBarId; } } - DankActionButton { + DActionButton { visible: root.editingBarId !== "" iconName: "close" Accessible.name: I18n.tr("Cancel") @@ -163,7 +163,7 @@ Column { width: parent.width active: root.editingBarId !== "" visible: active - sourceComponent: DankTextField { + sourceComponent: DTextField { id: renameField width: parent.width outlined: true diff --git a/quickshell/Modules/Settings/BarWidgetOptions/AppsDockOptions.qml b/quickshell/Modules/Settings/BarWidgetOptions/AppsDockOptions.qml index 45b833916..20ae02508 100644 --- a/quickshell/Modules/Settings/BarWidgetOptions/AppsDockOptions.qml +++ b/quickshell/Modules/Settings/BarWidgetOptions/AppsDockOptions.qml @@ -2,7 +2,7 @@ import QtQuick import qs.Common import qs.Modals.FileBrowser import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings import qs.Modules.Settings.Widgets @@ -165,7 +165,7 @@ Column { value: root.apps.get("launcherLogoCustomPath") onEditingFinished: value => root.apps.set("launcherLogoCustomPath", value.trim()) - actions: DankActionButton { + actions: DActionButton { iconName: "folder_open" Accessible.name: I18n.tr("Select Dock Launcher Logo") onClicked: logoFileBrowser.open() diff --git a/quickshell/Modules/Settings/BarWidgetOptions/ControlCenterOptions.qml b/quickshell/Modules/Settings/BarWidgetOptions/ControlCenterOptions.qml index a25d67124..c41c11c9a 100644 --- a/quickshell/Modules/Settings/BarWidgetOptions/ControlCenterOptions.qml +++ b/quickshell/Modules/Settings/BarWidgetOptions/ControlCenterOptions.qml @@ -2,7 +2,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets Column { @@ -146,7 +146,7 @@ Column { clickable: true onClicked: root.setSetting(modelData.setting, !root.page.value(modelData.setting)) - DankToggle { + DToggle { hideText: true checked: root.page.value(indicatorRow.modelData.setting) onToggled: value => root.setSetting(indicatorRow.modelData.setting, value) diff --git a/quickshell/Modules/Settings/BarWidgetOptions/KeyboardLayoutOptions.qml b/quickshell/Modules/Settings/BarWidgetOptions/KeyboardLayoutOptions.qml index c2e2e6da7..3d3f0f9cd 100644 --- a/quickshell/Modules/Settings/BarWidgetOptions/KeyboardLayoutOptions.qml +++ b/quickshell/Modules/Settings/BarWidgetOptions/KeyboardLayoutOptions.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Common import qs.Modules.Settings.Widgets -import qs.Widgets +import qs.DCommon.Widgets Column { id: root @@ -72,7 +72,7 @@ Column { width: parent.width spacing: Theme.spacingS - DankTextField { + DTextField { id: rawField outlined: true labelText: I18n.tr("Displayed label", "keyboard layout override, the label currently shown") @@ -82,7 +82,7 @@ Column { onAccepted: root.addOverride() } - DankTextField { + DTextField { id: customField outlined: true labelText: I18n.tr("Custom label", "keyboard layout override, the replacement label") @@ -92,7 +92,7 @@ Column { onAccepted: root.addOverride() } - DankButton { + DButton { id: addOverrideBtn iconName: "add" text: I18n.tr("Add") @@ -133,7 +133,7 @@ Column { elide: Text.ElideRight } - DankActionButton { + DActionButton { id: removeOverrideBtn anchors.right: parent.right anchors.rightMargin: Theme.spacingS diff --git a/quickshell/Modules/Settings/BarWidgetOptions/LauncherButtonOptions.qml b/quickshell/Modules/Settings/BarWidgetOptions/LauncherButtonOptions.qml index 4572753cd..ca95613f6 100644 --- a/quickshell/Modules/Settings/BarWidgetOptions/LauncherButtonOptions.qml +++ b/quickshell/Modules/Settings/BarWidgetOptions/LauncherButtonOptions.qml @@ -2,7 +2,7 @@ import QtQuick import qs.Common import qs.Modals.FileBrowser import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings import qs.Modules.Settings.Widgets @@ -60,7 +60,7 @@ Column { value: root.page.value("launcherLogoCustomPath") onEditingFinished: value => root.page.set("launcherLogoCustomPath", value.trim()) - actions: DankActionButton { + actions: DActionButton { iconName: "folder_open" Accessible.name: I18n.tr("Select Launcher Logo") onClicked: logoFileBrowser.open() diff --git a/quickshell/Modules/Settings/BarWidgetOptions/WorkspaceSwitcherOptions.qml b/quickshell/Modules/Settings/BarWidgetOptions/WorkspaceSwitcherOptions.qml index d7692f5c7..93f69b4af 100644 --- a/quickshell/Modules/Settings/BarWidgetOptions/WorkspaceSwitcherOptions.qml +++ b/quickshell/Modules/Settings/BarWidgetOptions/WorkspaceSwitcherOptions.qml @@ -4,7 +4,6 @@ import QtQuick import Quickshell import qs.Common import qs.Services -import qs.Widgets import qs.Modules.Settings import qs.Modules.Settings.Widgets diff --git a/quickshell/Modules/Settings/BarWidgetTab.qml b/quickshell/Modules/Settings/BarWidgetTab.qml index 54418ec91..0e32a0905 100644 --- a/quickshell/Modules/Settings/BarWidgetTab.qml +++ b/quickshell/Modules/Settings/BarWidgetTab.qml @@ -3,7 +3,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets import "../../Common/settings/DockConfig.js" as DockConfig import "../DankBar/OverflowLayout.js" as OverflowLayout @@ -191,7 +191,7 @@ Item { height: optionsLoader.status === Loader.Loading ? Theme.iconButtonSize * 2 : 0 visible: optionsLoader.status === Loader.Loading - DankSpinner { + DSpinner { anchors.centerIn: parent } } diff --git a/quickshell/Modules/Settings/BatteryTab.qml b/quickshell/Modules/Settings/BatteryTab.qml index 562fb585e..23c5f4112 100644 --- a/quickshell/Modules/Settings/BatteryTab.qml +++ b/quickshell/Modules/Settings/BatteryTab.qml @@ -2,7 +2,7 @@ import QtQuick import Quickshell.Io import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets import qs.Modules.DankBar.Popouts @@ -86,7 +86,7 @@ done width: parent.width spacing: Theme.spacingM - DankIcon { + DIcon { name: BatteryService.getBatteryIcon() size: Theme.iconSizeLarge color: root.batteryStatusColor @@ -273,7 +273,7 @@ done height: 1 } - DankButton { + DButton { id: applyButton text: I18n.tr("Apply to hardware") iconName: "lock" diff --git a/quickshell/Modules/Settings/ChangelogTab.qml b/quickshell/Modules/Settings/ChangelogTab.qml index 63fc489bd..9e0e57d3a 100644 --- a/quickshell/Modules/Settings/ChangelogTab.qml +++ b/quickshell/Modules/Settings/ChangelogTab.qml @@ -1,6 +1,7 @@ import QtQuick import qs.Common import qs.Services +import qs.DCommon.Widgets import qs.Widgets import qs.Modules.Settings.Widgets @@ -30,7 +31,7 @@ Item { title: I18n.tr("Release notes are unavailable", "empty state title when no release notes are loaded") subtitle: I18n.tr("They load with the next update check. Release notes are also published on GitHub.", "release notes empty state description") - DankButton { + DButton { anchors.verticalCenter: parent.verticalCenter text: I18n.tr("Retry") iconName: "refresh" @@ -41,7 +42,7 @@ Item { onClicked: SystemUpdateService.loadReleases(true) } - DankButton { + DButton { anchors.verticalCenter: parent.verticalCenter text: I18n.tr("View on GitHub", "link to the release on GitHub") iconName: "open_in_new" @@ -53,7 +54,7 @@ Item { SettingsRow { visible: !root.feedMissing - body: DankFilterChips { + body: DFilterChips { width: parent.width model: root.releases.map(r => "v" + r.version) currentIndex: root.selectedIndex diff --git a/quickshell/Modules/Settings/ClipboardTab.qml b/quickshell/Modules/Settings/ClipboardTab.qml index 6525711a6..38c963b8b 100644 --- a/quickshell/Modules/Settings/ClipboardTab.qml +++ b/quickshell/Modules/Settings/ClipboardTab.qml @@ -1,7 +1,6 @@ import QtQuick import qs.Common import qs.Services -import qs.Widgets import qs.Modules.Settings.Widgets Item { diff --git a/quickshell/Modules/Settings/ColorDropdownRow.qml b/quickshell/Modules/Settings/ColorDropdownRow.qml index ac72c0cd6..1e64ee257 100644 --- a/quickshell/Modules/Settings/ColorDropdownRow.qml +++ b/quickshell/Modules/Settings/ColorDropdownRow.qml @@ -3,6 +3,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common import qs.Services +import qs.DCommon.Widgets import qs.Widgets import qs.Modules.Settings.Widgets @@ -148,13 +149,13 @@ Column { anchors.rightMargin: SettingsMetrics.rowPaddingH spacing: Theme.spacingM - DankColorSwatch { + DColorSwatch { width: Theme.avatarSize height: Theme.avatarSize swatchColor: root.customColor anchors.verticalCenter: parent.verticalCenter - DankIcon { + DIcon { anchors.centerIn: parent name: "colorize" size: Theme.iconSizeSmall @@ -186,7 +187,7 @@ Column { } } - DankIcon { + DIcon { id: editIcon name: "edit" size: Theme.iconSizeSmall diff --git a/quickshell/Modules/Settings/CompositorLayoutTab.qml b/quickshell/Modules/Settings/CompositorLayoutTab.qml index 4c894c9f6..acda16a11 100644 --- a/quickshell/Modules/Settings/CompositorLayoutTab.qml +++ b/quickshell/Modules/Settings/CompositorLayoutTab.qml @@ -2,7 +2,7 @@ import QtCore import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets Item { @@ -63,7 +63,7 @@ awk '$1 == "xray" { print FILENAME ":" FNR; exit }' $files 2>/dev/null`; anchors.margins: Theme.spacingL spacing: Theme.spacingM - DankIcon { + DIcon { name: "warning" size: Theme.iconSize color: Theme.primary diff --git a/quickshell/Modules/Settings/CreateUserTab.qml b/quickshell/Modules/Settings/CreateUserTab.qml index 6fd243e2a..7ba5f339a 100644 --- a/quickshell/Modules/Settings/CreateUserTab.qml +++ b/quickshell/Modules/Settings/CreateUserTab.qml @@ -3,7 +3,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets Item { @@ -70,7 +70,7 @@ Item { width: parent.width spacing: Theme.spacingXS - DankTextField { + DTextField { id: usernameField outlined: true leftIconName: "person" @@ -111,7 +111,7 @@ Item { width: parent.width spacing: Theme.spacingXS - DankTextField { + DTextField { id: passwordField outlined: true leftIconName: "lock" @@ -129,7 +129,7 @@ Item { width: parent.width spacing: Theme.spacingXS - DankTextField { + DTextField { id: confirmField outlined: true leftIconName: "lock" @@ -177,7 +177,7 @@ Item { width: parent.width spacing: Theme.spacingM - DankButton { + DButton { text: root.operationPending ? I18n.tr("Working...", "create user button text while the operation runs") : I18n.tr("Add user", "button and settings page title, creates a new user account") iconName: "person_add" backgroundColor: Theme.primary diff --git a/quickshell/Modules/Settings/DankBarAppearanceTab.qml b/quickshell/Modules/Settings/DankBarAppearanceTab.qml index b00091304..f9c80d195 100644 --- a/quickshell/Modules/Settings/DankBarAppearanceTab.qml +++ b/quickshell/Modules/Settings/DankBarAppearanceTab.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets Item { @@ -20,7 +20,6 @@ Item { readonly property bool selectedIslandFree: bar.selectedBarIsIsland && SettingsData.islandFreePlacement(bar.selectedBarConfig) readonly property int frameInsetPaddingDisplay: Math.round(SettingsData.frameBarContentGap) - BarSelectionState { id: bar } @@ -108,7 +107,7 @@ Item { anchors.verticalCenter: parent.verticalCenter spacing: Theme.spacingS - DankIcon { + DIcon { name: "blur_on" size: Theme.fontSizeMedium color: Theme.primary diff --git a/quickshell/Modules/Settings/DankBarTab.qml b/quickshell/Modules/Settings/DankBarTab.qml index 58e4c7ba0..3883a765f 100644 --- a/quickshell/Modules/Settings/DankBarTab.qml +++ b/quickshell/Modules/Settings/DankBarTab.qml @@ -2,7 +2,7 @@ import QtQuick import Quickshell import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets Item { diff --git a/quickshell/Modules/Settings/DankDashTab.qml b/quickshell/Modules/Settings/DankDashTab.qml index 68e88ab49..e3e777ecf 100644 --- a/quickshell/Modules/Settings/DankDashTab.qml +++ b/quickshell/Modules/Settings/DankDashTab.qml @@ -4,7 +4,7 @@ import QtQuick import Quickshell import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets import qs.Modules.DankDash import qs.Modules.DankDash.Overview @@ -62,7 +62,7 @@ FocusScope { settingKey: "dashTabs" tab: "dank_dash" - headerActions: DankActionButton { + headerActions: DActionButton { iconName: "refresh" iconSize: Theme.iconSizeSmall tooltipText: I18n.tr("Reset to default") @@ -147,7 +147,7 @@ FocusScope { spacing: Theme.spacingXS anchors.verticalCenter: parent.verticalCenter - DankActionButton { + DActionButton { anchors.verticalCenter: parent.verticalCenter objectName: "editDashTab" iconName: "edit" @@ -157,7 +157,7 @@ FocusScope { onClicked: PopoutService.openDankDashEditor(tabRow.modelData.id, root.Window.window?.screen) } - DankToggle { + DToggle { anchors.verticalCenter: parent.verticalCenter hideText: true checked: tabRow.modelData.enabled diff --git a/quickshell/Modules/Settings/DankDotTab.qml b/quickshell/Modules/Settings/DankDotTab.qml index 37cb6c496..b7ee57be6 100644 --- a/quickshell/Modules/Settings/DankDotTab.qml +++ b/quickshell/Modules/Settings/DankDotTab.qml @@ -1,7 +1,6 @@ import QtQuick import qs.Common import qs.Services -import qs.Widgets import qs.Modules.Settings.Widgets Item { diff --git a/quickshell/Modules/Settings/DefaultAppsTab.qml b/quickshell/Modules/Settings/DefaultAppsTab.qml index 438e5e5b4..12fa10645 100644 --- a/quickshell/Modules/Settings/DefaultAppsTab.qml +++ b/quickshell/Modules/Settings/DefaultAppsTab.qml @@ -3,7 +3,6 @@ import Quickshell import Quickshell.Io import qs.Common import qs.Services -import qs.Widgets import qs.Modules.Settings.Widgets Item { diff --git a/quickshell/Modules/Settings/DesktopWidgetBrowser.qml b/quickshell/Modules/Settings/DesktopWidgetBrowser.qml index a89bb0d82..a8d1407ea 100644 --- a/quickshell/Modules/Settings/DesktopWidgetBrowser.qml +++ b/quickshell/Modules/Settings/DesktopWidgetBrowser.qml @@ -3,7 +3,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets WidgetPickerWindow { id: root @@ -33,7 +33,7 @@ WidgetPickerWindow { Component { id: tileDelegate - DankListItem { + DListItem { id: delegateRoot required property var modelData @@ -57,7 +57,7 @@ WidgetPickerWindow { color: Theme.withAlpha(Theme.primary, Theme.tonalTintAlpha) anchors.verticalCenter: parent.verticalCenter - DankIcon { + DIcon { anchors.centerIn: parent name: delegateRoot.modelData.icon || "widgets" size: Theme.iconSize @@ -108,7 +108,7 @@ WidgetPickerWindow { } } - DankIcon { + DIcon { name: "add" size: Theme.iconSizeMedium color: Theme.primary diff --git a/quickshell/Modules/Settings/DesktopWidgetGroupSection.qml b/quickshell/Modules/Settings/DesktopWidgetGroupSection.qml index 691f1a048..13b02856c 100644 --- a/quickshell/Modules/Settings/DesktopWidgetGroupSection.qml +++ b/quickshell/Modules/Settings/DesktopWidgetGroupSection.qml @@ -3,7 +3,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets Column { @@ -38,7 +38,7 @@ Column { clickable: true onClicked: section.collapseToggled(section.sectionKey) - DankIcon { + DIcon { anchors.verticalCenter: parent.verticalCenter name: section.collapsed ? "expand_more" : "expand_less" size: Theme.iconSize diff --git a/quickshell/Modules/Settings/DesktopWidgetInstanceCard.qml b/quickshell/Modules/Settings/DesktopWidgetInstanceCard.qml index 4aa4a615c..a46f0e729 100644 --- a/quickshell/Modules/Settings/DesktopWidgetInstanceCard.qml +++ b/quickshell/Modules/Settings/DesktopWidgetInstanceCard.qml @@ -3,7 +3,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets SettingsReorderRow { @@ -29,7 +29,7 @@ SettingsReorderRow { onClicked: configureRequested() trailing: [ - DankIcon { + DIcon { anchors.verticalCenter: parent.verticalCenter name: "chevron_right" size: Theme.iconSize @@ -39,7 +39,7 @@ SettingsReorderRow { SettingsDivider { vertical: true }, - DankToggle { + DToggle { anchors.verticalCenter: parent.verticalCenter visible: !root.fixed hideText: true @@ -51,7 +51,7 @@ SettingsReorderRow { }); } }, - DankActionButton { + DActionButton { anchors.verticalCenter: parent.verticalCenter visible: !root.fixed iconName: "content_copy" diff --git a/quickshell/Modules/Settings/DesktopWidgetTab.qml b/quickshell/Modules/Settings/DesktopWidgetTab.qml index e3af72646..b33038c6a 100644 --- a/quickshell/Modules/Settings/DesktopWidgetTab.qml +++ b/quickshell/Modules/Settings/DesktopWidgetTab.qml @@ -4,7 +4,7 @@ import QtQuick import Quickshell import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets import qs.Modules.Settings.DesktopWidgetSettings as DWS @@ -153,7 +153,7 @@ Item { elide: Text.ElideMiddle } - DankActionButton { + DActionButton { id: copyButton anchors.verticalCenter: parent.verticalCenter iconName: "content_copy" diff --git a/quickshell/Modules/Settings/DesktopWidgetsTab.qml b/quickshell/Modules/Settings/DesktopWidgetsTab.qml index 364decc87..800638f13 100644 --- a/quickshell/Modules/Settings/DesktopWidgetsTab.qml +++ b/quickshell/Modules/Settings/DesktopWidgetsTab.qml @@ -4,7 +4,7 @@ import QtQuick import Quickshell import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets Item { @@ -111,7 +111,7 @@ Item { spacing: Theme.spacingS width: parent.width - DankTextField { + DTextField { id: newGroupField outlined: true leftIconName: "folder" @@ -128,7 +128,7 @@ Item { } } - DankButton { + DButton { id: addGroupBtn iconName: "add" text: I18n.tr("Add") @@ -154,13 +154,13 @@ Item { title: modelData.name singleLineTitle: true - DankActionButton { + DActionButton { iconName: "edit" tooltipText: I18n.tr("Rename") onClicked: root.openRenameDialog(groupRow.modelData) } - DankActionButton { + DActionButton { iconName: "delete" iconColor: Theme.error tooltipText: I18n.tr("Delete") @@ -253,21 +253,21 @@ Item { } SettingsFabBar { - DankFab { + DFab { text: I18n.tr("Browse plugins") iconName: "store" colorRole: "secondaryContainer" onClicked: root.showDesktopPluginBrowser() } - DankFab { + DFab { text: I18n.tr("Edit widgets") iconName: "edit" colorRole: "secondaryContainer" onClicked: DesktopWidgetRegistry.editing = true } - DankFab { + DFab { text: I18n.tr("Add widget") iconName: "add" onClicked: root.showWidgetBrowser() diff --git a/quickshell/Modules/Settings/DigitalWellbeingTab.qml b/quickshell/Modules/Settings/DigitalWellbeingTab.qml index 32cff64e8..6100521e8 100644 --- a/quickshell/Modules/Settings/DigitalWellbeingTab.qml +++ b/quickshell/Modules/Settings/DigitalWellbeingTab.qml @@ -3,7 +3,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modals.Common import qs.Modules.Settings.Widgets import qs.Modules.ControlCenter.Widgets @@ -158,7 +158,7 @@ Item { onCommitted: next => WellbeingService.setAppLimit(limitRow.modelData, next) } - DankActionButton { + DActionButton { anchors.verticalCenter: parent.verticalCenter iconName: "close" iconColor: Theme.surfaceVariantText @@ -181,7 +181,7 @@ Item { title: I18n.tr("Screen time history", "settings row title, stored screen time data") subtitle: I18n.tr("Kept for %1 days on this device", "screen time history description, %1 is a number of days").arg(WellbeingMetrics.retentionDays) - DankButton { + DButton { anchors.verticalCenter: parent.verticalCenter buttonHeight: Theme.buttonHeightXS text: I18n.tr("Clear") diff --git a/quickshell/Modules/Settings/DisplayConfig/HyprlandOutputSettings.qml b/quickshell/Modules/Settings/DisplayConfig/HyprlandOutputSettings.qml index 18af3b0fe..49c1e96b7 100644 --- a/quickshell/Modules/Settings/DisplayConfig/HyprlandOutputSettings.qml +++ b/quickshell/Modules/Settings/DisplayConfig/HyprlandOutputSettings.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets SettingsCard { @@ -125,7 +125,7 @@ SettingsCard { width: parent.width spacing: Theme.spacingM - DankTextField { + DTextField { outlined: true leftIconName: "brightness_6" labelText: I18n.tr("SDR brightness") @@ -149,7 +149,7 @@ SettingsCard { } } - DankTextField { + DTextField { outlined: true leftIconName: "palette" labelText: I18n.tr("SDR saturation") diff --git a/quickshell/Modules/Settings/DisplayConfig/ICCProfileInfoModal.qml b/quickshell/Modules/Settings/DisplayConfig/ICCProfileInfoModal.qml index f43f2d7aa..3db201eed 100644 --- a/quickshell/Modules/Settings/DisplayConfig/ICCProfileInfoModal.qml +++ b/quickshell/Modules/Settings/DisplayConfig/ICCProfileInfoModal.qml @@ -2,7 +2,7 @@ import QtQuick import qs.Common import qs.Modals.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets DankModal { id: root @@ -151,7 +151,7 @@ DankModal { } } - DankActionButton { + DActionButton { iconName: "close" iconSize: Theme.iconSize - 4 iconColor: Theme.surfaceText @@ -168,7 +168,7 @@ DankModal { border.width: Theme.layerOutlineWidth clip: true - DankFlickable { + DFlickable { anchors.fill: parent anchors.margins: Theme.spacingM contentHeight: detailColumn.implicitHeight @@ -236,7 +236,7 @@ DankModal { width: parent.width height: 40 - DankButton { + DButton { anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter text: I18n.tr("Close", "Close") diff --git a/quickshell/Modules/Settings/DisplayConfig/MonitorCanvas.qml b/quickshell/Modules/Settings/DisplayConfig/MonitorCanvas.qml index f682f2672..3b4741d06 100644 --- a/quickshell/Modules/Settings/DisplayConfig/MonitorCanvas.qml +++ b/quickshell/Modules/Settings/DisplayConfig/MonitorCanvas.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets Rectangle { @@ -104,7 +104,7 @@ Rectangle { } } - DankActionButton { + DActionButton { id: identifyButton anchors.top: parent.top anchors.right: parent.right diff --git a/quickshell/Modules/Settings/DisplayConfig/MonitorIdentifyOverlay.qml b/quickshell/Modules/Settings/DisplayConfig/MonitorIdentifyOverlay.qml index eb33a1a91..9add4b09a 100644 --- a/quickshell/Modules/Settings/DisplayConfig/MonitorIdentifyOverlay.qml +++ b/quickshell/Modules/Settings/DisplayConfig/MonitorIdentifyOverlay.qml @@ -2,7 +2,7 @@ import QtQuick import Quickshell import Quickshell.Wayland import qs.Common -import qs.Widgets +import qs.DCommon.Widgets Variants { model: Quickshell.screens diff --git a/quickshell/Modules/Settings/DisplayConfig/MonitorRect.qml b/quickshell/Modules/Settings/DisplayConfig/MonitorRect.qml index 46c9572ee..eb637f991 100644 --- a/quickshell/Modules/Settings/DisplayConfig/MonitorRect.qml +++ b/quickshell/Modules/Settings/DisplayConfig/MonitorRect.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets Rectangle { @@ -72,7 +72,7 @@ Rectangle { anchors.centerIn: parent spacing: Theme.spacingXXS - DankIcon { + DIcon { name: root.isConnected ? "desktop_windows" : "desktop_access_disabled" size: Math.min(24, Math.min(root.width * 0.3, root.height * 0.25)) color: root.isConnected ? (root.isValidPosition ? Theme.primary : Theme.error) : Theme.surfaceVariantText diff --git a/quickshell/Modules/Settings/DisplayConfig/NiriOutputSettings.qml b/quickshell/Modules/Settings/DisplayConfig/NiriOutputSettings.qml index b7d4212ea..dbad39e5d 100644 --- a/quickshell/Modules/Settings/DisplayConfig/NiriOutputSettings.qml +++ b/quickshell/Modules/Settings/DisplayConfig/NiriOutputSettings.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets SettingsCard { @@ -109,7 +109,7 @@ SettingsCard { width: parent.width spacing: Theme.spacingM - DankTextField { + DTextField { outlined: true leftIconName: "space_dashboard" labelText: I18n.tr("Window gaps (px)") @@ -137,7 +137,7 @@ SettingsCard { } } - DankTextField { + DTextField { outlined: true leftIconName: "width_normal" labelText: I18n.tr("Default width (%)", "niri output field label, default column width percent") @@ -172,7 +172,7 @@ SettingsCard { } } - DankTextField { + DTextField { outlined: true leftIconName: "view_column" labelText: I18n.tr("Preset widths (%)", "niri output field label, preset column width percents") diff --git a/quickshell/Modules/Settings/DisplayConfig/NoBackendMessage.qml b/quickshell/Modules/Settings/DisplayConfig/NoBackendMessage.qml index 7f5491714..d4c7d477d 100644 --- a/quickshell/Modules/Settings/DisplayConfig/NoBackendMessage.qml +++ b/quickshell/Modules/Settings/DisplayConfig/NoBackendMessage.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets StyledRect { @@ -26,7 +26,7 @@ StyledRect { width: parent.width spacing: Theme.spacingM - DankIcon { + DIcon { name: "monitor" size: Theme.iconSize color: Theme.surfaceVariantText diff --git a/quickshell/Modules/Settings/DisplayConfig/OutputCard.qml b/quickshell/Modules/Settings/DisplayConfig/OutputCard.qml index 70f2f9be5..2586794b1 100644 --- a/quickshell/Modules/Settings/DisplayConfig/OutputCard.qml +++ b/quickshell/Modules/Settings/DisplayConfig/OutputCard.qml @@ -1,6 +1,7 @@ import QtQuick import qs.Common import qs.Services +import qs.DCommon.Widgets import qs.Widgets import qs.Modules.Settings.Widgets @@ -58,7 +59,7 @@ Column { return ""; } - DankActionButton { + DActionButton { visible: !root.isConnected buttonSize: Theme.iconButtonSize iconName: "delete" @@ -175,7 +176,7 @@ Column { } } - DankTextField { + DTextField { id: scaleInput visible: scaleRow.customMode outlined: true @@ -265,7 +266,7 @@ Column { } subtitleColor: hasProfile ? Theme.success : Theme.surfaceVariantText - DankActionButton { + DActionButton { visible: colorProfileRow.hasProfile buttonSize: Theme.iconButtonSize iconName: "info" @@ -275,7 +276,7 @@ Column { onClicked: root.requestICCInfo(root.outputName) } - DankActionButton { + DActionButton { visible: colorProfileRow.hasProfile buttonSize: Theme.iconButtonSize iconName: "close" @@ -286,7 +287,7 @@ Column { onClicked: ICCService.removeICC(root.outputName) } - DankButton { + DButton { text: I18n.tr("Browse", "Browse") iconName: "folder_open" anchors.verticalCenter: parent.verticalCenter diff --git a/quickshell/Modules/Settings/DisplayConfigTab.qml b/quickshell/Modules/Settings/DisplayConfigTab.qml index 525d78ac6..9d904d9fa 100644 --- a/quickshell/Modules/Settings/DisplayConfigTab.qml +++ b/quickshell/Modules/Settings/DisplayConfigTab.qml @@ -3,6 +3,7 @@ import qs.Common import qs.Modals import qs.Modals.FileBrowser import qs.Services +import qs.DCommon.Widgets import qs.Widgets import qs.Modules.Settings.Widgets import qs.Modules.Settings.DisplayConfig @@ -102,7 +103,7 @@ Item { subtitle: DisplayConfigState.validationError subtitleColor: Theme.error - DankButton { + DButton { text: I18n.tr("Discard draft and reload", "Discard unsaved Aqueous display settings and refresh the current display state") enabled: !DisplayConfigState.validatingConfig onClicked: DisplayConfigState.discardAqueousPreview() @@ -161,7 +162,7 @@ Item { value: SettingsData.displayProfileAutoSelect ? I18n.tr("Auto") : root.getProfileNameById(root.selectedProfileId) } - DankButton { + DButton { id: newButton tooltipText: I18n.tr("New profile") iconName: "add" @@ -176,7 +177,7 @@ Item { } } - DankButton { + DButton { id: editMonitorsButton tooltipText: I18n.tr("Edit monitors") iconName: "edit" @@ -188,7 +189,7 @@ Item { onClicked: root.openEditMonitorsDialog() } - DankButton { + DButton { id: deleteButton Accessible.name: I18n.tr("Delete profile") iconName: "delete" @@ -208,7 +209,7 @@ Item { width: parent.width spacing: Theme.spacingS - DankTextField { + DTextField { id: newProfileField outlined: true leftIconName: "badge" @@ -224,7 +225,7 @@ Item { Component.onCompleted: forceActiveFocus() } - DankButton { + DButton { id: createButton text: I18n.tr("Create") enabled: root.newProfileName.trim() !== "" @@ -234,7 +235,7 @@ Item { } } - DankButton { + DButton { id: cancelNewButton text: I18n.tr("Cancel") backgroundColor: "transparent" @@ -248,7 +249,7 @@ Item { visible: root.showDeleteConfirmDialog title: I18n.tr("Delete profile \"%1\"?", "delete confirmation, %1 is the display profile name").arg(root.getProfileNameById(root.selectedProfileId)) - DankButton { + DButton { text: I18n.tr("Delete") backgroundColor: Theme.error textColor: Theme.primaryText @@ -258,7 +259,7 @@ Item { } } - DankButton { + DButton { text: I18n.tr("Cancel") backgroundColor: "transparent" textColor: Theme.surfaceText @@ -296,7 +297,7 @@ Item { SettingsRow { visible: root.showEditMonitorsDialog - DankButton { + DButton { text: I18n.tr("Save") enabled: Object.values(root.editMonitorSelection).some(v => v) onClicked: { @@ -306,7 +307,7 @@ Item { } } - DankButton { + DButton { text: I18n.tr("Cancel") backgroundColor: "transparent" textColor: Theme.surfaceText @@ -373,7 +374,7 @@ Item { return I18n.tr("%1 disconnected (hidden)", "displays row title, %1 is a count of disconnected monitors").arg(disconnected.length); } - DankButton { + DButton { text: SettingsData.displayShowDisconnected ? I18n.tr("Hide") : I18n.tr("Show") backgroundColor: "transparent" textColor: Theme.primary @@ -416,14 +417,14 @@ Item { id: pendingChangesBar shown: DisplayConfigState.hasOutputBackend && DisplayConfigState.hasPendingChanges - DankFab { + DFab { text: I18n.tr("Discard", "verb, button to discard pending changes") iconName: "undo" colorRole: "secondaryContainer" onClicked: DisplayConfigState.discardChanges() } - DankFab { + DFab { text: I18n.tr("Apply changes") iconName: "check" colorRole: "primary" diff --git a/quickshell/Modules/Settings/DisplayWidgetsTab.qml b/quickshell/Modules/Settings/DisplayWidgetsTab.qml index a08276cee..07a3e7862 100644 --- a/quickshell/Modules/Settings/DisplayWidgetsTab.qml +++ b/quickshell/Modules/Settings/DisplayWidgetsTab.qml @@ -3,7 +3,6 @@ import Quickshell import qs.Common import qs.Modules.Settings.Widgets import qs.Services -import qs.Widgets Item { id: root diff --git a/quickshell/Modules/Settings/DockAdvancedTab.qml b/quickshell/Modules/Settings/DockAdvancedTab.qml index d8054d063..9ac976699 100644 --- a/quickshell/Modules/Settings/DockAdvancedTab.qml +++ b/quickshell/Modules/Settings/DockAdvancedTab.qml @@ -1,7 +1,6 @@ import QtQuick import qs.Common import qs.Services -import qs.Widgets import qs.Modules.Settings.Widgets Item { diff --git a/quickshell/Modules/Settings/DockAppearanceTab.qml b/quickshell/Modules/Settings/DockAppearanceTab.qml index afbf311c5..3020897ba 100644 --- a/quickshell/Modules/Settings/DockAppearanceTab.qml +++ b/quickshell/Modules/Settings/DockAppearanceTab.qml @@ -1,6 +1,5 @@ import QtQuick import qs.Common -import qs.Widgets import qs.Modules.Settings.Widgets Item { @@ -118,11 +117,7 @@ Item { return I18n.tr("Parabolic", "magnification animation profile"); } } - options: [ - I18n.tr("Parabolic", "magnification animation profile"), - I18n.tr("Cosine", "magnification animation profile"), - I18n.tr("Gaussian", "magnification animation profile") - ] + options: [I18n.tr("Parabolic", "magnification animation profile"), I18n.tr("Cosine", "magnification animation profile"), I18n.tr("Gaussian", "magnification animation profile")] onValueChanged: value => { if (value === I18n.tr("Cosine", "magnification animation profile")) dock.setOption("magnificationProfile", "cosine"); diff --git a/quickshell/Modules/Settings/DockGeneralTab.qml b/quickshell/Modules/Settings/DockGeneralTab.qml index cd1ff43d7..8b0d67f6a 100644 --- a/quickshell/Modules/Settings/DockGeneralTab.qml +++ b/quickshell/Modules/Settings/DockGeneralTab.qml @@ -1,7 +1,6 @@ import QtQuick import qs.Common import qs.Services -import qs.Widgets import qs.Modules.Settings.Widgets Item { diff --git a/quickshell/Modules/Settings/DockHubHeader.qml b/quickshell/Modules/Settings/DockHubHeader.qml index 85f9bd6f4..00802bfa4 100644 --- a/quickshell/Modules/Settings/DockHubHeader.qml +++ b/quickshell/Modules/Settings/DockHubHeader.qml @@ -3,7 +3,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets Column { @@ -49,7 +49,7 @@ Column { title: I18n.tr("Docks", "noun plural, settings card title listing configured docks") settingKey: "dockConfiguration" tags: ["dock", "configuration", "add", "remove", "name", "show", "enable"] - headerActions: DankButton { + headerActions: DButton { text: I18n.tr("Add", "verb, button that adds a new item to a list") iconName: "add" buttonHeight: Theme.buttonHeightXS @@ -81,7 +81,7 @@ Column { subtitle: root.editingDockId ? "" : dock.config?.name ?? "" visible: dock.hasConfig - DankActionButton { + DActionButton { iconName: root.editingDockId ? "check" : "edit" Accessible.name: root.editingDockId ? I18n.tr("Save") : I18n.tr("Rename") onClicked: { @@ -93,7 +93,7 @@ Column { root.editingDockId = dock.selectedDockId; } } - DankActionButton { + DActionButton { visible: root.editingDockId !== "" iconName: "close" Accessible.name: I18n.tr("Cancel") @@ -104,7 +104,7 @@ Column { width: parent.width active: root.editingDockId !== "" visible: active - sourceComponent: DankTextField { + sourceComponent: DTextField { id: renameField width: parent.width outlined: true diff --git a/quickshell/Modules/Settings/DockWidgetsTab.qml b/quickshell/Modules/Settings/DockWidgetsTab.qml index 3576ec732..6fa2f1c59 100644 --- a/quickshell/Modules/Settings/DockWidgetsTab.qml +++ b/quickshell/Modules/Settings/DockWidgetsTab.qml @@ -2,7 +2,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets import qs.Modules.Settings.BarWidgetOptions @@ -192,14 +192,14 @@ Item { Row { spacing: Theme.spacingXS - DankActionButton { + DActionButton { iconName: "settings" visible: widgetRow.modelData.widgetId !== "appsDock" && !!BarWidgetCatalog.optionsFile(widgetRow.modelData.widgetId) Accessible.name: I18n.tr("Settings") onClicked: root.configureWidget(widgetRow.modelData) } - DankActionButton { + DActionButton { iconName: widgetRow.shown ? "visibility" : "visibility_off" Accessible.name: widgetRow.shown ? I18n.tr("Hide") : I18n.tr("Show") onClicked: { @@ -235,7 +235,7 @@ Item { SettingsFabBar { shown: dock.hasConfig - DankFab { + DFab { text: I18n.tr("Add widget") iconName: "add" onClicked: { diff --git a/quickshell/Modules/Settings/GammaControlTab.qml b/quickshell/Modules/Settings/GammaControlTab.qml index ec859f4f0..d05635317 100644 --- a/quickshell/Modules/Settings/GammaControlTab.qml +++ b/quickshell/Modules/Settings/GammaControlTab.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets import "../../Common/Format.js" as Format @@ -42,7 +42,7 @@ Item { anchors.centerIn: parent spacing: Theme.spacingXS - DankIcon { + DIcon { name: tile.iconName size: Theme.iconSize color: tile.iconColor @@ -295,14 +295,14 @@ Item { onAccepted: root.addNightModeExcludedApp() actions: [ - DankIconButton { + DIconButton { variant: "filled" iconName: "add" Accessible.name: I18n.tr("Add") enabled: excludeEditor.value.trim() !== "" onClicked: root.addNightModeExcludedApp() }, - DankIconButton { + DIconButton { iconName: "apps" tooltipText: I18n.tr("Browse") onClicked: appBrowserPopup.show() @@ -320,7 +320,7 @@ Item { title: modelData iconName: "bedtime_off" - DankActionButton { + DActionButton { anchors.verticalCenter: parent.verticalCenter iconName: "delete" iconColor: Theme.error diff --git a/quickshell/Modules/Settings/GreeterAuthTab.qml b/quickshell/Modules/Settings/GreeterAuthTab.qml index 82f049e8e..b89d636a9 100644 --- a/quickshell/Modules/Settings/GreeterAuthTab.qml +++ b/quickshell/Modules/Settings/GreeterAuthTab.qml @@ -3,7 +3,6 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common import qs.Services -import qs.Widgets import qs.Modules.Settings.Widgets Item { diff --git a/quickshell/Modules/Settings/GreeterSyncFabBar.qml b/quickshell/Modules/Settings/GreeterSyncFabBar.qml index d0ec531ea..6c13a2888 100644 --- a/quickshell/Modules/Settings/GreeterSyncFabBar.qml +++ b/quickshell/Modules/Settings/GreeterSyncFabBar.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets SettingsFabBar { @@ -11,7 +11,7 @@ SettingsFabBar { shown: SessionData.greeterSyncPending && GreeterService.binaryExists - DankFab { + DFab { text: I18n.tr("Revert") iconName: "undo" colorRole: "secondaryContainer" @@ -19,7 +19,7 @@ SettingsFabBar { onClicked: SettingsData.revertGreeterSyncPending() } - DankFab { + DFab { text: GreeterService.syncing ? I18n.tr("Syncing...", "greeter settings status while sync is running") : I18n.tr("Apply changes") iconName: "check" colorRole: "primary" diff --git a/quickshell/Modules/Settings/GreeterTab.qml b/quickshell/Modules/Settings/GreeterTab.qml index ac7b312d5..a91f7f9ee 100644 --- a/quickshell/Modules/Settings/GreeterTab.qml +++ b/quickshell/Modules/Settings/GreeterTab.qml @@ -6,7 +6,7 @@ import Quickshell.Io import qs.Common import qs.Modals.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets Item { @@ -284,7 +284,7 @@ Item { title: root.greeterStateTitle subtitle: root.greeterStateSubtitle - DankButton { + DButton { visible: root.greeterStateAction !== "" anchors.verticalCenter: parent.verticalCenter text: root.greeterStateAction @@ -509,7 +509,7 @@ Item { readonly property bool syncPending: SessionData.greeterSyncPending && GreeterService.binaryExists - DankFab { + DFab { visible: greeterFabs.syncPending text: I18n.tr("Revert") iconName: "undo" @@ -518,7 +518,7 @@ Item { onClicked: SettingsData.revertGreeterSyncPending() } - DankFab { + DFab { visible: greeterFabs.syncPending text: GreeterService.syncing ? I18n.tr("Syncing...", "greeter settings status while sync is running") : I18n.tr("Apply changes") iconName: "check" @@ -528,7 +528,7 @@ Item { onClicked: GreeterService.sync() } - DankFab { + DFab { visible: !greeterFabs.syncPending text: I18n.tr("Edit widgets") iconName: "edit" @@ -536,7 +536,7 @@ Item { onClicked: SessionService.greeterEditorRequested() } - DankFab { + DFab { visible: !greeterFabs.syncPending && !SettingsData.greeterFollowLockScreen text: I18n.tr("Add widget") iconName: "add" diff --git a/quickshell/Modules/Settings/KeybindEditorDialog.qml b/quickshell/Modules/Settings/KeybindEditorDialog.qml index 4348742e7..f0223ca3b 100644 --- a/quickshell/Modules/Settings/KeybindEditorDialog.qml +++ b/quickshell/Modules/Settings/KeybindEditorDialog.qml @@ -4,12 +4,13 @@ import QtQuick import Quickshell.Wayland import qs.Common import qs.Services +import qs.DCommon.Widgets import qs.Widgets import qs.Modules.Settings.Widgets import "../../Common/KeyUtils.js" as KeyUtils import "../../Common/KeybindActions.js" as Actions -DankDialog { +DDialog { id: root readonly property var log: Log.scoped("KeybindEditorDialog") @@ -678,7 +679,7 @@ DankDialog { } actions: [ - DankButton { + DButton { text: I18n.tr("Reset to default") visible: root.canReset enabled: !root.busy && !root.locked @@ -686,14 +687,14 @@ DankDialog { textColor: Theme.primary onClicked: root.resetRequested(root.originalKey) }, - DankButton { + DButton { text: I18n.tr("Cancel") enabled: root.closeEnabled backgroundColor: "transparent" textColor: Theme.primary onClicked: root.rejected() }, - DankButton { + DButton { text: root.isNew ? I18n.tr("Add") : I18n.tr("Save") visible: !root.readOnly enabled: root.canSubmit @@ -721,7 +722,7 @@ DankDialog { SettingsCard { title: I18n.tr("Key", "noun, keybind editor row label for the key combination") enabled: root.formEnabled - headerActions: DankButton { + headerActions: DButton { visible: !root.isNew && !root.readOnly && !root.addingNewKey text: I18n.tr("New key") iconName: "add" @@ -734,7 +735,7 @@ DankDialog { SettingsRow { visible: !root.isNew && (root.keys.length > 1 || root.addingNewKey) - body: DankFilterChips { + body: DFilterChips { id: keyChips width: parent.width showCounts: false @@ -812,14 +813,14 @@ DankDialog { anchors.verticalCenter: parent.verticalCenter spacing: Theme.spacingM - DankIcon { + DIcon { name: "keyboard" size: Theme.iconSize color: Theme.surfaceVariantText anchors.verticalCenter: parent.verticalCenter } - DankKeycap { + DKeycap { text: root.editKey visible: root.editKey !== "" && !root.recording anchors.verticalCenter: parent.verticalCenter @@ -835,7 +836,7 @@ DankDialog { } } - DankActionButton { + DActionButton { id: recordButton anchors.right: parent.right anchors.rightMargin: Theme.spacingXS @@ -853,7 +854,7 @@ DankDialog { spacing: Theme.spacingS visible: root.conflicts.length > 0 - DankIcon { + DIcon { id: conflictIcon name: "warning" size: Theme.iconSizeSmall @@ -875,7 +876,7 @@ DankDialog { spacing: Theme.spacingS visible: root.keysymUnreachable - DankIcon { + DIcon { id: unreachableIcon name: "warning" size: Theme.iconSizeSmall @@ -900,7 +901,7 @@ DankDialog { enabled: root.formEnabled SettingsRow { - body: DankButtonGroup { + body: DButtonGroup { arrowKeysSelect: false width: parent.width fillWidth: true @@ -975,7 +976,7 @@ DankDialog { } } - DankTextField { + DTextField { visible: root.useCustomCompositor width: parent.width - compositorCategoryDropdown.width - parent.spacing outlined: true @@ -995,7 +996,7 @@ DankDialog { SettingsRow { visible: root.actionType === "spawn" - body: DankTextField { + body: DTextField { readonly property var parsedCommand: root.actionType === "spawn" ? Actions.parseSpawnCommand(root.editAction) : null width: parent.width @@ -1018,7 +1019,7 @@ DankDialog { SettingsRow { visible: root.actionType === "shell" - body: DankTextField { + body: DTextField { width: parent.width outlined: true leftIconName: "terminal" @@ -1038,7 +1039,7 @@ DankDialog { SettingsRow { visible: root.showDmsArgs && root.dmsArgDefs.some(arg => arg.name === "amount") - body: DankTextField { + body: DTextField { id: amountField readonly property string amount: root.dmsParsedArgs?.args?.amount || "" @@ -1067,7 +1068,7 @@ DankDialog { SettingsRow { visible: root.showDmsArgs && root.dmsArgDefs.some(arg => arg.name === "device") - body: DankTextField { + body: DTextField { readonly property string device: root.dmsParsedArgs?.args?.device || "" width: parent.width @@ -1103,7 +1104,7 @@ DankDialog { SettingsRow { visible: root.showDmsArgs && root.dmsFlagArgs.length > 0 - body: DankFilterChips { + body: DFilterChips { width: parent.width multiSelect: true showCounts: false @@ -1128,7 +1129,7 @@ DankDialog { visible: root.showArgEditor(index, argDef) - body: DankTextField { + body: DTextField { id: argField property bool syncing: false @@ -1160,7 +1161,7 @@ DankDialog { SettingsRow { visible: root.showCompositorPicker && root.compositorFlags.length > 0 - body: DankFilterChips { + body: DFilterChips { width: parent.width multiSelect: true showCounts: false @@ -1173,7 +1174,7 @@ DankDialog { SettingsRow { visible: KeybindsService.currentProvider !== "aqueous" - body: DankTextField { + body: DTextField { width: parent.width outlined: true leftIconName: "title" @@ -1193,7 +1194,7 @@ DankDialog { visible: KeybindsService.currentProvider === "niri" || KeybindsService.currentProvider === "hyprland" SettingsRow { - body: DankFilterChips { + body: DFilterChips { width: parent.width multiSelect: true showCounts: false @@ -1206,7 +1207,7 @@ DankDialog { SettingsRow { visible: KeybindsService.currentProvider === "niri" - body: DankTextField { + body: DTextField { id: cooldownField readonly property int cooldownMs: root.editCooldownMs @@ -1241,7 +1242,7 @@ DankDialog { } component FieldUnit: StyledText { - required property DankTextField field + required property DTextField field anchors.right: parent.right anchors.rightMargin: field.contentPadding diff --git a/quickshell/Modules/Settings/KeybindRow.qml b/quickshell/Modules/Settings/KeybindRow.qml index b20ecda51..618defb6d 100644 --- a/quickshell/Modules/Settings/KeybindRow.qml +++ b/quickshell/Modules/Settings/KeybindRow.qml @@ -2,7 +2,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets SettingsRow { @@ -51,12 +51,12 @@ SettingsRow { anchors.right: parent?.right spacing: Theme.spacingS - DankKeycap { + DKeycap { text: keyLine.modelData.key anchors.verticalCenter: parent.verticalCenter } - DankActionButton { + DActionButton { iconName: "edit" Accessible.name: I18n.tr("Edit") Accessible.description: root.title + ", " + keyLine.modelData.key @@ -70,7 +70,7 @@ SettingsRow { visible: !root.readOnly anchors.verticalCenter: parent.verticalCenter - DankActionButton { + DActionButton { id: deleteButton iconName: "delete" iconColor: Theme.error diff --git a/quickshell/Modules/Settings/KeybindsTab.qml b/quickshell/Modules/Settings/KeybindsTab.qml index c58943684..762cd85e0 100644 --- a/quickshell/Modules/Settings/KeybindsTab.qml +++ b/quickshell/Modules/Settings/KeybindsTab.qml @@ -7,7 +7,7 @@ import qs.Common import qs.Modals.Common import qs.Modules.Settings.Widgets import qs.Services -import qs.Widgets +import qs.DCommon.Widgets Item { id: keybindsTab @@ -512,7 +512,7 @@ Item { spacing: Theme.spacingS layoutDirection: Qt.RightToLeft - DankButton { + DButton { text: I18n.tr("Accept reviewed changes", "Aqueous keyboard shortcut editor, retaining an unsaved edit while reviewing current bindings") iconName: "check" visible: reviewPanel.host.reviewingEdit && !!reviewPanel.host.reviewSnapshot @@ -520,7 +520,7 @@ Item { onClicked: reviewPanel.host.acceptReview() } - DankButton { + DButton { text: I18n.tr("Remove", "verb, button that removes an item from a list") iconName: "delete" visible: reviewPanel.host.hasEditDraft && reviewPanel.host.editDraft.operation !== "set" @@ -528,7 +528,7 @@ Item { onClicked: reviewPanel.host.confirmEditRemoval() } - DankButton { + DButton { text: I18n.tr("Discard") backgroundColor: "transparent" textColor: Theme.surfaceText @@ -536,7 +536,7 @@ Item { onClicked: reviewPanel.host.discardEdit() } - DankActionButton { + DActionButton { iconName: "refresh" iconColor: Theme.surfaceVariantText Accessible.name: I18n.tr("Refresh") @@ -585,7 +585,7 @@ Item { } } - DankListView { + DListView { id: flickable keyNavigationEnabled: false // ListView hands focus to every new current row; cleared, filtering can't steal it from the header search @@ -642,7 +642,7 @@ Item { topPadding: Theme.spacingXS spacing: Theme.spacingL - DankSearchField { + DSearchField { id: searchInput width: parent.width placeholderText: I18n.tr("Search shortcuts...") @@ -652,7 +652,7 @@ Item { } } - DankFilterChips { + DFilterChips { id: categoryFilter width: parent.width showCounts: false @@ -685,7 +685,7 @@ Item { anchors.margins: Theme.spacingL spacing: Theme.spacingM - DankIcon { + DIcon { name: warningBox.showWarning ? "info" : "warning" size: Theme.iconSize color: Theme.primary @@ -734,7 +734,7 @@ Item { } } - DankButton { + DButton { id: fixButton visible: warningBox.showSetup text: KeybindsService.fixing ? I18n.tr("Setting up...") : I18n.tr("Setup", "verb, button that creates the dms include config file") @@ -771,7 +771,7 @@ Item { leading: Loader { active: keybindsTab.initialLoading - sourceComponent: DankSpinner { + sourceComponent: DSpinner { size: Theme.iconSize } } @@ -787,7 +787,7 @@ Item { SettingsFabBar { shown: !KeybindsService.readOnly - DankFab { + DFab { text: I18n.tr("Add shortcut", "keybind editor dialog title and button") iconName: "add" onClicked: keybindsTab.openNewEditor() diff --git a/quickshell/Modules/Settings/KeyboardTab.qml b/quickshell/Modules/Settings/KeyboardTab.qml index a87b77a15..c95dc0d1e 100644 --- a/quickshell/Modules/Settings/KeyboardTab.qml +++ b/quickshell/Modules/Settings/KeyboardTab.qml @@ -1,7 +1,6 @@ import QtQuick import qs.Common import qs.Services -import qs.Widgets import qs.Modules.Settings.Widgets Item { diff --git a/quickshell/Modules/Settings/LauncherTab.qml b/quickshell/Modules/Settings/LauncherTab.qml index 1d2cdb222..5174d4de8 100644 --- a/quickshell/Modules/Settings/LauncherTab.qml +++ b/quickshell/Modules/Settings/LauncherTab.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets Item { @@ -359,7 +359,7 @@ Item { fallbackText: (hiddenAppRow.modelData.name || "?").charAt(0).toUpperCase() } - DankActionButton { + DActionButton { iconName: "visibility" Accessible.name: I18n.tr("Show") iconColor: Theme.primary @@ -433,7 +433,7 @@ Item { fallbackText: (overrideRow.modelData.name || "?").charAt(0).toUpperCase() } - DankActionButton { + DActionButton { iconName: "delete" tooltipText: I18n.tr("Reset to default") iconColor: Theme.error @@ -567,7 +567,7 @@ Item { iconName: modelData.iconType !== "unicode" ? modelData.icon : "" textIcon: modelData.iconType === "unicode" ? modelData.icon : "" - DankBadge { + DBadge { anchors.verticalCenter: parent.verticalCenter visible: pluginRow.modelData.isBuiltIn text: I18n.tr("Built-in", "badge on launcher plugins that ship with DMS") @@ -575,7 +575,7 @@ Item { textColor: Theme.primary } - DankToggle { + DToggle { anchors.verticalCenter: parent.verticalCenter hideText: true checked: { @@ -635,7 +635,7 @@ Item { iconName: plugin?.cornerIcon ?? "extension" title: plugin?.name ?? modelData - DankTextField { + DTextField { outlined: true leftIconName: "keyboard" labelText: I18n.tr("Trigger", "noun, launcher plugin trigger prefix text field label") @@ -645,7 +645,7 @@ Item { Component.onCompleted: text = SettingsData.getBuiltInPluginSetting(builtInRow.modelData, "trigger", builtInRow.plugin?.defaultTrigger ?? "") } - DankToggle { + DToggle { hideText: true anchors.verticalCenter: parent.verticalCenter checked: SettingsData.getBuiltInPluginSetting(builtInRow.modelData, "enabled", true) @@ -751,7 +751,7 @@ Item { anchors.verticalCenter: parent.verticalCenter } - DankActionButton { + DActionButton { id: clearAllButton iconName: "delete_sweep" tooltipText: I18n.tr("Clear All") @@ -796,7 +796,7 @@ Item { } ] - DankActionButton { + DActionButton { iconName: "close" Accessible.name: I18n.tr("Remove") iconColor: Theme.error diff --git a/quickshell/Modules/Settings/LocaleTab.qml b/quickshell/Modules/Settings/LocaleTab.qml index 29b1a9bf5..5f66c0952 100644 --- a/quickshell/Modules/Settings/LocaleTab.qml +++ b/quickshell/Modules/Settings/LocaleTab.qml @@ -1,6 +1,5 @@ import QtQuick import qs.Common -import qs.Widgets import qs.Modules.Settings.Widgets Item { diff --git a/quickshell/Modules/Settings/LockScreenTab.qml b/quickshell/Modules/Settings/LockScreenTab.qml index 5621967ee..5c3b93fcc 100644 --- a/quickshell/Modules/Settings/LockScreenTab.qml +++ b/quickshell/Modules/Settings/LockScreenTab.qml @@ -4,7 +4,7 @@ import Quickshell.Io import qs.Common import qs.Modals.FileBrowser import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets import "../../Common/KeyUtils.js" as KeyUtils @@ -465,7 +465,7 @@ Item { placeholderText: "/path/to/videos" onValueEdited: value => SettingsData.set("lockScreenVideoPath", value) - actions: DankButton { + actions: DButton { text: I18n.tr("Browse") onClicked: videoBrowserModal.open() } @@ -572,7 +572,7 @@ Item { } } - DankButton { + DButton { id: securityKeyCapture width: 200 anchors.verticalCenter: parent.verticalCenter @@ -695,7 +695,7 @@ Item { PopoutService.colorPickerModal.show(); } - DankColorSwatch { + DColorSwatch { width: Theme.iconSizeMedium height: width swatchColor: SettingsData.lockScreenInactiveColor @@ -754,7 +754,7 @@ Item { width: parent.width spacing: Theme.spacingS - DankTextField { + DTextField { id: customPamField outlined: true leftIconName: "lock" @@ -764,7 +764,7 @@ Item { text: SettingsData.lockPamPath } - DankButton { + DButton { id: validatePamButton text: I18n.tr("Apply changes") enabled: !root.authValidateRunning && customPamField.text.trim() !== "" @@ -808,7 +808,7 @@ Item { width: parent.width spacing: Theme.spacingS - DankTextField { + DTextField { id: customU2fPamField outlined: true leftIconName: "key" @@ -818,7 +818,7 @@ Item { text: SettingsData.lockU2fPamPath } - DankButton { + DButton { id: validateU2fPamButton text: I18n.tr("Apply changes") enabled: !root.u2fValidateRunning && customU2fPamField.text.trim() !== "" @@ -864,21 +864,21 @@ Item { } SettingsFabBar { - DankFab { + DFab { text: I18n.tr("Browse plugins") iconName: "store" colorRole: "secondaryContainer" onClicked: root.showPluginBrowser() } - DankFab { + DFab { text: I18n.tr("Edit widgets") iconName: "edit" colorRole: "secondaryContainer" onClicked: SessionService.lockEditorRequested() } - DankFab { + DFab { text: I18n.tr("Add widget") iconName: "add" onClicked: root.showWidgetBrowser() diff --git a/quickshell/Modules/Settings/LockWidgetSettings/LockPowerSettings.qml b/quickshell/Modules/Settings/LockWidgetSettings/LockPowerSettings.qml index deeb4d84b..6f47603ed 100644 --- a/quickshell/Modules/Settings/LockWidgetSettings/LockPowerSettings.qml +++ b/quickshell/Modules/Settings/LockWidgetSettings/LockPowerSettings.qml @@ -2,7 +2,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets import qs.Modules.Settings.DesktopWidgetSettings @@ -39,14 +39,14 @@ DesktopWidgetInstanceSettings { Accessible.role: Accessible.RadioButton Accessible.name: modelData - DankMaterialShape { + DMaterialShape { anchors.centerIn: parent width: Theme.iconSizeLarge height: Theme.iconSizeLarge shape: swatch.modelData === "round" ? "circle" : swatch.modelData color: Theme.secondaryContainer - DankIcon { + DIcon { anchors.centerIn: parent name: "power_settings_new" size: Theme.iconSizeSmall diff --git a/quickshell/Modules/Settings/MediaPlayerTab.qml b/quickshell/Modules/Settings/MediaPlayerTab.qml index 3c0be3e15..15afe8dc7 100644 --- a/quickshell/Modules/Settings/MediaPlayerTab.qml +++ b/quickshell/Modules/Settings/MediaPlayerTab.qml @@ -1,7 +1,7 @@ import QtQuick import Quickshell.Io import qs.Common -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets import qs.Modules.DankDash import qs.Services @@ -99,7 +99,7 @@ Item { resetKeys: ["audioWheelScrollAmount"] title: I18n.tr("Volume step") - DankTextField { + DTextField { outlined: true leftIconName: "volume_up" width: Theme.fieldHeight * 2 @@ -140,7 +140,7 @@ Item { settingKey: "mediaLyricsProviders" tags: ["lyrics", "provider", "priority", "order", "source", "lrclib", "better lyrics", "unison", "lyricsplus", "kugou", "youtube music"] - headerActions: DankActionButton { + headerActions: DActionButton { iconName: "restart_alt" tooltipText: I18n.tr("Reset to default") enabled: !SettingsData.isDefault(["mediaLyricsProviders"]) @@ -166,7 +166,7 @@ Item { clickable: true onClicked: MediaOptions.setLyricsProviderEnabled(modelData, !provider?.enabled) - DankToggle { + DToggle { hideText: true Accessible.name: providerRow.title checked: providerRow.provider?.enabled ?? false @@ -192,14 +192,14 @@ Item { onAccepted: root.addExcludedPlayer() actions: [ - DankIconButton { + DIconButton { variant: "filled" iconName: "add" Accessible.name: I18n.tr("Add") enabled: excludeEditor.value.trim() !== "" onClicked: root.addExcludedPlayer() }, - DankIconButton { + DIconButton { iconName: "apps" tooltipText: I18n.tr("Browse") onClicked: appBrowserPopup.show() @@ -217,7 +217,7 @@ Item { title: modelData iconName: "music_off" - DankActionButton { + DActionButton { anchors.verticalCenter: parent.verticalCenter iconName: "delete" iconColor: Theme.error diff --git a/quickshell/Modules/Settings/MouseTouchpadTab.qml b/quickshell/Modules/Settings/MouseTouchpadTab.qml index 6de57835b..3ec067143 100644 --- a/quickshell/Modules/Settings/MouseTouchpadTab.qml +++ b/quickshell/Modules/Settings/MouseTouchpadTab.qml @@ -1,7 +1,6 @@ import QtQuick import qs.Common import qs.Services -import qs.Widgets import qs.Modules.Settings.Widgets Item { diff --git a/quickshell/Modules/Settings/MuxTab.qml b/quickshell/Modules/Settings/MuxTab.qml index 064cdf8a1..4483b9c92 100644 --- a/quickshell/Modules/Settings/MuxTab.qml +++ b/quickshell/Modules/Settings/MuxTab.qml @@ -1,7 +1,6 @@ import QtQuick import qs.Common import qs.Services -import qs.Widgets import qs.Modules.Settings.Widgets import "../../Common/MuxBackends.js" as MuxBackends diff --git a/quickshell/Modules/Settings/NetworkCellularTab.qml b/quickshell/Modules/Settings/NetworkCellularTab.qml index ee0211746..e66375e4a 100644 --- a/quickshell/Modules/Settings/NetworkCellularTab.qml +++ b/quickshell/Modules/Settings/NetworkCellularTab.qml @@ -4,7 +4,7 @@ import QtQuick import qs.Common import qs.Modules.Settings.Widgets import qs.Services -import qs.Widgets +import qs.DCommon.Widgets Item { id: networkCellularTab @@ -62,7 +62,7 @@ Item { anchors.verticalCenter: parent.verticalCenter spacing: Theme.spacingS - DankToggle { + DToggle { checked: NetworkService.cellularEnabled enabled: NetworkService.cellularHardwareEnabled && !NetworkService.cellularToggling onToggled: NetworkService.toggleCellularRadio() @@ -108,7 +108,7 @@ Item { anchors.verticalCenter: parent.verticalCenter spacing: Theme.spacingS - DankIcon { + DIcon { name: "network_cell" size: 20 color: modemDelegate.isConnected ? Theme.accentOnSelectedContainer : Theme.surfaceText @@ -152,7 +152,7 @@ Item { anchors.verticalCenter: parent.verticalCenter spacing: Theme.spacingXS - DankActionButton { + DActionButton { buttonSize: Theme.buttonHeightXXS iconName: modemDelegate.isConnected ? "link_off" : "link" iconColor: Theme.surfaceVariantText @@ -224,7 +224,7 @@ Item { anchors.verticalCenter: parent.verticalCenter spacing: Theme.spacingS - DankIcon { + DIcon { name: "sim_card" size: 20 color: profileDelegate.isActive ? Theme.accentOnSelectedContainer : Theme.surfaceText @@ -256,7 +256,7 @@ Item { } } - DankActionButton { + DActionButton { id: profileAction anchors.right: parent.right anchors.rightMargin: Theme.spacingS diff --git a/quickshell/Modules/Settings/NetworkEthernetTab.qml b/quickshell/Modules/Settings/NetworkEthernetTab.qml index 0b6d9ed87..cb0a1ce95 100644 --- a/quickshell/Modules/Settings/NetworkEthernetTab.qml +++ b/quickshell/Modules/Settings/NetworkEthernetTab.qml @@ -4,7 +4,7 @@ import QtQuick import qs.Common import qs.Modules.Settings.Widgets import qs.Services -import qs.Widgets +import qs.DCommon.Widgets Item { id: networkEthernetTab @@ -105,7 +105,7 @@ Item { anchors.rightMargin: Theme.spacingS spacing: Theme.spacingS - DankIcon { + DIcon { name: "lan" size: 20 color: isConnected ? Theme.accentOnSelectedContainer : Theme.surfaceText @@ -172,7 +172,7 @@ Item { anchors.verticalCenter: parent.verticalCenter spacing: Theme.spacingXS - DankActionButton { + DActionButton { buttonSize: Theme.buttonHeightXXS iconName: isExpanded ? "expand_less" : "expand_more" iconColor: Theme.surfaceText @@ -188,7 +188,7 @@ Item { } } - DankActionButton { + DActionButton { buttonSize: Theme.buttonHeightXXS iconName: "link_off" iconColor: Theme.surfaceVariantText @@ -261,7 +261,7 @@ Item { return fields; } - delegate: DankDetailChip { + delegate: DDetailChip { required property var modelData label: modelData.label @@ -275,7 +275,7 @@ Item { height: NetworkService.networkWiredInfoLoading ? 40 : 0 visible: NetworkService.networkWiredInfoLoading - DankSpinner { + DSpinner { anchors.centerIn: parent size: 20 } @@ -322,7 +322,7 @@ Item { anchors.verticalCenter: parent.verticalCenter spacing: Theme.spacingS - DankIcon { + DIcon { name: "lan" size: 20 color: modelData.isActive ? Theme.accentOnSelectedContainer : Theme.surfaceText diff --git a/quickshell/Modules/Settings/NetworkStatusTab.qml b/quickshell/Modules/Settings/NetworkStatusTab.qml index 48cc3b4df..a1965cc65 100644 --- a/quickshell/Modules/Settings/NetworkStatusTab.qml +++ b/quickshell/Modules/Settings/NetworkStatusTab.qml @@ -4,7 +4,7 @@ import QtQuick import qs.Common import qs.Modules.Settings.Widgets import qs.Services -import qs.Widgets +import qs.DCommon.Widgets Item { id: networkStatusTab @@ -136,9 +136,9 @@ Item { height: 1 } - DankButtonGroup { - arrowKeysSelect: false + DButtonGroup { id: preferenceButtons + arrowKeysSelect: false readonly property var preferenceValues: { const values = ["auto", "ethernet", "wifi"]; diff --git a/quickshell/Modules/Settings/NetworkVpnTab.qml b/quickshell/Modules/Settings/NetworkVpnTab.qml index 7a9acd06d..b32c9c45f 100644 --- a/quickshell/Modules/Settings/NetworkVpnTab.qml +++ b/quickshell/Modules/Settings/NetworkVpnTab.qml @@ -8,7 +8,7 @@ import qs.Modules.Settings.Widgets import qs.Modals.Common import qs.Modals.FileBrowser import qs.Services -import qs.Widgets +import qs.DCommon.Widgets Item { id: networkVpnTab @@ -71,7 +71,7 @@ Item { anchors.centerIn: parent spacing: Theme.spacingS - DankIcon { + DIcon { name: "vpn_key_off" size: 36 color: Theme.surfaceVariantText @@ -125,7 +125,7 @@ Item { SettingsFabBar { shown: DMSNetworkService.vpnAvailable - DankFab { + DFab { text: I18n.tr("Import VPN") iconName: "add" busy: VPNService.importing diff --git a/quickshell/Modules/Settings/NetworkWifiTab.qml b/quickshell/Modules/Settings/NetworkWifiTab.qml index 6a7aab381..5656573e0 100644 --- a/quickshell/Modules/Settings/NetworkWifiTab.qml +++ b/quickshell/Modules/Settings/NetworkWifiTab.qml @@ -6,7 +6,7 @@ import qs.Modules.Network import qs.Modules.Settings.Widgets import qs.Modals.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import "../../Common/QmlUtils.js" as QmlUtils Item { @@ -193,7 +193,7 @@ Item { return I18n.tr("Not connected"); } - DankToggle { + DToggle { anchors.verticalCenter: parent.verticalCenter checked: NetworkService.wifiEnabled enabled: !NetworkService.wifiToggling @@ -236,7 +236,7 @@ Item { title: I18n.tr("Signal", "noun, wifi signal strength label") + ":" trailingBadge: NetworkService.wifiSignalStrength + "%" - DankIcon { + DIcon { name: { const s = NetworkService.wifiSignalStrength; if (s >= 50) @@ -298,14 +298,14 @@ Item { color: Theme.surfaceVariantText anchors.verticalCenter: parent.verticalCenter }, - DankActionButton { + DActionButton { iconName: "wifi_find" tooltipText: I18n.tr("Connect to Hidden Network") buttonSize: Theme.buttonHeightXS visible: NetworkService.backend === "networkmanager" onClicked: PopoutService.showHiddenNetworkModal() }, - DankRefreshButton { + DRefreshButton { tooltipText: I18n.tr("Scan") buttonSize: Theme.buttonHeightXS busy: NetworkService.isScanning @@ -319,7 +319,7 @@ Item { width: parent.width spacing: Theme.spacingS - DankLoadingIndicator { + DLoadingIndicator { anchors.horizontalCenter: parent.horizontalCenter } @@ -370,7 +370,7 @@ Item { } leading: [ - DankSpinner { + DSpinner { size: Theme.iconSizeMedium strokeWidth: 2 color: Theme.warning @@ -378,7 +378,7 @@ Item { visible: wifiNetworkDelegate.isConnecting anchors.verticalCenter: parent.verticalCenter }, - DankIcon { + DIcon { visible: !wifiNetworkDelegate.isConnecting name: { const s = wifiNetworkDelegate.modelData.signal || 0; @@ -394,7 +394,7 @@ Item { } ] - DankActionButton { + DActionButton { iconName: wifiNetworkDelegate.isExpanded ? "expand_less" : "expand_more" Accessible.name: wifiNetworkDelegate.isExpanded ? I18n.tr("Collapse") : I18n.tr("Expand") iconSize: Theme.iconSizeSmall @@ -409,7 +409,7 @@ Item { } } - DankActionButton { + DActionButton { iconName: "qr_code" tooltipText: I18n.tr("Show QR Code") visible: wifiNetworkDelegate.modelData.secured && wifiNetworkDelegate.modelData.saved && !(wifiNetworkDelegate.modelData.enterprise || false) @@ -418,7 +418,7 @@ Item { } } - DankActionButton { + DActionButton { iconName: "push_pin" Accessible.name: wifiNetworkDelegate.isPinned ? I18n.tr("Unpin") : I18n.tr("Pin", "verb, keep an item pinned in place") iconColor: wifiNetworkDelegate.isPinned ? Theme.primary : Theme.surfaceVariantText @@ -427,7 +427,7 @@ Item { } } - DankActionButton { + DActionButton { iconName: "delete" tooltipText: I18n.tr("Forget", "verb, remove a saved wifi network, button") iconColor: Theme.error @@ -449,7 +449,7 @@ Item { height: NetworkService.networkInfoLoading ? 40 : 0 visible: NetworkService.networkInfoLoading - DankSpinner { + DSpinner { anchors.centerIn: parent size: Theme.iconSizeMedium } @@ -463,7 +463,7 @@ Item { Repeater { model: wifiNetworkDelegate.isExpanded ? networkWifiTab.wifiDetailFields(wifiNetworkDelegate.modelData) : [] - delegate: DankDetailChip { + delegate: DDetailChip { required property var modelData label: modelData.label @@ -550,7 +550,7 @@ Item { } leading: [ - DankSpinner { + DSpinner { size: Theme.iconSizeMedium strokeWidth: 2 color: Theme.warning @@ -558,7 +558,7 @@ Item { visible: savedWifiDelegate.isConnecting anchors.verticalCenter: parent.verticalCenter }, - DankIcon { + DIcon { visible: !savedWifiDelegate.isConnecting name: { if (savedWifiDelegate.isOutOfRange) @@ -576,7 +576,7 @@ Item { } ] - DankActionButton { + DActionButton { iconName: savedWifiDelegate.isExpanded ? "expand_less" : "expand_more" Accessible.name: savedWifiDelegate.isExpanded ? I18n.tr("Collapse") : I18n.tr("Expand") iconSize: Theme.iconSizeSmall @@ -589,7 +589,7 @@ Item { } } - DankActionButton { + DActionButton { iconName: "qr_code" tooltipText: I18n.tr("Show QR Code") visible: savedWifiDelegate.modelData.secured && !(savedWifiDelegate.modelData.enterprise || false) @@ -598,7 +598,7 @@ Item { } } - DankActionButton { + DActionButton { iconName: "push_pin" Accessible.name: savedWifiDelegate.isPinned ? I18n.tr("Unpin") : I18n.tr("Pin", "verb, keep an item pinned in place") iconColor: savedWifiDelegate.isPinned ? Theme.primary : Theme.surfaceVariantText @@ -607,7 +607,7 @@ Item { } } - DankActionButton { + DActionButton { iconName: "delete" tooltipText: I18n.tr("Forget", "verb, remove a saved wifi network, button") iconColor: Theme.error @@ -624,7 +624,7 @@ Item { Repeater { model: savedWifiDelegate.isExpanded ? savedWifiDelegate.detailFields : [] - delegate: DankDetailChip { + delegate: DDetailChip { required property var modelData label: modelData.label @@ -851,7 +851,7 @@ Item { SettingsRow { visible: hotspotCard.showForm - body: DankTextField { + body: DTextField { outlined: true width: parent.width labelText: I18n.tr("Hotspot name", "hotspot SSID field label") @@ -866,7 +866,7 @@ Item { SettingsRow { visible: hotspotCard.showForm - body: DankTextField { + body: DTextField { outlined: true width: parent.width labelText: I18n.tr("Password", "hotspot password field label") @@ -916,7 +916,7 @@ Item { } SettingsRow { - DankButton { + DButton { visible: hotspotCard.editing text: I18n.tr("Cancel", "cancel hotspot editing action") buttonHeight: 36 @@ -925,7 +925,7 @@ Item { onClicked: hotspotCard.stopEditing() } - DankButton { + DButton { visible: !hotspotCard.showForm text: I18n.tr("Edit", "edit hotspot action") iconName: "edit" @@ -936,7 +936,7 @@ Item { onClicked: hotspotCard.beginEditing() } - DankButton { + DButton { visible: hotspotCard.showForm text: hotspotCard.passwordLoading ? I18n.tr("Loading...", "hotspot password loading status") : (NetworkService.hotspotBusy ? I18n.tr("Saving...", "hotspot configuration saving status") : I18n.tr("Save", "save hotspot configuration action")) iconName: "save" @@ -947,7 +947,7 @@ Item { onClicked: hotspotCard.saveOnly() } - DankButton { + DButton { text: { if (NetworkService.hotspotEnabled) return I18n.tr("Stop", "stop hotspot action"); diff --git a/quickshell/Modules/Settings/NotificationRuleEditorDialog.qml b/quickshell/Modules/Settings/NotificationRuleEditorDialog.qml index 983ac8ab8..e58dd38e9 100644 --- a/quickshell/Modules/Settings/NotificationRuleEditorDialog.qml +++ b/quickshell/Modules/Settings/NotificationRuleEditorDialog.qml @@ -2,10 +2,11 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common +import qs.DCommon.Widgets import qs.Widgets import qs.Modules.Settings.Widgets -DankDialog { +DDialog { id: root required property var fieldOptions @@ -77,13 +78,13 @@ DankDialog { } actions: [ - DankButton { + DButton { text: I18n.tr("Cancel") backgroundColor: "transparent" textColor: Theme.primary onClicked: root.rejected() }, - DankButton { + DButton { text: root.isEditMode ? I18n.tr("Save") : I18n.tr("Add") enabled: root.acceptEnabled onClicked: root.submit() @@ -118,7 +119,7 @@ DankDialog { onValueChanged: value => root.ruleMatchType = root.valueOf(root.matchTypeOptions, value) } - DankTextField { + DTextField { id: patternInput width: parent.width - fieldDropdown.width - matchTypeDropdown.width - parent.spacing * 2 anchors.verticalCenter: parent.verticalCenter diff --git a/quickshell/Modules/Settings/NotificationRulesTab.qml b/quickshell/Modules/Settings/NotificationRulesTab.qml index bd9be1d09..b26879ddb 100644 --- a/quickshell/Modules/Settings/NotificationRulesTab.qml +++ b/quickshell/Modules/Settings/NotificationRulesTab.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets Item { @@ -174,7 +174,7 @@ Item { settingKey: "notificationRules" tags: ["notification", "rules", "mute", "ignore", "priority", "regex", "history"] - headerActions: DankActionButton { + headerActions: DActionButton { buttonSize: 36 iconName: "restart_alt" tooltipText: I18n.tr("Reset to default") @@ -203,7 +203,7 @@ Item { titleColor: rule.enabled !== false ? Theme.surfaceText : Theme.surfaceVariantText subtitle: root.matchSummary(rule) - DankToggle { + DToggle { anchors.verticalCenter: parent.verticalCenter hideText: true text: ruleRow.title @@ -211,14 +211,14 @@ Item { onToggled: checked => SettingsData.updateNotificationRuleField(ruleRow.index, "enabled", checked) } - DankActionButton { + DActionButton { anchors.verticalCenter: parent.verticalCenter iconName: "edit" Accessible.name: I18n.tr("Edit rule") onClicked: root.openEditor(ruleRow.index, ruleRow.rule) } - DankActionButton { + DActionButton { anchors.verticalCenter: parent.verticalCenter iconName: "delete" iconColor: Theme.error @@ -234,7 +234,7 @@ Item { Repeater { model: ruleRow.badges - delegate: DankBadge { + delegate: DBadge { required property string modelData text: modelData color: Theme.primaryContainer @@ -265,7 +265,7 @@ Item { title: modelData.rule?.pattern || I18n.tr("Unknown") singleLineTitle: true - DankButton { + DButton { text: I18n.tr("Unmute") backgroundColor: "transparent" textColor: Theme.primary @@ -276,7 +276,7 @@ Item { } SettingsFabBar { - DankFab { + DFab { text: I18n.tr("Add rule", "notification rule dialog title and button") iconName: "add" onClicked: root.openEditor(-1, null) diff --git a/quickshell/Modules/Settings/NotificationsTab.qml b/quickshell/Modules/Settings/NotificationsTab.qml index e1f37f52e..672e577b9 100644 --- a/quickshell/Modules/Settings/NotificationsTab.qml +++ b/quickshell/Modules/Settings/NotificationsTab.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets Column { @@ -95,7 +95,7 @@ Column { title: I18n.tr("Popups", "notification settings card title, popup notifications") settingKey: "notificationPopups" - headerActions: DankButton { + headerActions: DButton { text: I18n.tr("Preview") buttonHeight: Theme.buttonHeightXS onClicked: NotificationService.sendTestNotifications() @@ -282,7 +282,7 @@ Column { title: modelData.rule?.pattern || I18n.tr("Unknown") singleLineTitle: true - DankActionButton { + DActionButton { iconName: "delete" iconColor: Theme.error tooltipText: I18n.tr("Remove") diff --git a/quickshell/Modules/Settings/OSDTab.qml b/quickshell/Modules/Settings/OSDTab.qml index f83ee9d6d..358b714ec 100644 --- a/quickshell/Modules/Settings/OSDTab.qml +++ b/quickshell/Modules/Settings/OSDTab.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets Item { @@ -98,7 +98,7 @@ Item { onResetRequested: SettingsData.resetOsdPosition(root.positionScope) body: [ - DankFilterChips { + DFilterChips { model: root.positionScopes Binding on currentIndex { value: Math.max(0, root.positionScopes.findIndex(scope => scope.value === root.positionScope)) diff --git a/quickshell/Modules/Settings/PaletteInjectTab.qml b/quickshell/Modules/Settings/PaletteInjectTab.qml index 22dee7028..2ce8b444d 100644 --- a/quickshell/Modules/Settings/PaletteInjectTab.qml +++ b/quickshell/Modules/Settings/PaletteInjectTab.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets Item { @@ -82,14 +82,14 @@ Item { height: 1 } - DankToggle { + DToggle { id: enableToggle hideText: true checked: paletteItem.modelData.enabled !== false onToggled: checked => PaletteInjectService.updatePalette(paletteItem.index, "enabled", checked) } - DankActionButton { + DActionButton { buttonSize: Theme.buttonHeightXXS iconName: "delete" iconColor: Theme.surfaceVariantText @@ -100,7 +100,7 @@ Item { } } - DankTextField { + DTextField { outlined: true leftIconName: "label" labelText: I18n.tr("Name") @@ -111,7 +111,7 @@ Item { onEditingFinished: PaletteInjectService.updatePalette(paletteItem.index, "namespace", text) } - DankTextField { + DTextField { outlined: true leftIconName: "terminal" labelText: I18n.tr("Command") @@ -121,7 +121,7 @@ Item { onEditingFinished: PaletteInjectService.updatePalette(paletteItem.index, "command", text) } - DankTextField { + DTextField { outlined: true leftIconName: "data_array" labelText: I18n.tr("Arguments", "injected palette command arguments field label") @@ -132,7 +132,7 @@ Item { onEditingFinished: PaletteInjectService.updatePalette(paletteItem.index, "args", PaletteInjectService.argsFromText(text)) } - DankTextField { + DTextField { outlined: true leftIconName: "description" labelText: I18n.tr("JSON output path", "injected palette field label, file the command writes its palette to") @@ -152,7 +152,7 @@ Item { SettingsFabBar { shown: Theme.matugenAvailable - DankFab { + DFab { text: I18n.tr("Add palette", "injected palettes add button") iconName: "add" onClicked: PaletteInjectService.addPalette() diff --git a/quickshell/Modules/Settings/PluginBadge.qml b/quickshell/Modules/Settings/PluginBadge.qml index f16eb704a..396076166 100644 --- a/quickshell/Modules/Settings/PluginBadge.qml +++ b/quickshell/Modules/Settings/PluginBadge.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets Rectangle { @@ -22,7 +22,7 @@ Rectangle { anchors.centerIn: parent spacing: Theme.spacingXXS - DankIcon { + DIcon { name: root.iconName size: Theme.iconSizeSmall color: root.tone diff --git a/quickshell/Modules/Settings/PluginBrowser.qml b/quickshell/Modules/Settings/PluginBrowser.qml index 03be44161..eb10d8355 100644 --- a/quickshell/Modules/Settings/PluginBrowser.qml +++ b/quickshell/Modules/Settings/PluginBrowser.qml @@ -4,6 +4,7 @@ import Quickshell.Widgets import qs.Common import qs.Modals.Common import qs.Services +import qs.DCommon.Widgets import qs.Widgets import qs.Modules.Settings.Widgets @@ -605,7 +606,7 @@ RegistryBrowserWindow { iconName: "extension" onToggled: show => root.setThirdPartyVisible(show) }, - DankCard { + DCard { id: operationStatus readonly property color statusColor: root.operationFailed ? Theme.onErrorContainer : contentColor anchors.left: parent.left @@ -623,7 +624,7 @@ RegistryBrowserWindow { anchors.fill: parent spacing: Theme.spacingS - DankIcon { + DIcon { name: root.operationFailed ? "error" : root.operationPending ? "downloading" : "check_circle" size: Theme.iconSize color: operationStatus.statusColor @@ -646,7 +647,7 @@ RegistryBrowserWindow { anchors.right: parent.right spacing: Theme.spacingS - DankFilterChips { + DFilterChips { width: parent.width model: root.sortChipOptions.slice(2) currentIndex: Math.max(0, model.findIndex(option => option.id === root.normalizedSortMode(SessionData.pluginBrowserSortMode))) @@ -658,7 +659,7 @@ RegistryBrowserWindow { root.updateFilteredPlugins(); } } - DankFilterChips { + DFilterChips { width: parent.width model: root.sortChipOptions.slice(0, 2).map(option => ({ label: option.label, @@ -716,7 +717,7 @@ RegistryBrowserWindow { ] listContent: [ - DankGridView { + DGridView { id: pluginGrid property int columns: Math.max(1, Math.floor(width / (Theme.smallBreakpoint / 2 + Theme.spacingXL * 2))) @@ -757,7 +758,7 @@ RegistryBrowserWindow { } } }, - DankFlickable { + DFlickable { id: letterIndex anchors.right: parent.right anchors.top: pluginGrid.top @@ -773,7 +774,7 @@ RegistryBrowserWindow { Repeater { model: root.availableLetters - DankButton { + DButton { required property string modelData width: letterIndex.width minimumWidth: 0 @@ -792,7 +793,7 @@ RegistryBrowserWindow { spacing: Theme.spacingS visible: !root.isLoading && root.loadError === "" && root.filteredPlugins.length === 0 - DankIcon { + DIcon { anchors.horizontalCenter: parent.horizontalCenter name: "search_off" size: Theme.iconButtonSize @@ -812,7 +813,7 @@ RegistryBrowserWindow { visible: !root.isLoading && root.loadError !== "" width: parent.width - DankIcon { + DIcon { anchors.horizontalCenter: parent.horizontalCenter name: "cloud_off" size: Theme.iconButtonSize @@ -836,7 +837,7 @@ RegistryBrowserWindow { color: Theme.onSurfaceVariant } - DankButton { + DButton { anchors.horizontalCenter: parent.horizontalCenter text: I18n.tr("Retry", "retry failed action button") iconName: "refresh" @@ -884,7 +885,7 @@ RegistryBrowserWindow { anchors.right: parent.right height: Theme.buttonHeightS - DankActionButton { + DActionButton { id: detailBackButton anchors.left: parent.left anchors.verticalCenter: parent.verticalCenter @@ -895,7 +896,7 @@ RegistryBrowserWindow { onClicked: root.closePluginDetail() } - DankIcon { + DIcon { id: detailIcon anchors.left: detailBackButton.right anchors.leftMargin: Theme.spacingS @@ -919,7 +920,7 @@ RegistryBrowserWindow { maximumLineCount: 1 } - DankButton { + DButton { id: detailInstallButton readonly property bool compatible: PluginService.checkPluginCompatibility(detailPane.plugin.requires_dms) anchors.right: parent.right @@ -931,7 +932,7 @@ RegistryBrowserWindow { } } - DankFlickable { + DFlickable { id: detailFlickable anchors.top: detailHeader.bottom anchors.topMargin: Theme.spacingM @@ -977,7 +978,7 @@ RegistryBrowserWindow { } } - DankSpinner { + DSpinner { anchors.centerIn: parent running: heroImage.status === Image.Loading visible: running @@ -988,7 +989,7 @@ RegistryBrowserWindow { spacing: Theme.spacingXS visible: heroImage.imagePath.length === 0 || heroImage.status === Image.Error - DankIcon { + DIcon { anchors.horizontalCenter: parent.horizontalCenter name: "image_not_supported" size: Theme.iconSizeLarge @@ -1103,7 +1104,7 @@ RegistryBrowserWindow { spacing: Theme.spacingS visible: (detailPane.plugin.permissions || []).length > 0 - DankIcon { + DIcon { name: "security" size: Theme.iconSizeSmall color: Theme.surfaceVariantText @@ -1130,7 +1131,7 @@ RegistryBrowserWindow { spacing: Theme.spacingS visible: (detailPane.plugin.dependencies || []).length > 0 - DankIcon { + DIcon { name: "package_2" size: Theme.iconSizeSmall color: Theme.surfaceVariantText @@ -1171,7 +1172,7 @@ RegistryBrowserWindow { Repeater { model: root.relatedPlugins(detailPane.plugin) - DankButton { + DButton { required property var modelData text: modelData.name iconName: "extension" diff --git a/quickshell/Modules/Settings/PluginCard.qml b/quickshell/Modules/Settings/PluginCard.qml index 025acf317..23b9a290c 100644 --- a/quickshell/Modules/Settings/PluginCard.qml +++ b/quickshell/Modules/Settings/PluginCard.qml @@ -3,9 +3,9 @@ import Quickshell.Widgets import qs.Common import qs.Modules.Settings.Widgets import qs.Services -import qs.Widgets +import qs.DCommon.Widgets -DankCard { +DCard { id: root property var plugin: ({}) @@ -58,7 +58,7 @@ DankCard { visible: status === Image.Ready } - DankIcon { + DIcon { anchors.centerIn: parent name: root.plugin.icon || root.fallbackIcon size: Theme.avatarSize @@ -66,14 +66,14 @@ DankCard { visible: cardPreview.status !== Image.Ready } - DankSpinner { + DSpinner { anchors.centerIn: parent running: cardPreview.status === Image.Loading visible: running } } - DankPaletteSwatch { + DPaletteSwatch { anchors.top: parent.top anchors.right: parent.right anchors.margins: Theme.spacingXS @@ -128,7 +128,7 @@ DankCard { width: parent.width spacing: Theme.spacingS - DankIcon { + DIcon { id: cardIcon name: root.plugin.icon || root.fallbackIcon size: Theme.iconSizeMedium @@ -147,7 +147,7 @@ DankCard { anchors.verticalCenter: parent.verticalCenter } - DankActionButton { + DActionButton { id: installAction anchors.verticalCenter: parent.verticalCenter enabled: !root.busy && (root.installed ? root.allowUninstall : root.compatible) diff --git a/quickshell/Modules/Settings/PluginSettingsPage.qml b/quickshell/Modules/Settings/PluginSettingsPage.qml index 5028af148..0386e193e 100644 --- a/quickshell/Modules/Settings/PluginSettingsPage.qml +++ b/quickshell/Modules/Settings/PluginSettingsPage.qml @@ -3,7 +3,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modals.Common import qs.Modules.Settings.Widgets @@ -248,7 +248,7 @@ FocusScope { visible: root.pluginRepo !== "" onClicked: Qt.openUrlExternally(root.pluginRepo) - DankIcon { + DIcon { anchors.verticalCenter: parent.verticalCenter name: "open_in_browser" size: Theme.iconSizeMedium @@ -265,7 +265,7 @@ FocusScope { Repeater { model: root.permissions - DankBadge { + DBadge { required property string modelData text: modelData diff --git a/quickshell/Modules/Settings/PluginUpdatesDialog.qml b/quickshell/Modules/Settings/PluginUpdatesDialog.qml index c1aae0274..c1ee5ef4f 100644 --- a/quickshell/Modules/Settings/PluginUpdatesDialog.qml +++ b/quickshell/Modules/Settings/PluginUpdatesDialog.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets import qs.Services @@ -20,7 +20,7 @@ SettingsCard { title: I18n.tr("Available Updates (%1)", "plugin updates dialog title, %1 is a count").arg(updatesList.length) visible: false - headerActions: DankActionButton { + headerActions: DActionButton { iconName: "close" tooltipText: I18n.tr("Close") iconColor: Theme.surfaceVariantText @@ -90,7 +90,7 @@ SettingsCard { SettingsRow { visible: root.isUpdating title: root.currentUpdatingPlugin ? I18n.tr("Updating %1...", "plugin updates dialog progress, %1 is the plugin name").arg(root.currentUpdatingPlugin) : I18n.tr("Updating plugins...") - leading: DankSpinner { + leading: DSpinner { size: Theme.iconSize running: root.isUpdating } @@ -115,14 +115,14 @@ SettingsCard { subtitle: !compatible ? I18n.tr("Requires DMS %1", "plugin incompatibility notice, %1 is the required DMS version").arg(modelData.requires_dms) : modelData.author ? I18n.tr("by %1", "author attribution").arg(modelData.author) : "" subtitleColor: compatible ? supportingContentColor : Theme.error - DankActionButton { + DActionButton { iconName: "open_in_new" tooltipText: I18n.tr("View Changes", "open plugin changes before updating") visible: !!modelData.diffUrl || !!modelData.repo onClicked: Qt.openUrlExternally(modelData.diffUrl || modelData.repo) } - DankActionButton { + DActionButton { iconName: "download" tooltipText: I18n.tr("Update", "verb, button installing a newer plugin version") enabled: !root.isUpdating && !root.operationsBlocked && compatible @@ -139,7 +139,7 @@ SettingsCard { SettingsRow { visible: !root.isUpdating - DankButton { + DButton { text: I18n.tr("Cancel") iconName: "close" backgroundColor: "transparent" @@ -147,7 +147,7 @@ SettingsCard { onClicked: root.hide() } - DankButton { + DButton { text: I18n.tr("Update All") iconName: "download" enabled: !root.operationsBlocked && root.updatesList.some(plugin => PluginService.checkPluginCompatibility(plugin.requires_dms)) diff --git a/quickshell/Modules/Settings/PluginsHubHeader.qml b/quickshell/Modules/Settings/PluginsHubHeader.qml index 08ea1a292..63d6d7b90 100644 --- a/quickshell/Modules/Settings/PluginsHubHeader.qml +++ b/quickshell/Modules/Settings/PluginsHubHeader.qml @@ -5,6 +5,7 @@ import QtQuick.Layouts import Quickshell import qs.Common import qs.Services +import qs.DCommon.Widgets import qs.Widgets import "../../Common/QmlUtils.js" as QmlUtils import qs.Modals.Common @@ -378,7 +379,7 @@ Column { Layout.preferredHeight: implicitHeight spacing: Theme.spacingS - DankButton { + DButton { text: root.pluginsWithUpdates.length ? I18n.tr("Update All") + " (" + root.pluginsWithUpdates.length + ")" : I18n.tr("Check for updates") iconName: root.pluginsWithUpdates.length ? "download" : "refresh" busy: root.checkingUpdates || pluginUpdatesDialogItem.isUpdating @@ -398,7 +399,7 @@ Column { root.checkUpdates(); } } - DankIconButton { + DIconButton { iconName: "refresh" widthMode: "narrow" tooltipText: I18n.tr("Check for updates") @@ -408,7 +409,7 @@ Column { } } - DankButton { + DButton { text: I18n.tr("Manage Registries", "plugin registry management") buttonHeight: Theme.buttonHeightXS horizontalPadding: Theme.spacingS @@ -430,7 +431,7 @@ Column { wrapMode: Text.Wrap } - DankCard { + DCard { id: storeCard color: SettingsMetrics.rowColor width: parent.width @@ -443,7 +444,7 @@ Column { width: parent.width spacing: Theme.spacingM - DankIcon { + DIcon { name: "store" size: Theme.iconSizeLarge color: storeCard.accentColor @@ -467,7 +468,7 @@ Column { Layout.preferredHeight: implicitHeight spacing: Theme.spacingS - DankButton { + DButton { text: I18n.tr("Browse") iconName: "store" backgroundColor: Theme.primary @@ -477,7 +478,7 @@ Column { enabled: DMSService.dmsAvailable onClicked: root.showPluginBrowser() } - DankButton { + DButton { text: I18n.tr("Manage Registries", "plugin registry management") backgroundColor: "transparent" textColor: storeCard.accentColor @@ -494,7 +495,7 @@ Column { spacing: Theme.spacingS visible: root.plugins.length > 0 - DankSearchField { + DSearchField { width: parent.width text: root.searchQuery placeholderText: I18n.tr("Search plugins...", "plugin search placeholder") @@ -504,7 +505,7 @@ Column { width: parent.width spacing: Theme.spacingS - DankSplitButton { + DSplitButton { id: filterButton text: I18n.tr("Filter") + ": " + root.filterOptions[root.filterIndex] iconName: "filter_list" @@ -531,7 +532,7 @@ Column { onValueChanged: value => root.setFilter(options.indexOf(value)) } } - DankSplitButton { + DSplitButton { id: sortButton text: I18n.tr("Sort by") + ": " + root.sortOptions[root.sortIndex] iconName: root.descending ? "arrow_downward" : "arrow_upward" @@ -593,7 +594,7 @@ Column { Repeater { model: root.filteredPlugins - DankCard { + DCard { id: installedCard required property var modelData readonly property bool loaded: PluginService.loadedPlugins[modelData.pluginId] !== undefined @@ -638,7 +639,7 @@ Column { Layout.minimumHeight: Math.ceil(pluginTitleMetrics.height) * 2 + Theme.spacingXXS + pluginMetadata.implicitHeight Layout.maximumHeight: Layout.minimumHeight spacing: Theme.spacingS - DankIcon { + DIcon { id: pluginIcon Layout.alignment: Qt.AlignTop Layout.topMargin: Math.max(0, (pluginTitle.implicitHeight - height) / 2) @@ -670,7 +671,7 @@ Column { Layout.minimumWidth: 0 implicitHeight: Math.max(Theme.spacingL, Math.ceil(pluginDescriptionMetrics.height), versionBadge.implicitHeight) - DankBadge { + DBadge { id: versionBadge anchors.left: parent.left anchors.top: parent.top @@ -696,7 +697,7 @@ Column { } } } - DankToggle { + DToggle { Layout.alignment: Qt.AlignTop enabled: !root.updatingPluginId && !pluginUpdatesDialogItem.isUpdating && !root.uninstalling[installedCard.modelData.pluginId] checked: installedCard.loaded @@ -721,7 +722,7 @@ Column { Layout.fillHeight: false visible: installedCard.problem !== "" || !!root.uninstalling[installedCard.modelData.pluginId] spacing: Theme.spacingS - DankActionButton { + DActionButton { visible: installedCard.problem !== "" buttonSize: Theme.buttonHeightXS iconName: "error" @@ -744,7 +745,7 @@ Column { Layout.fillWidth: true implicitHeight: Math.max(settingsButton.implicitHeight, cardActions.implicitHeight) - DankIconButton { + DIconButton { id: settingsButton anchors.left: parent.left anchors.verticalCenter: parent.verticalCenter @@ -759,7 +760,7 @@ Column { anchors.verticalCenter: parent.verticalCenter spacing: Theme.spacingXS - DankIconButton { + DIconButton { iconName: "download" variant: "tonal" tooltipText: root.updatingPluginId === installedCard.modelData.pluginId ? I18n.tr("Updating...", "plugin update button tooltip while the update runs") : I18n.tr("Update available", "plugin row badge") @@ -767,7 +768,7 @@ Column { enabled: DMSService.dmsAvailable && !root.checkingUpdates && !pluginUpdatesDialogItem.isUpdating && !root.updatingPluginId && !root.uninstalling[installedCard.modelData.pluginId] onClicked: root.requestUpdate(installedCard.modelData) } - DankIconButton { + DIconButton { iconName: "delete" Accessible.name: I18n.tr("Uninstall") visible: installedCard.plugin.source !== "system" @@ -784,7 +785,7 @@ Column { SettingsFabBar { shown: root.plugins.length > 0 && DMSService.dmsAvailable - DankFab { + DFab { text: I18n.tr("Browse") iconName: "store" onClicked: root.showPluginBrowser() diff --git a/quickshell/Modules/Settings/PluginsManageTab.qml b/quickshell/Modules/Settings/PluginsManageTab.qml index baf0da986..7a42a3c67 100644 --- a/quickshell/Modules/Settings/PluginsManageTab.qml +++ b/quickshell/Modules/Settings/PluginsManageTab.qml @@ -3,7 +3,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets FocusScope { @@ -74,7 +74,7 @@ FocusScope { width: parent.width spacing: Theme.spacingS - DankButton { + DButton { text: PluginService.pluginDirectoryExists ? I18n.tr("Open folder") : I18n.tr("Create folder") iconName: PluginService.pluginDirectoryExists ? "folder_open" : "create_new_folder" maximumWidth: parent.width @@ -87,7 +87,7 @@ FocusScope { PluginService.createPluginDirectory(); } } - DankButton { + DButton { text: I18n.tr("Scan", "verb, button that scans for plugins, wifi networks or bluetooth devices") iconName: "refresh" backgroundColor: Theme.secondaryContainer @@ -127,7 +127,7 @@ FocusScope { title: I18n.tr("Error") subtitle: root.registryError subtitleColor: Theme.error - DankButton { + DButton { text: I18n.tr("Retry", "retry failed action button") enabled: !root.registryBusy onClicked: root.refreshRegistries() @@ -145,7 +145,7 @@ FocusScope { subtitle: modelData.url trailingBadge: modelData.official ? I18n.tr("official") : "" - DankActionButton { + DActionButton { anchors.verticalCenter: parent.verticalCenter iconName: "delete" iconColor: Theme.error @@ -176,7 +176,7 @@ FocusScope { text: I18n.tr("URL", "Plugin registry repository address") placeholderText: "https://github.com/user/registry.git" - actions: DankButton { + actions: DButton { text: I18n.tr("Add") enabled: !root.registryBusy && registryNameField.value.trim() !== "" && registryUrlField.value.trim() !== "" onClicked: { diff --git a/quickshell/Modules/Settings/PowerSleepTab.qml b/quickshell/Modules/Settings/PowerSleepTab.qml index 2f3771c56..8ca62fe79 100644 --- a/quickshell/Modules/Settings/PowerSleepTab.qml +++ b/quickshell/Modules/Settings/PowerSleepTab.qml @@ -1,6 +1,7 @@ import QtQuick import qs.Common import qs.Services +import qs.DCommon.Widgets import qs.Widgets import qs.Modules.Settings.Widgets import "../../Services/BootEntries.js" as BootEntries @@ -336,7 +337,7 @@ Item { subtitle: "Boot" + modelData.id iconName: "restart_alt" - DankActionButton { + DActionButton { anchors.verticalCenter: parent.verticalCenter iconName: "delete" iconColor: Theme.error diff --git a/quickshell/Modules/Settings/PrinterTab.qml b/quickshell/Modules/Settings/PrinterTab.qml index cd81c185b..d181947da 100644 --- a/quickshell/Modules/Settings/PrinterTab.qml +++ b/quickshell/Modules/Settings/PrinterTab.qml @@ -4,7 +4,7 @@ import QtQuick import qs.Common import qs.Modals.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets Item { @@ -142,7 +142,7 @@ Item { title: I18n.tr("Status", "noun, settings row or section title showing current state") trailingBadge: CupsService.cupsAvailable ? I18n.tr("Available") : I18n.tr("Unavailable") - DankBadge { + DBadge { color: CupsService.cupsAvailable ? Theme.success : Theme.error } } @@ -168,7 +168,7 @@ Item { iconName: "add_circle" title: I18n.tr("Configure a new printer") - DankActionButton { + DActionButton { iconName: "close" Accessible.name: I18n.tr("Cancel") onClicked: { @@ -225,7 +225,7 @@ Item { printerTab.selectDevice(device); } - DankRefreshButton { + DRefreshButton { buttonSize: 32 anchors.verticalCenter: parent.verticalCenter busy: CupsService.loadingDevices @@ -285,12 +285,12 @@ Item { const error = result?.data?.error || result?.error || ""; return [details, error].filter(line => line !== "").join("\n"); } - leading: DankBadge { + leading: DBadge { visible: printerTab.testConnectionResult !== null color: printerTab.testConnectionResult?.success ? Theme.success : Theme.error } - DankButton { + DButton { text: printerTab.testingConnection ? I18n.tr("Testing...", "Button state while testing printer connection") : I18n.tr("Test connection", "Button to test connection to a printer by IP address") iconName: printerTab.testingConnection ? "sync" : "lan" buttonHeight: 36 @@ -359,7 +359,7 @@ Item { printerTab.selectedPpd = ppd.name; } - DankRefreshButton { + DRefreshButton { buttonSize: 32 anchors.verticalCenter: parent.verticalCenter busy: CupsService.loadingPPDs @@ -401,7 +401,7 @@ Item { width: parent.width layoutDirection: Qt.RightToLeft - DankButton { + DButton { text: CupsService.creatingPrinter ? I18n.tr("Creating...", "create printer button label while the printer is being added") : I18n.tr("Create printer") iconName: CupsService.creatingPrinter ? "sync" : "add" buttonHeight: 36 @@ -437,7 +437,7 @@ Item { color: Theme.surfaceVariantText anchors.verticalCenter: parent.verticalCenter }, - DankActionButton { + DActionButton { iconName: "refresh" Accessible.name: I18n.tr("Refresh") buttonSize: 32 @@ -451,7 +451,7 @@ Item { width: parent.width spacing: Theme.spacingS - DankIcon { + DIcon { name: "print_disabled" size: 32 color: Theme.surfaceVariantText @@ -506,7 +506,7 @@ Item { clickable: true onClicked: CupsService.setSelectedPrinter(printerDelegate.modelData) - DankActionButton { + DActionButton { iconName: printerDelegate.isExpanded ? "expand_less" : "expand_more" Accessible.name: printerDelegate.isExpanded ? I18n.tr("Collapse") : I18n.tr("Expand") onClicked: { @@ -514,7 +514,7 @@ Item { } } - DankActionButton { + DActionButton { iconName: "delete" Accessible.name: I18n.tr("Delete") onClicked: { @@ -573,7 +573,7 @@ Item { return fields; } - delegate: DankDetailChip { + delegate: DDetailChip { required property var modelData label: modelData.label @@ -586,7 +586,7 @@ Item { width: parent.width spacing: Theme.spacingS - DankButton { + DButton { text: printerDelegate.isStopped ? I18n.tr("Resume", "verb, button that resumes a paused printer") : I18n.tr("Pause") iconName: printerDelegate.isStopped ? "play_arrow" : "pause" buttonHeight: Theme.buttonHeightXS @@ -601,7 +601,7 @@ Item { } } - DankButton { + DButton { text: I18n.tr("Test page") iconName: "description" buttonHeight: Theme.buttonHeightXS @@ -610,7 +610,7 @@ Item { onClicked: CupsService.printTestPage(printerDelegate.modelData) } - DankButton { + DButton { text: printerDelegate.printerData?.accepting ? I18n.tr("Reject jobs") : I18n.tr("Accept jobs") iconName: printerDelegate.printerData?.accepting ? "block" : "check_circle" buttonHeight: Theme.buttonHeightXS @@ -639,7 +639,7 @@ Item { anchors.verticalCenter: parent.verticalCenter } - DankButton { + DButton { text: I18n.tr("Clear All") iconName: "delete_sweep" buttonHeight: Theme.buttonHeightXS @@ -677,21 +677,21 @@ Item { return size + " KB • " + date.toLocaleString(Qt.locale(), Locale.ShortFormat); } - DankActionButton { + DActionButton { visible: jobRow.modelData.state === "pending" iconName: "pause" Accessible.name: I18n.tr("Pause") onClicked: CupsService.holdJob(jobRow.modelData.id) } - DankActionButton { + DActionButton { visible: jobRow.modelData.state === "pending-held" || jobRow.modelData.state === "completed" || jobRow.modelData.state === "aborted" iconName: "replay" tooltipText: I18n.tr("Retry") onClicked: CupsService.restartJob(jobRow.modelData.id) } - DankActionButton { + DActionButton { iconName: "close" Accessible.name: I18n.tr("Cancel") onClicked: CupsService.cancelJob(printerDelegate.modelData, jobRow.modelData.id) @@ -715,7 +715,7 @@ Item { color: Theme.surfaceVariantText anchors.verticalCenter: parent.verticalCenter }, - DankActionButton { + DActionButton { iconName: "refresh" Accessible.name: I18n.tr("Refresh") buttonSize: 32 @@ -736,7 +736,7 @@ Item { title: modelData.name || I18n.tr("Unknown") subtitle: ((modelData.members?.length ?? 0) === 1 ? I18n.tr("%1 printer") : I18n.tr("%1 printers")).arg(modelData.members?.length ?? 0) - DankActionButton { + DActionButton { iconName: "delete" Accessible.name: I18n.tr("Delete") onClicked: { @@ -756,7 +756,7 @@ Item { SettingsFabBar { shown: CupsService.cupsAvailable && !printerTab.showAddPrinter - DankFab { + DFab { text: I18n.tr("Add printer") iconName: "add" onClicked: { diff --git a/quickshell/Modules/Settings/RegistryBrowserWindow.qml b/quickshell/Modules/Settings/RegistryBrowserWindow.qml index 5afc63453..e661b175c 100644 --- a/quickshell/Modules/Settings/RegistryBrowserWindow.qml +++ b/quickshell/Modules/Settings/RegistryBrowserWindow.qml @@ -1,6 +1,7 @@ import QtQuick import qs.Common import qs.Modals.Common +import qs.DCommon.Widgets import qs.Widgets import qs.Modules.Settings.Widgets @@ -159,7 +160,7 @@ DankFloatingWindow { } } - DankWindowHeader { + DWindowHeader { id: headerArea anchors.left: parent.left anchors.right: parent.right @@ -168,7 +169,7 @@ DankFloatingWindow { title: root.headerTitle onCloseRequested: root.hide() - DankRefreshButton { + DRefreshButton { buttonSize: Theme.buttonHeightXXS iconSize: Theme.iconSizeSmall iconColor: Theme.surfaceText @@ -203,7 +204,7 @@ DankFloatingWindow { spacing: Theme.spacingS } - DankSearchField { + DSearchField { id: browserSearchField anchors.left: parent.left anchors.right: parent.right @@ -244,7 +245,7 @@ DankFloatingWindow { anchors.fill: parent visible: root.isLoading - DankSpinner { + DSpinner { anchors.centerIn: parent running: root.isLoading } diff --git a/quickshell/Modules/Settings/RunningAppsTab.qml b/quickshell/Modules/Settings/RunningAppsTab.qml index 12dd57e91..5ce60ccdb 100644 --- a/quickshell/Modules/Settings/RunningAppsTab.qml +++ b/quickshell/Modules/Settings/RunningAppsTab.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets Item { @@ -16,7 +16,7 @@ Item { settingKey: "appIdSubstitutions" tags: ["app", "icon", "substitution", "replacement", "pattern", "window", "class", "regex"] - headerActions: DankActionButton { + headerActions: DActionButton { iconName: "restart_alt" tooltipText: I18n.tr("Reset to default") visible: JSON.stringify(SettingsData.appIdSubstitutions) !== JSON.stringify(SettingsData.getDefaultAppIdSubstitutions()) @@ -45,7 +45,7 @@ Item { value: substitutionGroup.modelData.pattern onEditingFinished: value => SettingsData.updateAppIdSubstitution(substitutionGroup.index, value, replacementField.value, substitutionGroup.modelData.type) - actions: DankActionButton { + actions: DActionButton { iconName: "delete" iconColor: Theme.error Accessible.name: I18n.tr("Remove") @@ -72,7 +72,7 @@ Item { } SettingsFabBar { - DankFab { + DFab { text: I18n.tr("Add substitution", "running apps settings button, adds an app name or icon substitution") iconName: "add" onClicked: SettingsData.addAppIdSubstitution("", "", "exact") diff --git a/quickshell/Modules/Settings/SettingsHubPage.qml b/quickshell/Modules/Settings/SettingsHubPage.qml index 52b8396ad..5f7dafda2 100644 --- a/quickshell/Modules/Settings/SettingsHubPage.qml +++ b/quickshell/Modules/Settings/SettingsHubPage.qml @@ -3,7 +3,6 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common import qs.Services -import qs.Widgets import qs.Modules.Settings.Widgets FocusScope { diff --git a/quickshell/Modules/Settings/ShadowsTab.qml b/quickshell/Modules/Settings/ShadowsTab.qml index 50fa300c6..17fb034f1 100644 --- a/quickshell/Modules/Settings/ShadowsTab.qml +++ b/quickshell/Modules/Settings/ShadowsTab.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets Item { @@ -119,7 +119,7 @@ Item { clickable: true onClicked: root.openShadowColorPicker() - DankColorSwatch { + DColorSwatch { width: Theme.iconSizeMedium height: width swatchColor: SettingsData.m3ElevationCustomColor ?? "#000000" diff --git a/quickshell/Modules/Settings/SoftwareUpdatesTab.qml b/quickshell/Modules/Settings/SoftwareUpdatesTab.qml index 77e5c6c33..11d8ddd38 100644 --- a/quickshell/Modules/Settings/SoftwareUpdatesTab.qml +++ b/quickshell/Modules/Settings/SoftwareUpdatesTab.qml @@ -5,7 +5,7 @@ import QtQuick.Effects import Quickshell.Widgets import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modals.Common import qs.Modules.Settings.Widgets import "../../Common/Format.js" as Format @@ -272,7 +272,7 @@ Item { SettingsPage { id: mainColumn - DankCard { + DCard { id: hero width: parent.width height: heroColumn.implicitHeight + SettingsMetrics.pagePaddingV * 2 @@ -368,7 +368,7 @@ Item { iconName: failed ? "error_outline" : SystemUpdateService.restartPending ? "restart_alt" : "system_update_alt" iconColor: failed ? Theme.error : SystemUpdateService.restartPending ? Theme.warning : Theme.primary - DankActionButton { + DActionButton { anchors.verticalCenter: parent.verticalCenter visible: SystemUpdateService.sysupdateAvailable && !root.primaryIsCheck enabled: !root.busy @@ -380,7 +380,7 @@ Item { onClicked: SystemUpdateService.checkForUpdates() } - DankButton { + DButton { anchors.verticalCenter: parent.verticalCenter visible: SystemUpdateService.sysupdateAvailable buttonHeight: Theme.buttonHeightS @@ -433,7 +433,7 @@ Item { color: SystemUpdateService.commitsBehind === 0 ? Theme.surfaceVariantText : Theme.primary } - DankActionButton { + DActionButton { anchors.verticalCenter: parent.verticalCenter buttonSize: Theme.buttonHeightS iconName: "open_in_browser" @@ -488,7 +488,7 @@ Item { clickable: root.systemCount > 0 onClicked: root.packagesExpanded = !root.packagesExpanded - DankIcon { + DIcon { anchors.verticalCenter: parent.verticalCenter visible: root.systemCount > 0 name: "expand_more" @@ -527,7 +527,7 @@ Item { return repo && version ? repo + " · " + version : repo || version; } - DankActionButton { + DActionButton { anchors.verticalCenter: parent.verticalCenter iconName: "visibility_off" visible: SystemUpdateService.canIgnorePackage(packageRow.modelData) @@ -549,7 +549,7 @@ Item { title: I18n.tr("Upgrading...", "system update popout status while packages upgrade") iconName: "open_in_new" - DankButton { + DButton { anchors.verticalCenter: parent.verticalCenter buttonHeight: Theme.buttonHeightS text: I18n.tr("Show window", "button, brings back the floating system update window") @@ -590,7 +590,7 @@ Item { iconName: "error_outline" iconColor: Theme.error - DankButton { + DButton { anchors.verticalCenter: parent.verticalCenter visible: root.upgradeFailed && !root.upgradeRunsInTerminal text: I18n.tr("Open in terminal") @@ -785,7 +785,7 @@ Item { onAccepted: ignoredPackagesCard.addIgnoredPackage() onValueEdited: ignoredPackageError.visible = false - actions: DankIconButton { + actions: DIconButton { variant: "filled" iconName: "add" tooltipText: I18n.tr("Ignore package", "tooltip, exclude a package from system updates") @@ -812,7 +812,7 @@ Item { title: modelData iconName: "visibility_off" - DankActionButton { + DActionButton { anchors.verticalCenter: parent.verticalCenter iconName: "delete" iconColor: Theme.error diff --git a/quickshell/Modules/Settings/SoundsTab.qml b/quickshell/Modules/Settings/SoundsTab.qml index 8c11a8443..ca2cfa127 100644 --- a/quickshell/Modules/Settings/SoundsTab.qml +++ b/quickshell/Modules/Settings/SoundsTab.qml @@ -1,7 +1,6 @@ import QtQuick import qs.Common import qs.Services -import qs.Widgets import qs.Modules.Settings.Widgets Item { diff --git a/quickshell/Modules/Settings/ThemeAppsTab.qml b/quickshell/Modules/Settings/ThemeAppsTab.qml index 2b7cb079d..2e8f8d586 100644 --- a/quickshell/Modules/Settings/ThemeAppsTab.qml +++ b/quickshell/Modules/Settings/ThemeAppsTab.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets Item { @@ -65,7 +65,7 @@ Item { width: parent.width spacing: Theme.spacingM - DankButton { + DButton { width: (parent.width - Theme.spacingM) / 2 iconName: "settings" text: I18n.tr("Apply GTK colors") @@ -74,7 +74,7 @@ Item { onClicked: Theme.applyGtkColors() } - DankButton { + DButton { width: (parent.width - Theme.spacingM) / 2 iconName: "settings" text: I18n.tr("Apply Qt colors") diff --git a/quickshell/Modules/Settings/ThemeBrowser.qml b/quickshell/Modules/Settings/ThemeBrowser.qml index f21cb8ca2..773cb51eb 100644 --- a/quickshell/Modules/Settings/ThemeBrowser.qml +++ b/quickshell/Modules/Settings/ThemeBrowser.qml @@ -3,7 +3,7 @@ import Quickshell import qs.Common import qs.Modals.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets import "../../Common/ThemePalette.js" as ThemePalette @@ -307,7 +307,7 @@ RegistryBrowserWindow { anchors.right: parent.right spacing: Theme.spacingS - DankFilterChips { + DFilterChips { width: parent.width model: [I18n.tr("All"), I18n.tr("Installed"), I18n.tr("Available")] currentIndex: root.filterIndex @@ -330,7 +330,7 @@ RegistryBrowserWindow { color: Theme.error wrapMode: Text.Wrap } - DankButton { + DButton { visible: root.loadError !== "" text: I18n.tr("Retry", "retry failed action button") iconName: "refresh" @@ -340,7 +340,7 @@ RegistryBrowserWindow { ] listContent: [ - DankGridView { + DGridView { id: themeGrid property int columns: Math.max(1, Math.floor(width / (Theme.smallBreakpoint / 2 + Theme.spacingXL * 2))) diff --git a/quickshell/Modules/Settings/ThemeColorsTab.qml b/quickshell/Modules/Settings/ThemeColorsTab.qml index 894c247c7..d2428573f 100644 --- a/quickshell/Modules/Settings/ThemeColorsTab.qml +++ b/quickshell/Modules/Settings/ThemeColorsTab.qml @@ -6,7 +6,7 @@ import qs.Common import qs.Modals.Common import qs.Modals.FileBrowser import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets import "../../Common/ThemePalette.js" as ThemePalette @@ -125,7 +125,7 @@ Item { height: themeCategoryGroup.implicitHeight clip: true - DankButtonGroup { + DButtonGroup { id: themeCategoryGroup arrowKeysSelect: false anchors.horizontalCenter: parent.horizontalCenter @@ -247,7 +247,7 @@ Item { visible: Theme.wallpaperPath && Theme.wallpaperPath.startsWith("#") } - DankIcon { + DIcon { anchors.centerIn: parent name: (ToastService.wallpaperErrorStatus === "error" || ToastService.wallpaperErrorStatus === "matugen_missing") ? "error" : "palette" size: Theme.iconSizeLarge @@ -298,7 +298,7 @@ Item { } } - DankActionButton { + DActionButton { buttonSize: 36 iconName: "download" iconSize: Theme.iconSize @@ -365,7 +365,7 @@ Item { } } - DankSpinner { + DSpinner { anchors.centerIn: parent running: !MatugenPreviewService.ready visible: running @@ -457,7 +457,7 @@ Item { width: parent.width spacing: Theme.spacingM - DankActionButton { + DActionButton { buttonSize: Theme.minimumTouchTargetSize iconName: "folder_open" Accessible.name: I18n.tr("Browse Files") @@ -467,7 +467,7 @@ Item { onClicked: fileBrowserModal.open() } - DankPaletteSwatch { + DPaletteSwatch { id: customSwatch width: Theme.minimumTouchTargetSize height: Theme.minimumTouchTargetSize @@ -567,7 +567,7 @@ Item { horizontalAlignment: Text.AlignHCenter } - DankButton { + DButton { text: I18n.tr("Browse Themes", "browse themes button") iconName: "store" anchors.horizontalCenter: parent.horizontalCenter @@ -664,7 +664,7 @@ Item { clip: true visible: variantSelector.isMultiVariant && variantSelector.flavorOptions.length > 1 - DankButtonGroup { + DButtonGroup { id: flavorButtonGroup arrowKeysSelect: false anchors.horizontalCenter: parent.horizontalCenter @@ -714,7 +714,7 @@ Item { Repeater { model: variantSelector.activeThemeVariants?.accents || [] - DankColorButton { + DColorButton { required property var modelData required property int index readonly property string accentId: modelData.id @@ -741,7 +741,7 @@ Item { clip: true visible: !variantSelector.isMultiVariant && variantSelector.variantNames.length > 0 - DankButtonGroup { + DButtonGroup { id: variantButtonGroup arrowKeysSelect: false anchors.horizontalCenter: parent.horizontalCenter diff --git a/quickshell/Modules/Settings/ThemeScheduleTab.qml b/quickshell/Modules/Settings/ThemeScheduleTab.qml index 58fc06a43..55cbb31e1 100644 --- a/quickshell/Modules/Settings/ThemeScheduleTab.qml +++ b/quickshell/Modules/Settings/ThemeScheduleTab.qml @@ -3,7 +3,6 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common import qs.Services -import qs.Widgets import qs.Modules.Settings.Widgets import "../../Common/Format.js" as Format diff --git a/quickshell/Modules/Settings/ThemeSurfacesTab.qml b/quickshell/Modules/Settings/ThemeSurfacesTab.qml index 6703c8e16..440726830 100644 --- a/quickshell/Modules/Settings/ThemeSurfacesTab.qml +++ b/quickshell/Modules/Settings/ThemeSurfacesTab.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets Column { @@ -459,7 +459,7 @@ Column { clickable: true onClicked: targetCard.showHidden = !targetCard.showHidden - DankIcon { + DIcon { anchors.verticalCenter: parent.verticalCenter name: targetCard.showHidden ? "expand_less" : "expand_more" size: Theme.iconSize diff --git a/quickshell/Modules/Settings/TimeWeatherTab.qml b/quickshell/Modules/Settings/TimeWeatherTab.qml index bcae65c6a..f24a5d69c 100644 --- a/quickshell/Modules/Settings/TimeWeatherTab.qml +++ b/quickshell/Modules/Settings/TimeWeatherTab.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets Item { @@ -195,7 +195,7 @@ Item { } } - DankTextField { + DTextField { id: customFormatInput outlined: true leftIconName: "calendar_today" @@ -274,7 +274,7 @@ Item { } } - DankTextField { + DTextField { id: customLockFormatInput outlined: true leftIconName: "calendar_today" diff --git a/quickshell/Modules/Settings/TypographyMotionTab.qml b/quickshell/Modules/Settings/TypographyMotionTab.qml index da786c0cd..386301d67 100644 --- a/quickshell/Modules/Settings/TypographyMotionTab.qml +++ b/quickshell/Modules/Settings/TypographyMotionTab.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets import qs.Services import qs.Modules.Settings.Widgets @@ -194,7 +194,7 @@ Item { radius: Theme.fullRadius(width, height) color: Theme.primary - DankIcon { + DIcon { anchors.centerIn: parent name: motionPreview.atEnd ? "arrow_back" : "arrow_forward" size: Theme.iconSizeMedium diff --git a/quickshell/Modules/Settings/UserAccountsTab.qml b/quickshell/Modules/Settings/UserAccountsTab.qml index 2f8601756..f837450e8 100644 --- a/quickshell/Modules/Settings/UserAccountsTab.qml +++ b/quickshell/Modules/Settings/UserAccountsTab.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets Column { @@ -22,7 +22,7 @@ Column { settingKey: "profileImage" tags: ["user", "account", "profile", "avatar", "image"] - leading: DankCircularImage { + leading: DCircularImage { width: SettingsMetrics.avatarSize ringWidth: Theme.avatarRingWidth ringColor: Theme.avatarRingColor @@ -31,13 +31,13 @@ Column { fallbackIcon: "material:person" } - DankActionButton { + DActionButton { iconName: "edit" tooltipText: I18n.tr("Select Profile Image", "profile image file browser title") onClicked: root.parentModal?.openProfileBrowser() } - DankActionButton { + DActionButton { iconName: "close" Accessible.name: I18n.tr("Clear") enabled: PortalService.profileImage !== "" diff --git a/quickshell/Modules/Settings/UsersTab.qml b/quickshell/Modules/Settings/UsersTab.qml index c98f5a7a3..5560fe3f3 100644 --- a/quickshell/Modules/Settings/UsersTab.qml +++ b/quickshell/Modules/Settings/UsersTab.qml @@ -4,7 +4,7 @@ import QtQuick import qs.Common import qs.Modals.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets Item { @@ -89,7 +89,7 @@ Item { id: actionButtons spacing: Theme.spacingS - DankActionButton { + DActionButton { id: greeterToggleBtn readonly property bool actionBlocked: root.operationPending buttonSize: Theme.iconButtonSize @@ -117,7 +117,7 @@ Item { } } - DankActionButton { + DActionButton { id: adminToggleBtn readonly property bool actionBlocked: root.operationPending || (userRow.isLastAdmin && userRow.modelData.isAdmin) buttonSize: Theme.iconButtonSize @@ -145,7 +145,7 @@ Item { } } - DankActionButton { + DActionButton { id: deleteBtn readonly property bool actionBlocked: root.operationPending || !UsersService.canDelete(userRow.modelData.username) buttonSize: Theme.iconButtonSize @@ -189,7 +189,7 @@ Item { SettingsFabBar { shown: PolkitService.polkitAvailable - DankFab { + DFab { text: I18n.tr("Add user", "button and settings page title, creates a new user account") iconName: "person_add" onClicked: keyboard => root.parentModal?.navigateTo("user_create", keyboard) diff --git a/quickshell/Modules/Settings/WallpaperColorsTab.qml b/quickshell/Modules/Settings/WallpaperColorsTab.qml index cadd8c5f6..464b3a009 100644 --- a/quickshell/Modules/Settings/WallpaperColorsTab.qml +++ b/quickshell/Modules/Settings/WallpaperColorsTab.qml @@ -5,11 +5,11 @@ import Quickshell import qs.Common import qs.Modals.FileBrowser import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets import "../../Common/Format.js" as Format import "../../Common/ThemePalette.js" as ThemePalette -import "../../DankCommon/Common/MaterialWallpaper.js" as Art +import "../../DCommon/Common/MaterialWallpaper.js" as Art Column { id: root @@ -225,7 +225,7 @@ Column { width: hero.stacked ? hero.width : hero.width - hero.thumbWidth - hero.spacing spacing: Theme.spacingM - DankButtonGroup { + DButtonGroup { id: modeGroup arrowKeysSelect: false width: parent.width @@ -284,7 +284,7 @@ Column { paddingV: Theme.spacingM onClicked: keyboard => root.parentModal?.navigateTo("theme", keyboard) - leading: DankPaletteSwatch { + leading: DPaletteSwatch { width: SettingsMetrics.heroLeadingSize height: width primaryColor: root.themePalette.primary @@ -416,7 +416,7 @@ Column { SettingsRow { visible: root.perMonitor title: I18n.tr("Use default wallpaper", "inherit the global wallpaper on this display") - DankButton { + DButton { text: I18n.tr("Reset") onClicked: SessionData.setMonitorWallpaper(root.selectedScreen, "") } @@ -518,7 +518,7 @@ Column { color: Theme.surfaceText } - DankFilterChips { + DFilterChips { width: parent.width multiSelect: true model: SessionData.availableWallpaperTransitions.filter(t => t !== "none").map(t => ({ @@ -578,7 +578,7 @@ Column { visible: Theme.matugenAvailable && !root.dynamicTheme title: I18n.tr("Dynamic theme is off", "Material seed card status") subtitle: I18n.tr("Shapes use the %1 theme's colors", "Material seed card status, %1 is a theme name").arg(Theme.currentThemeLabel) - DankButton { + DButton { text: I18n.tr("Use Dynamic", "switch the shell theme to the dynamic palette") onClicked: Theme.switchTheme(Theme.dynamic) } @@ -588,12 +588,12 @@ Column { visible: root.dynamicTheme && SettingsData.matugenSeedColor !== "" title: I18n.tr("A custom seed color overrides this", "Material seed card status") subtitle: I18n.tr("Set under Theme & colors, Derived color", "Material seed card status") - leading: DankColorSwatch { + leading: DColorSwatch { width: SettingsMetrics.heroLeadingSize height: width swatchColor: SettingsData.matugenSeedColor } - DankButton { + DButton { text: I18n.tr("Remove override", "clear the custom matugen seed color") onClicked: SettingsData.setMatugenSeedColor("") } @@ -609,7 +609,7 @@ Column { subtitle: I18n.tr("The shell palette is built from this color. Shapes take their colors from that palette.", "Material seed picker description") modified: root.materialEntry.seed !== Art.defaultSeed onResetRequested: root.selectSeed(Art.defaultSeed) - DankActionButton { + DActionButton { iconName: "colorize" iconColor: Theme.primary backgroundColor: SettingsMetrics.controlColor @@ -700,7 +700,7 @@ Column { visible: root.dynamicTheme && MatugenPreviewService.seedPreviewFailed title: I18n.tr("Color previews unavailable", "Material seed card status") subtitle: I18n.tr("Swatches show the seed color itself", "Material seed card status") - DankButton { + DButton { text: I18n.tr("Retry") onClicked: seedPicker.retry() } @@ -713,7 +713,7 @@ Column { visible: root.dynamicTheme title: I18n.tr("Palette style", "matugen scheme navigation row") hint: Theme.getMatugenScheme(SettingsData.matugenScheme).label - leading: DankPaletteSwatch { + leading: DPaletteSwatch { width: SettingsMetrics.heroLeadingSize height: width primaryColor: root.themePalette.primary diff --git a/quickshell/Modules/Settings/WallpaperCyclingTab.qml b/quickshell/Modules/Settings/WallpaperCyclingTab.qml index e9036d1cf..6742c8ef0 100644 --- a/quickshell/Modules/Settings/WallpaperCyclingTab.qml +++ b/quickshell/Modules/Settings/WallpaperCyclingTab.qml @@ -5,7 +5,7 @@ import Quickshell import qs.Common import qs.Modals.FileBrowser import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets Item { @@ -144,7 +144,7 @@ Item { subtitle: root.wallpaperFolder enabled: root.canCycle - DankActionButton { + DActionButton { buttonSize: Theme.iconButtonSize iconName: "skip_previous" iconSize: Theme.iconSizeMedium @@ -156,7 +156,7 @@ Item { onClicked: root.cycle(true) } - DankActionButton { + DActionButton { buttonSize: Theme.iconButtonSize iconName: "skip_next" iconSize: Theme.iconSizeMedium @@ -185,7 +185,7 @@ Item { title: I18n.tr("Folder") subtitle: root.folderPath || I18n.tr("Use desktop wallpaper") - DankButton { + DButton { text: I18n.tr("Browse") horizontalPadding: Theme.spacingL anchors.verticalCenter: parent.verticalCenter diff --git a/quickshell/Modules/Settings/WeatherSettingsTab.qml b/quickshell/Modules/Settings/WeatherSettingsTab.qml index 2a16e53d7..991c1ec07 100644 --- a/quickshell/Modules/Settings/WeatherSettingsTab.qml +++ b/quickshell/Modules/Settings/WeatherSettingsTab.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets Item { @@ -70,7 +70,7 @@ Item { SettingsRow { enabled: !SettingsData.useAutoLocation title: I18n.tr("Location search") - body: DankLocationSearch { + body: DLocationSearch { width: parent.width currentLocation: SettingsData.weatherLocation placeholderText: I18n.tr("New York, NY") @@ -89,7 +89,7 @@ Item { width: parent.width spacing: Theme.spacingM - DankTextField { + DTextField { id: latitude outlined: true leftIconName: "location_on" @@ -100,7 +100,7 @@ Item { onAccepted: root.saveCoordinates() } - DankTextField { + DTextField { id: longitude outlined: true leftIconName: "location_on" @@ -112,7 +112,7 @@ Item { } } - DankButton { + DButton { text: I18n.tr("Apply", "verb, button that saves custom weather coordinates") enabled: root.validCoordinates onClicked: root.saveCoordinates() diff --git a/quickshell/Modules/Settings/WidgetPickerWindow.qml b/quickshell/Modules/Settings/WidgetPickerWindow.qml index aea66c05b..64ed4aa86 100644 --- a/quickshell/Modules/Settings/WidgetPickerWindow.qml +++ b/quickshell/Modules/Settings/WidgetPickerWindow.qml @@ -1,5 +1,6 @@ import QtQuick import qs.Common +import qs.DCommon.Widgets import qs.Widgets import qs.Modules.Settings.Widgets @@ -164,7 +165,7 @@ DankFloatingWindow { anchors.fill: parent spacing: 0 - DankWindowHeader { + DWindowHeader { id: titleBar width: parent.width controls: windowControls @@ -191,7 +192,7 @@ DankFloatingWindow { wrapMode: Text.WordWrap } - DankSearchField { + DSearchField { id: searchField width: parent.width height: Theme.fieldHeightLarge @@ -217,7 +218,7 @@ DankFloatingWindow { } } - DankListView { + DListView { id: widgetList width: parent.width diff --git a/quickshell/Modules/Settings/WidgetSelectionPopup.qml b/quickshell/Modules/Settings/WidgetSelectionPopup.qml index cb74357af..12607c8a8 100644 --- a/quickshell/Modules/Settings/WidgetSelectionPopup.qml +++ b/quickshell/Modules/Settings/WidgetSelectionPopup.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets WidgetPickerWindow { id: root @@ -49,7 +49,7 @@ WidgetPickerWindow { Component { id: rowDelegate - DankListItem { + DListItem { width: ListView.view.width implicitHeight: Math.max(Theme.listItemHeight, textColumn.implicitHeight + Theme.spacingM * 2) isSelected: root.keyboardNavigationActive && index === root.selectedIndex && !modelData.disabled @@ -62,7 +62,7 @@ WidgetPickerWindow { anchors.margins: Theme.spacingM spacing: Theme.spacingM - DankIcon { + DIcon { name: modelData.icon size: Theme.iconSize color: modelData.disabled ? Theme.onSurface_38 : Theme.primary @@ -95,7 +95,7 @@ WidgetPickerWindow { } } - DankIcon { + DIcon { name: "add" size: Theme.iconSizeMedium color: modelData.disabled ? Theme.onSurface_38 : Theme.primary diff --git a/quickshell/Modules/Settings/Widgets/AppBrowserPopup.qml b/quickshell/Modules/Settings/Widgets/AppBrowserPopup.qml index dd8f2d017..8cfaf1073 100644 --- a/quickshell/Modules/Settings/Widgets/AppBrowserPopup.qml +++ b/quickshell/Modules/Settings/Widgets/AppBrowserPopup.qml @@ -1,5 +1,6 @@ import QtQuick import qs.Common +import qs.DCommon.Widgets import qs.Widgets DankFloatingWindow { @@ -58,7 +59,7 @@ DankFloatingWindow { anchors.fill: parent spacing: 0 - DankWindowHeader { + DWindowHeader { id: titleBar width: parent.width controls: windowControls @@ -76,7 +77,7 @@ DankFloatingWindow { anchors.topMargin: 0 spacing: Theme.spacingM - DankSearchField { + DSearchField { id: searchField width: parent.width height: Theme.fieldHeightLarge @@ -90,7 +91,7 @@ DankFloatingWindow { } } - DankListView { + DListView { id: appList width: parent.width height: parent.height - searchField.height - Theme.spacingM @@ -159,7 +160,7 @@ DankFloatingWindow { } } - DankIcon { + DIcon { name: "add" size: Theme.iconSizeMedium color: Theme.primary diff --git a/quickshell/Modules/Settings/Widgets/AqueousAppearanceSettings.qml b/quickshell/Modules/Settings/Widgets/AqueousAppearanceSettings.qml index 8bad359ea..eec7e4798 100644 --- a/quickshell/Modules/Settings/Widgets/AqueousAppearanceSettings.qml +++ b/quickshell/Modules/Settings/Widgets/AqueousAppearanceSettings.qml @@ -3,7 +3,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets SettingsCard { id: root @@ -117,7 +117,7 @@ SettingsCard { Component.onCompleted: reload() - headerActions: DankActionButton { + headerActions: DActionButton { iconName: "refresh" iconColor: Theme.surfaceVariantText Accessible.name: I18n.tr("Refresh") @@ -175,7 +175,7 @@ SettingsCard { subtitle: root.error || I18n.tr("Error") subtitleColor: Theme.error - DankButton { + DButton { visible: root.partial text: I18n.tr("Retry") enabled: root.supported && !root.working @@ -191,7 +191,7 @@ SettingsCard { title: modelData.id trailingBadge: root.targetStatus(modelData) - DankBadge { + DBadge { color: root.targetColor(modelData) } } @@ -200,7 +200,7 @@ SettingsCard { SettingsFabBar { shown: root.hasChanges - DankFab { + DFab { text: I18n.tr("Discard") iconName: "undo" colorRole: "secondaryContainer" @@ -208,7 +208,7 @@ SettingsCard { onClicked: root.changes = ({}) } - DankFab { + DFab { text: I18n.tr("Apply changes") iconName: "check" colorRole: "primary" diff --git a/quickshell/Modules/Settings/Widgets/DeviceAliasRow.qml b/quickshell/Modules/Settings/Widgets/DeviceAliasRow.qml index 5733d4647..e11e74d12 100644 --- a/quickshell/Modules/Settings/Widgets/DeviceAliasRow.qml +++ b/quickshell/Modules/Settings/Widgets/DeviceAliasRow.qml @@ -3,7 +3,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets SettingsRow { id: root @@ -26,7 +26,7 @@ SettingsRow { modified: hasCustomAlias onResetRequested: AudioService.removeDeviceAlias(deviceNode.name) - DankActionButton { + DActionButton { visible: root.showHideButton iconName: root.isHidden ? "visibility" : "visibility_off" iconSize: Theme.iconSizeMedium @@ -34,7 +34,7 @@ SettingsRow { onClicked: root.hideRequested(root.deviceNode) } - DankActionButton { + DActionButton { visible: !root.isHidden iconName: "edit" iconSize: Theme.iconSizeMedium diff --git a/quickshell/Modules/Settings/Widgets/IncludeSetupBanner.qml b/quickshell/Modules/Settings/Widgets/IncludeSetupBanner.qml index 0f02b3d8d..b1492fd3d 100644 --- a/quickshell/Modules/Settings/Widgets/IncludeSetupBanner.qml +++ b/quickshell/Modules/Settings/Widgets/IncludeSetupBanner.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets StyledRect { id: root @@ -25,7 +25,7 @@ StyledRect { anchors.margins: Theme.spacingL spacing: Theme.spacingM - DankIcon { + DIcon { name: "warning" size: Theme.iconSize color: Theme.primary @@ -56,7 +56,7 @@ StyledRect { } } - DankButton { + DButton { id: fixButton visible: root.showSetup text: root.include.fixing ? I18n.tr("Setting up...") : I18n.tr("Setup") diff --git a/quickshell/Modules/Settings/Widgets/IslandBehaviorCard.qml b/quickshell/Modules/Settings/Widgets/IslandBehaviorCard.qml index 54bb4c345..7ad7dcd93 100644 --- a/quickshell/Modules/Settings/Widgets/IslandBehaviorCard.qml +++ b/quickshell/Modules/Settings/Widgets/IslandBehaviorCard.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets SettingsCard { id: root diff --git a/quickshell/Modules/Settings/Widgets/IslandHomeCard.qml b/quickshell/Modules/Settings/Widgets/IslandHomeCard.qml index 06482f8d1..a2fac5432 100644 --- a/quickshell/Modules/Settings/Widgets/IslandHomeCard.qml +++ b/quickshell/Modules/Settings/Widgets/IslandHomeCard.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets SettingsCard { id: root @@ -17,7 +17,6 @@ SettingsCard { readonly property var batteryStyleValues: ["solid", "outline", "ring", "duo"] readonly property bool batteryShown: SettingsData.islandHomeGroupEnabled(root.store.config, "status") && BatteryService.batteryAvailable && SettingsData.islandHomeStatusContent(root.store.config) === "battery" - iconName: "home" title: I18n.tr("Home compact", "island settings: home face card title") settingKey: root.keyPrefix + "Activities" @@ -28,7 +27,7 @@ SettingsCard { title: I18n.tr("Layout", "noun, settings section title for arrangement options") visible: !root.hosted - DankButton { + DButton { text: I18n.tr("Bar widgets") iconName: "widgets" onClicked: { diff --git a/quickshell/Modules/Settings/Widgets/IslandHomeLayoutEditor.qml b/quickshell/Modules/Settings/Widgets/IslandHomeLayoutEditor.qml index 3dca033b0..f586a8973 100644 --- a/quickshell/Modules/Settings/Widgets/IslandHomeLayoutEditor.qml +++ b/quickshell/Modules/Settings/Widgets/IslandHomeLayoutEditor.qml @@ -3,7 +3,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets Column { id: root @@ -111,7 +111,7 @@ Column { subtitle: root.presentation[modelData.id].description iconName: root.presentation[modelData.id].icon - DankIcon { + DIcon { anchors.verticalCenter: parent.verticalCenter name: "lock" size: Theme.iconSizeMedium @@ -119,7 +119,7 @@ Column { visible: groupRow.modelData.id === "clock" } - DankActionButton { + DActionButton { anchors.verticalCenter: parent.verticalCenter visible: groupRow.modelData.id !== "clock" iconName: "visibility" @@ -138,7 +138,7 @@ Column { clickable: true onClicked: root.showHidden = !root.showHidden - DankIcon { + DIcon { anchors.verticalCenter: parent.verticalCenter name: root.showHidden ? "expand_less" : "expand_more" size: Theme.iconSize @@ -167,7 +167,7 @@ Column { iconName: root.presentation[modelData.id].icon iconColor: Theme.onSurfaceVariant - DankActionButton { + DActionButton { anchors.verticalCenter: parent.verticalCenter iconName: "visibility_off" tooltipText: I18n.tr("Show", "island settings: show home group") diff --git a/quickshell/Modules/Settings/Widgets/MaterialSeedPicker.qml b/quickshell/Modules/Settings/Widgets/MaterialSeedPicker.qml index 634a82539..b3b8d1ca0 100644 --- a/quickshell/Modules/Settings/Widgets/MaterialSeedPicker.qml +++ b/quickshell/Modules/Settings/Widgets/MaterialSeedPicker.qml @@ -3,8 +3,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common import qs.Services -import qs.Widgets -import "../../../DankCommon/Common/MaterialWallpaper.js" as Art +import "../../../DCommon/Common/MaterialWallpaper.js" as Art SettingsSwatchGrid { id: root diff --git a/quickshell/Modules/Settings/Widgets/MaterialWallpaperPresets.qml b/quickshell/Modules/Settings/Widgets/MaterialWallpaperPresets.qml index 1c8071884..7f34b8852 100644 --- a/quickshell/Modules/Settings/Widgets/MaterialWallpaperPresets.qml +++ b/quickshell/Modules/Settings/Widgets/MaterialWallpaperPresets.qml @@ -3,8 +3,9 @@ pragma ComponentBehavior: Bound import QtQuick import Quickshell.Widgets import qs.Common +import qs.DCommon.Widgets import qs.Widgets -import "../../../DankCommon/Common/MaterialWallpaper.js" as Art +import "../../../DCommon/Common/MaterialWallpaper.js" as Art Flow { id: root diff --git a/quickshell/Modules/Settings/Widgets/SettingsButtonGroupRow.qml b/quickshell/Modules/Settings/Widgets/SettingsButtonGroupRow.qml index 13f55bda3..1a901b239 100644 --- a/quickshell/Modules/Settings/Widgets/SettingsButtonGroupRow.qml +++ b/quickshell/Modules/Settings/Widgets/SettingsButtonGroupRow.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets SettingsRow { id: root @@ -53,9 +53,9 @@ SettingsRow { visible: root.compact } - DankButtonGroup { - arrowKeysSelect: false + DButtonGroup { id: buttonGroup + arrowKeysSelect: false parent: root.compact ? bodyHost : trailingHost x: root.compact ? (parent.width - width) / 2 : 0 selectionMode: "single" diff --git a/quickshell/Modules/Settings/Widgets/SettingsColorPicker.qml b/quickshell/Modules/Settings/Widgets/SettingsColorPicker.qml index f80c646ae..714fa958d 100644 --- a/quickshell/Modules/Settings/Widgets/SettingsColorPicker.qml +++ b/quickshell/Modules/Settings/Widgets/SettingsColorPicker.qml @@ -3,7 +3,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets SettingsRow { id: root @@ -64,13 +64,13 @@ SettingsRow { anchors.centerIn: parent spacing: Theme.spacingXS - DankColorSwatch { + DColorSwatch { width: Theme.iconSize height: Theme.iconSize swatchColor: modelData.color anchors.horizontalCenter: parent.horizontalCenter - DankIcon { + DIcon { visible: modelData.id === "custom" anchors.centerIn: parent name: "colorize" diff --git a/quickshell/Modules/Settings/Widgets/SettingsControlledBy.qml b/quickshell/Modules/Settings/Widgets/SettingsControlledBy.qml index 62a446ad2..824541918 100644 --- a/quickshell/Modules/Settings/Widgets/SettingsControlledBy.qml +++ b/quickshell/Modules/Settings/Widgets/SettingsControlledBy.qml @@ -3,7 +3,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets StyledRect { id: root @@ -65,7 +65,7 @@ StyledRect { anchors.rightMargin: Theme.spacingM spacing: Theme.spacingM - DankIcon { + DIcon { name: root.iconName size: Theme.iconSize color: Theme.primary @@ -96,7 +96,7 @@ StyledRect { } } - DankButton { + DButton { id: openButton anchors.verticalCenter: parent.verticalCenter text: root.buttonText diff --git a/quickshell/Modules/Settings/Widgets/SettingsDeleteButton.qml b/quickshell/Modules/Settings/Widgets/SettingsDeleteButton.qml index 21b23f5bf..9911aa413 100644 --- a/quickshell/Modules/Settings/Widgets/SettingsDeleteButton.qml +++ b/quickshell/Modules/Settings/Widgets/SettingsDeleteButton.qml @@ -1,8 +1,8 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets -DankActionButton { +DActionButton { id: root property bool confirming: false diff --git a/quickshell/Modules/Settings/Widgets/SettingsFabBar.qml b/quickshell/Modules/Settings/Widgets/SettingsFabBar.qml index 2f34b8d69..4ae81bb78 100644 --- a/quickshell/Modules/Settings/Widgets/SettingsFabBar.qml +++ b/quickshell/Modules/Settings/Widgets/SettingsFabBar.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets Item { id: root @@ -38,7 +38,7 @@ Item { damping: root.scaleSpring.damping } - DankLayer { + DLayer { id: surface width: row.implicitWidth + root.shadowPadding * 2 diff --git a/quickshell/Modules/Settings/Widgets/SettingsFontDropdownRow.qml b/quickshell/Modules/Settings/Widgets/SettingsFontDropdownRow.qml index f001ce9f2..3e2a24978 100644 --- a/quickshell/Modules/Settings/Widgets/SettingsFontDropdownRow.qml +++ b/quickshell/Modules/Settings/Widgets/SettingsFontDropdownRow.qml @@ -2,7 +2,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common -import qs.DankCommon.Common as DankCommon +import qs.DCommon.Common as DCommon SettingsDropdownRow { id: root @@ -17,7 +17,7 @@ SettingsDropdownRow { function _enumerate() { if (_enumerated) return; - const bundled = DankCommon.Fonts.bundledFamilies.filter(f => f !== root.defaultFamily); + const bundled = DCommon.Fonts.bundledFamilies.filter(f => f !== root.defaultFamily); const system = Qt.fontFamilies().filter(f => !f.startsWith(".") && f !== root.defaultFamily && !bundled.includes(f)); system.sort(); _families = ["Default"].concat(bundled, system); diff --git a/quickshell/Modules/Settings/Widgets/SettingsInstanceRow.qml b/quickshell/Modules/Settings/Widgets/SettingsInstanceRow.qml index 5fe35d395..de01b85d7 100644 --- a/quickshell/Modules/Settings/Widgets/SettingsInstanceRow.qml +++ b/quickshell/Modules/Settings/Widgets/SettingsInstanceRow.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets SettingsRow { id: root @@ -21,7 +21,7 @@ SettingsRow { subtitle: deleteButton.confirming ? I18n.tr("Confirm Delete") : summary subtitleColor: deleteButton.confirming ? Theme.error : Theme.surfaceVariantText - DankToggle { + DToggle { visible: root.toggleVisible hideText: true text: root.title diff --git a/quickshell/Modules/Settings/Widgets/SettingsLayoutPicker.qml b/quickshell/Modules/Settings/Widgets/SettingsLayoutPicker.qml index 972710f8b..3c6353756 100644 --- a/quickshell/Modules/Settings/Widgets/SettingsLayoutPicker.qml +++ b/quickshell/Modules/Settings/Widgets/SettingsLayoutPicker.qml @@ -4,6 +4,7 @@ import QtQuick import QtQuick.Layouts import qs.Common import qs.Modules.DankBar +import qs.DCommon.Widgets import qs.Widgets GridLayout { diff --git a/quickshell/Modules/Settings/Widgets/SettingsLocationSection.qml b/quickshell/Modules/Settings/Widgets/SettingsLocationSection.qml index 40d30d8a3..aefc4996f 100644 --- a/quickshell/Modules/Settings/Widgets/SettingsLocationSection.qml +++ b/quickshell/Modules/Settings/Widgets/SettingsLocationSection.qml @@ -2,7 +2,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets Column { id: root @@ -12,7 +12,7 @@ Column { width: parent.width spacing: Theme.spacingM - DankToggle { + DToggle { id: ipLocationToggle width: parent.width text: I18n.tr("Use IP Location") @@ -50,7 +50,7 @@ Column { width: (parent.width - Theme.spacingM) / 2 spacing: Theme.spacingXS - DankTextField { + DTextField { id: latitudeField outlined: true leftIconName: "location_on" @@ -88,7 +88,7 @@ Column { width: (parent.width - Theme.spacingM) / 2 spacing: Theme.spacingXS - DankTextField { + DTextField { id: longitudeField outlined: true leftIconName: "location_on" @@ -130,7 +130,7 @@ Column { font.weight: Theme.fontWeightMedium } - DankLocationSearch { + DLocationSearch { width: parent.width currentLocation: SessionData.nightModeLocationName onLocationSelected: (displayName, coordinates) => { diff --git a/quickshell/Modules/Settings/Widgets/SettingsNoteRow.qml b/quickshell/Modules/Settings/Widgets/SettingsNoteRow.qml index b5df938ef..b0b76ea38 100644 --- a/quickshell/Modules/Settings/Widgets/SettingsNoteRow.qml +++ b/quickshell/Modules/Settings/Widgets/SettingsNoteRow.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets SettingsRow { id: root @@ -20,7 +20,7 @@ SettingsRow { radius: Theme.cornerRadius color: root.tintBackground - DankFlickable { + DFlickable { anchors.fill: parent anchors.margins: Theme.spacingS contentHeight: noteRow.implicitHeight @@ -33,7 +33,7 @@ SettingsRow { width: parent.width spacing: Theme.spacingS - DankIcon { + DIcon { visible: root.noteIconName !== "" name: root.noteIconName size: Theme.iconSizeSmall diff --git a/quickshell/Modules/Settings/Widgets/SettingsPage.qml b/quickshell/Modules/Settings/Widgets/SettingsPage.qml index 8ffafb889..c01b4f7f3 100644 --- a/quickshell/Modules/Settings/Widgets/SettingsPage.qml +++ b/quickshell/Modules/Settings/Widgets/SettingsPage.qml @@ -1,8 +1,8 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets -DankFlickable { +DFlickable { id: root default property alias content: column.data diff --git a/quickshell/Modules/Settings/Widgets/SettingsRenameDialog.qml b/quickshell/Modules/Settings/Widgets/SettingsRenameDialog.qml index f9e620aaf..f3538ee3e 100644 --- a/quickshell/Modules/Settings/Widgets/SettingsRenameDialog.qml +++ b/quickshell/Modules/Settings/Widgets/SettingsRenameDialog.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets // Parent to the modal focus scope so it covers the window; focus returns to the opener on close Loader { @@ -49,7 +49,7 @@ Loader { focusItem.forceActiveFocus(Qt.OtherFocusReason); } - sourceComponent: DankDialog { + sourceComponent: DDialog { id: dialog embedded: nativeWindow @@ -75,13 +75,13 @@ Loader { } actions: [ - DankButton { + DButton { text: I18n.tr("Cancel") backgroundColor: "transparent" textColor: Theme.primary onClicked: dialog.rejected() }, - DankButton { + DButton { text: I18n.tr("Save") iconName: "check" enabled: dialog.acceptEnabled @@ -95,7 +95,7 @@ Loader { sourceComponent: root.aboveField } - DankTextField { + DTextField { id: nameInput outlined: true leftIconName: root.leftIconName diff --git a/quickshell/Modules/Settings/Widgets/SettingsReorderGroup.qml b/quickshell/Modules/Settings/Widgets/SettingsReorderGroup.qml index 4c1d12694..01d3dafa3 100644 --- a/quickshell/Modules/Settings/Widgets/SettingsReorderGroup.qml +++ b/quickshell/Modules/Settings/Widgets/SettingsReorderGroup.qml @@ -1,3 +1,3 @@ -import qs.Widgets +import qs.DCommon.Widgets -DankReorderGroup {} +DReorderGroup {} diff --git a/quickshell/Modules/Settings/Widgets/SettingsReorderList.qml b/quickshell/Modules/Settings/Widgets/SettingsReorderList.qml index 3f47abbc4..636ca01f7 100644 --- a/quickshell/Modules/Settings/Widgets/SettingsReorderList.qml +++ b/quickshell/Modules/Settings/Widgets/SettingsReorderList.qml @@ -1,8 +1,8 @@ import QtQuick -import qs.Widgets +import qs.DCommon.Widgets import "../../../Common/QmlUtils.js" as QmlUtils -DankReorderList { +DReorderList { id: root readonly property bool isSettingsRow: true diff --git a/quickshell/Modules/Settings/Widgets/SettingsReorderPreview.qml b/quickshell/Modules/Settings/Widgets/SettingsReorderPreview.qml index 2f9e50923..1b4689283 100644 --- a/quickshell/Modules/Settings/Widgets/SettingsReorderPreview.qml +++ b/quickshell/Modules/Settings/Widgets/SettingsReorderPreview.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets SettingsRow { id: root @@ -24,7 +24,7 @@ SettingsRow { width: Theme.iconButtonSize height: Theme.iconButtonSize - DankIcon { + DIcon { anchors.centerIn: parent name: "drag_indicator" size: Theme.iconSizeMedium diff --git a/quickshell/Modules/Settings/Widgets/SettingsReorderRow.qml b/quickshell/Modules/Settings/Widgets/SettingsReorderRow.qml index 00d848949..f899ff653 100644 --- a/quickshell/Modules/Settings/Widgets/SettingsReorderRow.qml +++ b/quickshell/Modules/Settings/Widgets/SettingsReorderRow.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets SettingsRow { id: root @@ -38,7 +38,7 @@ SettingsRow { } leading: [ - DankDragHandle { + DDragHandle { id: handle visible: root.reorderEnabled diff --git a/quickshell/Modules/Settings/Widgets/SettingsRow.qml b/quickshell/Modules/Settings/Widgets/SettingsRow.qml index 25596c0d8..a530f1836 100644 --- a/quickshell/Modules/Settings/Widgets/SettingsRow.qml +++ b/quickshell/Modules/Settings/Widgets/SettingsRow.qml @@ -4,7 +4,7 @@ import QtQuick import QtQuick.Templates as T import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets T.Control { id: root @@ -178,7 +178,7 @@ T.Control { } } - DankRipple { + DRipple { id: ripple visible: root.clickable rippleColor: root.contentColor @@ -262,7 +262,7 @@ T.Control { color: root.iconBox ? Theme.withAlpha(root.iconColor, Theme.tonalTintAlpha) : "transparent" visible: root.iconName !== "" - DankIcon { + DIcon { anchors.centerIn: parent name: root.iconName size: root.iconBox ? Theme.iconSizeMedium : Theme.iconSize @@ -313,7 +313,7 @@ T.Control { active: root.modified && root.resetInHeader visible: active - sourceComponent: DankActionButton { + sourceComponent: DActionButton { buttonSize: Theme.iconButtonSize iconName: "restart_alt" iconSize: Theme.iconSizeMedium @@ -346,7 +346,7 @@ T.Control { anchors.verticalCenter: parent.verticalCenter } - DankIcon { + DIcon { name: "chevron_right" size: Theme.iconSize color: root.supportingContentColor diff --git a/quickshell/Modules/Settings/Widgets/SettingsScreenPositionPicker.qml b/quickshell/Modules/Settings/Widgets/SettingsScreenPositionPicker.qml index 8ec526bc9..20c0fac94 100644 --- a/quickshell/Modules/Settings/Widgets/SettingsScreenPositionPicker.qml +++ b/quickshell/Modules/Settings/Widgets/SettingsScreenPositionPicker.qml @@ -2,6 +2,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common +import qs.DCommon.Widgets import qs.Widgets Item { diff --git a/quickshell/Modules/Settings/Widgets/SettingsSectionLabel.qml b/quickshell/Modules/Settings/Widgets/SettingsSectionLabel.qml index ae57cdafd..c1198c130 100644 --- a/quickshell/Modules/Settings/Widgets/SettingsSectionLabel.qml +++ b/quickshell/Modules/Settings/Widgets/SettingsSectionLabel.qml @@ -1,5 +1,6 @@ import QtQuick import qs.Common +import qs.DCommon.Widgets import qs.Widgets Item { @@ -67,7 +68,7 @@ Item { spacing: Theme.spacingXS } - DankIcon { + DIcon { id: caret anchors.right: parent.right anchors.verticalCenter: label.verticalCenter diff --git a/quickshell/Modules/Settings/Widgets/SettingsSidebarItem.qml b/quickshell/Modules/Settings/Widgets/SettingsSidebarItem.qml index b2e90927a..13d13ef7a 100644 --- a/quickshell/Modules/Settings/Widgets/SettingsSidebarItem.qml +++ b/quickshell/Modules/Settings/Widgets/SettingsSidebarItem.qml @@ -1,5 +1,6 @@ import QtQuick import qs.Common +import qs.DCommon.Widgets import qs.Widgets Rectangle { @@ -95,7 +96,7 @@ Rectangle { } } - DankRipple { + DRipple { id: ripple rippleColor: Theme.surfaceText topLeftRadius: root.topRadius @@ -123,7 +124,7 @@ Rectangle { } } - DankIcon { + DIcon { anchors.centerIn: parent name: root.iconName size: Theme.iconSizeMedium diff --git a/quickshell/Modules/Settings/Widgets/SettingsSliderRow.qml b/quickshell/Modules/Settings/Widgets/SettingsSliderRow.qml index 414c5de08..3bfe95024 100644 --- a/quickshell/Modules/Settings/Widgets/SettingsSliderRow.qml +++ b/quickshell/Modules/Settings/Widgets/SettingsSliderRow.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets SettingsRow { id: root @@ -53,7 +53,7 @@ SettingsRow { width: parent.width spacing: Theme.spacingS - DankActionButton { + DActionButton { buttonSize: Theme.iconButtonSize iconName: "remove" Accessible.name: I18n.tr("Decrease", "verb, minus button next to a settings slider") @@ -64,7 +64,7 @@ SettingsRow { onClicked: root.nudge(-1) } - DankSlider { + DSlider { id: slider upDownKeysStep: false Accessible.name: root.text @@ -80,7 +80,7 @@ SettingsRow { onSliderDragFinished: finalValue => root.sliderDragFinished(finalValue) } - DankActionButton { + DActionButton { buttonSize: Theme.iconButtonSize iconName: "add" Accessible.name: I18n.tr("Increase", "verb, plus button next to a settings slider") diff --git a/quickshell/Modules/Settings/Widgets/SettingsSplitRow.qml b/quickshell/Modules/Settings/Widgets/SettingsSplitRow.qml index 788dc503f..971878404 100644 --- a/quickshell/Modules/Settings/Widgets/SettingsSplitRow.qml +++ b/quickshell/Modules/Settings/Widgets/SettingsSplitRow.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets SettingsRow { id: root @@ -14,7 +14,7 @@ SettingsRow { clickable: navigable onClicked: keyboard => navigated(keyboard) - DankIcon { + DIcon { name: "chevron_right" size: Theme.iconSize color: Theme.surfaceVariantText @@ -34,7 +34,7 @@ SettingsRow { visible: root.navigable } - DankToggle { + DToggle { hideText: true text: root.title checked: root.checked diff --git a/quickshell/Modules/Settings/Widgets/SettingsSurfacePreview.qml b/quickshell/Modules/Settings/Widgets/SettingsSurfacePreview.qml index c53cc584e..33e0b6539 100644 --- a/quickshell/Modules/Settings/Widgets/SettingsSurfacePreview.qml +++ b/quickshell/Modules/Settings/Widgets/SettingsSurfacePreview.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets Item { id: root diff --git a/quickshell/Modules/Settings/Widgets/SettingsSwatchGrid.qml b/quickshell/Modules/Settings/Widgets/SettingsSwatchGrid.qml index 808c1b169..429a9446e 100644 --- a/quickshell/Modules/Settings/Widgets/SettingsSwatchGrid.qml +++ b/quickshell/Modules/Settings/Widgets/SettingsSwatchGrid.qml @@ -2,6 +2,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common +import qs.DCommon.Widgets import qs.Widgets import qs.Modules.Settings.Widgets @@ -105,7 +106,7 @@ Flow { } } - DankPaletteSwatch { + DPaletteSwatch { anchors.centerIn: parent width: Theme.minimumTouchTargetSize height: Theme.minimumTouchTargetSize @@ -116,7 +117,7 @@ Flow { } } - DankBadge { + DBadge { anchors.top: parent.top anchors.left: parent.left anchors.margins: Theme.spacingXS @@ -126,7 +127,7 @@ Flow { textColor: Theme.onSecondaryContainer } - DankActionButton { + DActionButton { anchors.top: parent.top anchors.right: parent.right anchors.margins: Theme.spacingXS diff --git a/quickshell/Modules/Settings/Widgets/SettingsTextFieldRow.qml b/quickshell/Modules/Settings/Widgets/SettingsTextFieldRow.qml index c243e6c2b..8d61c20f7 100644 --- a/quickshell/Modules/Settings/Widgets/SettingsTextFieldRow.qml +++ b/quickshell/Modules/Settings/Widgets/SettingsTextFieldRow.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets SettingsRow { id: root @@ -36,7 +36,7 @@ SettingsRow { width: parent.width spacing: Theme.spacingS - DankTextField { + DTextField { id: field outlined: true labelText: root.text @@ -49,7 +49,7 @@ SettingsRow { onEditingFinished: root.editingFinished(text) onAccepted: root.accepted(text) - DankActionButton { + DActionButton { id: resetButton anchors.right: parent.right anchors.rightMargin: Theme.spacingXS diff --git a/quickshell/Modules/Settings/Widgets/SettingsTimeRow.qml b/quickshell/Modules/Settings/Widgets/SettingsTimeRow.qml index 85e4a9cdd..e4db98c41 100644 --- a/quickshell/Modules/Settings/Widgets/SettingsTimeRow.qml +++ b/quickshell/Modules/Settings/Widgets/SettingsTimeRow.qml @@ -3,7 +3,7 @@ pragma ComponentBehavior: Bound import QtQuick import QtQuick.Window import qs.Common -import qs.Widgets +import qs.DCommon.Widgets Item { id: root @@ -71,7 +71,7 @@ Item { enabled: root.enabled onClicked: root.edit(isStart) - DankIcon { + DIcon { name: "schedule" size: Theme.iconSize color: Theme.surfaceVariantText @@ -85,7 +85,7 @@ Item { id: pickerLoader active: false - sourceComponent: DankTimePicker { + sourceComponent: DTimePicker { parent: root.Window.contentItem is24Hour: root.is24Hour onAccepted: (hour, minute) => { diff --git a/quickshell/Modules/Settings/Widgets/SettingsToggleRow.qml b/quickshell/Modules/Settings/Widgets/SettingsToggleRow.qml index 5e9362122..3e872429f 100644 --- a/quickshell/Modules/Settings/Widgets/SettingsToggleRow.qml +++ b/quickshell/Modules/Settings/Widgets/SettingsToggleRow.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets SettingsRow { id: root @@ -32,7 +32,7 @@ SettingsRow { toggled(!checked); } - DankToggle { + DToggle { hideText: true text: root.text description: root.description diff --git a/quickshell/Modules/Settings/Widgets/SettingsWallpaperThumb.qml b/quickshell/Modules/Settings/Widgets/SettingsWallpaperThumb.qml index 0f2eb9b3f..6480eec2e 100644 --- a/quickshell/Modules/Settings/Widgets/SettingsWallpaperThumb.qml +++ b/quickshell/Modules/Settings/Widgets/SettingsWallpaperThumb.qml @@ -1,6 +1,7 @@ import QtQuick import Quickshell.Widgets import qs.Common +import qs.DCommon.Widgets import qs.Widgets Rectangle { @@ -53,7 +54,7 @@ Rectangle { } } - DankIcon { + DIcon { anchors.centerIn: parent name: root.placeholderIcon size: Theme.iconSizeLarge @@ -86,7 +87,7 @@ Rectangle { anchors.centerIn: parent spacing: Theme.spacingS - DankActionButton { + DActionButton { buttonSize: Theme.iconButtonSize iconName: "folder_open" iconSize: Theme.iconSizeMedium @@ -96,7 +97,7 @@ Rectangle { onClicked: root.browse() } - DankActionButton { + DActionButton { buttonSize: Theme.iconButtonSize iconName: "palette" iconSize: Theme.iconSizeMedium @@ -107,7 +108,7 @@ Rectangle { onClicked: root.pickColor() } - DankActionButton { + DActionButton { buttonSize: Theme.iconButtonSize iconName: "close" iconSize: Theme.iconSizeMedium diff --git a/quickshell/Modules/Settings/WidgetsTab.qml b/quickshell/Modules/Settings/WidgetsTab.qml index ed8e6d14b..c96dd93b1 100644 --- a/quickshell/Modules/Settings/WidgetsTab.qml +++ b/quickshell/Modules/Settings/WidgetsTab.qml @@ -2,7 +2,7 @@ import QtQuick import Quickshell import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets Item { @@ -583,9 +583,9 @@ Item { visible: hasMultipleBars SettingsRow { - body: DankButtonGroup { - arrowKeysSelect: false + body: DButtonGroup { id: barSelectorGroup + arrowKeysSelect: false width: parent.width model: SettingsData.barConfigs.map(cfg => cfg.name || ("Bar " + (SettingsData.barConfigs.indexOf(cfg) + 1))) currentIndex: { @@ -607,7 +607,7 @@ Item { iconName: "widgets" title: I18n.tr("Sections", "bar widget settings heading for left, center, right sections") - headerActions: DankButton { + headerActions: DButton { text: I18n.tr("Reset") iconName: "refresh" buttonHeight: Theme.buttonHeightXS @@ -694,7 +694,7 @@ Item { width: parent.width spacing: Theme.spacingS - DankButton { + DButton { text: I18n.tr("Launcher", "island settings: button to launcher tab") iconName: "grid_view" onClicked: { @@ -705,7 +705,7 @@ Item { } } - DankButton { + DButton { text: I18n.tr("Time & weather", "island settings: button to weather tab") iconName: "cloud" onClicked: { diff --git a/quickshell/Modules/Settings/WidgetsTabSection.qml b/quickshell/Modules/Settings/WidgetsTabSection.qml index 89e78d1c4..52717710d 100644 --- a/quickshell/Modules/Settings/WidgetsTabSection.qml +++ b/quickshell/Modules/Settings/WidgetsTabSection.qml @@ -2,7 +2,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets import qs.Services import qs.Modules.Settings.Widgets import "../DankBar/OverflowLayout.js" as OverflowLayout @@ -63,7 +63,7 @@ Column { SettingsSectionLabel { text: root.title actions: [ - DankActionButton { + DActionButton { buttonSize: Theme.buttonHeightXXS iconName: "more_horiz" tooltipText: I18n.tr("Overflow") @@ -73,7 +73,7 @@ Column { visible: root.barId !== "" onClicked: root.overflowSettingsExpanded = !root.overflowSettingsExpanded }, - DankActionButton { + DActionButton { buttonSize: Theme.buttonHeightXXS iconName: "format_list_numbered" tooltipText: I18n.tr("Index centering") @@ -82,7 +82,7 @@ Column { visible: root.sectionId === "center" onClicked: SettingsData.set("centeringMode", "index") }, - DankActionButton { + DActionButton { buttonSize: Theme.buttonHeightXXS iconName: "center_focus_weak" tooltipText: I18n.tr("Geometric centering") @@ -169,7 +169,7 @@ Column { visible: !!widgetRow.modelData.warning anchors.verticalCenter: parent.verticalCenter - DankIcon { + DIcon { name: "warning" size: Theme.iconSizeMedium color: Theme.error @@ -182,14 +182,14 @@ Column { hoverEnabled: true } - DankTooltipHost { + DTooltipHost { text: widgetRow.modelData.warning target: parent hoverArea: warningArea } } - DankIcon { + DIcon { name: "chevron_right" size: Theme.iconSize color: Theme.onSurfaceVariant @@ -203,7 +203,7 @@ Column { visible: widgetRow.configurable } - DankNumberStepper { + DNumberStepper { visible: widgetRow.modelData.id === "spacer" anchors.verticalCenter: parent.verticalCenter text: (widgetRow.modelData.size || 20).toString() @@ -213,7 +213,7 @@ Column { onIncrement: () => root.spacerSizeChanged(root.sectionId, widgetRow.index, Math.min(5000, (widgetRow.modelData.size || 20) + 5)) } - DankToggle { + DToggle { hideText: true visible: widgetRow.modelData.id !== "spacer" checked: widgetRow.modelData.enabled @@ -221,7 +221,7 @@ Column { onToggled: value => root.itemEnabledChanged(root.sectionId, widgetRow.modelData.id, value) } - DankActionButton { + DActionButton { iconName: "close" iconColor: Theme.error Accessible.name: I18n.tr("Remove") @@ -231,7 +231,7 @@ Column { } } - DankButton { + DButton { anchors.horizontalCenter: parent.horizontalCenter text: I18n.tr("Add widget") iconName: "add" diff --git a/quickshell/Modules/Settings/WindowRuleEditorDialog.qml b/quickshell/Modules/Settings/WindowRuleEditorDialog.qml index 0b18c2b31..bb3cc354a 100644 --- a/quickshell/Modules/Settings/WindowRuleEditorDialog.qml +++ b/quickshell/Modules/Settings/WindowRuleEditorDialog.qml @@ -4,10 +4,11 @@ import QtQuick import qs.Common import "../../Common/WindowRuleSize.js" as WindowRuleSize import qs.Services +import qs.DCommon.Widgets import qs.Widgets import qs.Modules.Settings.Widgets -DankDialog { +DDialog { id: root property var editingRule: null @@ -607,7 +608,7 @@ DankDialog { } } - component Field: DankTextField { + component Field: DTextField { property int share: 1 property int shares: 2 @@ -628,7 +629,7 @@ DankDialog { placeholderText: unit === WindowRuleSize.PERCENT ? "50" : pixelsPlaceholder rightAccessoryWidth: unitPicker.width + Theme.spacingS - DankButtonGroup { + DButtonGroup { id: unitPicker anchors.right: parent.right anchors.rightMargin: Theme.spacingS @@ -649,14 +650,14 @@ DankDialog { readonly property var matchConditions: [condFloating, condActive, condFocused, condActiveInColumn, condCastTarget, condUrgent, condAtStartup, condXwayland, condFullscreen, condPinned, condInitialised] actions: [ - DankButton { + DButton { text: I18n.tr("Cancel") enabled: root.closeEnabled backgroundColor: "transparent" textColor: Theme.primary onClicked: root.rejected() }, - DankButton { + DButton { text: root.isEditMode ? I18n.tr("Save") : I18n.tr("Add") enabled: root.acceptEnabled busy: root.submitting @@ -666,7 +667,7 @@ DankDialog { SettingsGroup { SettingsRow { - body: DankTextField { + body: DTextField { id: nameInput width: parent.width outlined: true @@ -680,7 +681,7 @@ DankDialog { SettingsCard { title: I18n.tr("Match Criteria") - headerActions: DankButton { + headerActions: DButton { visible: root.isNiri text: I18n.tr("Add match") iconName: "add" @@ -700,7 +701,7 @@ DankDialog { } SettingsRow { - body: DankTextField { + body: DTextField { id: appIdInput width: parent.width outlined: true @@ -719,7 +720,7 @@ DankDialog { labelText: root.isMango ? I18n.tr("Title (optional)") : I18n.tr("Title regex (optional)") } - DankActionButton { + DActionButton { id: addTitle anchors.verticalCenter: parent.verticalCenter iconName: "add" @@ -755,7 +756,7 @@ DankDialog { onTextEdited: extraMatchModel.setProperty(extraRow.index, "rowTitle", text) } - DankActionButton { + DActionButton { id: removeMatch anchors.verticalCenter: parent.verticalCenter iconName: "close" @@ -865,7 +866,7 @@ DankDialog { } SettingsRow { - body: DankFilterChips { + body: DFilterChips { width: parent.width multiSelect: true showCounts: false @@ -977,7 +978,7 @@ DankDialog { SettingsRow { visible: root.isNiri - body: DankFilterChips { + body: DFilterChips { width: parent.width multiSelect: true showCounts: false @@ -1143,7 +1144,7 @@ DankDialog { visible: root.isHyprland SettingsRow { - body: DankFilterChips { + body: DFilterChips { width: parent.width multiSelect: true showCounts: false @@ -1208,7 +1209,7 @@ DankDialog { visible: root.isMango SettingsRow { - body: DankFilterChips { + body: DFilterChips { width: parent.width multiSelect: true showCounts: false diff --git a/quickshell/Modules/Settings/WindowRulesTab.qml b/quickshell/Modules/Settings/WindowRulesTab.qml index c3b0ea9e5..570d002a6 100644 --- a/quickshell/Modules/Settings/WindowRulesTab.qml +++ b/quickshell/Modules/Settings/WindowRulesTab.qml @@ -7,6 +7,7 @@ import qs.Common import "../../Common/ConfigIncludeResolve.js" as ConfigIncludeResolve import "../../Common/WindowRuleSize.js" as WindowRuleSize import qs.Services +import qs.DCommon.Widgets import qs.Widgets import qs.Modules.Settings.Widgets @@ -386,7 +387,7 @@ Item { width: parent.width spacing: Theme.spacingXS - DankIcon { + DIcon { name: "select_window" size: Theme.iconSizeLarge color: Theme.surfaceVariantText @@ -432,7 +433,7 @@ Item { return parts.length > 0 ? parts.join(" · ") : I18n.tr("No match criteria"); } - DankActionButton { + DActionButton { anchors.verticalCenter: parent.verticalCenter iconName: "edit" enabled: !root.readOnly @@ -440,7 +441,7 @@ Item { onClicked: root.editRule(ruleRow.liveRuleData) } - DankActionButton { + DActionButton { anchors.verticalCenter: parent.verticalCenter iconName: "delete" iconColor: Theme.error @@ -458,7 +459,7 @@ Item { id: actionRepeater model: root.actionChips(ruleRow.liveRuleData.actions) - delegate: DankBadge { + delegate: DBadge { required property string modelData maximumWidth: parent?.width ?? 0 text: modelData @@ -526,7 +527,7 @@ Item { clickable: true onClicked: root.expandedExternalId = externalCard.expanded ? "" : externalCard.modelData.id - DankBadge { + DBadge { visible: externalCard.sourceFile.length > 0 anchors.verticalCenter: parent.verticalCenter text: externalCard.sourceFile @@ -534,14 +535,14 @@ Item { textColor: Theme.surfaceVariantText } - DankIcon { + DIcon { name: externalCard.expanded ? "expand_less" : "expand_more" size: Theme.iconSize color: Theme.surfaceVariantText anchors.verticalCenter: parent.verticalCenter } - DankActionButton { + DActionButton { iconName: "content_copy" iconColor: Theme.surfaceVariantText enabled: !root.readOnly @@ -564,7 +565,7 @@ Item { Repeater { model: root.actionChips(externalCard.modelData.actions) - delegate: DankBadge { + delegate: DBadge { required property string modelData maximumWidth: parent?.width ?? 0 text: modelData @@ -641,7 +642,7 @@ Item { SettingsFabBar { shown: !root.readOnly - DankFab { + DFab { text: I18n.tr("Add window rule") iconName: "add" onClicked: root.openRuleModal() diff --git a/quickshell/Modules/Settings/WorkspaceAppearanceCard.qml b/quickshell/Modules/Settings/WorkspaceAppearanceCard.qml index 9f1749897..cb6ec051c 100644 --- a/quickshell/Modules/Settings/WorkspaceAppearanceCard.qml +++ b/quickshell/Modules/Settings/WorkspaceAppearanceCard.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Settings.Widgets SettingsCard { @@ -55,7 +55,7 @@ SettingsCard { width: parent.width height: workspaceTabBar.height + Theme.spacingM - DankTabBar { + DTabBar { id: workspaceTabBar width: parent.width tabHeight: 44 @@ -216,7 +216,7 @@ SettingsCard { title: modelData - DankIconPicker { + DIconPicker { id: iconPicker anchors.verticalCenter: parent.verticalCenter @@ -247,7 +247,7 @@ SettingsCard { } } - DankActionButton { + DActionButton { buttonSize: Theme.iconButtonSize iconName: "close" Accessible.name: I18n.tr("Remove") diff --git a/quickshell/Modules/SurfaceWidgets/ApplicationItem.qml b/quickshell/Modules/SurfaceWidgets/ApplicationItem.qml index ba798ef54..19c0ce79e 100644 --- a/quickshell/Modules/SurfaceWidgets/ApplicationItem.qml +++ b/quickshell/Modules/SurfaceWidgets/ApplicationItem.qml @@ -3,7 +3,6 @@ pragma ComponentBehavior: Bound import QtQuick import qs.Common import qs.Modules.Dock -import qs.Widgets Item { id: delegateItem diff --git a/quickshell/Modules/SurfaceWidgets/BarPill.qml b/quickshell/Modules/SurfaceWidgets/BarPill.qml index 1b451243e..ce26bde36 100644 --- a/quickshell/Modules/SurfaceWidgets/BarPill.qml +++ b/quickshell/Modules/SurfaceWidgets/BarPill.qml @@ -1,6 +1,7 @@ import QtQuick import qs.Common import qs.Services +import qs.DCommon.Widgets import qs.Widgets import qs.Modules.DankBar @@ -279,7 +280,7 @@ Item { } } - DankRipple { + DRipple { id: rippleLayer rippleColor: Theme.surfaceText topLeftRadius: root.topLeftRadius diff --git a/quickshell/Modules/SurfaceWidgets/MediaActivityFace.qml b/quickshell/Modules/SurfaceWidgets/MediaActivityFace.qml index 8a4d0e56b..e092fd928 100644 --- a/quickshell/Modules/SurfaceWidgets/MediaActivityFace.qml +++ b/quickshell/Modules/SurfaceWidgets/MediaActivityFace.qml @@ -5,6 +5,7 @@ import Quickshell import qs.Common import qs.Modules.DankBar.Widgets import qs.Services +import qs.DCommon.Widgets import qs.Widgets Item { diff --git a/quickshell/Modules/SurfaceWidgets/SurfaceStrip.qml b/quickshell/Modules/SurfaceWidgets/SurfaceStrip.qml index ab3bce68f..7e749c78c 100644 --- a/quickshell/Modules/SurfaceWidgets/SurfaceStrip.qml +++ b/quickshell/Modules/SurfaceWidgets/SurfaceStrip.qml @@ -2,7 +2,7 @@ pragma ComponentBehavior: Bound import QtQuick import Quickshell import qs.Common -import qs.Widgets +import qs.DCommon.Widgets import "../../Common/settings/DockConfig.js" as DockConfig FocusScope { @@ -296,7 +296,7 @@ FocusScope { id: updateLayout onTriggered: root.layoutRevision++ } - DankFlickable { + DFlickable { id: scroll x: root.vertical ? -root.crossOverflow : 0 y: root.vertical ? 0 : -root.crossOverflow @@ -499,7 +499,7 @@ FocusScope { onCanceled: root.cancelDrag() onWheel: wheel => wheel.accepted = false } - DankActionButton { + DActionButton { visible: root.surfaceContext.editMode && slot.modelData.widgetId !== "application" && (root.participating[slot.index] ?? false) z: 2 anchors.top: parent.top diff --git a/quickshell/Modules/SystemUpdate/SystemUpdatePanel.qml b/quickshell/Modules/SystemUpdate/SystemUpdatePanel.qml index ace33cc80..e763ed598 100644 --- a/quickshell/Modules/SystemUpdate/SystemUpdatePanel.qml +++ b/quickshell/Modules/SystemUpdate/SystemUpdatePanel.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Layouts import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets FocusScope { id: updaterPanel @@ -137,7 +137,7 @@ FocusScope { } } - DankRefreshButton { + DRefreshButton { Layout.alignment: Qt.AlignTop buttonSize: Theme.buttonHeightXS iconSize: Theme.iconSizeSmall @@ -155,7 +155,7 @@ FocusScope { Layout.fillHeight: true Layout.minimumHeight: Theme.listItemTwoLineHeight - DankListView { + DListView { id: packagesList anchors.fill: parent visible: updaterPanel.showPackages @@ -163,7 +163,7 @@ FocusScope { spacing: Theme.groupedListGap model: SystemUpdateService.availableUpdates - delegate: DankListRow { + delegate: DListRow { id: packageRow required property var modelData required property int index @@ -215,7 +215,7 @@ FocusScope { } } - DankActionButton { + DActionButton { buttonSize: Theme.iconButtonSize iconSize: Theme.iconSize iconName: "visibility_off" @@ -231,7 +231,7 @@ FocusScope { } } - DankFlickable { + DFlickable { id: statusView anchors.fill: parent visible: !updaterPanel.showPackages && (!SystemUpdateService.isUpgrading || updaterPanel.upgradeRunsInTerminal) @@ -246,7 +246,7 @@ FocusScope { width: statusView.width - Theme.spacingL * 2 spacing: Theme.spacingM - DankIcon { + DIcon { anchors.horizontalCenter: parent.horizontalCenter name: { switch (true) { @@ -301,7 +301,7 @@ FocusScope { } } - DankFlickable { + DFlickable { id: upgradeLog anchors.fill: parent visible: SystemUpdateService.isUpgrading && !updaterPanel.upgradeRunsInTerminal @@ -324,7 +324,7 @@ FocusScope { } } - DankButton { + DButton { Layout.fillWidth: true visible: updaterPanel.showIgnored text: I18n.tr("Ignored (%1)").arg(updaterPanel.ignoredNames.length) @@ -338,7 +338,7 @@ FocusScope { onClicked: updaterPanel.ignoredExpanded = !updaterPanel.ignoredExpanded } - DankListView { + DListView { id: ignoredList Layout.fillWidth: true Layout.preferredHeight: Math.min(contentHeight, Theme.listItemHeight * 2) @@ -347,7 +347,7 @@ FocusScope { spacing: Theme.groupedListGap model: updaterPanel.ignoredNames - delegate: DankListRow { + delegate: DListRow { id: ignoredRow required property string modelData required property int index @@ -372,7 +372,7 @@ FocusScope { elide: Text.ElideRight } - DankActionButton { + DActionButton { buttonSize: Theme.iconButtonSize iconSize: Theme.iconSize iconName: "visibility" @@ -393,7 +393,7 @@ FocusScope { layoutDirection: Qt.RightToLeft spacing: Theme.spacingS - DankButton { + DButton { text: SystemUpdateService.isUpgrading ? I18n.tr("Cancel") : I18n.tr("Update All") iconName: SystemUpdateService.isUpgrading ? "stop" : "system_update_alt" backgroundColor: Theme.primary @@ -404,7 +404,7 @@ FocusScope { onClicked: updaterPanel.updateAll() } - DankButton { + DButton { id: closeButton text: I18n.tr("Close") backgroundColor: "transparent" diff --git a/quickshell/Modules/Toast.qml b/quickshell/Modules/Toast.qml index bfd06690a..c3d45ee1d 100644 --- a/quickshell/Modules/Toast.qml +++ b/quickshell/Modules/Toast.qml @@ -3,6 +3,7 @@ import Quickshell import Quickshell.Wayland import qs.Common import qs.Services +import qs.DCommon.Widgets import qs.Widgets import "../Common/Format.js" as Format @@ -138,7 +139,7 @@ PanelWindow { width: parent.width height: Math.max(Theme.iconSize + 8, messageText.implicitHeight) - DankIcon { + DIcon { id: statusIcon name: { switch (ToastService.currentLevel) { @@ -188,7 +189,7 @@ PanelWindow { wrapMode: Text.NoWrap } - DankActionButton { + DActionButton { id: expandButton iconName: toast.expanded ? "expand_less" : "expand_more" Accessible.name: toast.expanded ? I18n.tr("Collapse", "verb, button that collapses an expanded item or section") : I18n.tr("Expand", "verb, button that expands a collapsed item or section") @@ -218,7 +219,7 @@ PanelWindow { } } - DankActionButton { + DActionButton { id: closeButton iconName: "close" Accessible.name: I18n.tr("Close") @@ -302,7 +303,7 @@ PanelWindow { } } - DankActionButton { + DActionButton { id: copyDetailsButton iconName: "content_copy" Accessible.name: I18n.tr("Copy") @@ -384,7 +385,7 @@ PanelWindow { wrapMode: Text.Wrap } - DankActionButton { + DActionButton { id: copyButton iconName: "content_copy" Accessible.name: I18n.tr("Copy Full Command") diff --git a/quickshell/Modules/WorkspaceOverlays/OverviewWidget.qml b/quickshell/Modules/WorkspaceOverlays/OverviewWidget.qml index 8ef7afd41..3c17f0ea4 100644 --- a/quickshell/Modules/WorkspaceOverlays/OverviewWidget.qml +++ b/quickshell/Modules/WorkspaceOverlays/OverviewWidget.qml @@ -3,6 +3,7 @@ import Quickshell import Quickshell.Hyprland import qs.Common import qs.Services +import qs.DCommon.Widgets import qs.Widgets Item { diff --git a/quickshell/PLUGINS/AttachedPanelExample/AttachedPanelExample.qml b/quickshell/PLUGINS/AttachedPanelExample/AttachedPanelExample.qml index 31e08197f..cfdb63177 100644 --- a/quickshell/PLUGINS/AttachedPanelExample/AttachedPanelExample.qml +++ b/quickshell/PLUGINS/AttachedPanelExample/AttachedPanelExample.qml @@ -1,12 +1,12 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Plugins PluginComponent { id: root horizontalBarPill: Component { - DankIcon { + DIcon { name: "sticky_note_2" size: root.iconSize } @@ -22,12 +22,12 @@ PluginComponent { color: Theme.surfaceText font.pixelSize: Theme.fontSizeLarge } - DankTextField { + DTextField { width: parent.width - Theme.spacingM * 2 placeholderText: I18n.trFor("attachedPanelExample", "Type here…") Accessible.name: I18n.trFor("attachedPanelExample", "Notes") } - DankButton { + DButton { text: I18n.trFor("attachedPanelExample", "Close") onClicked: root.surfaceContext.dismissExpansion() } diff --git a/quickshell/PLUGINS/ColorDemoPlugin/ColorDemoSettings.qml b/quickshell/PLUGINS/ColorDemoPlugin/ColorDemoSettings.qml index f34af795b..e0309d8c8 100644 --- a/quickshell/PLUGINS/ColorDemoPlugin/ColorDemoSettings.qml +++ b/quickshell/PLUGINS/ColorDemoPlugin/ColorDemoSettings.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Common import qs.Modules.Plugins -import qs.Widgets +import qs.DCommon.Widgets PluginSettings { id: root diff --git a/quickshell/PLUGINS/ColorDemoPlugin/ColorDemoWidget.qml b/quickshell/PLUGINS/ColorDemoPlugin/ColorDemoWidget.qml index 82928b213..84686a6dc 100644 --- a/quickshell/PLUGINS/ColorDemoPlugin/ColorDemoWidget.qml +++ b/quickshell/PLUGINS/ColorDemoPlugin/ColorDemoWidget.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Plugins PluginComponent { diff --git a/quickshell/PLUGINS/ControlCenterDetailExample/DetailExampleWidget.qml b/quickshell/PLUGINS/ControlCenterDetailExample/DetailExampleWidget.qml index f8e5228fd..28392b799 100644 --- a/quickshell/PLUGINS/ControlCenterDetailExample/DetailExampleWidget.qml +++ b/quickshell/PLUGINS/ControlCenterDetailExample/DetailExampleWidget.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Plugins PluginComponent { @@ -91,7 +91,7 @@ PluginComponent { spacing: Theme.spacingS enabled: false - DankIcon { + DIcon { name: detailRoot.currentSelection === modelData ? "radio_button_checked" : "radio_button_unchecked" color: detailRoot.currentSelection === modelData ? Theme.primary : Theme.surfaceVariantText size: Theme.iconSize @@ -115,7 +115,7 @@ PluginComponent { Row { spacing: Theme.spacingXS - DankIcon { + DIcon { name: root.isEnabled ? "settings" : "settings_off" color: root.isEnabled ? Theme.primary : Theme.surfaceVariantText size: root.iconSize diff --git a/quickshell/PLUGINS/ControlCenterExample/ControlCenterExampleWidget.qml b/quickshell/PLUGINS/ControlCenterExample/ControlCenterExampleWidget.qml index ecce2c64b..4bb3f5f41 100644 --- a/quickshell/PLUGINS/ControlCenterExample/ControlCenterExampleWidget.qml +++ b/quickshell/PLUGINS/ControlCenterExample/ControlCenterExampleWidget.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Plugins PluginComponent { @@ -29,7 +29,7 @@ PluginComponent { Row { spacing: Theme.spacingXS - DankIcon { + DIcon { name: root.isEnabled ? "toggle_on" : "toggle_off" color: root.isEnabled ? Theme.primary : Theme.surfaceVariantText size: root.iconSize @@ -49,7 +49,7 @@ PluginComponent { Column { spacing: Theme.spacingXS - DankIcon { + DIcon { name: root.isEnabled ? "toggle_on" : "toggle_off" color: root.isEnabled ? Theme.primary : Theme.surfaceVariantText size: root.iconSize diff --git a/quickshell/PLUGINS/DashCardExample/ProgressCard.qml b/quickshell/PLUGINS/DashCardExample/ProgressCard.qml index 37047fc82..556d13c58 100644 --- a/quickshell/PLUGINS/DashCardExample/ProgressCard.qml +++ b/quickshell/PLUGINS/DashCardExample/ProgressCard.qml @@ -1,7 +1,7 @@ import QtQuick import Quickshell import qs.Common -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Plugins import qs.Modules.DankDash diff --git a/quickshell/PLUGINS/DashCounterExample/CounterCard.qml b/quickshell/PLUGINS/DashCounterExample/CounterCard.qml index 2529b3beb..e100f501d 100644 --- a/quickshell/PLUGINS/DashCounterExample/CounterCard.qml +++ b/quickshell/PLUGINS/DashCounterExample/CounterCard.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Plugins DashCardComponent { @@ -26,7 +26,7 @@ DashCardComponent { anchors.centerIn: parent spacing: Theme.spacingM - DankIcon { + DIcon { anchors.verticalCenter: parent.verticalCenter name: "counter_1" size: Theme.iconSizeLarge diff --git a/quickshell/PLUGINS/DashCounterExample/CounterTab.qml b/quickshell/PLUGINS/DashCounterExample/CounterTab.qml index bac11eb12..554952da0 100644 --- a/quickshell/PLUGINS/DashCounterExample/CounterTab.qml +++ b/quickshell/PLUGINS/DashCounterExample/CounterTab.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Plugins import qs.Modules.DankDash import qs.Modules.DankDash.Overview @@ -96,7 +96,7 @@ DashTabComponent { anchors.horizontalCenter: parent.horizontalCenter spacing: Theme.spacingS - DankActionButton { + DActionButton { buttonSize: Theme.buttonHeightM iconSize: Theme.iconSize iconName: "remove" @@ -105,7 +105,7 @@ DashTabComponent { onClicked: root.bump(-1) } - DankActionButton { + DActionButton { buttonSize: Theme.buttonHeightM iconSize: Theme.iconSize iconName: "add" @@ -123,7 +123,7 @@ DashTabComponent { id: resetWidget Card { - DankButton { + DButton { anchors.centerIn: parent text: I18n.trFor("dashCounterExample", "Reset") iconName: "restart_alt" diff --git a/quickshell/PLUGINS/DashCounterExample/CounterWidget.qml b/quickshell/PLUGINS/DashCounterExample/CounterWidget.qml index 32f408801..d5b9bc3eb 100644 --- a/quickshell/PLUGINS/DashCounterExample/CounterWidget.qml +++ b/quickshell/PLUGINS/DashCounterExample/CounterWidget.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Plugins PluginComponent { @@ -16,7 +16,7 @@ PluginComponent { Row { spacing: Theme.spacingXS - DankIcon { + DIcon { anchors.verticalCenter: parent.verticalCenter name: "counter_1" size: root.iconSize @@ -36,7 +36,7 @@ PluginComponent { Column { spacing: Theme.spacingXXS - DankIcon { + DIcon { anchors.horizontalCenter: parent.horizontalCenter name: "counter_1" size: root.iconSize diff --git a/quickshell/PLUGINS/DashTabExample/StopwatchTab.qml b/quickshell/PLUGINS/DashTabExample/StopwatchTab.qml index b230487ab..836e85a63 100644 --- a/quickshell/PLUGINS/DashTabExample/StopwatchTab.qml +++ b/quickshell/PLUGINS/DashTabExample/StopwatchTab.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Plugins import qs.Modules.DankDash import qs.Modules.DankDash.Overview @@ -143,7 +143,7 @@ DashTabComponent { anchors.horizontalCenter: parent.horizontalCenter spacing: Theme.spacingS - DankButton { + DButton { text: root.running ? I18n.trFor("dashTabExample", "Lap") : I18n.trFor("dashTabExample", "Reset") reserveText: I18n.trFor("dashTabExample", "Reset") iconName: root.running ? "flag" : "restart_alt" @@ -153,7 +153,7 @@ DashTabComponent { onClicked: root.running ? root.lap() : root.reset() } - DankButton { + DButton { id: startButton text: root.running ? I18n.trFor("dashTabExample", "Pause") : root.elapsed > 0 ? I18n.trFor("dashTabExample", "Resume") : I18n.trFor("dashTabExample", "Start") reserveText: I18n.trFor("dashTabExample", "Resume") diff --git a/quickshell/PLUGINS/ExampleCompositePlugin/CompositeBarWidget.qml b/quickshell/PLUGINS/ExampleCompositePlugin/CompositeBarWidget.qml index 34ab28762..2e5cdbb44 100644 --- a/quickshell/PLUGINS/ExampleCompositePlugin/CompositeBarWidget.qml +++ b/quickshell/PLUGINS/ExampleCompositePlugin/CompositeBarWidget.qml @@ -2,7 +2,7 @@ import QtQuick import Quickshell import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Plugins PluginComponent { @@ -90,7 +90,7 @@ PluginComponent { width: parent.width implicitHeight: root.popoutHeight - popoutColumn.headerHeight - popoutColumn.detailsHeight - Theme.spacingXL - DankGridView { + DGridView { id: emojiGrid anchors.horizontalCenter: parent.horizontalCenter width: Math.floor(parent.width / 50) * 50 diff --git a/quickshell/PLUGINS/ExampleCompositePlugin/CompositeSettings.qml b/quickshell/PLUGINS/ExampleCompositePlugin/CompositeSettings.qml index ba37d2c63..f54976881 100644 --- a/quickshell/PLUGINS/ExampleCompositePlugin/CompositeSettings.qml +++ b/quickshell/PLUGINS/ExampleCompositePlugin/CompositeSettings.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Plugins PluginSettings { diff --git a/quickshell/PLUGINS/ExampleEmojiPlugin/EmojiSettings.qml b/quickshell/PLUGINS/ExampleEmojiPlugin/EmojiSettings.qml index 47f8ef8f0..6f86f003f 100644 --- a/quickshell/PLUGINS/ExampleEmojiPlugin/EmojiSettings.qml +++ b/quickshell/PLUGINS/ExampleEmojiPlugin/EmojiSettings.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Plugins PluginSettings { diff --git a/quickshell/PLUGINS/ExampleEmojiPlugin/EmojiWidget.qml b/quickshell/PLUGINS/ExampleEmojiPlugin/EmojiWidget.qml index 722b22866..497f227cb 100644 --- a/quickshell/PLUGINS/ExampleEmojiPlugin/EmojiWidget.qml +++ b/quickshell/PLUGINS/ExampleEmojiPlugin/EmojiWidget.qml @@ -2,7 +2,7 @@ import QtQuick import Quickshell import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Plugins PluginComponent { @@ -90,7 +90,7 @@ PluginComponent { width: parent.width implicitHeight: root.popoutHeight - popoutColumn.headerHeight - popoutColumn.detailsHeight - Theme.spacingXL - DankGridView { + DGridView { id: emojiGrid anchors.horizontalCenter: parent.horizontalCenter width: Math.floor(parent.width / 50) * 50 diff --git a/quickshell/PLUGINS/ExampleStartupCheck/StartupCheckWidget.qml b/quickshell/PLUGINS/ExampleStartupCheck/StartupCheckWidget.qml index f9dbb38f3..70d80acec 100644 --- a/quickshell/PLUGINS/ExampleStartupCheck/StartupCheckWidget.qml +++ b/quickshell/PLUGINS/ExampleStartupCheck/StartupCheckWidget.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Plugins PluginComponent { @@ -12,7 +12,7 @@ PluginComponent { Row { spacing: Theme.spacingXS - DankIcon { + DIcon { name: "verified_user" size: root.iconSize color: Theme.primary @@ -29,7 +29,7 @@ PluginComponent { } verticalBarPill: Component { - DankIcon { + DIcon { name: "verified_user" size: root.iconSize color: Theme.primary diff --git a/quickshell/PLUGINS/ExampleWithVariants/VariantSettings.qml b/quickshell/PLUGINS/ExampleWithVariants/VariantSettings.qml index 037070af1..2bb2b0eaa 100644 --- a/quickshell/PLUGINS/ExampleWithVariants/VariantSettings.qml +++ b/quickshell/PLUGINS/ExampleWithVariants/VariantSettings.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Plugins PluginSettings { @@ -64,7 +64,7 @@ PluginSettings { color: Theme.surfaceVariantText } - DankTextField { + DTextField { id: nameField width: parent.width placeholderText: "Variant Name" @@ -81,7 +81,7 @@ PluginSettings { color: Theme.surfaceVariantText } - DankTextField { + DTextField { id: iconField width: parent.width placeholderText: "star" @@ -98,7 +98,7 @@ PluginSettings { color: Theme.surfaceVariantText } - DankTextField { + DTextField { id: textField width: parent.width placeholderText: "Display Text" @@ -106,7 +106,7 @@ PluginSettings { } } - DankButton { + DButton { text: "Create Variant" iconName: "add" onClicked: { @@ -178,7 +178,7 @@ PluginSettings { height: Theme.iconSize anchors.verticalCenter: parent.verticalCenter - DankIcon { + DIcon { anchors.centerIn: parent name: model.icon || "widgets" size: Theme.iconSize @@ -212,16 +212,16 @@ PluginSettings { } Rectangle { + id: deleteButton Accessible.role: Accessible.Button Accessible.name: I18n.tr("Delete") - id: deleteButton width: 32 height: 32 radius: 16 color: deleteArea.containsMouse ? Theme.error : Theme.withAlpha(Theme.error, 0) anchors.verticalCenter: parent.verticalCenter - DankIcon { + DIcon { anchors.centerIn: parent name: "delete" size: 16 @@ -275,7 +275,7 @@ PluginSettings { Row { spacing: Theme.spacingM - DankIcon { + DIcon { name: "info" size: Theme.iconSize color: Theme.primary diff --git a/quickshell/PLUGINS/ExampleWithVariants/VariantWidget.qml b/quickshell/PLUGINS/ExampleWithVariants/VariantWidget.qml index 04e92bdb0..11205f895 100644 --- a/quickshell/PLUGINS/ExampleWithVariants/VariantWidget.qml +++ b/quickshell/PLUGINS/ExampleWithVariants/VariantWidget.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Common import qs.Services -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Plugins PluginComponent { @@ -17,7 +17,7 @@ PluginComponent { Row { spacing: Theme.spacingXS - DankIcon { + DIcon { name: root.displayIcon size: root.iconSize color: Theme.surfaceText @@ -38,7 +38,7 @@ PluginComponent { Column { spacing: 1 - DankIcon { + DIcon { name: root.displayIcon size: root.iconSize color: Theme.surfaceText diff --git a/quickshell/PLUGINS/LauncherExample/LauncherExampleSettings.qml b/quickshell/PLUGINS/LauncherExample/LauncherExampleSettings.qml index e2345c23f..855e9742d 100644 --- a/quickshell/PLUGINS/LauncherExample/LauncherExampleSettings.qml +++ b/quickshell/PLUGINS/LauncherExample/LauncherExampleSettings.qml @@ -1,7 +1,7 @@ import QtQuick import QtQuick.Controls import qs.Common -import qs.Widgets +import qs.DCommon.Widgets FocusScope { id: root @@ -115,7 +115,7 @@ FocusScope { anchors.verticalCenter: parent.verticalCenter } - DankTextField { + DTextField { id: triggerField width: 100 height: 40 diff --git a/quickshell/PLUGINS/PopoutControlExample/PopoutControlSettings.qml b/quickshell/PLUGINS/PopoutControlExample/PopoutControlSettings.qml index b17ca989a..c818fa6b7 100644 --- a/quickshell/PLUGINS/PopoutControlExample/PopoutControlSettings.qml +++ b/quickshell/PLUGINS/PopoutControlExample/PopoutControlSettings.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Plugins PluginSettings { diff --git a/quickshell/PLUGINS/PopoutControlExample/PopoutControlWidget.qml b/quickshell/PLUGINS/PopoutControlExample/PopoutControlWidget.qml index 7d94578eb..dd1652e70 100644 --- a/quickshell/PLUGINS/PopoutControlExample/PopoutControlWidget.qml +++ b/quickshell/PLUGINS/PopoutControlExample/PopoutControlWidget.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Plugins PluginComponent { @@ -54,7 +54,7 @@ PluginComponent { Row { spacing: Theme.spacingXS - DankIcon { + DIcon { name: "widgets" color: Theme.primary size: root.iconSize @@ -74,7 +74,7 @@ PluginComponent { Column { spacing: Theme.spacingXS - DankIcon { + DIcon { name: "widgets" color: Theme.primary size: root.iconSize diff --git a/quickshell/PLUGINS/QuickNotesExample/QuickNotesSettings.qml b/quickshell/PLUGINS/QuickNotesExample/QuickNotesSettings.qml index 8d13dda67..17645b4cf 100644 --- a/quickshell/PLUGINS/QuickNotesExample/QuickNotesSettings.qml +++ b/quickshell/PLUGINS/QuickNotesExample/QuickNotesSettings.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets FocusScope { id: root @@ -60,7 +60,7 @@ FocusScope { anchors.verticalCenter: parent.verticalCenter } - DankTextField { + DTextField { id: triggerField width: 100 height: 40 @@ -103,7 +103,7 @@ FocusScope { anchors.verticalCenter: parent.verticalCenter } - DankTextField { + DTextField { id: maxNotesField width: 80 height: 40 diff --git a/quickshell/PLUGINS/WallpaperWatcherDaemon/WallpaperWatcherSettings.qml b/quickshell/PLUGINS/WallpaperWatcherDaemon/WallpaperWatcherSettings.qml index 9eda35a8a..cbafcda03 100644 --- a/quickshell/PLUGINS/WallpaperWatcherDaemon/WallpaperWatcherSettings.qml +++ b/quickshell/PLUGINS/WallpaperWatcherDaemon/WallpaperWatcherSettings.qml @@ -1,6 +1,6 @@ import QtQuick import qs.Common -import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Plugins PluginSettings { diff --git a/quickshell/Services/AqueousService.qml b/quickshell/Services/AqueousService.qml index b66268eac..4d8d068f0 100644 --- a/quickshell/Services/AqueousService.qml +++ b/quickshell/Services/AqueousService.qml @@ -6,6 +6,7 @@ import Quickshell import Quickshell.Io import qs.Common import qs.Services +import qs.DCommon.Common as DCommon import "../Common/AqueousIpc.js" as Ipc Singleton { @@ -567,7 +568,7 @@ Singleton { onTriggered: root.reconnecting = false } - component IpcConnection: DankSocket { + component IpcConnection: DCommon.DSocket { id: connection property bool events: false property var handshake: null diff --git a/quickshell/Services/CalendarDankBackend.qml b/quickshell/Services/CalendarDankBackend.qml index f4049ea8e..2cc0e72d9 100644 --- a/quickshell/Services/CalendarDankBackend.qml +++ b/quickshell/Services/CalendarDankBackend.qml @@ -5,6 +5,7 @@ import Quickshell import Quickshell.Io import qs.Common import qs.Services +import qs.DCommon.Common as DCommon Item { id: root @@ -132,7 +133,7 @@ Item { Qt.callLater(() => requestSocket.connected = true); } - DankSocket { + DCommon.DSocket { id: requestSocket path: root.socketPath connected: false @@ -173,7 +174,7 @@ Item { } } - DankSocket { + DCommon.DSocket { id: subscribeSocket path: root.socketPath connected: false diff --git a/quickshell/Services/CompositorService.qml b/quickshell/Services/CompositorService.qml index 6623f0940..5eb742409 100644 --- a/quickshell/Services/CompositorService.qml +++ b/quickshell/Services/CompositorService.qml @@ -7,7 +7,7 @@ import Quickshell.I3 import Quickshell.Wayland import Quickshell.Hyprland import qs.Common -import qs.DankCommon.Common as DankCommon +import qs.DCommon.Common as DCommon import qs.Services import "../Common/WorkspaceModel.js" as WorkspaceModel import "../Common/WindowModel.js" as WindowModel @@ -31,9 +31,7 @@ Singleton { readonly property bool genericPowerBackend: compositorDetected && !isNiri && !isHyprland && !isMango && !isSway && !isScroll && !isMiracle && !isLabwc && !isUmbriel onGenericPowerBackendChanged: probeOutputPower() - readonly property bool inOverview: (isHyprland && HyprlandService.inOverview) || - (isNiri && NiriService.inOverview) || - (isMango && MangoService.inOverview) + readonly property bool inOverview: (isHyprland && HyprlandService.inOverview) || (isNiri && NiriService.inOverview) || (isMango && MangoService.inOverview) function probeOutputPower() { outputPowerAvailable = false; @@ -101,7 +99,7 @@ Singleton { right: SettingsData.Position.Right }) - readonly property bool supportsMinimize: isAqueous && AqueousService.available ? AqueousService.capabilities.commands && !AqueousService.locked : DankCommon.Compositor.supportsMinimize + readonly property bool supportsMinimize: isAqueous && AqueousService.available ? AqueousService.capabilities.commands && !AqueousService.locked : DCommon.Compositor.supportsMinimize readonly property bool hasWorkspaceIpc: { switch (compositor) { diff --git a/quickshell/Services/DMSService.qml b/quickshell/Services/DMSService.qml index 9d19623c5..92a72b780 100644 --- a/quickshell/Services/DMSService.qml +++ b/quickshell/Services/DMSService.qml @@ -6,6 +6,7 @@ import Quickshell import Quickshell.Io import qs.Common import qs.Services +import qs.DCommon.Common as DCommon Singleton { id: root @@ -90,7 +91,7 @@ Singleton { requestSocket.connected = true; } - DankSocket { + DCommon.DSocket { id: requestSocket path: root.socketPath connected: false @@ -132,7 +133,7 @@ Singleton { } } - DankSocket { + DCommon.DSocket { id: subscribeSocket path: root.socketPath connected: false diff --git a/quickshell/Services/MangoService.qml b/quickshell/Services/MangoService.qml index 277b0953f..400cf625b 100644 --- a/quickshell/Services/MangoService.qml +++ b/quickshell/Services/MangoService.qml @@ -7,6 +7,7 @@ import Quickshell import Quickshell.Io import qs.Common import qs.Services +import qs.DCommon.Common as DCommon import "../Common/OutputModel.js" as OutputModel // Native MangoWM IPC client. mango advertises a JSON-over-Unix-socket protocol @@ -101,7 +102,7 @@ Singleton { onFileChanged: root.handleWatchedConfigChanged() } - DankSocket { + DCommon.DSocket { id: monitorsSocket path: root.socketPath connected: root.available @@ -118,7 +119,7 @@ Singleton { } } - DankSocket { + DCommon.DSocket { id: clientsSocket path: root.socketPath connected: root.available @@ -135,7 +136,7 @@ Singleton { // mango closes the connection after each non-watch command; queued // dispatches drain one per reconnect cycle. - DankSocket { + DCommon.DSocket { id: dispatchSocket path: root.socketPath connected: root.available diff --git a/quickshell/Services/MediaAccentService.qml b/quickshell/Services/MediaAccentService.qml index b53386add..1f3f633a4 100644 --- a/quickshell/Services/MediaAccentService.qml +++ b/quickshell/Services/MediaAccentService.qml @@ -5,8 +5,8 @@ import Quickshell import QtQuick import qs.Common import qs.Services -import "../DankCommon/Common/Contrast.js" as Contrast -import "../DankCommon/Common/Hct.js" as Hct +import "../DCommon/Common/Contrast.js" as Contrast +import "../DCommon/Common/Hct.js" as Hct Singleton { id: root diff --git a/quickshell/Services/NiriService.qml b/quickshell/Services/NiriService.qml index 0d058e74f..c3dd58990 100644 --- a/quickshell/Services/NiriService.qml +++ b/quickshell/Services/NiriService.qml @@ -7,6 +7,7 @@ import Quickshell import Quickshell.Io import qs.Common import qs.Services +import qs.DCommon.Common as DCommon import "../Common/OutputModel.js" as OutputModel Singleton { @@ -248,7 +249,7 @@ Singleton { } } - DankSocket { + DCommon.DSocket { id: eventStreamSocket path: root.socketPath connected: CompositorService.isNiri @@ -272,7 +273,7 @@ Singleton { } } - DankSocket { + DCommon.DSocket { id: requestSocket path: root.socketPath connected: CompositorService.isNiri diff --git a/quickshell/Services/UmbrielService.qml b/quickshell/Services/UmbrielService.qml index e5b49903f..86529a05c 100644 --- a/quickshell/Services/UmbrielService.qml +++ b/quickshell/Services/UmbrielService.qml @@ -6,6 +6,7 @@ import Quickshell import Quickshell.Io import qs.Common import qs.Services +import qs.DCommon.Common as DCommon Singleton { id: root @@ -18,7 +19,7 @@ Singleton { property var windows: [] readonly property string focusedOutput: workspaces.find(ws => ws.focused)?.output ?? "" - DankSocket { + DCommon.DSocket { path: root.socketPath connected: root.active && root.socketPath !== "" diff --git a/quickshell/Widgets/AppIconRenderer.qml b/quickshell/Widgets/AppIconRenderer.qml index 501715e9e..3e522b185 100644 --- a/quickshell/Widgets/AppIconRenderer.qml +++ b/quickshell/Widgets/AppIconRenderer.qml @@ -1,3 +1,3 @@ -import qs.DankCommon.Widgets as DankCommon +import qs.DCommon.Widgets as DCommon -DankCommon.AppIconRenderer {} +DCommon.AppIconRenderer {} diff --git a/quickshell/Widgets/BatteryMeter.qml b/quickshell/Widgets/BatteryMeter.qml index 6bb680de3..bd7d48aee 100644 --- a/quickshell/Widgets/BatteryMeter.qml +++ b/quickshell/Widgets/BatteryMeter.qml @@ -5,6 +5,7 @@ import QtQuick.Shapes import Quickshell.Widgets import qs.Common import qs.Services +import qs.DCommon.Widgets import qs.Widgets Item { @@ -261,7 +262,7 @@ Item { readonly property real dotSize: Math.max(2, Math.round(root.ringStroke * 1.25)) readonly property int glyphInset: Math.round(root.ringDiameter * 0.2) - DankIcon { + DIcon { id: glyph x: face.glyphInset @@ -270,7 +271,7 @@ Item { size: root.ringDiameter - 2 * face.glyphInset color: NetworkService.networkStatus !== "disconnected" ? Theme.surfaceText : Theme.surfaceTextMedium - DankBlink { + DBlink { target: glyph running: face.visible && (NetworkService.wifiToggling || NetworkService.isWifiConnecting) } diff --git a/quickshell/Widgets/CachingImage.qml b/quickshell/Widgets/CachingImage.qml index 78d82d8a4..f5c773349 100644 --- a/quickshell/Widgets/CachingImage.qml +++ b/quickshell/Widgets/CachingImage.qml @@ -1,3 +1,3 @@ -import qs.DankCommon.Widgets as DankCommon +import qs.DCommon.Widgets as DCommon -DankCommon.CachingImage {} +DCommon.CachingImage {} diff --git a/quickshell/Widgets/ClockContent.qml b/quickshell/Widgets/ClockContent.qml index f1c5e9ce1..0f364d25c 100644 --- a/quickshell/Widgets/ClockContent.qml +++ b/quickshell/Widgets/ClockContent.qml @@ -2,6 +2,7 @@ import QtQuick import Quickshell import qs.Common import qs.Services +import qs.DCommon.Widgets Item { id: root diff --git a/quickshell/Widgets/DankActionButton.qml b/quickshell/Widgets/DankActionButton.qml index 5901b62ce..eabf0451b 100644 --- a/quickshell/Widgets/DankActionButton.qml +++ b/quickshell/Widgets/DankActionButton.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankActionButton {} +DCommon.DActionButton { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankActionButton", "DActionButton", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankAnalogClock.qml b/quickshell/Widgets/DankAnalogClock.qml index 904323693..fdf6c58c5 100644 --- a/quickshell/Widgets/DankAnalogClock.qml +++ b/quickshell/Widgets/DankAnalogClock.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankAnalogClock {} +DCommon.DAnalogClock { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankAnalogClock", "DAnalogClock", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankBadge.qml b/quickshell/Widgets/DankBadge.qml index 09ae46c0a..e8fc8ee50 100644 --- a/quickshell/Widgets/DankBadge.qml +++ b/quickshell/Widgets/DankBadge.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankBadge {} +DCommon.DBadge { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankBadge", "DBadge", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankBlink.qml b/quickshell/Widgets/DankBlink.qml index 5f1ab20de..01e496d74 100644 --- a/quickshell/Widgets/DankBlink.qml +++ b/quickshell/Widgets/DankBlink.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankBlink {} +DCommon.DBlink { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankBlink", "DBlink", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankBottomSheet.qml b/quickshell/Widgets/DankBottomSheet.qml index 69cf4a085..702c6304d 100644 --- a/quickshell/Widgets/DankBottomSheet.qml +++ b/quickshell/Widgets/DankBottomSheet.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankBottomSheet {} +DCommon.DBottomSheet { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankBottomSheet", "DBottomSheet", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankButton.qml b/quickshell/Widgets/DankButton.qml index 8286b446f..731a78cec 100644 --- a/quickshell/Widgets/DankButton.qml +++ b/quickshell/Widgets/DankButton.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankButton {} +DCommon.DButton { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankButton", "DButton", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankButtonGroup.qml b/quickshell/Widgets/DankButtonGroup.qml index 600ee66f4..0e79fdd7e 100644 --- a/quickshell/Widgets/DankButtonGroup.qml +++ b/quickshell/Widgets/DankButtonGroup.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankButtonGroup {} +DCommon.DButtonGroup { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankButtonGroup", "DButtonGroup", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankCard.qml b/quickshell/Widgets/DankCard.qml index 9a2cd842b..fee9b49b4 100644 --- a/quickshell/Widgets/DankCard.qml +++ b/quickshell/Widgets/DankCard.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankCard {} +DCommon.DCard { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankCard", "DCard", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankCircularImage.qml b/quickshell/Widgets/DankCircularImage.qml index 9598ca075..a25bd0cde 100644 --- a/quickshell/Widgets/DankCircularImage.qml +++ b/quickshell/Widgets/DankCircularImage.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankCircularImage {} +DCommon.DCircularImage { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankCircularImage", "DCircularImage", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankClockFace.qml b/quickshell/Widgets/DankClockFace.qml index 8fbb7995a..12cd1996d 100644 --- a/quickshell/Widgets/DankClockFace.qml +++ b/quickshell/Widgets/DankClockFace.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankClockFace {} +DCommon.DClockFace { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankClockFace", "DClockFace", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankClockWidget.qml b/quickshell/Widgets/DankClockWidget.qml index 7f65a63a4..3554b645c 100644 --- a/quickshell/Widgets/DankClockWidget.qml +++ b/quickshell/Widgets/DankClockWidget.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankClockWidget {} +DCommon.DClockWidget { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankClockWidget", "DClockWidget", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankCollapsibleSection.qml b/quickshell/Widgets/DankCollapsibleSection.qml index 59d6c01e6..48b36bf13 100644 --- a/quickshell/Widgets/DankCollapsibleSection.qml +++ b/quickshell/Widgets/DankCollapsibleSection.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankCollapsibleSection {} +DCommon.DCollapsibleSection { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankCollapsibleSection", "DCollapsibleSection", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankColorAnimation.qml b/quickshell/Widgets/DankColorAnimation.qml index f0440f7f6..7f5fc0bc0 100644 --- a/quickshell/Widgets/DankColorAnimation.qml +++ b/quickshell/Widgets/DankColorAnimation.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankColorAnimation {} +DCommon.DColorAnimation { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankColorAnimation", "DColorAnimation", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankColorButton.qml b/quickshell/Widgets/DankColorButton.qml index e47ce9bdc..255bc8ae0 100644 --- a/quickshell/Widgets/DankColorButton.qml +++ b/quickshell/Widgets/DankColorButton.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankColorButton {} +DCommon.DColorButton { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankColorButton", "DColorButton", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankColorSwatch.qml b/quickshell/Widgets/DankColorSwatch.qml index 55f8c6682..8556f6d34 100644 --- a/quickshell/Widgets/DankColorSwatch.qml +++ b/quickshell/Widgets/DankColorSwatch.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankColorSwatch {} +DCommon.DColorSwatch { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankColorSwatch", "DColorSwatch", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankConfirmDialogContent.qml b/quickshell/Widgets/DankConfirmDialogContent.qml index 650d19be2..92e451be3 100644 --- a/quickshell/Widgets/DankConfirmDialogContent.qml +++ b/quickshell/Widgets/DankConfirmDialogContent.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankConfirmDialogContent {} +DCommon.DConfirmDialogContent { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankConfirmDialogContent", "DConfirmDialogContent", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankContextMenu.qml b/quickshell/Widgets/DankContextMenu.qml index 88ccceb41..0c7cfc721 100644 --- a/quickshell/Widgets/DankContextMenu.qml +++ b/quickshell/Widgets/DankContextMenu.qml @@ -5,6 +5,7 @@ import Quickshell import Quickshell.Wayland import qs.Common import qs.Services +import qs.DCommon.Widgets import qs.Widgets Item { @@ -292,7 +293,7 @@ Item { shadowEnabled: Theme.elevationEnabled } - DankFlickable { + DFlickable { id: menuFlickable anchors.fill: parent anchors.margins: Theme.spacingS @@ -369,7 +370,7 @@ Item { anchors.verticalCenter: parent.verticalCenter spacing: Theme.spacingS - DankIcon { + DIcon { name: menuItemDelegate.modelData?.icon ?? "" size: Theme.iconSizeMedium color: menuRow.contentColor @@ -387,7 +388,7 @@ Item { } } - DankRipple { + DRipple { id: menuItemRipple rippleColor: menuRow.contentColor cornerRadius: Theme.cornerRadiusM diff --git a/quickshell/Widgets/DankDetailChip.qml b/quickshell/Widgets/DankDetailChip.qml index c570cd704..b5f7687ee 100644 --- a/quickshell/Widgets/DankDetailChip.qml +++ b/quickshell/Widgets/DankDetailChip.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankDetailChip {} +DCommon.DDetailChip { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankDetailChip", "DDetailChip", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankDialog.qml b/quickshell/Widgets/DankDialog.qml index c1b7ba10f..cb8319dd8 100644 --- a/quickshell/Widgets/DankDialog.qml +++ b/quickshell/Widgets/DankDialog.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankDialog {} +DCommon.DDialog { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankDialog", "DDialog", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankDragHandle.qml b/quickshell/Widgets/DankDragHandle.qml index 027c4ab86..bbd955cfb 100644 --- a/quickshell/Widgets/DankDragHandle.qml +++ b/quickshell/Widgets/DankDragHandle.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankDragHandle {} +DCommon.DDragHandle { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankDragHandle", "DDragHandle", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankDropdown.qml b/quickshell/Widgets/DankDropdown.qml index df302eb0c..30a97eca8 100644 --- a/quickshell/Widgets/DankDropdown.qml +++ b/quickshell/Widgets/DankDropdown.qml @@ -1,7 +1,7 @@ -import qs.DankCommon.Widgets as DankCommon +import qs.DCommon.Widgets as DCommon import qs.Services -DankCommon.DankDropdown { +DCommon.DDropdown { // Hyprland drops a focus grab when a whitelisted popup takes its own xdg grab popupGrabsFocus: !(CompositorService.useHyprlandFocusGrab && transientSurfaceTracker) } diff --git a/quickshell/Widgets/DankFab.qml b/quickshell/Widgets/DankFab.qml index fbf05e896..4c04f5eba 100644 --- a/quickshell/Widgets/DankFab.qml +++ b/quickshell/Widgets/DankFab.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankFab {} +DCommon.DFab { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankFab", "DFab", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankFilterChips.qml b/quickshell/Widgets/DankFilterChips.qml index 7b037e7ec..266a73177 100644 --- a/quickshell/Widgets/DankFilterChips.qml +++ b/quickshell/Widgets/DankFilterChips.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankFilterChips {} +DCommon.DFilterChips { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankFilterChips", "DFilterChips", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankFlickable.qml b/quickshell/Widgets/DankFlickable.qml index 0e41d0ed1..ea5f84b05 100644 --- a/quickshell/Widgets/DankFlickable.qml +++ b/quickshell/Widgets/DankFlickable.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankFlickable {} +DCommon.DFlickable { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankFlickable", "DFlickable", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankGridEditChrome.qml b/quickshell/Widgets/DankGridEditChrome.qml index 59d528b7a..2948a9ab9 100644 --- a/quickshell/Widgets/DankGridEditChrome.qml +++ b/quickshell/Widgets/DankGridEditChrome.qml @@ -1,5 +1,6 @@ import QtQuick import qs.Common +import qs.DCommon.Widgets import qs.Widgets Item { @@ -71,7 +72,7 @@ Item { visible: root.chromeButtons > 0 } - DankActionButton { + DActionButton { id: removeButton x: I18n.isRtl ? root.width - root.contentInset - width : root.contentInset @@ -103,7 +104,7 @@ Item { } } - DankActionButton { + DActionButton { id: optionsButton readonly property real slotOffset: root.removable ? root.touchTargetSize : 0 diff --git a/quickshell/Widgets/DankGridView.qml b/quickshell/Widgets/DankGridView.qml index af62f5d44..309f9c52e 100644 --- a/quickshell/Widgets/DankGridView.qml +++ b/quickshell/Widgets/DankGridView.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankGridView {} +DCommon.DGridView { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankGridView", "DGridView", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankIcon.qml b/quickshell/Widgets/DankIcon.qml index f7b58afd2..f8ed42579 100644 --- a/quickshell/Widgets/DankIcon.qml +++ b/quickshell/Widgets/DankIcon.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankIcon {} +DCommon.DIcon { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankIcon", "DIcon", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankIconButton.qml b/quickshell/Widgets/DankIconButton.qml index 6e0c81462..634028cdd 100644 --- a/quickshell/Widgets/DankIconButton.qml +++ b/quickshell/Widgets/DankIconButton.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankIconButton {} +DCommon.DIconButton { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankIconButton", "DIconButton", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankIconPicker.qml b/quickshell/Widgets/DankIconPicker.qml index 866bcb89a..7639d6c06 100644 --- a/quickshell/Widgets/DankIconPicker.qml +++ b/quickshell/Widgets/DankIconPicker.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankIconPicker {} +DCommon.DIconPicker { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankIconPicker", "DIconPicker", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankKeyHints.qml b/quickshell/Widgets/DankKeyHints.qml index 7f1cb255b..eea0ffaa7 100644 --- a/quickshell/Widgets/DankKeyHints.qml +++ b/quickshell/Widgets/DankKeyHints.qml @@ -1,5 +1,6 @@ import QtQuick import qs.Common +import qs.DCommon.Widgets import "../Common/KeyUtils.js" as KeyUtils Item { @@ -65,7 +66,7 @@ Item { Repeater { model: KeyUtils.formatKeyTokens(combo.modelData) - DankKeycap { + DKeycap { required property string modelData text: modelData diff --git a/quickshell/Widgets/DankKeycap.qml b/quickshell/Widgets/DankKeycap.qml index bb5eac101..0629c47d4 100644 --- a/quickshell/Widgets/DankKeycap.qml +++ b/quickshell/Widgets/DankKeycap.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankKeycap {} +DCommon.DKeycap { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankKeycap", "DKeycap", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankLayer.qml b/quickshell/Widgets/DankLayer.qml index b248d6e0d..805dd4f5f 100644 --- a/quickshell/Widgets/DankLayer.qml +++ b/quickshell/Widgets/DankLayer.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankLayer {} +DCommon.DLayer { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankLayer", "DLayer", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankListHighlight.qml b/quickshell/Widgets/DankListHighlight.qml index 8e0f2a16f..6fe239ae8 100644 --- a/quickshell/Widgets/DankListHighlight.qml +++ b/quickshell/Widgets/DankListHighlight.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankListHighlight {} +DCommon.DListHighlight { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankListHighlight", "DListHighlight", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankListItem.qml b/quickshell/Widgets/DankListItem.qml index 15b720d2a..82fc47ea6 100644 --- a/quickshell/Widgets/DankListItem.qml +++ b/quickshell/Widgets/DankListItem.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankListItem {} +DCommon.DListItem { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankListItem", "DListItem", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankListRow.qml b/quickshell/Widgets/DankListRow.qml index e1a19872d..19f24bddc 100644 --- a/quickshell/Widgets/DankListRow.qml +++ b/quickshell/Widgets/DankListRow.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankListRow {} +DCommon.DListRow { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankListRow", "DListRow", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankListView.qml b/quickshell/Widgets/DankListView.qml index 315bf5a0a..7d0848c7b 100644 --- a/quickshell/Widgets/DankListView.qml +++ b/quickshell/Widgets/DankListView.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankListView {} +DCommon.DListView { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankListView", "DListView", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankLoadingIndicator.qml b/quickshell/Widgets/DankLoadingIndicator.qml index 1c423dfbd..6788deac5 100644 --- a/quickshell/Widgets/DankLoadingIndicator.qml +++ b/quickshell/Widgets/DankLoadingIndicator.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankLoadingIndicator {} +DCommon.DLoadingIndicator { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankLoadingIndicator", "DLoadingIndicator", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankLocationSearch.qml b/quickshell/Widgets/DankLocationSearch.qml index d2ebbfffe..226f63ed7 100644 --- a/quickshell/Widgets/DankLocationSearch.qml +++ b/quickshell/Widgets/DankLocationSearch.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankLocationSearch {} +DCommon.DLocationSearch { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankLocationSearch", "DLocationSearch", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankMaterialShape.qml b/quickshell/Widgets/DankMaterialShape.qml index c2f9a4079..9410c5a3a 100644 --- a/quickshell/Widgets/DankMaterialShape.qml +++ b/quickshell/Widgets/DankMaterialShape.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankMaterialShape {} +DCommon.DMaterialShape { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankMaterialShape", "DMaterialShape", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankMonthGrid.qml b/quickshell/Widgets/DankMonthGrid.qml index 9436aedc6..25e5f961c 100644 --- a/quickshell/Widgets/DankMonthGrid.qml +++ b/quickshell/Widgets/DankMonthGrid.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankMonthGrid {} +DCommon.DMonthGrid { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankMonthGrid", "DMonthGrid", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankNFIcon.qml b/quickshell/Widgets/DankNFIcon.qml index 12959c65f..14195d30f 100644 --- a/quickshell/Widgets/DankNFIcon.qml +++ b/quickshell/Widgets/DankNFIcon.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankNFIcon {} +DCommon.DNFIcon { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankNFIcon", "DNFIcon", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankNavigationBar.qml b/quickshell/Widgets/DankNavigationBar.qml index ee06b5011..c52204d12 100644 --- a/quickshell/Widgets/DankNavigationBar.qml +++ b/quickshell/Widgets/DankNavigationBar.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankNavigationBar {} +DCommon.DNavigationBar { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankNavigationBar", "DNavigationBar", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankNumberStepper.qml b/quickshell/Widgets/DankNumberStepper.qml index ba50f3450..860cc3bcb 100644 --- a/quickshell/Widgets/DankNumberStepper.qml +++ b/quickshell/Widgets/DankNumberStepper.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankNumberStepper {} +DCommon.DNumberStepper { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankNumberStepper", "DNumberStepper", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankOrganicBlob.qml b/quickshell/Widgets/DankOrganicBlob.qml index c221c1dfe..08a3f2efa 100644 --- a/quickshell/Widgets/DankOrganicBlob.qml +++ b/quickshell/Widgets/DankOrganicBlob.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankOrganicBlob {} +DCommon.DOrganicBlob { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankOrganicBlob", "DOrganicBlob", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankOverlapClockFace.qml b/quickshell/Widgets/DankOverlapClockFace.qml index d95ba7bf1..fb86faf74 100644 --- a/quickshell/Widgets/DankOverlapClockFace.qml +++ b/quickshell/Widgets/DankOverlapClockFace.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankOverlapClockFace {} +DCommon.DOverlapClockFace { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankOverlapClockFace", "DOverlapClockFace", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankPaletteSwatch.qml b/quickshell/Widgets/DankPaletteSwatch.qml index f4cce1d31..abf0efddd 100644 --- a/quickshell/Widgets/DankPaletteSwatch.qml +++ b/quickshell/Widgets/DankPaletteSwatch.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankPaletteSwatch {} +DCommon.DPaletteSwatch { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankPaletteSwatch", "DPaletteSwatch", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankPopoutHost.qml b/quickshell/Widgets/DankPopoutHost.qml index 23a3ab614..8b72f8b61 100644 --- a/quickshell/Widgets/DankPopoutHost.qml +++ b/quickshell/Widgets/DankPopoutHost.qml @@ -5,6 +5,7 @@ import Quickshell import Quickshell.Wayland import qs.Common import qs.Services +import qs.DCommon.Widgets import qs.Widgets import "../Common/ConnectedSurfaceGeometry.js" as SurfaceGeometry import "../Common/FluidGeometry.js" as FluidGeometry @@ -1947,7 +1948,7 @@ Item { } } - DankLayer { + DLayer { id: contentWrapper width: rollOutAdjuster.baseWidth height: rollOutAdjuster.baseHeight @@ -2107,7 +2108,7 @@ Item { shadowEnabled: Theme.elevationEnabled && SettingsData.popoutElevationEnabled && Quickshell.env("DMS_DISABLE_LAYER") !== "true" && Quickshell.env("DMS_DISABLE_LAYER") !== "1" && !(root.suspendShadowWhileResizing && root._resizeActive) } - DankLayer { + DLayer { id: contentWrapper width: chrome.width height: chrome.height diff --git a/quickshell/Widgets/DankRefreshButton.qml b/quickshell/Widgets/DankRefreshButton.qml index 5f7c23e86..f3496c4fd 100644 --- a/quickshell/Widgets/DankRefreshButton.qml +++ b/quickshell/Widgets/DankRefreshButton.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankRefreshButton {} +DCommon.DRefreshButton { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankRefreshButton", "DRefreshButton", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankReorderGroup.qml b/quickshell/Widgets/DankReorderGroup.qml index 1d3b45569..aed76475f 100644 --- a/quickshell/Widgets/DankReorderGroup.qml +++ b/quickshell/Widgets/DankReorderGroup.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankReorderGroup {} +DCommon.DReorderGroup { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankReorderGroup", "DReorderGroup", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankReorderList.qml b/quickshell/Widgets/DankReorderList.qml index de176e65b..94e8dca85 100644 --- a/quickshell/Widgets/DankReorderList.qml +++ b/quickshell/Widgets/DankReorderList.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankReorderList {} +DCommon.DReorderList { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankReorderList", "DReorderList", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankRingGauge.qml b/quickshell/Widgets/DankRingGauge.qml index 4db563ecc..5baca4521 100644 --- a/quickshell/Widgets/DankRingGauge.qml +++ b/quickshell/Widgets/DankRingGauge.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankRingGauge {} +DCommon.DRingGauge { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankRingGauge", "DRingGauge", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankRipple.qml b/quickshell/Widgets/DankRipple.qml index 0a889b0b7..5b5d97c8c 100644 --- a/quickshell/Widgets/DankRipple.qml +++ b/quickshell/Widgets/DankRipple.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankRipple {} +DCommon.DRipple { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankRipple", "DRipple", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankSVGIcon.qml b/quickshell/Widgets/DankSVGIcon.qml index 90bef5085..dc59d6f3e 100644 --- a/quickshell/Widgets/DankSVGIcon.qml +++ b/quickshell/Widgets/DankSVGIcon.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankSVGIcon {} +DCommon.DSVGIcon { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankSVGIcon", "DSVGIcon", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankScrollbar.qml b/quickshell/Widgets/DankScrollbar.qml index 11f5ba311..03e887e84 100644 --- a/quickshell/Widgets/DankScrollbar.qml +++ b/quickshell/Widgets/DankScrollbar.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankScrollbar {} +DCommon.DScrollbar { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankScrollbar", "DScrollbar", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankSearchField.qml b/quickshell/Widgets/DankSearchField.qml index 5bad1c5af..dd4a907f9 100644 --- a/quickshell/Widgets/DankSearchField.qml +++ b/quickshell/Widgets/DankSearchField.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankSearchField {} +DCommon.DSearchField { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankSearchField", "DSearchField", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankSeekbar.qml b/quickshell/Widgets/DankSeekbar.qml index c6fd8b22d..7d4cf4b3f 100644 --- a/quickshell/Widgets/DankSeekbar.qml +++ b/quickshell/Widgets/DankSeekbar.qml @@ -1,6 +1,7 @@ import QtQuick import Quickshell.Services.Mpris import qs.Common +import qs.DCommon.Widgets import qs.Widgets Item { diff --git a/quickshell/Widgets/DankSlideout.qml b/quickshell/Widgets/DankSlideout.qml index da149dcdf..beeaa6626 100644 --- a/quickshell/Widgets/DankSlideout.qml +++ b/quickshell/Widgets/DankSlideout.qml @@ -4,6 +4,7 @@ import Quickshell import Quickshell.Wayland import qs.Common import qs.Services +import qs.DCommon.Widgets import qs.Widgets PanelWindow { @@ -261,7 +262,7 @@ PanelWindow { id: buttonRow spacing: Theme.spacingXS - DankActionButton { + DActionButton { id: expandButton iconName: root.expandedWidth ? "unfold_less" : "unfold_more" tooltipText: root.expandedWidth ? I18n.tr("Collapse") : I18n.tr("Expand") @@ -277,7 +278,7 @@ PanelWindow { } } - DankActionButton { + DActionButton { id: closeButton iconName: "close" Accessible.name: I18n.tr("Close") diff --git a/quickshell/Widgets/DankSlider.qml b/quickshell/Widgets/DankSlider.qml index c07ac6e94..e69e33eaf 100644 --- a/quickshell/Widgets/DankSlider.qml +++ b/quickshell/Widgets/DankSlider.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankSlider {} +DCommon.DSlider { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankSlider", "DSlider", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankSparkline.qml b/quickshell/Widgets/DankSparkline.qml index 423a593b4..07a1674de 100644 --- a/quickshell/Widgets/DankSparkline.qml +++ b/quickshell/Widgets/DankSparkline.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankSparkline {} +DCommon.DSparkline { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankSparkline", "DSparkline", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankSpinner.qml b/quickshell/Widgets/DankSpinner.qml index a7a910ba9..694c4d182 100644 --- a/quickshell/Widgets/DankSpinner.qml +++ b/quickshell/Widgets/DankSpinner.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankSpinner {} +DCommon.DSpinner { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankSpinner", "DSpinner", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankSplitButton.qml b/quickshell/Widgets/DankSplitButton.qml index 9e433ad51..d29a399a6 100644 --- a/quickshell/Widgets/DankSplitButton.qml +++ b/quickshell/Widgets/DankSplitButton.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankSplitButton {} +DCommon.DSplitButton { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankSplitButton", "DSplitButton", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankTabBar.qml b/quickshell/Widgets/DankTabBar.qml index 209899e96..38098948e 100644 --- a/quickshell/Widgets/DankTabBar.qml +++ b/quickshell/Widgets/DankTabBar.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankTabBar {} +DCommon.DTabBar { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankTabBar", "DTabBar", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankTextCursor.qml b/quickshell/Widgets/DankTextCursor.qml index 498adbb24..344a67a0a 100644 --- a/quickshell/Widgets/DankTextCursor.qml +++ b/quickshell/Widgets/DankTextCursor.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankTextCursor {} +DCommon.DTextCursor { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankTextCursor", "DTextCursor", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankTextEdit.qml b/quickshell/Widgets/DankTextEdit.qml index 7c29182e5..60d6e42cb 100644 --- a/quickshell/Widgets/DankTextEdit.qml +++ b/quickshell/Widgets/DankTextEdit.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankTextEdit {} +DCommon.DTextEdit { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankTextEdit", "DTextEdit", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankTextField.qml b/quickshell/Widgets/DankTextField.qml index 4da0f0019..d8ef98d2c 100644 --- a/quickshell/Widgets/DankTextField.qml +++ b/quickshell/Widgets/DankTextField.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankTextField {} +DCommon.DTextField { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankTextField", "DTextField", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankTimePicker.qml b/quickshell/Widgets/DankTimePicker.qml index 703f83774..a8f2ceb20 100644 --- a/quickshell/Widgets/DankTimePicker.qml +++ b/quickshell/Widgets/DankTimePicker.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankTimePicker {} +DCommon.DTimePicker { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankTimePicker", "DTimePicker", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankToggle.qml b/quickshell/Widgets/DankToggle.qml index 333dba262..382d299f5 100644 --- a/quickshell/Widgets/DankToggle.qml +++ b/quickshell/Widgets/DankToggle.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankToggle {} +DCommon.DToggle { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankToggle", "DToggle", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankTone.qml b/quickshell/Widgets/DankTone.qml index 01f19caee..04f1e4a89 100644 --- a/quickshell/Widgets/DankTone.qml +++ b/quickshell/Widgets/DankTone.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankTone {} +DCommon.DTone { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankTone", "DTone", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankTooltip.qml b/quickshell/Widgets/DankTooltip.qml index a9c1f0bf1..477c86768 100644 --- a/quickshell/Widgets/DankTooltip.qml +++ b/quickshell/Widgets/DankTooltip.qml @@ -2,6 +2,7 @@ import QtQuick import Quickshell import Quickshell.Wayland import qs.Common +import qs.DCommon.Widgets import qs.Widgets PanelWindow { diff --git a/quickshell/Widgets/DankTooltipHost.qml b/quickshell/Widgets/DankTooltipHost.qml index d68e1328d..7c83553bf 100644 --- a/quickshell/Widgets/DankTooltipHost.qml +++ b/quickshell/Widgets/DankTooltipHost.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankTooltipHost {} +DCommon.DTooltipHost { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankTooltipHost", "DTooltipHost", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankTooltipV2.qml b/quickshell/Widgets/DankTooltipV2.qml index 2b956934d..553fed81d 100644 --- a/quickshell/Widgets/DankTooltipV2.qml +++ b/quickshell/Widgets/DankTooltipV2.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankTooltipV2 {} +DCommon.DTooltipV2 { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankTooltipV2", "DTooltipV2", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/DankWindowHeader.qml b/quickshell/Widgets/DankWindowHeader.qml index eba163f5d..10838a63e 100644 --- a/quickshell/Widgets/DankWindowHeader.qml +++ b/quickshell/Widgets/DankWindowHeader.qml @@ -1,3 +1,8 @@ -import qs.DankCommon.Widgets as DankCommon +import QtQuick +import qs.Common +import qs.DCommon.Widgets as DCommon -DankCommon.DankWindowHeader {} +DCommon.DWindowHeader { + id: shim + Component.onCompleted: Deprecation.type(shim, "DankWindowHeader", "DWindowHeader", "qs.DCommon.Widgets") +} diff --git a/quickshell/Widgets/FloatingWindowControls.qml b/quickshell/Widgets/FloatingWindowControls.qml index f39365947..844bb75fd 100644 --- a/quickshell/Widgets/FloatingWindowControls.qml +++ b/quickshell/Widgets/FloatingWindowControls.qml @@ -1,3 +1,3 @@ -import qs.DankCommon.Widgets as DankCommon +import qs.DCommon.Widgets as DCommon -DankCommon.FloatingWindowControls {} +DCommon.FloatingWindowControls {} diff --git a/quickshell/Widgets/FocusRing.qml b/quickshell/Widgets/FocusRing.qml index 4ebad6ca5..133602480 100644 --- a/quickshell/Widgets/FocusRing.qml +++ b/quickshell/Widgets/FocusRing.qml @@ -1,6 +1,6 @@ -import qs.DankCommon.Widgets as DankCommon +import qs.DCommon.Widgets as DCommon -DankCommon.FocusRing { +DCommon.FocusRing { // Plain Items have no visualFocus; a tile sets this on its own press so a mouse click draws no ring property bool pointerFocused: false readonly property bool parentFocused: parent?.activeFocus ?? false diff --git a/quickshell/Widgets/LauncherLogo.qml b/quickshell/Widgets/LauncherLogo.qml index 60c3f240e..584ed83eb 100644 --- a/quickshell/Widgets/LauncherLogo.qml +++ b/quickshell/Widgets/LauncherLogo.qml @@ -5,6 +5,7 @@ import QtQuick.Effects import Quickshell.Widgets import qs.Common import qs.Services +import qs.DCommon.Widgets import qs.Widgets Item { @@ -74,7 +75,7 @@ Item { width: size height: size - DankIcon { + DIcon { visible: root.resolvedMode === "apps" anchors.centerIn: parent name: "apps" diff --git a/quickshell/Widgets/M3WaveProgress.qml b/quickshell/Widgets/M3WaveProgress.qml index e30fd39ef..3ad90405f 100644 --- a/quickshell/Widgets/M3WaveProgress.qml +++ b/quickshell/Widgets/M3WaveProgress.qml @@ -1,3 +1,3 @@ -import qs.DankCommon.Widgets as DankCommon +import qs.DCommon.Widgets as DCommon -DankCommon.M3WaveProgress {} +DCommon.M3WaveProgress {} diff --git a/quickshell/Widgets/MaterialWallpaper.qml b/quickshell/Widgets/MaterialWallpaper.qml index 86e994ce6..dfb432b49 100644 --- a/quickshell/Widgets/MaterialWallpaper.qml +++ b/quickshell/Widgets/MaterialWallpaper.qml @@ -1,7 +1,7 @@ import QtQuick import qs.Common -import qs.DankCommon.Widgets as Shared +import qs.DCommon.Widgets as Shared -Shared.DankMaterialWallpaper { +Shared.DMaterialWallpaper { palette: Theme.wallpaperPalette() } diff --git a/quickshell/Widgets/MediaArtwork.qml b/quickshell/Widgets/MediaArtwork.qml index df0230247..2f68ee728 100644 --- a/quickshell/Widgets/MediaArtwork.qml +++ b/quickshell/Widgets/MediaArtwork.qml @@ -3,6 +3,7 @@ pragma ComponentBehavior: Bound import QtQuick import Quickshell.Widgets import qs.Common +import qs.DCommon.Widgets Item { id: root @@ -19,7 +20,7 @@ Item { color: Theme.primaryContainer antialiasing: true - DankIcon { + DIcon { anchors.centerIn: parent name: "music_note" size: root.placeholderIconSize diff --git a/quickshell/Widgets/NumericText.qml b/quickshell/Widgets/NumericText.qml index 71458ba1d..84019ff90 100644 --- a/quickshell/Widgets/NumericText.qml +++ b/quickshell/Widgets/NumericText.qml @@ -1,3 +1,3 @@ -import qs.DankCommon.Widgets as DankCommon +import qs.DCommon.Widgets as DCommon -DankCommon.NumericText {} +DCommon.NumericText {} diff --git a/quickshell/Widgets/ReleaseNotesCard.qml b/quickshell/Widgets/ReleaseNotesCard.qml index 0bb3a9b4b..934eac93a 100644 --- a/quickshell/Widgets/ReleaseNotesCard.qml +++ b/quickshell/Widgets/ReleaseNotesCard.qml @@ -1,5 +1,6 @@ import QtQuick import qs.Common +import qs.DCommon.Widgets import qs.Widgets Column { @@ -33,7 +34,7 @@ Column { anchors.verticalCenter: parent.verticalCenter } - DankBadge { + DBadge { visible: root.hasRelease && (root.release.codename || "") !== "" text: root.hasRelease ? root.release.codename || "" : "" color: Theme.primaryContainer @@ -41,7 +42,7 @@ Column { anchors.verticalCenter: parent.verticalCenter } - DankBadge { + DBadge { visible: root.hasRelease && root.release.prerelease === true text: I18n.tr("Pre-release", "badge on a release that is not a stable version") color: Theme.chipSurface @@ -93,7 +94,7 @@ Column { width: parent.width spacing: Theme.spacingS - DankIcon { + DIcon { name: "arrow_right" size: Theme.iconSizeSmall color: Theme.primary @@ -116,7 +117,7 @@ Column { visible: root.hasRelease spacing: Theme.spacingS - DankButton { + DButton { visible: root.blogUrl !== "" text: I18n.tr("Read the blog post", "release notes link") iconName: "article" @@ -125,7 +126,7 @@ Column { onClicked: Qt.openUrlExternally(root.blogUrl) } - DankButton { + DButton { visible: root.releaseUrl !== "" text: I18n.tr("View on GitHub", "link to the release on GitHub") iconName: "open_in_new" diff --git a/quickshell/Widgets/ScrollingText.qml b/quickshell/Widgets/ScrollingText.qml index 577d5daf0..6004284b4 100644 --- a/quickshell/Widgets/ScrollingText.qml +++ b/quickshell/Widgets/ScrollingText.qml @@ -4,6 +4,7 @@ import QtQuick import QtQuick.Effects import qs.Common import qs.Services +import qs.DCommon.Widgets Item { id: root diff --git a/quickshell/Widgets/StateLayer.qml b/quickshell/Widgets/StateLayer.qml index d7b22fe78..0ece911bb 100644 --- a/quickshell/Widgets/StateLayer.qml +++ b/quickshell/Widgets/StateLayer.qml @@ -1,3 +1,3 @@ -import qs.DankCommon.Widgets as DankCommon +import qs.DCommon.Widgets as DCommon -DankCommon.StateLayer {} +DCommon.StateLayer {} diff --git a/quickshell/Widgets/StyledButton.qml b/quickshell/Widgets/StyledButton.qml index 02ddb51de..c288b04a3 100644 --- a/quickshell/Widgets/StyledButton.qml +++ b/quickshell/Widgets/StyledButton.qml @@ -1,3 +1,3 @@ -import qs.DankCommon.Widgets as DankCommon +import qs.DCommon.Widgets as DCommon -DankCommon.StyledButton {} +DCommon.StyledButton {} diff --git a/quickshell/Widgets/StyledRect.qml b/quickshell/Widgets/StyledRect.qml index 4bdab88c8..ea940bd27 100644 --- a/quickshell/Widgets/StyledRect.qml +++ b/quickshell/Widgets/StyledRect.qml @@ -1,3 +1,3 @@ -import qs.DankCommon.Widgets as DankCommon +import qs.DCommon.Widgets as DCommon -DankCommon.StyledRect {} +DCommon.StyledRect {} diff --git a/quickshell/Widgets/StyledText.qml b/quickshell/Widgets/StyledText.qml index 508393a25..94c753594 100644 --- a/quickshell/Widgets/StyledText.qml +++ b/quickshell/Widgets/StyledText.qml @@ -1,3 +1,3 @@ -import qs.DankCommon.Widgets as DankCommon +import qs.DCommon.Widgets as DCommon -DankCommon.StyledText {} +DCommon.StyledText {} diff --git a/quickshell/Widgets/StyledTextMetrics.qml b/quickshell/Widgets/StyledTextMetrics.qml index db7bc16ef..a784b3c75 100644 --- a/quickshell/Widgets/StyledTextMetrics.qml +++ b/quickshell/Widgets/StyledTextMetrics.qml @@ -1,3 +1,3 @@ -import qs.DankCommon.Widgets as DankCommon +import qs.DCommon.Widgets as DCommon -DankCommon.StyledTextMetrics {} +DCommon.StyledTextMetrics {} diff --git a/quickshell/Widgets/SystemLogo.qml b/quickshell/Widgets/SystemLogo.qml index ed7bcf7d1..752e32ce9 100644 --- a/quickshell/Widgets/SystemLogo.qml +++ b/quickshell/Widgets/SystemLogo.qml @@ -1,3 +1,3 @@ -import qs.DankCommon.Widgets as DankCommon +import qs.DCommon.Widgets as DCommon -DankCommon.SystemLogo {} +DCommon.SystemLogo {} diff --git a/quickshell/Widgets/UserIdentity.qml b/quickshell/Widgets/UserIdentity.qml index 0e2ec81b1..331007fe6 100644 --- a/quickshell/Widgets/UserIdentity.qml +++ b/quickshell/Widgets/UserIdentity.qml @@ -1,6 +1,7 @@ import QtQuick import qs.Common import qs.Services +import qs.DCommon.Widgets import qs.Widgets Item { @@ -54,7 +55,7 @@ Item { width: root.avatarDiameter height: root.avatarDiameter - DankCircularImage { + DCircularImage { anchors.fill: parent imageSource: root.avatarSource fallbackIcon: "material:person" @@ -124,7 +125,7 @@ Item { spacing: Theme.spacingXS visible: root.showCompositor && !root.stacked - DankIcon { + DIcon { anchors.verticalCenter: parent.verticalCenter name: "select_window" size: Theme.iconSizeSmall @@ -148,7 +149,7 @@ Item { visible: root.showUptime opacity: DgopService.shortUptime !== "" ? 1 : 0 - DankIcon { + DIcon { id: uptimeIcon anchors.verticalCenter: parent.verticalCenter name: "schedule" diff --git a/quickshell/scripts/i18nsync.py b/quickshell/scripts/i18nsync.py index e3e7707b8..5ba96c44a 100755 --- a/quickshell/scripts/i18nsync.py +++ b/quickshell/scripts/i18nsync.py @@ -20,7 +20,7 @@ TERM_RENAMES_JSON = REPO_ROOT / "translations" / "term_renames.json" # consumer gets them with the pointer. dankcalendar merges from this project. COMMON_ROOT = REPO_ROOT.parent / "dank-qml-common" COMMON_EN_JSON = COMMON_ROOT / "translations" / "en.json" -COMMON_POEXPORTS_DIR = COMMON_ROOT / "DankCommon" / "translations" / "poexports" +COMMON_POEXPORTS_DIR = COMMON_ROOT / "DCommon" / "translations" / "poexports" # The official plugin monorepo is scanned by extraction: its plugins use # I18n.tr, so their terms belong to the shell catalog. I18n.trFor terms diff --git a/quickshell/shell.qml b/quickshell/shell.qml index 768c1b0e9..4be23a8ce 100644 --- a/quickshell/shell.qml +++ b/quickshell/shell.qml @@ -10,7 +10,7 @@ import QtQuick import Quickshell import qs.Common -import qs.DankCommon.Common as DC +import qs.DCommon.Common as DC import qs.Modules import qs.Modules.Lock import qs.Services diff --git a/quickshell/tests/qml/notepad-save.qml b/quickshell/tests/qml/notepad-save.qml index 37c4bf746..726b87a07 100644 --- a/quickshell/tests/qml/notepad-save.qml +++ b/quickshell/tests/qml/notepad-save.qml @@ -5,7 +5,7 @@ import Quickshell.Io import qs.Common import qs.Services import qs.Modules.Notepad -import qs.DankCommon.Common as DC +import qs.DCommon.Common as DC ShellRoot { id: root @@ -86,13 +86,15 @@ ShellRoot { file.setText(JSON.stringify({ version: 1, currentTabIndex: 0, - tabs: [{ + tabs: [ + { id: 1, title: "first.txt", filePath: firstPath, isTemporary: false, lastSavedContent: original - }] + } + ] })); const notepad = notepadComponent.createObject(root); diff --git a/quickshell/tests/shell-embed.test.mjs b/quickshell/tests/shell-embed.test.mjs index 72d3a515d..c4d227ece 100644 --- a/quickshell/tests/shell-embed.test.mjs +++ b/quickshell/tests/shell-embed.test.mjs @@ -15,12 +15,12 @@ test("shell staging and archives exclude tests and preserve runtime assets", t = const common = join(temporary, "common"); const excluded = ["tests/qml/layout.qml", "Common/tests/fixture.json", "Tests/test.qml", "testdata/settings.json", "Modules/__tests__/widget.qml", "harness/shell.qml", "harnesses/layout.qml", "Common/layout.test.mjs", "Common/layout.test.js", - "Widgets/tst_button.qml", "Widgets/button_test.qml", "DankCommon/tests/qml/slider.qml"]; + "Widgets/tst_button.qml", "Widgets/button_test.qml", "DCommon/tests/qml/slider.qml"]; const included = ["shell.qml", "VERSION", "Common/LayoutResolver.js", "scripts/gtk.sh", "scripts/qt.sh", - "scripts/bluez-card-profile.lua", "DankCommon/Widgets/DankIcon.qml", "Widgets/LatestUpdate.qml"]; + "scripts/bluez-card-profile.lua", "DCommon/Widgets/DIcon.qml", "Widgets/LatestUpdate.qml"]; mkdirSync(source); mkdirSync(common); - symlinkSync(common, join(source, "DankCommon")); + symlinkSync(common, join(source, "DCommon")); for (const path of [...included, ...excluded]) { const target = join(source, path); mkdirSync(dirname(target), { recursive: true }); diff --git a/quickshell/translations/extract_translations.py b/quickshell/translations/extract_translations.py index b9a081817..ecaeaeafb 100755 --- a/quickshell/translations/extract_translations.py +++ b/quickshell/translations/extract_translations.py @@ -96,7 +96,7 @@ def scan_line(line, occ, translations, real_patterns, context_patterns, simple_p def extract_qstr_strings(root_dir): translations = defaultdict(new_translation_bucket) - # DankCommon terms are owned by the dank-qml-common repo (synced through + # DCommon terms are owned by the dank-qml-common repo (synced through # the DMS POEditor project); rglob not following the symlink is load-bearing. for qml_file in Path(root_dir).rglob('*.qml'): relative_path = qml_file.relative_to(root_dir)