mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-08-02 03:28:28 -04:00
235f0668b8
commit990d86d481Author: bbedward <bbedward@gmail.com> Date: Sat Jul 18 10:43:22 2026 -0400 flake: update-common commit526cb157fdAuthor: bbedward <bbedward@gmail.com> Date: Thu Jul 16 17:56:40 2026 -0400 i18n: update sync scrirpt for dank-qml-common commit92ba96d9f9Author: bbedward <bbedward@gmail.com> Date: Thu Jul 16 09:24:37 2026 -0400 qs: integrate with dank-qml-common
146 lines
6.1 KiB
Markdown
146 lines
6.1 KiB
Markdown
# Contributing
|
|
|
|
Contributions are welcome and encouraged.
|
|
|
|
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`:
|
|
|
|
```bash
|
|
git clone --recurse-submodules https://github.com/AvengeMedia/DankMaterialShell.git
|
|
# or, in an existing clone:
|
|
git submodule update --init
|
|
```
|
|
|
|
Install [prek](https://prek.j178.dev/) then activate pre-commit hooks:
|
|
|
|
```bash
|
|
prek install
|
|
```
|
|
|
|
### Nix Development Shell
|
|
|
|
If you have Nix installed with flakes enabled, you can use the provided development shell which includes all necessary dependencies:
|
|
|
|
```bash
|
|
nix develop
|
|
```
|
|
|
|
This will provide:
|
|
|
|
- Go 1.25+ toolchain (go, gopls, delve, go-tools) and GNU Make
|
|
- Quickshell and required QML packages
|
|
- Properly configured QML2_IMPORT_PATH
|
|
|
|
The dev shell automatically creates the `.qmlls.ini` file in the `quickshell/` directory.
|
|
|
|
## 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:
|
|
|
|
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`.
|
|
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.
|
|
|
|
The submodule URL in `.gitmodules` is HTTPS so CI and anonymous clones keep working. To push over SSH instead of being prompted for credentials, add a push rewrite to your git config — fetches stay HTTPS, pushes use SSH:
|
|
|
|
```bash
|
|
git config --global url."git@github.com:AvengeMedia/".pushInsteadOf "https://github.com/AvengeMedia/"
|
|
```
|
|
|
|
Shared widgets read app-provided singletons (`Theme`, `SettingsData`, ...) through a documented contract — see the dank-qml-common README. If your change needs a new contract property, add it to the library's stub singletons in the same PR, then to `quickshell/Common/` here when you bump.
|
|
|
|
Files in `quickshell/Widgets/`, `quickshell/Common/`, and `quickshell/Modals/FileBrowser/` that moved to the library remain in place as thin wrappers, so `import qs.Widgets`, `qs.Common`, and `qs.Modals.FileBrowser` keep working for the shell and for plugins.
|
|
|
|
## VSCode Setup
|
|
|
|
This is a monorepo, the easiest thing to do is to open an editor in either `quickshell`, `core`, or both depending on which part of the project you are working on.
|
|
|
|
### QML (`quickshell` directory)
|
|
|
|
1. Install the [QML Extension](https://doc.qt.io/vscodeext/)
|
|
2. Configure `ctrl+shift+p` -> user preferences (json) with qmlls path
|
|
|
|
**Note:** Paths may vary by distribution. Below are examples for Arch Linux and Fedora.
|
|
|
|
**Arch Linux:**
|
|
|
|
```json
|
|
{
|
|
"[qml]": {
|
|
"editor.defaultFormatter": "qt-project.qmlls",
|
|
"editor.formatOnSave": true
|
|
},
|
|
"qt-qml.doNotAskForQmllsDownload": true,
|
|
"qt-qml.qmlls.customExePath": "/usr/lib/qt6/bin/qmlls",
|
|
"qt-core.additionalQtPaths": [
|
|
{
|
|
"name": "Qt-6.x-linux-g++",
|
|
"path": "/usr/bin/qmake"
|
|
}
|
|
]
|
|
}
|
|
```
|
|
|
|
**Fedora:**
|
|
|
|
```json
|
|
{
|
|
"[qml]": {
|
|
"editor.defaultFormatter": "qt-project.qmlls",
|
|
"editor.formatOnSave": true
|
|
},
|
|
"qt-qml.doNotAskForQmllsDownload": true,
|
|
"qt-qml.qmlls.customExePath": "/usr/bin/qmlls",
|
|
"qt-core.additionalQtPaths": [
|
|
{
|
|
"name": "Qt-6.x-Fedora-linux-g++",
|
|
"path": "/usr/bin/qmake6"
|
|
}
|
|
]
|
|
}
|
|
```
|
|
|
|
3. Create empty `.qmlls.ini` file in `quickshell/` directory
|
|
|
|
```bash
|
|
cd quickshell
|
|
touch .qmlls.ini
|
|
```
|
|
|
|
4. Restart dms to generate the `.qmlls.ini` file
|
|
|
|
5. Run `make lint-qml` from the repo root to lint QML entrypoints (requires the `.qmlls.ini` generated above). The script needs the **Qt 6** `qmllint`; it checks `qmllint6`, Fedora's `qmllint-qt6`, `/usr/lib/qt6/bin/qmllint`, then `qmllint` in `PATH`. If your Qt 6 binary lives elsewhere, set `QMLLINT=/path/to/qmllint`.
|
|
|
|
6. Make your changes, test, and open a pull request.
|
|
|
|
### I18n/Localization
|
|
|
|
When adding user-facing strings, ensure they are wrapped in `I18n.tr()` with context, for example.
|
|
|
|
```qml
|
|
import qs.Common
|
|
|
|
Text {
|
|
text: I18n.tr("Hello World", "<This is context for the translators, example> Hello world greeting that appears on the lock screen")
|
|
}
|
|
```
|
|
|
|
Preferably, try to keep new terms to a minimum and re-use existing terms where possible. See `quickshell/translations/en.json` for the list of existing terms. (This isn't always possible obviously, but instead of using `Auto-connect` you would use `Autoconnect` since it's already translated)
|
|
|
|
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.
|
|
|
|
### GO (`core` directory)
|
|
|
|
1. Install the [Go Extension](https://code.visualstudio.com/docs/languages/go)
|
|
2. Ensure code is formatted with `make fmt`
|
|
3. Add appropriate test coverage and ensure tests pass with `make test`
|
|
4. Run `go mod tidy`
|
|
5. Open pull request
|
|
|
|
## Pull request
|
|
|
|
Include screenshots/video if applicable in your pull request if applicable, to visualize what your change is affecting.
|