Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
dd09e85b9e
|
||
|
|
7ea701de5c
|
||
|
|
64b62246d7
|
||
|
|
a9f7d9c770 | ||
|
|
5d85acecf4 | ||
|
|
2dfbd29ed1
|
||
|
|
d39e36e096
|
||
|
|
cf73b12996 | ||
|
|
9a6fa483a5 | ||
|
|
5db3650184 | ||
|
|
0524f26f97 |
+57
-143
@@ -3,160 +3,74 @@ name: Release
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- 'v*'
|
||||
- 'v*.*.*'
|
||||
|
||||
jobs:
|
||||
build-arch:
|
||||
name: Build ArchLinux Package
|
||||
runs-on: ubuntu-latest
|
||||
release:
|
||||
name: Build and Release
|
||||
runs-on: ubuntu-24.04
|
||||
steps:
|
||||
- name: Checkout Code
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Extract Version
|
||||
run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV
|
||||
|
||||
- name: Generate PKGBUILD
|
||||
- name: Verify Tag Matches Project Version
|
||||
run: |
|
||||
TAR_URL="https://git.uyani.de/Uyanide/WallReel/archive/v${{ env.VERSION }}.tar.gz"
|
||||
TAG_VERSION="${GITHUB_REF_NAME#v}"
|
||||
CMAKE_VERSION=$(sed -n 's/^project(WallReel VERSION \([0-9.]\+\).*/\1/p' CMakeLists.txt)
|
||||
if [ "$TAG_VERSION" != "$CMAKE_VERSION" ]; then
|
||||
echo "::error::Tag v${TAG_VERSION} does not match project(WallReel VERSION ${CMAKE_VERSION})"
|
||||
exit 1
|
||||
fi
|
||||
echo "VERSION=${TAG_VERSION}" >> "$GITHUB_ENV"
|
||||
|
||||
wget -qO source.tar.gz "$TAR_URL"
|
||||
SHA256=$(sha256sum source.tar.gz | awk '{print $1}')
|
||||
- name: Install Build Dependencies
|
||||
run: |
|
||||
apt-get update
|
||||
apt-get install -y --no-install-recommends \
|
||||
cmake g++ jq qt6-base-dev qt6-declarative-dev
|
||||
|
||||
cat << 'EOF' > PKGBUILD
|
||||
# Maintainer: Uyanide <me@uyani.de>
|
||||
pkgname=wallreel
|
||||
pkgver=${{ env.VERSION }}
|
||||
pkgrel=1
|
||||
pkgdesc="Choose and set desktop wallpapers with customizable themes and actions"
|
||||
arch=('x86_64')
|
||||
url="https://git.uyani.de/Uyanide/WallReel"
|
||||
license=('MIT')
|
||||
depends=('qt6-base' 'qt6-declarative' 'gcc-libs' 'glibc')
|
||||
makedepends=('cmake')
|
||||
options=('!debug')
|
||||
source=("${pkgname}-${pkgver}.tar.gz::https://git.uyani.de/Uyanide/WallReel/archive/v${pkgver}.tar.gz")
|
||||
sha256sums=('INSERT_SHA256_HERE')
|
||||
- name: Configure
|
||||
run: |
|
||||
cmake -S . -B build \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||
-Wno-dev
|
||||
|
||||
build() {
|
||||
cd "wallreel"
|
||||
cmake -B build -S . \
|
||||
-DCMAKE_BUILD_TYPE='Release' \
|
||||
-DCMAKE_INSTALL_PREFIX='/usr' \
|
||||
-Wno-dev
|
||||
cmake --build build
|
||||
- name: Build
|
||||
run: cmake --build build --parallel "$(nproc)"
|
||||
|
||||
- name: Publish Release
|
||||
env:
|
||||
TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
run: |
|
||||
set -euo pipefail
|
||||
|
||||
API="${GITHUB_SERVER_URL}/api/v1/repos/${GITHUB_REPOSITORY}"
|
||||
AUTH="Authorization: token ${TOKEN}"
|
||||
NOTES=$(git tag -l --format='%(contents)' "$GITHUB_REF_NAME")
|
||||
|
||||
payload() {
|
||||
jq -n --arg tag "$GITHUB_REF_NAME" \
|
||||
--arg name "WallReel ${VERSION}" \
|
||||
--arg body "$NOTES" \
|
||||
"$1"
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "wallreel"
|
||||
DESTDIR="$pkgdir" cmake --install build
|
||||
install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
|
||||
}
|
||||
EOF
|
||||
code=$(curl -sS -o /tmp/resp.json -w '%{http_code}' -X POST "$API/releases" \
|
||||
-H "$AUTH" -H 'Content-Type: application/json' \
|
||||
--data-binary "$(payload '{tag_name:$tag, name:$name, body:$body, draft:false, prerelease:false}')")
|
||||
|
||||
sed -i "s/INSERT_SHA256_HERE/$SHA256/" PKGBUILD
|
||||
if [ "$code" = "409" ]; then
|
||||
echo "Release for ${GITHUB_REF_NAME} already exists, updating in place."
|
||||
id=$(curl -sS -H "$AUTH" "$API/releases/tags/${GITHUB_REF_NAME}" | jq -r '.id')
|
||||
code=$(curl -sS -o /tmp/resp.json -w '%{http_code}' -X PATCH "$API/releases/${id}" \
|
||||
-H "$AUTH" -H 'Content-Type: application/json' \
|
||||
--data-binary "$(payload '{name:$name, body:$body, draft:false, prerelease:false}')")
|
||||
fi
|
||||
|
||||
- name: Build and Generate AUR Meta
|
||||
run: |
|
||||
tar -cf - . | docker run --rm -i archlinux:latest /bin/bash -e -c "
|
||||
mkdir -p /workspace && cd /workspace
|
||||
tar -xf -
|
||||
exec 3>&1 1>&2
|
||||
|
||||
pacman-key --init && pacman-key --populate
|
||||
pacman -Sy --noconfirm archlinux-keyring
|
||||
pacman -Su --noconfirm base-devel cmake qt6-base qt6-declarative sudo
|
||||
|
||||
echo 'MAKEFLAGS="-j$(nproc)"' >> /etc/makepkg.conf
|
||||
|
||||
useradd -m builduser
|
||||
chown -R builduser:builduser /workspace
|
||||
echo 'builduser ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers
|
||||
|
||||
su - builduser -c 'cd /workspace && makepkg -sf --noconfirm'
|
||||
su - builduser -c 'cd /workspace && makepkg --printsrcinfo' > SRCINFO.txt
|
||||
|
||||
tar -cf - *.pkg.tar.zst PKGBUILD SRCINFO.txt >&3
|
||||
" | tar -xf -
|
||||
|
||||
- name: Upload Arch Artifacts
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: arch-artifacts
|
||||
path: |
|
||||
*.pkg.tar.zst
|
||||
PKGBUILD
|
||||
SRCINFO.txt
|
||||
|
||||
publish-gitea:
|
||||
name: Publish to Gitea Release
|
||||
needs: [build-arch]
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Extract Version
|
||||
run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV
|
||||
|
||||
- name: Download Arch Artifacts
|
||||
uses: actions/download-artifact@v3
|
||||
with:
|
||||
name: arch-artifacts
|
||||
path: .
|
||||
|
||||
- name: Publish to Gitea Release
|
||||
uses: softprops/action-gh-release@v1
|
||||
with:
|
||||
name: WallReel ${{ env.VERSION }}
|
||||
draft: false
|
||||
prerelease: false
|
||||
files: "*.pkg.tar.zst"
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
publish-aur:
|
||||
name: Publish to AUR
|
||||
needs: [build-arch]
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Extract Version
|
||||
run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV
|
||||
|
||||
- name: Download Arch Artifacts
|
||||
uses: actions/download-artifact@v3
|
||||
with:
|
||||
name: arch-artifacts
|
||||
path: .
|
||||
|
||||
- name: Publish to AUR
|
||||
env:
|
||||
AUR_KEY: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
|
||||
run: |
|
||||
mkdir -p ~/.ssh
|
||||
echo "$AUR_KEY" > ~/.ssh/aur
|
||||
chmod 600 ~/.ssh/aur
|
||||
ssh-keyscan aur.archlinux.org >> ~/.ssh/known_hosts
|
||||
|
||||
cat <<EOF > ~/.ssh/config
|
||||
Host aur.archlinux.org
|
||||
IdentityFile ~/.ssh/aur
|
||||
User aur
|
||||
EOF
|
||||
|
||||
git config --global user.name "Uyanide"
|
||||
git config --global user.email "me@uyani.de"
|
||||
|
||||
git clone ssh://aur@aur.archlinux.org/wallreel.git aur-repo
|
||||
cp PKGBUILD aur-repo/
|
||||
cp SRCINFO.txt aur-repo/.SRCINFO
|
||||
cd aur-repo
|
||||
|
||||
cat << 'EOF' > LICENSE
|
||||
Copyright (C) 2026 by Uyanide me@uyani.de
|
||||
|
||||
Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
EOF
|
||||
|
||||
git add PKGBUILD LICENSE .SRCINFO
|
||||
git commit -m "Release v${{ env.VERSION }}"
|
||||
git push origin master
|
||||
case "$code" in
|
||||
2*) echo "Release published (HTTP ${code})." ;;
|
||||
*) echo "::error::Gitea API returned HTTP ${code}"; cat /tmp/resp.json; exit 1 ;;
|
||||
esac
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
cmake_minimum_required(VERSION 3.16)
|
||||
|
||||
project(WallReel VERSION 2.0.2 LANGUAGES CXX)
|
||||
project(WallReel VERSION 2.2.2 LANGUAGES CXX)
|
||||
|
||||
set(EXECUTABLE_NAME "wallreel")
|
||||
set(CORELIB_NAME "wallreel-core")
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
Copyright 2026 Uyanide me@uyani.de
|
||||
Copyright 2026 Uyanide pywang0608@foxmail.com
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
|
||||
|
||||
|
||||
@@ -117,12 +117,11 @@ Configures system commands to execute on specific events mapping to your window
|
||||
| :-------------------- | :--------------- | :------ | :------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
||||
| `previewDebounceTime` | Integer | `300` | Debounce time (ms) for triggering the preview action. |
|
||||
| `printSelected` | Boolean | `true` | Print selected wallpaper path to stdout on confirm. |
|
||||
| `printPreview` | Boolean | `false` | Print previewed wallpaper path to stdout on preview. |
|
||||
| `onSelected` | String | `""` | Command to execute when a wallpaper is confirmed. |
|
||||
| `onPreview` | String | `""` | Command to execute when a wallpaper is previewed. |
|
||||
| `saveState` | Array of Objects | `[]` | Commands to fetch system states before changing wallpapers. Each object defines: `key`, `fallback` (fallback value), `command` (stdout mapping), and `timeout` (ms). |
|
||||
| `onRestore` | String | `""` | Command to execute on restore. Extracted states from `saveState` can be injected using `{{ key }}`. |
|
||||
| `quitOnSelected` | Boolean | `false` | Quit the application after a selection is made. |
|
||||
| `quitOnSelected` | Boolean | `true` | Quit the application after a selection is made. |
|
||||
| `restoreOnClose` | Boolean | `true` | Run `onRestore` command if the application is closed without making a final selection. |
|
||||
|
||||
Available placeholders for `onSelected`, `onPreview` commands:
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
.\" Automatically generated by Pandoc 3.5
|
||||
.\" Automatically generated by Pandoc 3.9.0.2
|
||||
.\"
|
||||
.TH "WALLREEL" "1" "2026\-03\-24" "WallReel 2.0.2" "User Commands"
|
||||
.SH NAME
|
||||
@@ -42,20 +42,20 @@ In this mode, the configuration is still parsed.
|
||||
Action placeholders are resolved from the selected image and any
|
||||
captured state values.
|
||||
.SH BEHAVIOR NOTES
|
||||
.IP \[bu] 2
|
||||
.IP \(bu 2
|
||||
CLI options are generally optional; configuration is the preferred
|
||||
customization path.
|
||||
.IP \[bu] 2
|
||||
.IP \(bu 2
|
||||
Some options are mutually exclusive (for example \f[CR]\-\-verbose\f[R]
|
||||
and \f[CR]\-\-quiet\f[R]).
|
||||
.IP \[bu] 2
|
||||
.IP \(bu 2
|
||||
With \f[CR]\-\-apply\f[R], WallReel executes configured selection
|
||||
actions without opening the UI.
|
||||
.SH FILES
|
||||
\f[CR]\[ti]/.config/wallreel/config.json\f[R] : Default configuration
|
||||
\f[CR]\(ti/.config/wallreel/config.json\f[R] : Default configuration
|
||||
file location.
|
||||
.PP
|
||||
\f[CR]\[ti]/.cache/wallreel/\f[R] : Runtime cache location.
|
||||
\f[CR]\(ti/.cache/wallreel/\f[R] : Runtime cache location.
|
||||
.SH EXAMPLES
|
||||
Run with default configuration:
|
||||
.IP
|
||||
@@ -66,19 +66,19 @@ wallreel
|
||||
Use a custom configuration file:
|
||||
.IP
|
||||
.EX
|
||||
wallreel \-\-config\-file \[ti]/.config/wallreel/config.json
|
||||
wallreel \-\-config\-file \(ti/.config/wallreel/config.json
|
||||
.EE
|
||||
.PP
|
||||
Append additional search directories:
|
||||
.IP
|
||||
.EX
|
||||
wallreel \-\-append\-dir \[ti]/Pictures/Wallpapers \-\-append\-dir \[ti]/Art
|
||||
wallreel \-\-append\-dir \(ti/Pictures/Wallpapers \-\-append\-dir \(ti/Art
|
||||
.EE
|
||||
.PP
|
||||
Apply a wallpaper and exit:
|
||||
.IP
|
||||
.EX
|
||||
wallreel \-\-apply \[ti]/Pictures/wallpaper.jpg
|
||||
wallreel \-\-apply \(ti/Pictures/wallpaper.jpg
|
||||
.EE
|
||||
.SH EXIT STATUS
|
||||
Returns \f[CR]0\f[R] on success.
|
||||
|
||||
+60
-63
@@ -1,22 +1,22 @@
|
||||
.\" Automatically generated by Pandoc 3.5
|
||||
.\" Automatically generated by Pandoc 3.9.0.2
|
||||
.\"
|
||||
.TH "WALLREEL" "5" "2026\-03\-24" "WallReel 2.0.2" "File Formats Manual"
|
||||
.SH NAME
|
||||
wallreel\-config \- configuration format for wallreel
|
||||
.SH SYNOPSIS
|
||||
\f[CR]\[ti]/.config/wallreel/config.json\f[R]
|
||||
\f[CR]\(ti/.config/wallreel/config.json\f[R]
|
||||
.SH DESCRIPTION
|
||||
WallReel reads configuration from a JSON document.
|
||||
The root object is divided into five sections:
|
||||
.IP \[bu] 2
|
||||
.IP \(bu 2
|
||||
\f[CR]wallpaper\f[R]
|
||||
.IP \[bu] 2
|
||||
.IP \(bu 2
|
||||
\f[CR]theme\f[R]
|
||||
.IP \[bu] 2
|
||||
.IP \(bu 2
|
||||
\f[CR]action\f[R]
|
||||
.IP \[bu] 2
|
||||
.IP \(bu 2
|
||||
\f[CR]style\f[R]
|
||||
.IP \[bu] 2
|
||||
.IP \(bu 2
|
||||
\f[CR]cache\f[R]
|
||||
.PP
|
||||
For complete machine\-readable validation details, refer to
|
||||
@@ -25,7 +25,7 @@ For complete machine\-readable validation details, refer to
|
||||
Defines where WallReel looks for images and what to exclude.
|
||||
.PP
|
||||
If both \f[CR]paths\f[R] and \f[CR]dirs\f[R] are empty or omitted,
|
||||
WallReel defaults to recursively scanning the user\[aq]s Pictures
|
||||
WallReel defaults to recursively scanning the user\(aqs Pictures
|
||||
directory and treating all supported image files as wallpaper
|
||||
candidates.
|
||||
.PP
|
||||
@@ -36,9 +36,9 @@ to specific image files.
|
||||
to scan for images.
|
||||
.PP
|
||||
Each item has:
|
||||
.IP \[bu] 2
|
||||
.IP \(bu 2
|
||||
\f[CR]path\f[R] (string)
|
||||
.IP \[bu] 2
|
||||
.IP \(bu 2
|
||||
\f[CR]recursive\f[R] (boolean)
|
||||
.PP
|
||||
\f[CR]excludes\f[R] (array of string, default: \f[CR][]\f[R]) : Exclude
|
||||
@@ -54,16 +54,16 @@ the primary color.
|
||||
palette definitions.
|
||||
.PP
|
||||
Each palette has:
|
||||
.IP \[bu] 2
|
||||
.IP \(bu 2
|
||||
\f[CR]name\f[R] (string)
|
||||
.IP \[bu] 2
|
||||
.IP \(bu 2
|
||||
\f[CR]colors\f[R] (array)
|
||||
.PP
|
||||
Each color item has:
|
||||
.IP \[bu] 2
|
||||
.IP \(bu 2
|
||||
\f[CR]name\f[R] (string)
|
||||
.IP \[bu] 2
|
||||
\f[CR]value\f[R] (hex string, for example \f[CR]\[dq]#89b4fa\[dq]\f[R])
|
||||
.IP \(bu 2
|
||||
\f[CR]value\f[R] (hex string, for example \f[CR]\(dq#89b4fa\(dq\f[R])
|
||||
.SH ACTION SECTION
|
||||
Configures commands executed for preview, selection, and restore
|
||||
behavior.
|
||||
@@ -74,33 +74,30 @@ Debounce interval in milliseconds for preview actions.
|
||||
\f[CR]printSelected\f[R] (boolean, default: \f[CR]true\f[R]) : Print
|
||||
selected wallpaper path to stdout on confirmation.
|
||||
.PP
|
||||
\f[CR]printPreview\f[R] (boolean, default: \f[CR]false\f[R]) : Print
|
||||
previewed wallpaper path to stdout on preview.
|
||||
.PP
|
||||
\f[CR]onSelected\f[R] (string, default: \f[CR]\[dq]\[dq]\f[R]) : Command
|
||||
\f[CR]onSelected\f[R] (string, default: \f[CR]\(dq\(dq\f[R]) : Command
|
||||
executed when a wallpaper is confirmed.
|
||||
.PP
|
||||
\f[CR]onPreview\f[R] (string, default: \f[CR]\[dq]\[dq]\f[R]) : Command
|
||||
\f[CR]onPreview\f[R] (string, default: \f[CR]\(dq\(dq\f[R]) : Command
|
||||
executed when a wallpaper is previewed.
|
||||
.PP
|
||||
\f[CR]saveState\f[R] (array of object, default: \f[CR][]\f[R]) :
|
||||
Commands for capturing system values before changing wallpaper.
|
||||
.PP
|
||||
Each item has:
|
||||
.IP \[bu] 2
|
||||
.IP \(bu 2
|
||||
\f[CR]key\f[R] (placeholder key)
|
||||
.IP \[bu] 2
|
||||
.IP \(bu 2
|
||||
\f[CR]fallback\f[R] (default value)
|
||||
.IP \[bu] 2
|
||||
.IP \(bu 2
|
||||
\f[CR]command\f[R] (stdout\-mapped command)
|
||||
.IP \[bu] 2
|
||||
.IP \(bu 2
|
||||
\f[CR]timeout\f[R] (milliseconds)
|
||||
.PP
|
||||
\f[CR]onRestore\f[R] (string, default: \f[CR]\[dq]\[dq]\f[R]) : Command
|
||||
\f[CR]onRestore\f[R] (string, default: \f[CR]\(dq\(dq\f[R]) : Command
|
||||
executed on restore.
|
||||
Saved state keys are usable as placeholders.
|
||||
.PP
|
||||
\f[CR]quitOnSelected\f[R] (boolean, default: \f[CR]false\f[R]) : Exit
|
||||
\f[CR]quitOnSelected\f[R] (boolean, default: \f[CR]true\f[R]) : Exit
|
||||
application immediately after confirming a selection.
|
||||
.PP
|
||||
\f[CR]restoreOnClose\f[R] (boolean, default: \f[CR]true\f[R]) : Run
|
||||
@@ -117,13 +114,13 @@ The following placeholders are available in \f[CR]onSelected\f[R],
|
||||
wallpaper.
|
||||
.PP
|
||||
\f[CR]{{ palette }}\f[R] : Selected palette name
|
||||
(\f[CR]\[dq]null\[dq]\f[R] if none).
|
||||
(\f[CR]\(dqnull\(dq\f[R] if none).
|
||||
.PP
|
||||
\f[CR]{{ colorName }}\f[R] : Chosen primary color name
|
||||
(\f[CR]\[dq]null\[dq]\f[R] if none).
|
||||
(\f[CR]\(dqnull\(dq\f[R] if none).
|
||||
.PP
|
||||
\f[CR]{{ colorHex }}\f[R] : Chosen primary color hex
|
||||
(\f[CR]\[dq]null\[dq]\f[R] if none).
|
||||
(\f[CR]\(dqnull\(dq\f[R] if none).
|
||||
.PP
|
||||
\f[CR]{{ domColorHex }}\f[R] : Dominant color hex extracted from the
|
||||
wallpaper.
|
||||
@@ -162,54 +159,54 @@ Older entries are evicted.
|
||||
.IP
|
||||
.EX
|
||||
{
|
||||
\[dq]$schema\[dq]: \[dq]https://raw.githubusercontent.com/Uyanide/WallReel/refs/heads/master/config.schema.json\[dq],
|
||||
\[dq]wallpaper\[dq]: {
|
||||
\[dq]paths\[dq]: [\[dq]/home/user/Pictures/favorite.jpg\[dq]],
|
||||
\[dq]dirs\[dq]: [
|
||||
\(dq$schema\(dq: \(dqhttps://raw.githubusercontent.com/Uyanide/WallReel/refs/heads/master/config.schema.json\(dq,
|
||||
\(dqwallpaper\(dq: {
|
||||
\(dqpaths\(dq: [\(dq/home/user/Pictures/favorite.jpg\(dq],
|
||||
\(dqdirs\(dq: [
|
||||
{
|
||||
\[dq]path\[dq]: \[dq]/home/user/Pictures/Wallpapers\[dq],
|
||||
\[dq]recursive\[dq]: \f[B]true\f[R]
|
||||
\(dqpath\(dq: \(dq/home/user/Pictures/Wallpapers\(dq,
|
||||
\(dqrecursive\(dq: \f[B]true\f[R]
|
||||
}
|
||||
],
|
||||
\[dq]excludes\[dq]: [\[dq]\[rs]\[rs].gif$\[dq]]
|
||||
\(dqexcludes\(dq: [\(dq\(rs\(rs.gif$\(dq]
|
||||
},
|
||||
\[dq]theme\[dq]: {
|
||||
\[dq]palettes\[dq]: [
|
||||
\(dqtheme\(dq: {
|
||||
\(dqpalettes\(dq: [
|
||||
{
|
||||
\[dq]name\[dq]: \[dq]Dark\[dq],
|
||||
\[dq]colors\[dq]: [
|
||||
{ \[dq]name\[dq]: \[dq]blue\[dq], \[dq]value\[dq]: \[dq]#89b4fa\[dq] },
|
||||
{ \[dq]name\[dq]: \[dq]red\[dq], \[dq]value\[dq]: \[dq]#f38ba8\[dq] }
|
||||
\(dqname\(dq: \(dqDark\(dq,
|
||||
\(dqcolors\(dq: [
|
||||
{ \(dqname\(dq: \(dqblue\(dq, \(dqvalue\(dq: \(dq#89b4fa\(dq },
|
||||
{ \(dqname\(dq: \(dqred\(dq, \(dqvalue\(dq: \(dq#f38ba8\(dq }
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
\[dq]action\[dq]: {
|
||||
\[dq]previewDebounceTime\[dq]: 500,
|
||||
\[dq]quitOnSelected\[dq]: \f[B]true\f[R],
|
||||
\[dq]onPreview\[dq]: \[dq]swww img {{ path }}\[dq],
|
||||
\[dq]onSelected\[dq]: \[dq]cp {{ path }} \[ti]/.config/wallpaper/current/ && swww img {{ path }}\[dq],
|
||||
\[dq]saveState\[dq]: [
|
||||
\(dqaction\(dq: {
|
||||
\(dqpreviewDebounceTime\(dq: 500,
|
||||
\(dqquitOnSelected\(dq: \f[B]true\f[R],
|
||||
\(dqonPreview\(dq: \(dqswww img {{ path }}\(dq,
|
||||
\(dqonSelected\(dq: \(dqcp {{ path }} \(ti/.config/wallpaper/current/ && swww img {{ path }}\(dq,
|
||||
\(dqsaveState\(dq: [
|
||||
{
|
||||
\[dq]key\[dq]: \[dq]current_wp\[dq],
|
||||
\[dq]fallback\[dq]: \[dq]/home/user/Pictures/default.jpg\[dq],
|
||||
\[dq]command\[dq]: \[dq]find \[ti]/.config/wallpaper/current \-type f | head \-n 1\[dq],
|
||||
\[dq]timeout\[dq]: 1000
|
||||
\(dqkey\(dq: \(dqcurrent_wp\(dq,
|
||||
\(dqfallback\(dq: \(dq/home/user/Pictures/default.jpg\(dq,
|
||||
\(dqcommand\(dq: \(dqfind \(ti/.config/wallpaper/current \-type f | head \-n 1\(dq,
|
||||
\(dqtimeout\(dq: 1000
|
||||
}
|
||||
],
|
||||
\[dq]onRestore\[dq]: \[dq]swww img {{ current_wp }}\[dq]
|
||||
\(dqonRestore\(dq: \(dqswww img {{ current_wp }}\(dq
|
||||
},
|
||||
\[dq]style\[dq]: {
|
||||
\[dq]image_width\[dq]: 640,
|
||||
\[dq]image_height\[dq]: 400,
|
||||
\[dq]image_focus_scale\[dq]: 1.2,
|
||||
\[dq]window_width\[dq]: 1280,
|
||||
\[dq]window_height\[dq]: 720
|
||||
\(dqstyle\(dq: {
|
||||
\(dqimage_width\(dq: 640,
|
||||
\(dqimage_height\(dq: 400,
|
||||
\(dqimage_focus_scale\(dq: 1.2,
|
||||
\(dqwindow_width\(dq: 1280,
|
||||
\(dqwindow_height\(dq: 720
|
||||
},
|
||||
\[dq]cache\[dq]: {
|
||||
\[dq]saveSortMethod\[dq]: \f[B]true\f[R],
|
||||
\[dq]savePalette\[dq]: \f[B]true\f[R],
|
||||
\[dq]maxImageEntries\[dq]: 300
|
||||
\(dqcache\(dq: {
|
||||
\(dqsaveSortMethod\(dq: \f[B]true\f[R],
|
||||
\(dqsavePalette\(dq: \f[B]true\f[R],
|
||||
\(dqmaxImageEntries\(dq: 300
|
||||
}
|
||||
}
|
||||
.EE
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
#ifndef WALLREEL_CONFIG_DATA_HPP
|
||||
#define WALLREEL_CONFIG_DATA_HPP
|
||||
|
||||
#include <qtmetamacros.h>
|
||||
|
||||
#include <QColor>
|
||||
#include <QHash>
|
||||
#include <QList>
|
||||
@@ -27,7 +25,6 @@
|
||||
//
|
||||
// action.previewDebounceTime number 300 Debounce time for preview action in milliseconds
|
||||
// action.printSelected boolean true Whether to print the selected wallpaper path to stdout on confirm
|
||||
// action.printPreview boolean false Whether to print the previewed wallpaper path to stdout on preview
|
||||
// action.onSelected string "" Command to execute on confirmation
|
||||
// action.onPreview string "" Command to execute on preview
|
||||
// action.saveState array [] Useful for restore command
|
||||
@@ -36,7 +33,7 @@
|
||||
// action.saveState[].command string "" Command that outputs(to stdout) the value to save when executed
|
||||
// action.saveState[].timeout number 3000 Timeout for executing "command" in milliseconds. 0 or negative means no timeout
|
||||
// action.onRestore string "" Command to execute on restore ({{ key }} -> value defined or obtained in saveState)
|
||||
// action.quitOnSelected boolean false Whether to quit the application after confirming a wallpaper
|
||||
// action.quitOnSelected boolean true Whether to quit the application after confirming a wallpaper
|
||||
// action.restoreOnClose boolean true Whether to run the restore command after closing the application without confirming a wallpaper
|
||||
//
|
||||
// style.image_width number 320 Width of each image
|
||||
@@ -126,8 +123,7 @@ struct ActionConfigItems {
|
||||
QString onRestore;
|
||||
int previewDebounceTime = 300; // milliseconds
|
||||
bool printSelected = true;
|
||||
bool printPreview = false;
|
||||
bool quitOnSelected = false;
|
||||
bool quitOnSelected = true;
|
||||
bool restoreOnClose = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -54,9 +54,6 @@ Manager::Manager(
|
||||
WR_INFO(QString("No search directories specified, using Pictures directory: %1").arg(picturesPath));
|
||||
m_wallpaperConfig.dirs.append({picturesPath, true});
|
||||
}
|
||||
|
||||
WR_DEBUG("Loading wallpapers ...");
|
||||
_loadWallpapers();
|
||||
}
|
||||
|
||||
Manager::~Manager() {
|
||||
@@ -203,12 +200,6 @@ void Manager::_loadActionConfig(const QJsonObject& root) {
|
||||
m_actionConfig.printSelected = val.toBool();
|
||||
}
|
||||
}
|
||||
if (config.contains("printPreview")) {
|
||||
const auto& val = config["printPreview"];
|
||||
if (val.isBool()) {
|
||||
m_actionConfig.printPreview = val.toBool();
|
||||
}
|
||||
}
|
||||
if (config.contains("saveState") && config["saveState"].isArray()) {
|
||||
const QJsonArray& arr = config["saveState"].toArray();
|
||||
for (const auto& item : arr) {
|
||||
@@ -330,7 +321,7 @@ void Manager::_loadCacheConfig(const QJsonObject& root) {
|
||||
}
|
||||
}
|
||||
|
||||
void Manager::_loadWallpapers() {
|
||||
void Manager::scanWallpapers() {
|
||||
m_wallpapers.clear();
|
||||
|
||||
// Add paths first using a set to avoid duplicates
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#ifndef WALLREEL_CONFIGMGR_HPP
|
||||
#define WALLREEL_CONFIGMGR_HPP
|
||||
#ifndef WALLREEL_CONFIG_MANAGER_HPP
|
||||
#define WALLREEL_CONFIG_MANAGER_HPP
|
||||
|
||||
#include <QDir>
|
||||
|
||||
@@ -72,6 +72,8 @@ class Manager : public QObject {
|
||||
*/
|
||||
Q_INVOKABLE void captureState();
|
||||
|
||||
void scanWallpapers();
|
||||
|
||||
signals:
|
||||
void stateCaptured();
|
||||
|
||||
@@ -83,8 +85,6 @@ class Manager : public QObject {
|
||||
void _loadActionConfig(const QJsonObject& config);
|
||||
void _loadStyleConfig(const QJsonObject& config);
|
||||
void _loadCacheConfig(const QJsonObject& config);
|
||||
// Load wallpapers
|
||||
void _loadWallpapers();
|
||||
// Callback for state capture results
|
||||
void _onCaptureResult(const QString& key, const QString& value);
|
||||
|
||||
@@ -106,4 +106,4 @@ class Manager : public QObject {
|
||||
|
||||
} // namespace WallReel::Core::Config
|
||||
|
||||
#endif // WALLREEL_CONFIGMGR_HPP
|
||||
#endif // WALLREEL_CONFIG_MANAGER_HPP
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#ifndef WALLREEL_IMAGEDATA_HPP
|
||||
#define WALLREEL_IMAGEDATA_HPP
|
||||
#ifndef WALLREEL_IMAGE_DATA_HPP
|
||||
#define WALLREEL_IMAGE_DATA_HPP
|
||||
|
||||
#include <QDir>
|
||||
#include <QFileInfo>
|
||||
@@ -106,4 +106,4 @@ class Data {
|
||||
|
||||
} // namespace WallReel::Core::Image
|
||||
|
||||
#endif // WALLREEL_IMAGEDATA_HPP
|
||||
#endif // WALLREEL_IMAGE_DATA_HPP
|
||||
|
||||
@@ -9,10 +9,12 @@
|
||||
WALLREEL_DECLARE_SENDER("ImageManager")
|
||||
|
||||
WallReel::Core::Image::Manager::Manager(
|
||||
Config::Manager& configMgr,
|
||||
Cache::Manager& cacheMgr,
|
||||
const QSize& thumbnailSize,
|
||||
QObject* parent)
|
||||
: QObject(parent),
|
||||
m_configMgr(configMgr),
|
||||
m_cacheMgr(cacheMgr),
|
||||
m_thumbnailSize(thumbnailSize) {
|
||||
m_dataModel = new Model(this);
|
||||
@@ -38,6 +40,21 @@ WallReel::Core::Image::Manager::~Manager() {
|
||||
m_watcher.waitForFinished();
|
||||
}
|
||||
|
||||
void WallReel::Core::Image::Manager::loadAndProcess() {
|
||||
if (m_isLoading) {
|
||||
WR_WARN("Already loading images. Ignoring new load request.");
|
||||
return;
|
||||
}
|
||||
m_isLoading = true;
|
||||
emit isLoadingChanged();
|
||||
|
||||
_clearData();
|
||||
|
||||
m_configMgr.scanWallpapers();
|
||||
const auto paths = m_configMgr.getWallpapers();
|
||||
return _process(paths);
|
||||
}
|
||||
|
||||
void WallReel::Core::Image::Manager::loadAndProcess(const QStringList& paths) {
|
||||
if (m_isLoading) {
|
||||
WR_WARN("Already loading images. Ignoring new load request.");
|
||||
@@ -48,6 +65,10 @@ void WallReel::Core::Image::Manager::loadAndProcess(const QStringList& paths) {
|
||||
|
||||
_clearData();
|
||||
|
||||
return _process(paths);
|
||||
}
|
||||
|
||||
void WallReel::Core::Image::Manager::_process(const QStringList& paths) {
|
||||
m_processedCount = 0;
|
||||
m_progressUpdateTimer.start(s_ProgressUpdateIntervalMs);
|
||||
// These are all small objects so capturing by value should be fine
|
||||
@@ -75,6 +96,7 @@ void WallReel::Core::Image::Manager::stop() {
|
||||
|
||||
void WallReel::Core::Image::Manager::_clearData() {
|
||||
m_dataModel->clearData();
|
||||
m_dataMap.clear();
|
||||
}
|
||||
|
||||
void WallReel::Core::Image::Manager::_onProgressValueChanged(int value) {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#ifndef WALLREEL_IMAGEMANAGER_HPP
|
||||
#define WALLREEL_IMAGEMANAGER_HPP
|
||||
#ifndef WALLREEL_IMAGE_MANAGER_HPP
|
||||
#define WALLREEL_IMAGE_MANAGER_HPP
|
||||
|
||||
#include <QAbstractListModel>
|
||||
#include <QDir>
|
||||
@@ -8,6 +8,7 @@
|
||||
#include <atomic>
|
||||
|
||||
#include "Cache/manager.hpp"
|
||||
#include "Config/manager.hpp"
|
||||
#include "data.hpp"
|
||||
#include "model.hpp"
|
||||
|
||||
@@ -20,6 +21,7 @@ class Manager : public QObject {
|
||||
// Constructor / Destructor
|
||||
|
||||
Manager(
|
||||
Config::Manager& configMgr,
|
||||
Cache::Manager& cacheMgr,
|
||||
const QSize& thumbnailSize,
|
||||
QObject* parent = nullptr);
|
||||
@@ -32,6 +34,8 @@ class Manager : public QObject {
|
||||
|
||||
int processedCount() const { return m_processedCount.load(std::memory_order_relaxed); }
|
||||
|
||||
// Total count of processing items, NOT the count of items in the model
|
||||
// (Why did I name this method like this? idk)
|
||||
int totalCount() const { return m_watcher.progressMaximum(); }
|
||||
|
||||
void setSortType(Config::SortType type) { m_proxyModel->setSortType(type); }
|
||||
@@ -46,6 +50,8 @@ class Manager : public QObject {
|
||||
|
||||
QString searchText() const { return m_proxyModel->getSearchText(); }
|
||||
|
||||
void loadAndProcess();
|
||||
|
||||
void loadAndProcess(const QStringList& paths);
|
||||
|
||||
void stop();
|
||||
@@ -59,6 +65,7 @@ class Manager : public QObject {
|
||||
|
||||
private:
|
||||
void _clearData();
|
||||
void _process(const QStringList& paths);
|
||||
|
||||
signals:
|
||||
// Properties
|
||||
@@ -75,6 +82,7 @@ class Manager : public QObject {
|
||||
ProxyModel* m_proxyModel;
|
||||
QHash<QString, Data*> m_dataMap;
|
||||
|
||||
Config::Manager& m_configMgr;
|
||||
Cache::Manager& m_cacheMgr;
|
||||
QSize m_thumbnailSize;
|
||||
|
||||
@@ -88,4 +96,4 @@ class Manager : public QObject {
|
||||
|
||||
} // namespace WallReel::Core::Image
|
||||
|
||||
#endif // WALLREEL_IMAGEMANAGER_HPP
|
||||
#endif // WALLREEL_IMAGE_MANAGER_HPP
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#ifndef WALLREEL_IMAGEMODEL_HPP
|
||||
#define WALLREEL_IMAGEMODEL_HPP
|
||||
#ifndef WALLREEL_IMAGE_MODEL_HPP
|
||||
#define WALLREEL_IMAGE_MODEL_HPP
|
||||
|
||||
#include <QAbstractListModel>
|
||||
#include <QSortFilterProxyModel>
|
||||
@@ -78,10 +78,10 @@ class ProxyModel : public QSortFilterProxyModel {
|
||||
|
||||
private:
|
||||
QString m_searchText;
|
||||
Config::SortType m_sortType;
|
||||
bool m_sortDescending;
|
||||
Config::SortType m_sortType = Config::SortType::Date;
|
||||
bool m_sortDescending = true;
|
||||
};
|
||||
|
||||
} // namespace WallReel::Core::Image
|
||||
|
||||
#endif // WALLREEL_IMAGEMODEL_HPP
|
||||
#endif // WALLREEL_IMAGE_MODEL_HPP
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
#ifndef WALLREEL_PALETTE_DATA_HPP
|
||||
#define WALLREEL_PALETTE_DATA_HPP
|
||||
|
||||
#include <qcolor.h>
|
||||
|
||||
#include <QColor>
|
||||
#include <QList>
|
||||
#include <QObject>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#ifndef WALLREEL_CORE_PALETTE_DOMCOLOR_HPP
|
||||
#define WALLREEL_CORE_PALETTE_DOMCOLOR_HPP
|
||||
#ifndef WALLREEL_PALETTE_DOMCOLOR_HPP
|
||||
#define WALLREEL_PALETTE_DOMCOLOR_HPP
|
||||
|
||||
#include <QImage>
|
||||
|
||||
@@ -15,4 +15,4 @@ QColor getDominantColor(const QImage& image);
|
||||
|
||||
} // namespace WallReel::Core::Palette
|
||||
|
||||
#endif // WALLREEL_CORE_PALETTE_DOMCOLOR_HPP
|
||||
#endif // WALLREEL_PALETTE_DOMCOLOR_HPP
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
#include "manager.hpp"
|
||||
|
||||
#include <qcontainerfwd.h>
|
||||
|
||||
#include "Palette/matchcolor.hpp"
|
||||
#include "Utils/misc.hpp"
|
||||
#include "logger.hpp"
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
#ifndef WALLREEL_PALETTE_MANAGER_HPP
|
||||
#define WALLREEL_PALETTE_MANAGER_HPP
|
||||
|
||||
#include <qcolor.h>
|
||||
|
||||
#include "Config/data.hpp"
|
||||
#include "Image/manager.hpp"
|
||||
#include "data.hpp"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#ifndef WALLREEL_CORE_PALETTE_MATCHCOLOR_HPP
|
||||
#define WALLREEL_CORE_PALETTE_MATCHCOLOR_HPP
|
||||
#ifndef WALLREEL_PALETTE_MATCHCOLOR_HPP
|
||||
#define WALLREEL_PALETTE_MATCHCOLOR_HPP
|
||||
|
||||
#include "data.hpp"
|
||||
|
||||
@@ -16,4 +16,4 @@ ColorItem bestMatch(const QColor& target, const QList<ColorItem>& candidates);
|
||||
|
||||
} // namespace WallReel::Core::Palette
|
||||
|
||||
#endif // WALLREEL_CORE_PALETTE_MATCHCOLOR_HPP
|
||||
#endif // WALLREEL_PALETTE_MATCHCOLOR_HPP
|
||||
|
||||
@@ -36,6 +36,7 @@ class Bootstrap {
|
||||
}
|
||||
|
||||
imageMgr = new Image::Manager(
|
||||
*configMgr,
|
||||
*cacheMgr,
|
||||
configMgr->getFocusImageSize());
|
||||
|
||||
@@ -55,7 +56,7 @@ class Bootstrap {
|
||||
void start() {
|
||||
cacheMgr->evictOldEntries();
|
||||
configMgr->captureState();
|
||||
imageMgr->loadAndProcess(configMgr->getWallpapers());
|
||||
imageMgr->loadAndProcess();
|
||||
}
|
||||
|
||||
bool apply(const QString& path) {
|
||||
|
||||
@@ -171,6 +171,10 @@ class Carousel : public QObject {
|
||||
}
|
||||
}
|
||||
|
||||
Q_INVOKABLE void requestReload() {
|
||||
m_imageMgr->loadAndProcess();
|
||||
}
|
||||
|
||||
signals:
|
||||
void currentImageIdChanged();
|
||||
void currentIndexChanged();
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
#include "manager.hpp"
|
||||
|
||||
#include "Utils/misc.hpp"
|
||||
#include "Utils/texttemplate.hpp"
|
||||
#include "logger.hpp"
|
||||
|
||||
@@ -61,6 +62,8 @@ void Manager::selectWallpaper(const QString& id) {
|
||||
return;
|
||||
}
|
||||
|
||||
Utils::printPath(data->getFullPath());
|
||||
|
||||
const auto command = _renderCommand(m_actionConfig.onSelected, _generateVariables(*data));
|
||||
m_wallpaperService->select(command);
|
||||
}
|
||||
|
||||
@@ -1,9 +1,5 @@
|
||||
#include "Service/wallpaper.hpp"
|
||||
|
||||
#include <qprocess.h>
|
||||
|
||||
#include <QColor>
|
||||
|
||||
#include "logger.hpp"
|
||||
|
||||
WALLREEL_DECLARE_SENDER("WallpaperService")
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#ifndef WALLREEL_WALLPAPERSERVICE_HPP
|
||||
#define WALLREEL_WALLPAPERSERVICE_HPP
|
||||
#ifndef WALLREEL_SERVICE_WALLPAPER_HPP
|
||||
#define WALLREEL_SERVICE_WALLPAPER_HPP
|
||||
|
||||
#include <QProcess>
|
||||
#include <QTimer>
|
||||
@@ -38,4 +38,4 @@ class WallpaperService : public QObject {
|
||||
|
||||
} // namespace WallReel::Core::Service
|
||||
|
||||
#endif // WALLREEL_WALLPAPERSERVICE_HPP
|
||||
#endif // WALLREEL_SERVICE_WALLPAPER_HPP
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#ifndef WALLREEL_MISC_HPP
|
||||
#define WALLREEL_MISC_HPP
|
||||
#ifndef WALLREEL_UTILS_MISC_HPP
|
||||
#define WALLREEL_UTILS_MISC_HPP
|
||||
|
||||
#include <QDir>
|
||||
#include <QFileInfo>
|
||||
@@ -179,6 +179,24 @@ inline QDir getPicturesDir() {
|
||||
return QDir(picturesDir);
|
||||
}
|
||||
|
||||
inline void printPath(const QString& path, std::FILE* out = stdout) {
|
||||
if (path.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
const QByteArray bytes = QFile::encodeName(path);
|
||||
|
||||
const size_t n = static_cast<size_t>(bytes.size());
|
||||
if (std::fwrite(bytes.constData(), 1, n, out) != n) {
|
||||
return;
|
||||
}
|
||||
if (std::fputc('\n', out) == EOF) {
|
||||
return;
|
||||
}
|
||||
std::fflush(out);
|
||||
return;
|
||||
}
|
||||
|
||||
} // namespace WallReel::Core::Utils
|
||||
|
||||
#endif // WALLREEL_MISC_HPP
|
||||
#endif // WALLREEL_UTILS_MISC_HPP
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#ifndef TEXTTEMPLATE_HPP
|
||||
#define TEXTTEMPLATE_HPP
|
||||
#ifndef WALLREEL_UTILS_TEXTTEMPLATE_HPP
|
||||
#define WALLREEL_UTILS_TEXTTEMPLATE_HPP
|
||||
|
||||
#include <QMap>
|
||||
#include <QRegularExpression>
|
||||
@@ -139,4 +139,4 @@ inline QStringList extractTemplateKeys(const QString& templateStr) {
|
||||
|
||||
} // namespace WallReel::Core::Utils
|
||||
|
||||
#endif // TEXTTEMPLATE_HPP
|
||||
#endif // WALLREEL_UTILS_TEXTTEMPLATE_HPP
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
#pragma once
|
||||
#ifndef WALLREEL_CORE_APPOPTIONS_HPP
|
||||
#define WALLREEL_CORE_APPOPTIONS_HPP
|
||||
|
||||
#include <QCommandLineParser>
|
||||
#include <QStringList>
|
||||
@@ -36,3 +37,5 @@ class AppOptions {
|
||||
};
|
||||
|
||||
} // namespace WallReel::Core
|
||||
|
||||
#endif // WALLREEL_CORE_APPOPTIONS_HPP
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
#ifndef WALLREEL_LOGGER_HPP
|
||||
#define WALLREEL_LOGGER_HPP
|
||||
|
||||
#include <qcontainerfwd.h>
|
||||
|
||||
#include <QLoggingCategory>
|
||||
#include <QString>
|
||||
#include <cstdio>
|
||||
|
||||
@@ -28,6 +28,7 @@ qt_add_qml_module(${UILIB_NAME}_Modules
|
||||
Modules/ColorControl.qml
|
||||
Modules/TopBar.qml
|
||||
Modules/BottomBar.qml
|
||||
Modules/ReloadButton.qml
|
||||
)
|
||||
qt_add_qml_module(${UILIB_NAME}_Components
|
||||
STATIC
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
import QtQuick
|
||||
import QtQuick.Controls
|
||||
|
||||
ToolButton {
|
||||
id: reloadBtn
|
||||
|
||||
property bool isLoading: false
|
||||
|
||||
icon.name: "view-refresh"
|
||||
icon.width: 16
|
||||
icon.height: 16
|
||||
focusPolicy: Qt.NoFocus
|
||||
ToolTip.visible: hovered
|
||||
ToolTip.delay: 600
|
||||
ToolTip.text: "Reload from disk"
|
||||
enabled: !isLoading
|
||||
}
|
||||
@@ -14,10 +14,12 @@ Item {
|
||||
property alias availableSortTypes: sortCtrl.availableSortTypes
|
||||
property alias selectedSortType: sortCtrl.selectedSortType
|
||||
property alias isSortDescending: sortCtrl.isDescending
|
||||
property alias isLoading: reloadBtn.isLoading
|
||||
|
||||
signal sortTypeSelected(string sortType)
|
||||
signal sortDescendingToggled(bool descending)
|
||||
signal searchDismissed()
|
||||
signal reloadRequested()
|
||||
|
||||
function requestSearchFocus() {
|
||||
searchBar.requestFocus();
|
||||
@@ -63,6 +65,13 @@ Item {
|
||||
}
|
||||
}
|
||||
|
||||
ReloadButton {
|
||||
id: reloadBtn
|
||||
|
||||
Layout.alignment: Qt.AlignVCenter
|
||||
onClicked: root.reloadRequested()
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -32,6 +32,10 @@ Item {
|
||||
root.forceActiveFocus();
|
||||
}
|
||||
|
||||
function onReloadRequested() {
|
||||
CarouselProvider.requestReload();
|
||||
}
|
||||
|
||||
target: topBar
|
||||
}
|
||||
|
||||
@@ -48,6 +52,7 @@ Item {
|
||||
title: carousel.currentImageName
|
||||
availableSortTypes: CarouselProvider.availableSortTypes
|
||||
isSortDescending: CarouselProvider.sortDescending
|
||||
isLoading: CarouselProvider.isLoading
|
||||
onSortTypeSelected: (t) => {
|
||||
return CarouselProvider.setSortType(t);
|
||||
}
|
||||
|
||||
+37
-9
@@ -1,8 +1,8 @@
|
||||
#include <qobject.h>
|
||||
|
||||
#include <QApplication>
|
||||
#include <QFileInfo>
|
||||
#include <QQmlApplicationEngine>
|
||||
#include <QQmlContext>
|
||||
#include <QQuickStyle>
|
||||
#include <QSocketNotifier>
|
||||
|
||||
extern "C" {
|
||||
@@ -21,6 +21,26 @@ using namespace WallReel::Core;
|
||||
|
||||
WALLREEL_DECLARE_SENDER("Main")
|
||||
|
||||
static QString pickControlsStyle(const QQmlApplicationEngine& engine) {
|
||||
// Respect env
|
||||
if (!qEnvironmentVariableIsEmpty("QT_QUICK_CONTROLS_STYLE"))
|
||||
return {};
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)
|
||||
using namespace Qt::StringLiterals;
|
||||
// Prefer KDE style if available,
|
||||
for (const QString& p : engine.importPathList())
|
||||
if (QFileInfo::exists(p + u"/org/kde/desktop/qmldir"_s))
|
||||
return u"org.kde.desktop"_s;
|
||||
// fallback to Fusion
|
||||
return u"Fusion"_s;
|
||||
#else
|
||||
for (const QString& p : engine.importPathList())
|
||||
if (QFileInfo::exists(p + u"/org/kde/desktop/qmldir"_qs))
|
||||
return u"org.kde.desktop"_qs;
|
||||
return u"Fusion"_qs;
|
||||
#endif
|
||||
}
|
||||
|
||||
int main(int argc, char* argv[]) {
|
||||
// Destruction order after QApplication quits its event loop:
|
||||
// 1. QQmlApplicationEngine (with all QML objects)
|
||||
@@ -46,12 +66,14 @@ int main(int argc, char* argv[]) {
|
||||
QApplication a(argc, argv);
|
||||
a.setApplicationName(APP_NAME);
|
||||
a.setApplicationVersion(APP_VERSION);
|
||||
{
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)
|
||||
using namespace Qt::StringLiterals;
|
||||
a.setWindowIcon(QIcon(u":/icon.svg"_s));
|
||||
using namespace Qt::StringLiterals;
|
||||
a.setWindowIcon(QIcon(u":/icon.svg"_s));
|
||||
#else
|
||||
a.setWindowIcon(QIcon(u":/%1.svg"_qs.arg(APP_NAME)));
|
||||
a.setWindowIcon(QIcon(u":/icon.svg"_qs));
|
||||
#endif
|
||||
}
|
||||
|
||||
{
|
||||
Logger::init();
|
||||
@@ -105,6 +127,10 @@ int main(int argc, char* argv[]) {
|
||||
{
|
||||
QQmlApplicationEngine engine;
|
||||
|
||||
if (const QString s = pickControlsStyle(engine); !s.isEmpty()) {
|
||||
QQuickStyle::setStyle(s);
|
||||
}
|
||||
|
||||
QObject::connect(
|
||||
&engine,
|
||||
&QQmlApplicationEngine::objectCreationFailed,
|
||||
@@ -112,13 +138,15 @@ int main(int argc, char* argv[]) {
|
||||
[]() { QCoreApplication::exit(-1); },
|
||||
Qt::QueuedConnection);
|
||||
|
||||
{
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
|
||||
using namespace Qt::StringLiterals;
|
||||
engine.loadFromModule(UIMODULE_URI, u"Main"_s);
|
||||
using namespace Qt::StringLiterals;
|
||||
engine.loadFromModule(UIMODULE_URI, u"Main"_s);
|
||||
#else
|
||||
engine.addImportPath(u"qrc:/"_qs);
|
||||
engine.load(QUrl(u"qrc:/WallReel/UI/Main.qml"_qs));
|
||||
engine.addImportPath(u"qrc:/"_qs);
|
||||
engine.load(QUrl(u"qrc:/WallReel/UI/Main.qml"_qs));
|
||||
#endif
|
||||
}
|
||||
|
||||
bootstrap.start();
|
||||
|
||||
|
||||
+1
-6
@@ -96,11 +96,6 @@
|
||||
"default": true,
|
||||
"description": "Whether to print the selected wallpaper path to stdout on confirm"
|
||||
},
|
||||
"printPreview": {
|
||||
"type": "boolean",
|
||||
"default": false,
|
||||
"description": "Whether to print the previewed wallpaper path to stdout on preview"
|
||||
},
|
||||
"onSelected": {
|
||||
"type": "string",
|
||||
"default": "",
|
||||
@@ -148,7 +143,7 @@
|
||||
},
|
||||
"quitOnSelected": {
|
||||
"type": "boolean",
|
||||
"default": false,
|
||||
"default": true,
|
||||
"description": "Whether to quit the application after confirming a wallpaper"
|
||||
},
|
||||
"restoreOnClose": {
|
||||
|
||||
+1
-4
@@ -79,9 +79,6 @@ Configures commands executed for preview, selection, and restore behavior.
|
||||
`printSelected` (boolean, default: `true`)
|
||||
: Print selected wallpaper path to stdout on confirmation.
|
||||
|
||||
`printPreview` (boolean, default: `false`)
|
||||
: Print previewed wallpaper path to stdout on preview.
|
||||
|
||||
`onSelected` (string, default: `""`)
|
||||
: Command executed when a wallpaper is confirmed.
|
||||
|
||||
@@ -101,7 +98,7 @@ Each item has:
|
||||
`onRestore` (string, default: `""`)
|
||||
: Command executed on restore. Saved state keys are usable as placeholders.
|
||||
|
||||
`quitOnSelected` (boolean, default: `false`)
|
||||
`quitOnSelected` (boolean, default: `true`)
|
||||
: Exit application immediately after confirming a selection.
|
||||
|
||||
`restoreOnClose` (boolean, default: `true`)
|
||||
|
||||
Reference in New Issue
Block a user