From 6cd80ae59a727b425e2e33419dc71b5bf63ceb8f Mon Sep 17 00:00:00 2001 From: Stanislav Date: Wed, 26 Feb 2025 17:06:22 +0200 Subject: [PATCH] Refactor Tauri configuration and update tooltip class usage in CSS --- gui/src-tauri/Tauri.toml | 47 ++++--------------- .../capabilities/desktop-capability.toml | 16 +++++++ gui/src-tauri/capabilities/migrated.json | 27 ----------- gui/src-tauri/tauri.conf.json | 38 --------------- gui/src/app/app.component.scss | 2 +- gui/src/app/titlebar/titlebar.component.scss | 2 +- 6 files changed, 27 insertions(+), 105 deletions(-) create mode 100644 gui/src-tauri/capabilities/desktop-capability.toml delete mode 100644 gui/src-tauri/capabilities/migrated.json delete mode 100644 gui/src-tauri/tauri.conf.json diff --git a/gui/src-tauri/Tauri.toml b/gui/src-tauri/Tauri.toml index e05e285..9065215 100644 --- a/gui/src-tauri/Tauri.toml +++ b/gui/src-tauri/Tauri.toml @@ -1,49 +1,22 @@ -[build] -beforeDevCommand = "npm run start" -beforeBuildCommand = "npm run build" -devPath = "http://localhost:1420" -distDir = "../dist/gui/browser" - -[package] -productName = "scenario-rs" +product-name = "scenario-rs" version = "0.1.0" +identifier = "com.st4s1k.scenario-rs.app" -[tauri.allowlist] -all = false - -[tauri.allowlist.shell] -all = false -open = true - -[tauri.allowlist.dialog] -all = true -ask = true -confirm = true -message = true -open = true -save = true - -[tauri.allowlist.window] -all = false -close = true -hide = true -show = true -maximize = true -minimize = true -unmaximize = true -unminimize = true -startDragging = true +[build] +before-dev-command = "npm run start" +before-build-command = "npm run build" +dev-url = "http://localhost:1420" +frontend-dist = "../dist/gui/browser" -[[tauri.windows]] +[[app.windows]] decorations = false title = "scenario-rs" width = 800 height = 600 -[tauri.bundle] +[bundle] active = true targets = "all" -identifier = "com.st4s1k.scenario-rs.app" icon = [ "icons/32x32.png", "icons/128x128.png", @@ -51,5 +24,3 @@ icon = [ "icons/icon.icns", "icons/icon.ico" ] - -custom-protocol = ["tauri/custom-protocol"] diff --git a/gui/src-tauri/capabilities/desktop-capability.toml b/gui/src-tauri/capabilities/desktop-capability.toml new file mode 100644 index 0000000..a50713b --- /dev/null +++ b/gui/src-tauri/capabilities/desktop-capability.toml @@ -0,0 +1,16 @@ +schema = "../gen/schemas/desktop-schema.json" + +identifier = "desktop-capability" +windows = ["main"] +platforms = ["linux", "macOS", "windows"] + +permissions = [ + "core:default", + "core:window:allow-toggle-maximize", + "core:window:allow-minimize", + "core:window:allow-close", + "core:window:allow-start-dragging", + "dialog:default", + "shell:default", + "shell:allow-open", +] diff --git a/gui/src-tauri/capabilities/migrated.json b/gui/src-tauri/capabilities/migrated.json deleted file mode 100644 index 0947a87..0000000 --- a/gui/src-tauri/capabilities/migrated.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "identifier": "migrated", - "description": "permissions that were migrated from v1", - "local": true, - "windows": [ - "main" - ], - "permissions": [ - "core:default", - "core:window:allow-maximize", - "core:window:allow-unmaximize", - "core:window:allow-minimize", - "core:window:allow-unminimize", - "core:window:allow-show", - "core:window:allow-hide", - "core:window:allow-close", - "core:window:allow-start-dragging", - "shell:allow-open", - "dialog:allow-open", - "dialog:allow-save", - "dialog:allow-message", - "dialog:allow-ask", - "dialog:allow-confirm", - "dialog:default", - "shell:default" - ] -} \ No newline at end of file diff --git a/gui/src-tauri/tauri.conf.json b/gui/src-tauri/tauri.conf.json deleted file mode 100644 index 9b94441..0000000 --- a/gui/src-tauri/tauri.conf.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "build": { - "beforeDevCommand": "npm run start", - "beforeBuildCommand": "npm run build", - "frontendDist": "../dist/gui/browser", - "devUrl": "http://localhost:1420" - }, - "bundle": { - "active": true, - "targets": "all", - "icon": [ - "icons/32x32.png", - "icons/128x128.png", - "icons/128x128@2x.png", - "icons/icon.icns", - "icons/icon.ico" - ] - }, - "productName": "scenario-rs", - "mainBinaryName": "scenario-rs", - "version": "0.1.0", - "identifier": "com.st4s1k.scenario-rs.app", - "plugins": {}, - "app": { - "security": { - "csp": null - }, - "windows": [ - { - "decorations": false, - "title": "scenario-rs", - "width": 800, - "height": 600, - "useHttpsScheme": true - } - ] - } -} \ No newline at end of file diff --git a/gui/src/app/app.component.scss b/gui/src/app/app.component.scss index 3d7d6b6..69a559d 100644 --- a/gui/src/app/app.component.scss +++ b/gui/src/app/app.component.scss @@ -83,7 +83,7 @@ button.log-button { color: styles.$primary-color-lighter-40; } - .tooltip { + .tooltip-arrow-left { transform: translate(22px, -20px); } } diff --git a/gui/src/app/titlebar/titlebar.component.scss b/gui/src/app/titlebar/titlebar.component.scss index 8e5be18..a07eb9b 100644 --- a/gui/src/app/titlebar/titlebar.component.scss +++ b/gui/src/app/titlebar/titlebar.component.scss @@ -50,7 +50,7 @@ height: 20px; } - .tooltip { + .tooltip-arrow-top { transform: translate(-5px, styles.$titlebar-height + 5px); } }