Merge pull request #354 from dwall-rs/main

0.1.20

Author: thep0y

Cargo.lock

@@ -1,10 +1,10 @@
 [workspace]
 resolver = "2"
-members = ["src-tauri", "daemon"]
+members = ["daemon", "src-tauri"]
 
 [workspace.package]
 authors = ["thep0y"]
-version = "0.1.19"
+version = "0.1.20"
 # homepage = ""
 repository = "https://github.com/dwall-rs/dwall"
 license = "AGPL-3.0"

Cargo.toml

@@ -1,7 +1,11 @@
 <p align="center">
 <img height="64" width="64" src="./src-tauri/icons/128x128.png" />
 <br/>
-<a href="https://github.com/dwall-rs/dwall/releases/latest"><img src="https://img.shields.io/github/downloads/dwall-rs/dwall/total.svg?style=flat-square" alt="GitHub releases"></a>
+<a href="https://github.com/dwall-rs/dwall/releases/latest"><img src="https://img.shields.io/github/downloads/dwall-rs/dwall/total.svg?style=flat-square" alt="GitHub releases"/></a>
+<img src="https://img.shields.io/badge/Windows%2010-%230079d5.svg?style=for-the-badge&logo=Windows%2010&logoColor=white)" alt="Windows 10" height="20" />
+<img src="https://img.shields.io/badge/Windows%2011-%230079d5.svg?style=for-the-badge&logo=Windows%2011&logoColor=white)" alt="Windows 11" height="20" />
+<br/>
+English | <a href="./README.zh-CN.md">简体中文</a>
 </p>
 
 # DWALL
@@ -24,6 +28,9 @@ Recognizing this gap, DWALL was developed to provide an efficient alternative. I
 
 This project is still in the development stage and may have some issues. If you encounter any problems during use, please feel free to raise an issue on the GitHub page.
 
+> [!WARNING]  
+> This program may not run on lightweight operating systems. If you are using a lightweight version of Windows and encounter errors, please do not submit an issue. Try running the program after installing the official Windows operating system.
+
 ## Usage Steps
 
 1. Download the [latest DWALL executable](https://github.com/dwall-rs/dwall/releases/latest).

README.md

@@ -1,7 +1,11 @@
 <p align="center">
 <img height="64" width="64" src="./src-tauri/icons/128x128.png" />
 <br/>
-<a href="https://github.com/dwall-rs/dwall/releases/latest"><img src="https://img.shields.io/github/downloads/dwall-rs/dwall/total.svg?style=flat-square" alt="GitHub releases"></a>
+<a href="https://github.com/dwall-rs/dwall/releases/latest"><img src="https://img.shields.io/github/downloads/dwall-rs/dwall/total.svg?style=flat-square" alt="GitHub releases"/></a>
+<img src="https://img.shields.io/badge/Windows%2010-%230079d5.svg?style=for-the-badge&logo=Windows%2010&logoColor=white)" alt="Windows 10" height="20" />
+<img src="https://img.shields.io/badge/Windows%2011-%230079d5.svg?style=for-the-badge&logo=Windows%2011&logoColor=white)" alt="Windows 11" height="20" />
+<br/>
+<a href='./README.md'>English</a> | 简体中文
 </p>
 
 # DWALL
@@ -24,6 +28,9 @@ DWALL 是一款轻量级应用程序，旨在模拟 macOS 壁纸切换行为，
 
 本项目仍然处于开发阶段，可能存在一些问题。如果您在使用过程中遇到任何问题，请随时在 GitHub 页面上提出问题。
 
+> [!WARNING]  
+> 本程序可能无法在精简版操作系统上运行，如果你使用的是精简版 Windows 操作系统，遇到错误时不需要提交 issue，安装官方 Windows 操作系统后再尝试运行本程序。
+
 ## 使用步骤
 
 1. 在 [releases](https://github.com/dwall-rs/dwall/releases/latest) 中下载最新的 DWALL 可执行文件。

README.zh-CN.md

@@ -10,6 +10,9 @@ edition.workspace = true
 repository.workspace = true
 license.workspace = true
 
+[build-dependencies]
+winresource = { version = "0", optional = true }
+
 [dependencies]
 serde_valid = "1"
 time = { version = "0", default-features = false, features = [
@@ -55,3 +58,4 @@ windows-result = { version = '0.3.1', features = ['std'] }
 [features]
 default = []
 log-color = ["tracing-subscriber/ansi"]
+build-script = ["winresource"]

bun.lockb

@@ -0,0 +1,19 @@
+use std::io;
+
+fn main() -> io::Result<()> {
+    #[cfg(feature = "build-script")]
+    {
+        use {std::env, winresource::WindowsResource};
+
+        if env::var_os("CARGO_CFG_WINDOWS").is_some() {
+            WindowsResource::new()
+                .set_icon("../src-tauri/icons/icon.ico")
+                .set(
+                    "LegalCopyright",
+                    "Copyright (C) 2025 thep0y. All rights reserved.",
+                )
+                .compile()?;
+        }
+    }
+    Ok(())
+}

daemon/Cargo.toml

@@ -1,41 +1,43 @@
 {
   "name": "dwall-settings",
-  "version": "0.1.19",
+  "version": "0.1.20",
   "description": "",
   "type": "module",
   "scripts": {
     "start": "vite",
-    "build:vite": "cargo build -p dwall -r && vite build",
+    "build:daemon": "cargo build -p dwall --release --features build-script",
+    "build:daemon-debug": "cargo build -p dwall --features log-color,build-script",
+    "build:daemon-stage": "cargo build -p dwall --release --features log-color,build-script",
+    "build:vite": "bun run build:daemon && vite build",
     "build": "tauri build",
     "serve": "vite preview",
     "tauri": "tauri",
-    "start:dev": "cargo build -p dwall --features log-color && cross-env RUST_BACKTRACE=1 tauri dev --features log-color",
+    "start:dev": "bun run build:daemon-debug && cross-env RUST_BACKTRACE=1 tauri dev --features log-color",
     "check": "biome check --write src",
     "dev": "bun run start:dev",
-    "stage": "cargo build -r -p dwall --features log-color && cross-env RUST_BACKTRACE=1 tauri dev --features log-color devtools --release",
+    "stage": "bun run build:daemon-stage && cross-env RUST_BACKTRACE=1 tauri dev --features log-color devtools --release",
     "test": "vitest"
   },
   "license": "MIT",
   "dependencies": {
     "@tauri-apps/api": "^2.4.1",
     "@tauri-apps/plugin-dialog": "^2.2.1",
-    "@tauri-apps/plugin-process": "~2.0.0",
+    "@tauri-apps/plugin-process": "~2.2.1",
     "@tauri-apps/plugin-shell": "~2.2.1",
     "@tauri-apps/plugin-updater": "^2.7.0",
-    "alley-components": "^0.3.11",
-    "fluent-solid": "^0.1.18",
+    "fluent-solid": "^0.1.19",
     "solid-icons": "^1.1.0",
     "solid-js": "^1.9.5"
   },
   "devDependencies": {
     "@biomejs/biome": "^1.9.4",
     "@tauri-apps/cli": "^2.4.1",
-    "@types/node": "^22.14.0",
+    "@types/node": "^22.14.1",
     "cross-env": "^7.0.3",
-    "jsdom": "^26.0.0",
+    "jsdom": "^26.1.0",
     "sass": "^1.86.3",
     "typescript": "^5.8.3",
-    "vite": "^6.2.5",
+    "vite": "^6.2.6",
     "vite-plugin-solid": "^2.11.6",
     "vitest": "^3.1.1"
   }

daemon/build.rs

@@ -1,6 +1,6 @@
 [package]
 name = "dwall-settings"
-description = "A Tauri App"
+description = "Dwall settings"
 edition.workspace = true
 version.workspace = true
 authors.workspace = true
@@ -9,13 +9,6 @@ license.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
-[lib]
-# The `_lib` suffix may seem redundant but it is necessary
-# to make the lib name unique and wouldn't conflict with the bin name.
-# This seems to be only an issue on Windows, see https://github.com/rust-lang/cargo/issues/8519
-name = "dwall_settings_lib"
-crate-type = ["staticlib", "cdylib", "rlib"]
-
 [build-dependencies]
 tauri-build = { version = "2", features = [] }
 
@@ -46,7 +39,7 @@ windows = { workspace = true, features = [
   "Win32_Globalization",
   "Win32_System_Threading",
 ] }
-rand = { version = "0", default-features = false, features = ["std"] }
+rand = { version = "0", default-features = false, features = ["thread_rng"] }
 tauri-plugin-shell = "2"
 
 [target.'cfg(target_os = "windows")'.dependencies]

package.json

@@ -7,6 +7,7 @@ pub(super) const BUTTON_SELECT_FOLDER: &str = "button-select-folder";
 pub(super) const BUTTON_STOP: &str = "button-stop";
 
 // ---------------- help ----------------
+pub(super) const HELP_LAUNCH_AT_STARTUP: &str = "help-launch-at-startup";
 pub(super) const HELP_MANUALLY_SET_COORDINATES: &str = "help-manually-set-coordinates";
 
 // ---------------- labels ----------------
@@ -37,6 +38,8 @@ pub(super) const MESSAGE_DISABLE_STARTUP_FAILED: &str = "message-disable-startup
 pub(super) const MESSAGE_DOWNLOAD_CANCELLED: &str = "message-download-cancelled";
 pub(super) const MESSAGE_DOWNLOAD_FAILED: &str = "message-download-faild";
 pub(super) const MESSAGE_FILE_SIZE_WARNING: &str = "message-file-size-warning";
+pub(super) const MESSAGE_GITHUB_MIRROR_TEMPLATE_UPDATED: &str =
+    "message-github-mirror-template-updated";
 pub(super) const MESSAGE_GITHUB_STAR: &str = "message-github-star";
 pub(super) const MESSAGE_INVALID_NUMBER_INPUT: &str = "message-invalid-number-input";
 pub(super) const MESSAGE_LOCATION_PERMISSION: &str = "message-location-permission";
@@ -50,6 +53,7 @@ pub(super) const MESSAGE_SWITCH_AUTO_LIGHT_DARK_MODE_FAILED: &str =
 pub(super) const MESSAGE_SWITCHING_TO_MANUAL_COORDINATE_CONFIG: &str =
     "message-switching-to-manual-coordinate-config";
 pub(super) const MESSAGE_THEMES_DIRECTORY_MOVED: &str = "message-themes-directory-moved";
+pub(super) const MESSAGE_UPDATE_AVAILABLE: &str = "message-update-available";
 pub(super) const MESSAGE_UPDATE_FAILED: &str = "message-update-failed";
 pub(super) const MESSAGE_VERSION_IS_THE_LATEST: &str = "message-version-is-the-latest";