Merge branch 'main' into release

CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG
 
+## v6.2.0
+
+> [!WARNING]  
+> Prior to 6.2.0 auto-updater was not working. Now it's fixed but you need to download and install this version manually.
+
+- Fixed Auto-Updater and added a new update controls.
+- Replaced tray/buttons controls for Fullscreen and Zoom with Global Shortcuts (Ctrl + ...) and added Help button.
+- Added icons to server status details.
+
 ## v6.1.0
 
 - Added detailed status of server, if available: version, system, users.

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "flc",
-	"version": "6.1.0",
+	"version": "6.2.0",
 	"description": "Foundry Lightweight Client",
 	"type": "module",
 	"scripts": {
@@ -22,11 +22,12 @@
 		"@sveltejs/vite-plugin-svelte": "^4.0.1",
 		"@tauri-apps/api": "^2.1.1",
 		"@tauri-apps/cli": "^2.1.0",
-		"@tauri-apps/plugin-dialog": "~2.0.1",
-		"@tauri-apps/plugin-http": "~2.0.1",
-		"@tauri-apps/plugin-os": "~2.0.0",
-		"@tauri-apps/plugin-shell": "~2.0.1",
-		"@tauri-apps/plugin-updater": "~2.0.0",
+		"@tauri-apps/plugin-dialog": "^2.0.1",
+		"@tauri-apps/plugin-global-shortcut": "^2.0.0",
+		"@tauri-apps/plugin-http": "^2.0.1",
+		"@tauri-apps/plugin-os": "^2.0.0",
+		"@tauri-apps/plugin-shell": "^2.0.1",
+		"@tauri-apps/plugin-updater": "^2.0.0",
 		"@types/eslint": "^9.6.1",
 		"autoprefixer": "^10.4.20",
 		"bits-ui": "^1.0.0-next.63",
@@ -38,8 +39,8 @@
 		"lucide-svelte": "^0.460.1",
 		"mode-watcher": "^0.5.0",
 		"prettier": "^3.3.3",
-		"prettier-plugin-svelte": "^3.2.8",
-		"svelte": "^5.2.5",
+		"prettier-plugin-svelte": "^3.3.0",
+		"svelte": "^5.2.7",
 		"svelte-check": "^4.0.9",
 		"svelte-sonner": "^0.3.28",
 		"tailwind-merge": "^2.5.4",

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "flc"
-version = "6.1.0"
+version = "6.2.0"
 description = "Foundry Lightweight Client"
 authors = ["phenomen"]
 license = "MIT"
@@ -29,7 +29,7 @@ crate-type = ["staticlib", "cdylib", "rlib"]
 tauri-build = { version = "2", features = [] }
 
 [dependencies]
-tauri = { version = "2", features = ["tray-icon", "devtools"] }
+tauri = { version = "2", features = ["devtools"] }
 tauri-plugin-shell = "2"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
@@ -38,4 +38,5 @@ tauri-plugin-http = "2"
 tauri-plugin-os = "2"
 
 [target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
+tauri-plugin-global-shortcut = "2"
 tauri-plugin-updater = "2"

src-tauri/capabilities/default.json

@@ -21,7 +21,12 @@
     "shell:allow-open",
     "shell:allow-spawn",
     "shell:allow-kill",
-    "updater:default",    
+    "updater:default",
+    "updater:allow-check",
+    "updater:allow-download",
+    "updater:allow-install",
+    "updater:allow-download-and-install",
+    "global-shortcut:allow-register",
     "core:app:allow-default-window-icon",
     "core:app:allow-set-app-theme",
     "core:webview:allow-create-webview-window",
@@ -32,6 +37,7 @@
     "core:window:allow-close",
     "core:window:allow-create",
     "core:window:allow-is-fullscreen",
+    "core:window:allow-is-focused",
     "core:window:allow-set-focus",
     "core:window:allow-set-fullscreen",
     {
@@ -55,6 +61,7 @@
         }
       ],
       "sidecar": false
-    }
+    },
+    "global-shortcut:default"
   ]
 }

src-tauri/gen/schemas/capabilities.json

@@ -1 +1 @@
-{"default":{"identifier":"default","description":"Capability for the main window","local":true,"windows":["main"],"permissions":["core:default","core:window:default","core:webview:default","dialog:default","http:default","os:default","shell:default","shell:allow-open","shell:allow-spawn","shell:allow-kill","updater:default","core:app:allow-default-window-icon","core:app:allow-set-app-theme","core:webview:allow-create-webview-window","core:webview:allow-create-webview","core:webview:allow-set-webview-focus","core:webview:allow-set-webview-size","core:webview:allow-set-webview-zoom","core:window:allow-close","core:window:allow-create","core:window:allow-is-fullscreen","core:window:allow-set-focus","core:window:allow-set-fullscreen",{"identifier":"http:default","allow":[{"url":"https://*:*"},{"url":"http://*:*"}]},{"identifier":"shell:allow-spawn","allow":[{"args":true,"cmd":"node","name":"node"}]}],"platforms":["macOS","windows","linux"]}}
+{"default":{"identifier":"default","description":"Capability for the main window","local":true,"windows":["main"],"permissions":["core:default","core:window:default","core:webview:default","dialog:default","http:default","os:default","shell:default","shell:allow-open","shell:allow-spawn","shell:allow-kill","updater:default","updater:allow-check","updater:allow-download","updater:allow-install","updater:allow-download-and-install","global-shortcut:allow-register","core:app:allow-default-window-icon","core:app:allow-set-app-theme","core:webview:allow-create-webview-window","core:webview:allow-create-webview","core:webview:allow-set-webview-focus","core:webview:allow-set-webview-size","core:webview:allow-set-webview-zoom","core:window:allow-close","core:window:allow-create","core:window:allow-is-fullscreen","core:window:allow-is-focused","core:window:allow-set-focus","core:window:allow-set-fullscreen",{"identifier":"http:default","allow":[{"url":"https://*:*"},{"url":"http://*:*"}]},{"identifier":"shell:allow-spawn","allow":[{"args":true,"cmd":"node","name":"node"}]},"global-shortcut:default"],"platforms":["macOS","windows","linux"]}}