Merge branch 'master' of https://github.com/slint-ui/slint into feature/fontique

tronical · tronical · commit 86878a948778 · 2025-09-29T12:56:42.000+02:00
Conflicts:
	Cargo.toml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -35,7 +35,8 @@ All notable changes to this project are documented in this file.
 
 ### Python
 
- - Python: Added support for asyncio by making the Slint event loop act as asyncio event loop.
+ - Added support for asyncio by making the Slint event loop act as asyncio event loop.
+ - Added suport for translations via `slint.init_translations()` accepting a `gettext.GNUTranslation`.
 
 ### Tools:
 
diff --git a/Cargo.toml b/Cargo.toml
@@ -171,6 +171,7 @@ glow = { version = "0.16" }
 tikv-jemallocator = { version = "0.6" }
 wgpu-26 = { package = "wgpu", version = "26", default-features = false }
 input = { version = "0.9.0", default-features = false }
+tr = { version = "0.1", default-features = false }
 fontique = { version = "0.5.0" }
 
 [profile.release]
diff --git a/api/python/slint/Cargo.toml b/api/python/slint/Cargo.toml
@@ -43,7 +43,7 @@ accessibility = ["slint-interpreter/accessibility"]
 
 [dependencies]
 i-slint-backend-selector = { workspace = true }
-i-slint-core = { workspace = true }
+i-slint-core = { workspace = true, features = ["tr"] }
 slint-interpreter = { workspace = true, features = ["default", "display-diagnostics", "internal"] }
 i-slint-compiler = { workspace = true }
 pyo3 = { version = "0.26", features = ["extension-module", "indexmap", "chrono", "abi3-py311"] }
diff --git a/api/python/slint/lib.rs b/api/python/slint/lib.rs
@@ -17,6 +17,7 @@ mod errors;
 mod models;
 mod timer;
 mod value;
+use i_slint_core::translations::Translator;
 
 fn handle_unraisable(py: Python<'_>, context: String, err: PyErr) {
     let exception = err.value(py);
@@ -78,6 +79,83 @@ fn invoke_from_event_loop(callable: Py<PyAny>) -> Result<(), errors::PyEventLoop
     .map_err(|e| e.into())
 }
 
+#[gen_stub_pyfunction]
+#[pyfunction]
+fn init_translations(_py: Python<'_>, translations: Bound<PyAny>) -> PyResult<()> {
+    i_slint_backend_selector::with_global_context(|ctx| {
+        ctx.set_external_translator(if translations.is_none() {
+            None
+        } else {
+            Some(Box::new(PyGettextTranslator(translations.unbind())))
+        });
+        i_slint_core::translations::mark_all_translations_dirty();
+    })
+    .map_err(|e| errors::PyPlatformError(e))?;
+    Ok(())
+}
+
+struct PyGettextTranslator(
+    /// A reference to a `gettext.GNUTranslations` object.
+    Py<PyAny>,
+);
+
+impl Translator for PyGettextTranslator {
+    fn translate<'a>(
+        &'a self,
+        string: &'a str,
+        context: Option<&'a str>,
+    ) -> std::borrow::Cow<'a, str> {
+        Python::attach(|py| {
+            match if let Some(context) = context {
+                self.0.call_method(py, pyo3::intern!(py, "pgettext"), (context, string), None)
+            } else {
+                self.0.call_method(py, pyo3::intern!(py, "gettext"), (string,), None)
+            } {
+                Ok(translation) => Some(translation),
+                Err(err) => {
+                    handle_unraisable(py, "calling pgettext/gettext".into(), err);
+                    None
+                }
+            }
+            .and_then(|maybe_str| maybe_str.extract::<String>(py).ok())
+            .map(std::borrow::Cow::Owned)
+        })
+        .unwrap_or(std::borrow::Cow::Borrowed(string))
+        .into()
+    }
+
+    fn ntranslate<'a>(
+        &'a self,
+        n: u64,
+        singular: &'a str,
+        plural: &'a str,
+        context: Option<&'a str>,
+    ) -> std::borrow::Cow<'a, str> {
+        Python::attach(|py| {
+            match if let Some(context) = context {
+                self.0.call_method(
+                    py,
+                    pyo3::intern!(py, "npgettext"),
+                    (context, singular, plural, n),
+                    None,
+                )
+            } else {
+                self.0.call_method(py, pyo3::intern!(py, "ngettext"), (singular, plural, n), None)
+            } {
+                Ok(translation) => Some(translation),
+                Err(err) => {
+                    handle_unraisable(py, "calling npgettext/ngettext".into(), err);
+                    None
+                }
+            }
+            .and_then(|maybe_str| maybe_str.extract::<String>(py).ok())
+            .map(std::borrow::Cow::Owned)
+        })
+        .unwrap_or(std::borrow::Cow::Borrowed(singular))
+        .into()
+    }
+}
+
 use pyo3::prelude::*;
 
 #[pymodule]
@@ -107,6 +185,7 @@ fn slint(_py: Python<'_>, m: &Bound<'_, PyModule>) -> PyResult<()> {
     m.add_function(wrap_pyfunction!(quit_event_loop, m)?)?;
     m.add_function(wrap_pyfunction!(set_xdg_app_id, m)?)?;
     m.add_function(wrap_pyfunction!(invoke_from_event_loop, m)?)?;
+    m.add_function(wrap_pyfunction!(init_translations, m)?)?;
 
     Ok(())
 }
diff --git a/api/python/slint/slint/__init__.py b/api/python/slint/slint/__init__.py
@@ -20,6 +20,7 @@
 from pathlib import Path
 from collections.abc import Coroutine
 import asyncio
+import gettext
 
 Struct = native.PyStruct
 
@@ -493,6 +494,25 @@ def quit_event_loop() -> None:
     quit_event.set()
 
 
+def init_translations(translations: typing.Optional[gettext.GNUTranslations]) -> None:
+    """Installs the specified translations object to handle translations originating from the Slint code.
+
+    Example:
+    ```python
+    import gettext
+    import slint
+
+    translations_dir = os.path.join(os.path.dirname(__file__), "lang")
+    try:
+        translations = gettext.translation("my_app", translations_dir, ["de"])
+        slint.install_translations(translations)
+    except OSError:
+        pass
+    ```
+    """
+    native.init_translations(translations)
+
+
 __all__ = [
     "CompileError",
     "Component",
@@ -509,4 +529,5 @@ def quit_event_loop() -> None:
     "callback",
     "run_event_loop",
     "quit_event_loop",
+    "init_translations",
 ]
diff --git a/api/python/slint/slint/slint.pyi b/api/python/slint/slint/slint.pyi
@@ -12,6 +12,7 @@ import typing
 from typing import Any, List
 from collections.abc import Callable, Buffer, Coroutine
 from enum import Enum, auto
+import gettext
 
 class RgbColor:
     red: int
@@ -146,6 +147,9 @@ def set_xdg_app_id(app_id: str) -> None: ...
 def invoke_from_event_loop(callable: typing.Callable[[], None]) -> None: ...
 def run_event_loop() -> None: ...
 def quit_event_loop() -> None: ...
+def init_translations(
+    translations: typing.Optional[gettext.GNUTranslations],
+) -> None: ...
 
 class PyModelBase:
     def init_self(self, *args: Any) -> None: ...
diff --git a/api/python/slint/tests/test-load-file.slint b/api/python/slint/tests/test-load-file.slint
@@ -56,6 +56,8 @@ export component App inherits Window {
     Rectangle {
         color: red;
     }
+
+    in-out property <string> translated: @tr("Yes");
 }
 
 component Diag inherits Window { }
diff --git a/api/python/slint/tests/test_translations.py b/api/python/slint/tests/test_translations.py
@@ -0,0 +1,39 @@
+# Copyright © SixtyFPS GmbH <info@slint.dev>
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
+
+from slint import load_file, init_translations
+from pathlib import Path
+import gettext
+import typing
+
+
+def base_dir() -> Path:
+    origin = __spec__.origin
+    assert origin is not None
+    base_dir = Path(origin).parent
+    assert base_dir is not None
+    return base_dir
+
+
+class DummyTranslation:
+    def gettext(self, message: str) -> str:
+        if message == "Yes":
+            return "Ja"
+        return message
+
+    def pgettext(self, context: str, message: str) -> str:
+        return self.gettext(message)
+
+
+def test_load_file() -> None:
+    module = load_file(base_dir() / "test-load-file.slint")
+
+    testcase = module.App()
+
+    assert testcase.translated == "Yes"
+    init_translations(typing.cast(gettext.GNUTranslations, DummyTranslation()))
+    try:
+        assert testcase.translated == "Ja"
+    finally:
+        init_translations(None)
+        assert testcase.translated == "Yes"
diff --git a/api/rs/build/lib.rs b/api/rs/build/lib.rs
@@ -7,6 +7,8 @@ It is meant to allow you to compile the `.slint` files from your `build.rs` scri
 
 The main entry point of this crate is the [`compile()`] function
 
+The generated code must be included in your crate by using the `slint::include_modules!()` macro.
+
 ## Example
 
 In your Cargo.toml:
@@ -425,6 +427,8 @@ fn formatter_test() {
 /// about how to use the generated code.
 ///
 /// This function can only be called within a build script run by cargo.
+///
+/// See also [`compile_with_config()`] if you want to specify a configuration.
 pub fn compile(path: impl AsRef<std::path::Path>) -> Result<(), CompileError> {
     compile_with_config(path, CompilerConfiguration::default())
 }
diff --git a/demos/printerdemo/python/main.py b/demos/printerdemo/python/main.py
@@ -7,6 +7,8 @@
 import os
 import copy
 import sys
+import gettext
+import typing
 
 sys.path.append(os.path.join(os.path.dirname(__file__), ".."))
 
@@ -66,6 +68,23 @@ def update_jobs(self):
             top_item = copy.copy(self.printer_queue[0])
         self.printer_queue[0] = top_item
 
+    @slint.callback(global_name="PrinterSettings")
+    def change_language(self, language: int) -> None:
+        def load_translation(language: str) -> typing.Optional[gettext.GNUTranslations]:
+            translations_dir = os.path.join(os.path.dirname(__file__), "..", "lang")
+            try:
+                return gettext.translation("printerdemo", translations_dir, [language])
+            except Exception:
+                return None
+
+        if language == 0:
+            translations = load_translation("en")
+        elif language == 1:
+            translations = load_translation("fr")
+        else:
+            return
+        slint.init_translations(translations)
+
 
 main_window = MainWindow()
 main_window.run()
diff --git a/docs/astro/src/content/docs/guide/development/translations.mdx b/docs/astro/src/content/docs/guide/development/translations.mdx
@@ -281,6 +281,9 @@ Use the <LangRefLink lang="cpp" relpath="api/function_namespaceslint_1a18aba7363
 <TabItem label="Rust" icon="rust">
 Use the <LangRefLink lang="rust-slint" relpath="fn.select_bundled_translation.html">`slint::select_bundled_translation`</LangRefLink> function to change translations at runtime.
 </TabItem>
+<TabItem label="Python">
+Use the <LangRefLink lang="python" relpath="slint#init_translations">`slint.init_translations()`</LangRefLink> function to change translations at runtime.
+</TabItem>
 </Tabs>
 
 ## Previewing Translations with `slint-viewer`
diff --git a/internal/common/enums.rs b/internal/common/enums.rs
@@ -331,9 +331,12 @@ macro_rules! for_each_enums {
                 /// Use the preferred size for all elements, distribute remaining space evenly between
                 /// elements.
                 SpaceBetween,
+                /// Use the preferred size for all elements, distribute remaining space evenly
+                /// between the elements, and use half spaces at the start and end.
+                SpaceAround,
                 /// Use the preferred size for all elements, distribute remaining space evenly before the
                 /// first element, after the last element and between elements.
-                SpaceAround,
+                SpaceEvenly,
             }
 
             /// PathEvent is a low-level data structure describing the composition of a path. Typically it is
diff --git a/internal/core/Cargo.toml b/internal/core/Cargo.toml
@@ -65,6 +65,8 @@ experimental = []
 
 unstable-wgpu-26 = ["dep:wgpu-26"]
 
+tr = ["dep:tr"]
+
 default = ["std", "unicode"]
 
 shared-parley = ["shared-fontique", "dep:parley"]
@@ -120,6 +122,8 @@ fontdue = { workspace = true, optional = true }
 
 wgpu-26 = { workspace = true, optional = true }
 
+tr = { workspace = true, optional = true }
+
 [target.'cfg(target_family = "unix")'.dependencies]
 gettext-rs = { version = "0.7.1", optional = true, features = ["gettext-system"] }
 
diff --git a/internal/core/context.rs b/internal/core/context.rs
@@ -25,6 +25,8 @@ pub(crate) struct SlintContextInner {
         core::cell::RefCell<Option<Box<dyn FnMut(&Rc<dyn crate::platform::WindowAdapter>)>>>,
     #[cfg(all(unix, not(target_os = "macos")))]
     xdg_app_id: core::cell::RefCell<Option<crate::SharedString>>,
+    #[cfg(feature = "tr")]
+    pub external_translator: core::cell::RefCell<Option<Box<dyn tr::Translator>>>,
 }
 
 /// This context is meant to hold the state and the backend.
@@ -44,6 +46,8 @@ impl SlintContext {
             window_shown_hook: Default::default(),
             #[cfg(all(unix, not(target_os = "macos")))]
             xdg_app_id: Default::default(),
+            #[cfg(feature = "tr")]
+            external_translator: Default::default(),
         }))
     }
 
@@ -87,6 +91,19 @@ impl SlintContext {
     pub fn xdg_app_id(&self) -> Option<crate::SharedString> {
         None
     }
+
+    #[cfg(feature = "tr")]
+    pub fn set_external_translator(&self, translator: Option<Box<dyn tr::Translator>>) {
+        *self.0.external_translator.borrow_mut() = translator;
+    }
+
+    #[cfg(feature = "tr")]
+    pub fn external_translator(&self) -> Option<core::cell::Ref<'_, Box<dyn tr::Translator>>> {
+        core::cell::Ref::filter_map(self.0.external_translator.borrow(), |maybe_translator| {
+            maybe_translator.as_ref()
+        })
+        .ok()
+    }
 }
 
 /// Internal function to access the context.
diff --git a/internal/core/layout.rs b/internal/core/layout.rs
@@ -570,6 +570,10 @@ pub fn solve_box_layout(data: &BoxLayoutData, repeater_indexes: Slice<u32>) -> S
             let spacing = (size_without_padding - pref_size) / (num_spacings + 1 as Coord);
             Some((data.padding.begin + spacing / 2 as Coord, spacing))
         }
+        LayoutAlignment::SpaceEvenly => {
+            let spacing = (size_without_padding - pref_size) / (num_spacings + 2 as Coord);
+            Some((data.padding.begin + spacing, spacing))
+        }
     };
     if let Some((mut pos, spacing)) = align {
         for it in &mut layout_data {
diff --git a/internal/core/translations.rs b/internal/core/translations.rs
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
diff --git a/tools/figma-inspector/package.json b/tools/figma-inspector/package.json
diff --git a/ui-libraries/material/docs/package.json b/ui-libraries/material/docs/package.json
diff --git a/ui-libraries/material/docs/src/content/collections/enums/LayoutAlignment.md b/ui-libraries/material/docs/src/content/collections/enums/LayoutAlignment.md

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,8 @@ export component App inherits Window {`
`56`	`56`	`Rectangle {`
`57`	`57`	`color: red;`
`58`	`58`	`}`
	`59`	`+`
	`60`	`+ in-out property <string> translated: @tr("Yes");`
`59`	`61`	`}`
`60`	`62`
`61`	`63`	`component Diag inherits Window { }`