From 7b3a2a1e48ce30bc93ec96fb92c8b8b17b207689 Mon Sep 17 00:00:00 2001 From: Aleksander Date: Sat, 17 Jan 2026 12:49:43 +0100 Subject: [PATCH] UI gradient intensity slider, update wgui Defaults for dashboard, prepend ui-related config entries with `ui_` --- dash-frontend/assets/lang/de.json | 3 +- dash-frontend/assets/lang/en.json | 1 + dash-frontend/assets/lang/es.json | 3 +- dash-frontend/assets/lang/it.json | 3 +- dash-frontend/assets/lang/ja.json | 3 +- dash-frontend/assets/lang/pl.json | 3 +- dash-frontend/assets/lang/zh_CN.json | 3 +- dash-frontend/src/frontend.rs | 27 ++- dash-frontend/src/tab/settings.rs | 34 ++-- scripts/translator/main.ts | 238 +++++++++++++-------------- scripts/translator/run.sh | 9 + wayvr/src/config.rs | 10 +- wayvr/src/res/config.yaml | 2 +- wayvr/src/state.rs | 4 +- wgui/src/event.rs | 1 - wgui/src/parser/widget_image.rs | 1 - wgui/src/parser/widget_sprite.rs | 1 - wlx-common/src/config.rs | 9 +- 18 files changed, 201 insertions(+), 154 deletions(-) diff --git a/dash-frontend/assets/lang/de.json b/dash-frontend/assets/lang/de.json index 7e22c1c..323195e 100644 --- a/dash-frontend/assets/lang/de.json +++ b/dash-frontend/assets/lang/de.json @@ -82,7 +82,8 @@ }, "AUTOSTART_APPS": "Anwendungen, die beim Start ausgeführt werden sollen", "HANDSFREE_POINTER": "Freihändige Modus", - "HANDSFREE_POINTER_HELP": "Eingabe, die bei Bewegung\nder Controller verwendet wird, wenn diese nicht verfügbar sind.\nLinkes Kneifen greift, rechtes klickt." + "HANDSFREE_POINTER_HELP": "Eingabe, die bei Bewegung\nder Controller verwendet wird, wenn diese nicht verfügbar sind.\nLinkes Kneifen greift, rechtes klickt.", + "UI_GRADIENT_INTENSITY": "UI-Verlaufsintensität" }, "HELLO": "Hallo!", "AUDIO": { diff --git a/dash-frontend/assets/lang/en.json b/dash-frontend/assets/lang/en.json index 9b5be9e..f94e11a 100644 --- a/dash-frontend/assets/lang/en.json +++ b/dash-frontend/assets/lang/en.json @@ -31,6 +31,7 @@ "APP_SETTINGS": { "ALLOW_SLIDING": "Stick interaction during grab", "ANIMATION_SPEED": "UI Animation speed", + "UI_GRADIENT_INTENSITY": "UI Gradient intensity", "BLOCK_GAME_INPUT": "Block game input", "BLOCK_GAME_INPUT_HELP": "Blocks all input when an overlay is hovered", "BLOCK_GAME_INPUT_IGNORE_WATCH": "Ignore watch when blocking input", diff --git a/dash-frontend/assets/lang/es.json b/dash-frontend/assets/lang/es.json index 777e78a..54fee60 100644 --- a/dash-frontend/assets/lang/es.json +++ b/dash-frontend/assets/lang/es.json @@ -82,7 +82,8 @@ }, "AUTOSTART_APPS": "Aplicaciones a ejecutar al inicio", "HANDSFREE_POINTER": "Modo manos libres", - "HANDSFREE_POINTER_HELP": "Entrada a utilizar cuando no\nestén disponibles los mandos de movimiento.\nPellizco con la izquierda para agarrar, con la derecha para hacer clic." + "HANDSFREE_POINTER_HELP": "Entrada a utilizar cuando no\nestén disponibles los mandos de movimiento.\nPellizco con la izquierda para agarrar, con la derecha para hacer clic.", + "UI_GRADIENT_INTENSITY": "Intensidad del degradado de la IU" }, "HELLO": "¡Hola!", "AUDIO": { diff --git a/dash-frontend/assets/lang/it.json b/dash-frontend/assets/lang/it.json index a5911f2..833efa1 100644 --- a/dash-frontend/assets/lang/it.json +++ b/dash-frontend/assets/lang/it.json @@ -102,7 +102,8 @@ "XWAYLAND_BY_DEFAULT": "Esegui le app in modalità Compatibilità per impostazione predefinita", "AUTOSTART_APPS": "App da avviare all'avvio", "HANDSFREE_POINTER": "Modalità a mani libere", - "HANDSFREE_POINTER_HELP": "Input da usare quando i\ncontroller di movimento non sono disponibili.\nPizzico sinistro per afferrare, destro per cliccare." + "HANDSFREE_POINTER_HELP": "Input da usare quando i\ncontroller di movimento non sono disponibili.\nPizzico sinistro per afferrare, destro per cliccare.", + "UI_GRADIENT_INTENSITY": "Intensità gradiente dell'interfaccia utente" }, "APPLICATION_LAUNCHER": "Lanciatore applicazioni", "APPLICATION_STARTED": "Applicazione avviata", diff --git a/dash-frontend/assets/lang/ja.json b/dash-frontend/assets/lang/ja.json index f46cb86..0b9309f 100644 --- a/dash-frontend/assets/lang/ja.json +++ b/dash-frontend/assets/lang/ja.json @@ -82,7 +82,8 @@ }, "AUTOSTART_APPS": "起動時に実行するアプリ", "HANDSFREE_POINTER": "ハンズフリーモード", - "HANDSFREE_POINTER_HELP": "モーションコントローラーが利用できない場合の入力方法。\n左手のピンチは掴み、右手のピンチはクリックです。" + "HANDSFREE_POINTER_HELP": "モーションコントローラーが利用できない場合の入力方法。\n左手のピンチは掴み、右手のピンチはクリックです。", + "UI_GRADIENT_INTENSITY": "UIグラデーションの強さ" }, "HELLO": "こんにちは！", "AUDIO": { diff --git a/dash-frontend/assets/lang/pl.json b/dash-frontend/assets/lang/pl.json index 99d8398..a316309 100644 --- a/dash-frontend/assets/lang/pl.json +++ b/dash-frontend/assets/lang/pl.json @@ -77,7 +77,8 @@ }, "AUTOSTART_APPS": "Aplikacje do uruchomienia przy starcie", "HANDSFREE_POINTER": "Tryb bez użycia rąk", - "HANDSFREE_POINTER_HELP": "Wejście do użycia, gdy kontrolery ruchu\nsą niedostępne. Lewy szczyptak to chwyt,\nprawy to kliknięcie." + "HANDSFREE_POINTER_HELP": "Wejście do użycia, gdy kontrolery ruchu\nsą niedostępne. Lewy szczyptak to chwyt,\nprawy to kliknięcie.", + "UI_GRADIENT_INTENSITY": "Intensywność gradientu UI" }, "APPLICATION_LAUNCHER": "Uruchamiacz aplikacji", "APPLICATIONS": "Aplikacje", diff --git a/dash-frontend/assets/lang/zh_CN.json b/dash-frontend/assets/lang/zh_CN.json index e618c8b..5e5576c 100644 --- a/dash-frontend/assets/lang/zh_CN.json +++ b/dash-frontend/assets/lang/zh_CN.json @@ -102,7 +102,8 @@ "XWAYLAND_BY_DEFAULT": "默认以兼容模式运行应用", "AUTOSTART_APPS": "开机启动应用", "HANDSFREE_POINTER": "免提模式", - "HANDSFREE_POINTER_HELP": "当运动控制器不可用时使用的输入。\n左手捏合为抓取，右手为点击。" + "HANDSFREE_POINTER_HELP": "当运动控制器不可用时使用的输入。\n左手捏合为抓取，右手为点击。", + "UI_GRADIENT_INTENSITY": "UI 渐变强度" }, "APPLICATION_LAUNCHER": "应用启动器", "APPLICATION_STARTED": "应用已启动", diff --git a/dash-frontend/src/frontend.rs b/dash-frontend/src/frontend.rs index bee35d9..190cfaa 100644 --- a/dash-frontend/src/frontend.rs +++ b/dash-frontend/src/frontend.rs @@ -97,11 +97,12 @@ pub enum FrontendTask { RecenterPlayspace, PushToast(Translation), PlaySound(SoundType), + UpdateWguiDefaultsFromConfig, HideDashboard, } impl Frontend { - pub fn new(params: InitParams, data: &mut T) -> anyhow::Result> { + pub fn new(mut params: InitParams, data: &mut T) -> anyhow::Result> { let mut assets = Box::new(assets::Asset {}); let font_binary_bold = assets.load_from_path_gzip("Quicksand-Bold.ttf.gz")?; @@ -120,6 +121,8 @@ impl Frontend { PathBuf::new(), //FIXME: pass from somewhere else )?; + Frontend::update_defaults_from_config(&globals, &mut params.interface, data); + let (layout, state) = wgui::parser::new_layout_from_assets( &ParseDocumentParams { globals: globals.clone(), @@ -166,8 +169,9 @@ impl Frontend { }; // init some things first - frontend.update_background(data)?; - frontend.update_time(data)?; + frontend.tasks.push(FrontendTask::RefreshBackground); + frontend.tasks.push(FrontendTask::RefreshClock); + frontend.tasks.push(FrontendTask::UpdateWguiDefaultsFromConfig); Frontend::register_widgets(&mut frontend)?; @@ -178,6 +182,16 @@ impl Frontend { self.sounds_to_play.push(sound_type); } + fn update_defaults_from_config(globals: &WguiGlobals, interface: &mut BoxDashInterface, data: &mut T) { + let config = interface.general_config(data); + + let mut globals = globals.get(); + let defaults = &mut globals.defaults; + + defaults.animation_mult = 1.0 / config.ui_animation_speed; + defaults.gradient_intensity = config.ui_gradient_intensity; + } + fn play_sound(&mut self, audio_system: &mut audio::AudioSystem, sound_type: SoundType) -> anyhow::Result<()> { let mut assets = self.globals.assets_builtin(); @@ -192,7 +206,7 @@ impl Frontend { Err(_) => assets.load_from_path(path)?.into(), }; - let sample = audio::AudioSample::from_mp3(&*sound_bytes)?; + let sample = audio::AudioSample::from_mp3(&sound_bytes)?; audio_system.play_sample(&sample); Ok(()) } @@ -307,6 +321,8 @@ impl Frontend { } fn update_background(&mut self, data: &mut T) -> anyhow::Result<()> { + self.layout.mark_redraw(); + let Some(mut rect) = self .layout .state @@ -341,6 +357,9 @@ impl Frontend { FrontendTask::PushToast(content) => self.toast_manager.push(content), FrontendTask::PlaySound(sound_type) => self.queue_play_sound(sound_type), FrontendTask::HideDashboard => self.action_hide_dashboard(params.data), + FrontendTask::UpdateWguiDefaultsFromConfig => { + Frontend::update_defaults_from_config(&self.globals, &mut self.interface, params.data) + } }; Ok(()) } diff --git a/dash-frontend/src/tab/settings.rs b/dash-frontend/src/tab/settings.rs index 64992e3..45564de 100644 --- a/dash-frontend/src/tab/settings.rs +++ b/dash-frontend/src/tab/settings.rs @@ -55,6 +55,7 @@ enum Task { UpdateBool(SettingType, bool), UpdateFloat(SettingType, f32), UpdateInt(SettingType, i32), + SettingUpdated(SettingType), OpenContextMenu(Vec2, Vec), ClearPipewireTokens, ClearSavedState, @@ -87,6 +88,7 @@ impl Tab for TabSettings { self.set_tab(frontend, data, tab)?; } Task::UpdateBool(setting, n) => { + self.tasks.push(Task::SettingUpdated(setting)); if let Some(task) = setting.get_frontend_task() { frontend.tasks.push(task) } @@ -95,6 +97,7 @@ impl Tab for TabSettings { changed = true; } Task::UpdateFloat(setting, n) => { + self.tasks.push(Task::SettingUpdated(setting)); if let Some(task) = setting.get_frontend_task() { frontend.tasks.push(task) } @@ -103,6 +106,7 @@ impl Tab for TabSettings { changed = true; } Task::UpdateInt(setting, n) => { + self.tasks.push(Task::SettingUpdated(setting)); if let Some(task) = setting.get_frontend_task() { frontend.tasks.push(task) } @@ -146,6 +150,12 @@ impl Tab for TabSettings { changed = true; } } + Task::SettingUpdated(setting) => match setting { + SettingType::UiAnimationSpeed | SettingType::UiGradientIntensity | SettingType::UiRoundMultiplier => { + frontend.tasks.push(FrontendTask::UpdateWguiDefaultsFromConfig); + } + _ => { /* do nothing */ } + }, } } @@ -190,8 +200,9 @@ impl Tab for TabSettings { #[allow(clippy::enum_variant_names)] #[derive(Clone, Copy, AsRefStr, EnumString)] enum SettingType { - AnimationSpeed, - RoundMultiplier, + UiAnimationSpeed, + UiGradientIntensity, + UiRoundMultiplier, InvertScrollDirectionX, InvertScrollDirectionY, ScrollSpeed, @@ -259,8 +270,9 @@ impl SettingType { pub fn mut_f32(self, config: &mut GeneralConfig) -> &mut f32 { match self { - Self::AnimationSpeed => &mut config.animation_speed, - Self::RoundMultiplier => &mut config.round_multiplier, + Self::UiAnimationSpeed => &mut config.ui_animation_speed, + Self::UiGradientIntensity => &mut config.ui_gradient_intensity, + Self::UiRoundMultiplier => &mut config.ui_round_multiplier, Self::ScrollSpeed => &mut config.scroll_speed, Self::LongPressDuration => &mut config.long_press_duration, Self::XrClickSensitivity => &mut config.xr_click_sensitivity, @@ -324,8 +336,9 @@ impl SettingType { /// Ok is translation, Err is raw text fn get_translation(self) -> Result<&'static str, &'static str> { match self { - Self::AnimationSpeed => Ok("APP_SETTINGS.ANIMATION_SPEED"), - Self::RoundMultiplier => Ok("APP_SETTINGS.ROUND_MULTIPLIER"), + Self::UiAnimationSpeed => Ok("APP_SETTINGS.ANIMATION_SPEED"), + Self::UiGradientIntensity => Ok("APP_SETTINGS.UI_GRADIENT_INTENSITY"), + Self::UiRoundMultiplier => Ok("APP_SETTINGS.ROUND_MULTIPLIER"), Self::InvertScrollDirectionX => Ok("APP_SETTINGS.INVERT_SCROLL_DIRECTION_X"), Self::InvertScrollDirectionY => Ok("APP_SETTINGS.INVERT_SCROLL_DIRECTION_Y"), Self::ScrollSpeed => Ok("APP_SETTINGS.SCROLL_SPEED"), @@ -385,8 +398,8 @@ impl SettingType { //TODO: incorporate this fn requires_restart(self) -> bool { match self { - Self::AnimationSpeed - | Self::RoundMultiplier + Self::UiAnimationSpeed + | Self::UiRoundMultiplier | Self::UprightScreenFix | Self::DoubleCursorFix | Self::UseSkybox @@ -692,8 +705,9 @@ impl TabSettings { checkbox!(mp, c, SettingType::OpaqueBackground); checkbox!(mp, c, SettingType::HideUsername); checkbox!(mp, c, SettingType::HideGrabHelp); - slider_f32!(mp, c, SettingType::AnimationSpeed, 0.5, 5.0, 0.1); // min, max, step - slider_f32!(mp, c, SettingType::RoundMultiplier, 0.5, 5.0, 0.1); + slider_f32!(mp, c, SettingType::UiAnimationSpeed, 0.5, 5.0, 0.1); // min, max, step + slider_f32!(mp, c, SettingType::UiGradientIntensity, 0.0, 1.0, 0.05); // min, max, step + slider_f32!(mp, c, SettingType::UiRoundMultiplier, 0.5, 5.0, 0.1); checkbox!(mp, c, SettingType::SetsOnWatch); checkbox!(mp, c, SettingType::UseSkybox); checkbox!(mp, c, SettingType::UsePassthrough); diff --git a/scripts/translator/main.ts b/scripts/translator/main.ts index 4bfa09b..0164284 100644 --- a/scripts/translator/main.ts +++ b/scripts/translator/main.ts @@ -9,187 +9,181 @@ const template_name = process.env["TEMPLATE"] as string; let lang_path = process.env["LANG_PATH"] as string; if (model_name === undefined) { - console.log("MODEL not set"); - exit(-1); + console.log("MODEL not set"); + exit(-1); } if (template_name === undefined) { - console.log("TEMPLATE not set"); - exit(-1); + console.log("TEMPLATE not set"); + exit(-1); } if (lang_path === undefined) { - console.log( - `LANG_PATH is not set. + console.log( + `LANG_PATH is not set. Try one of these: LANG_PATH=../../uidev/assets/lang/ ./run.sh LANG_PATH=../../dash-frontend/assets/lang/ ./run.sh LANG_PATH=../../wayvr/src/assets/lang/ ./run.sh`); - exit(-1); + exit(-1); } lang_path = path.resolve(__dirname + "/" + lang_path); if (lang_path === undefined || !fs.existsSync(lang_path)) { - console.log("Invalid or non-existent LANG_PATH"); - exit(-1); + console.log("Invalid or non-existent LANG_PATH"); + exit(-1); } const current_path = path.resolve(__dirname); const templates_path = path.resolve(__dirname + "/templates"); async function loop_object(obj: any, initial_str: string, callback: (key: string, value: string) => Promise) { - for (var key in obj) { - let full_key = initial_str + key; - if (typeof obj[key] === "object" && obj[key] !== null) { - await loop_object(obj[key], full_key + ".", callback) - } else if (obj.hasOwnProperty(key)) { - await callback(full_key, obj[key]) - } - } + for (var key in obj) { + let full_key = initial_str + key; + if (typeof obj[key] === "object" && obj[key] !== null) { + await loop_object(obj[key], full_key + ".", callback) + } else if (obj.hasOwnProperty(key)) { + await callback(full_key, obj[key]) + } + } } function extract_backticks(str: string) { - const regex = /`([^`]+)`/g; - return str.match(regex)?.map(match => match.slice(1, -1).trim()); + const regex = /`([^`]+)`/g; + return str.match(regex)?.map(match => match.slice(1, -1).trim()); } function set_i18n_key(obj: any, key: string, value: string | undefined) { - const parts = key.split('.'); - let cur_level = obj; - for (let i = 0; i < parts.length - 1; i++) { - const part = parts[i]!; - if (!cur_level[part]) { - cur_level[part] = {}; - } - cur_level = cur_level[part]; - } - cur_level[parts[parts.length - 1]!] = value; + const parts = key.split('.'); + let cur_level = obj; + for (let i = 0; i < parts.length - 1; i++) { + const part = parts[i]!; + if (!cur_level[part]) { + cur_level[part] = {}; + } + cur_level = cur_level[part]; + } + cur_level[parts[parts.length - 1]!] = value; } function key_exists(obj: any, key: string) { - const parts = key.split('.'); - let level = obj; + const parts = key.split('.'); + let level = obj; - for (let i = 0; i < parts.length; i++) { - const part = parts[i]!; - if (!level || !level[part]) { - return false; - } - level = level[part]; - } + for (let i = 0; i < parts.length; i++) { + const part = parts[i]!; + if (!level || !level[part]) { + return false; + } + level = level[part]; + } - return true; + return true; }; interface Example { - key: string; - en: string; - translated: string; + key: string; + en: string; + translated: string; } interface Template { - full_name: string; // "Polish" - examples: Example[] + full_name: string; // "Polish" + examples: Example[] } function gen_prompt(description: string, template: Template, key: string, english_translation: string) { - let num = 1; - for (const example of template.examples) { - description += "\nExample " + num + ":\n\n"; - description += "Translate key `" + example.key + "` from English to " + template.full_name + ":\n\n"; - description += "```\n"; - description += example.en + "\n"; - description += "```\n\n"; - description += "Result:\n\n"; - description += "```\n"; - description += example.translated + "\n"; - description += "```\n"; - num += 1; - } - description += "\nEnd of examples.\n\n"; - description += "Translate key `" + key + "` from English to " + template.full_name + ":\n\n"; - description += "```\n"; - description += english_translation + "\n"; - description += "```\n"; - return description; + let num = 1; + for (const example of template.examples) { + description += "\nExample " + num + ":\n\n"; + description += "Translate key `" + example.key + "` from English to " + template.full_name + ":\n\n"; + description += "```\n"; + description += example.en + "\n"; + description += "```\n\n"; + description += "Result:\n\n"; + description += "```\n"; + description += example.translated + "\n"; + description += "```\n"; + num += 1; + } + description += "\nEnd of examples.\n\n"; + description += "Translate key `" + key + "` from English to " + template.full_name + ":\n\n"; + description += "```\n"; + description += english_translation + "\n"; + description += "```\n"; + return description; } async function run() { - const template = JSON.parse(await fsp.readFile(templates_path + "/" + template_name + ".json", "utf-8")) as Template; + const template = JSON.parse(await fsp.readFile(templates_path + "/" + template_name + ".json", "utf-8")) as Template; - let description_txt = await fsp.readFile(current_path + "/description.txt", "utf-8"); - description_txt = description_txt.replaceAll("{TARGET_LANG}", template.full_name); + let description_txt = await fsp.readFile(current_path + "/description.txt", "utf-8"); + description_txt = description_txt.replaceAll("{TARGET_LANG}", template.full_name); - const orig_english_json = JSON.parse(await fsp.readFile(lang_path + "/en.json") as any); + const orig_english_json = JSON.parse(await fsp.readFile(lang_path + "/en.json") as any); - let orig_translated_json = {}; - try { - orig_translated_json = JSON.parse((await fsp.readFile(lang_path + "/" + template_name + ".json")).toString()); - } - catch (_e) { } + let orig_translated_json = {}; + try { + orig_translated_json = JSON.parse((await fsp.readFile(lang_path + "/" + template_name + ".json")).toString()); + } + catch (_e) { } - let llm_translated_json = {}; - const translated_json_path = lang_path + "/" + template_name + ".json"; - if (await fsp.exists(translated_json_path)) { - console.log("Loading file", translated_json_path); - llm_translated_json = JSON.parse((await fsp.readFile(translated_json_path)).toString()); - } + let llm_translated_json = {}; + const translated_json_path = lang_path + "/" + template_name + ".json"; + if (await fsp.exists(translated_json_path)) { + console.log("Loading file", translated_json_path); + llm_translated_json = JSON.parse((await fsp.readFile(translated_json_path)).toString()); + } - let human = 0; - let llm = 0; + let total_count = 0; + await loop_object(orig_english_json, "", async () => { + total_count += 1; + }); - let total_count = 0; - await loop_object(orig_english_json, "", async () => { - total_count += 1; - }); + await loop_object(llm_translated_json, "", async (key, _) => { + if (!key_exists(orig_english_json, key)) { + console.log("Removing key", key); + set_i18n_key(llm_translated_json, key, undefined); + fsp.writeFile(translated_json_path, JSON.stringify(llm_translated_json, undefined, 2)); + } + }); - await loop_object(llm_translated_json, "", async (key, _) => { - if (!key_exists(orig_english_json, key)) { - console.log("Removing key", key); - set_i18n_key(llm_translated_json, key, undefined); - fsp.writeFile(translated_json_path, JSON.stringify(llm_translated_json, undefined, 2)); - } - }); + await loop_object(orig_english_json, "", async (key, english_translation) => { + if (key_exists(orig_translated_json, key)) { + return; + } - await loop_object(orig_english_json, "", async (key, english_translation) => { - if (key_exists(orig_translated_json, key)) { - human += 1; - return; - } + if (key_exists(llm_translated_json, key)) { + return; + } - if (key_exists(llm_translated_json, key)) { - llm += 1; - return; - } + console.log("Translating", key, "..."); - console.log("Translating", key, "..."); - llm++; + const prompt = gen_prompt(description_txt, template, key, english_translation); - const prompt = gen_prompt(description_txt, template, key, english_translation); + const response = await ollama.chat({ + model: model_name, + messages: [{ role: "user", content: prompt }], + options: { + seed: 12345, + } + }) - const response = await ollama.chat({ - model: model_name, - messages: [{ role: "user", content: prompt }], - options: { - seed: 12345, - } - }) + const msg = extract_backticks(response.message.content); + if (msg === undefined || msg[0] === undefined) { + throw new Error("backticks failed. Raw content: " + response.message.content); + } - const msg = extract_backticks(response.message.content); - if (msg === undefined || msg[0] === undefined) { - throw new Error("backticks failed. Raw content: " + response.message.content); - } + console.log(" >>>", msg); - console.log(" >>>", msg); + set_i18n_key(llm_translated_json, key, msg[0]); + fsp.writeFile(translated_json_path, JSON.stringify(llm_translated_json, undefined, 2)); + }); - set_i18n_key(llm_translated_json, key, msg[0]); - fsp.writeFile(translated_json_path, JSON.stringify(llm_translated_json, undefined, 2)); - }); - - console.log("\"" + template_name + "\" translation finished,", human, "were already human translated,", llm, "llm-translated (" + Math.round((llm / total_count) * 100.0) + "% machine-translated)"); + console.log("Translation", template_name, "finished"); } run().catch((e) => { - console.log("Fatal error:", e); - exit(-1); + console.log("Fatal error:", e); + exit(-1); }); diff --git a/scripts/translator/run.sh b/scripts/translator/run.sh index a6a2e8a..0ed6024 100755 --- a/scripts/translator/run.sh +++ b/scripts/translator/run.sh @@ -1,4 +1,13 @@ #!/bin/bash + +# Do not run this script if you don’t have at least 32 GiB of system memory, +# unless you have enabled the mmap option in the Ollama startup settings. +# Submitting PRs that lack translated strings is okay if you don’t meet the +# system requirements to run this script, or if you simply prefer not to; we are +# regularly updating the missing translation strings anyway. +# +# Base language: English (en.json) + set -e cd "$(dirname "$0")" diff --git a/wayvr/src/config.rs b/wayvr/src/config.rs index a5a4544..b2b6dfd 100644 --- a/wayvr/src/config.rs +++ b/wayvr/src/config.rs @@ -104,8 +104,9 @@ pub fn load_general_config() -> GeneralConfig { #[derive(Serialize)] pub struct AutoSettings { - pub animation_speed: f32, - pub round_multiplier: f32, + pub ui_animation_speed: f32, + pub ui_round_multiplier: f32, + pub ui_gradient_intensity: f32, pub click_freeze_time_ms: i32, pub invert_scroll_direction_x: bool, pub invert_scroll_direction_y: bool, @@ -151,8 +152,9 @@ fn get_settings_path() -> PathBuf { pub fn save_settings(config: &GeneralConfig) -> anyhow::Result<()> { let conf = AutoSettings { - animation_speed: config.animation_speed, - round_multiplier: config.round_multiplier, + ui_animation_speed: config.ui_animation_speed, + ui_round_multiplier: config.ui_round_multiplier, + ui_gradient_intensity: config.ui_gradient_intensity, click_freeze_time_ms: config.click_freeze_time_ms, invert_scroll_direction_x: config.invert_scroll_direction_x, invert_scroll_direction_y: config.invert_scroll_direction_y, diff --git a/wayvr/src/res/config.yaml b/wayvr/src/res/config.yaml index 06dd6d6..bc6561d 100644 --- a/wayvr/src/res/config.yaml +++ b/wayvr/src/res/config.yaml @@ -141,7 +141,7 @@ ## Set whether notifications should be shown at all #notifications_enabled: true -## Set whether notfications should make a sound +## Set whether notifications should make a sound #notifications_sound_enabled: true ## Toggle keyboard click sound diff --git a/wayvr/src/state.rs b/wayvr/src/state.rs index f1c62a8..f2639af 100644 --- a/wayvr/src/state.rs +++ b/wayvr/src/state.rs @@ -128,8 +128,8 @@ impl AppState { apply_color(&mut defaults.bg_color, &session.config.color_background); } - defaults.animation_mult = 1. / session.config.animation_speed; - defaults.rounding_mult = session.config.round_multiplier; + defaults.animation_mult = 1. / session.config.ui_animation_speed; + defaults.rounding_mult = session.config.ui_round_multiplier; let dbus = DbusConnector::default(); diff --git a/wgui/src/event.rs b/wgui/src/event.rs index 48947d5..b0aec6c 100644 --- a/wgui/src/event.rs +++ b/wgui/src/event.rs @@ -9,7 +9,6 @@ use slotmap::{DenseSlotMap, new_key_type}; use crate::{ animation::{self, Animation}, - components::Component, globals, i18n::I18n, layout::{LayoutState, LayoutTask, WidgetID}, diff --git a/wgui/src/parser/widget_image.rs b/wgui/src/parser/widget_image.rs index 97548ef..90dc877 100644 --- a/wgui/src/parser/widget_image.rs +++ b/wgui/src/parser/widget_image.rs @@ -1,5 +1,4 @@ use crate::{ - assets::AssetPath, layout::WidgetID, parser::{ AttribPair, ParserContext, ParserFile, get_asset_path_from_kv, parse_children, parse_widget_universal, diff --git a/wgui/src/parser/widget_sprite.rs b/wgui/src/parser/widget_sprite.rs index 22bfa9a..dcab26f 100644 --- a/wgui/src/parser/widget_sprite.rs +++ b/wgui/src/parser/widget_sprite.rs @@ -1,5 +1,4 @@ use crate::{ - assets::AssetPath, layout::WidgetID, parser::{ AttribPair, ParserContext, ParserFile, get_asset_path_from_kv, parse_children, parse_widget_universal, diff --git a/wlx-common/src/config.rs b/wlx-common/src/config.rs index 8748715..eb0018b 100644 --- a/wlx-common/src/config.rs +++ b/wlx-common/src/config.rs @@ -148,10 +148,15 @@ pub struct GeneralConfig { pub color_background: Option, #[serde(default = "def_one")] - pub animation_speed: f32, + #[serde(alias = "ui_animation_speed", alias = "animation_speed" /* old name */)] + pub ui_animation_speed: f32, #[serde(default = "def_one")] - pub round_multiplier: f32, + #[serde(alias = "ui_round_multiplier", alias = "round_multiplier" /* old name */)] + pub ui_round_multiplier: f32, + + #[serde(default = "def_point3")] + pub ui_gradient_intensity: f32, pub default_keymap: Option,