slint-ui 1.6.0 → 1.7.0-nightly.2024060603

package/.yarnrc.yml

@@ -1,4 +1,4 @@
 # Copyright © SixtyFPS GmbH <info@slint.dev>
-# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
 
 nodeLinker: node-modules

package/Cargo.toml

@@ -1,5 +1,5 @@
 # Copyright © SixtyFPS GmbH <info@slint.dev>
-# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
 
 [package]
 name = "slint-node"
@@ -9,10 +9,10 @@ documentation = "https://slint.dev/docs"
 edition = "2021"
 homepage = "https://slint.dev"
 keywords = ["gui", "toolkit", "graphics", "design", "ui"]
-license = "GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial"
+license = "GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0"
 repository = "https://github.com/slint-ui/slint"
 rust-version = "1.73"
-version = "1.6.0"
+version = "1.7.0"
 categories = ["gui", "development-tools"]
 build = "build.rs"
 
@@ -40,11 +40,11 @@ accessibility = ["slint-interpreter/accessibility"]
 [dependencies]
 napi = { version = "2.14.0", default-features = false, features = ["napi8"] }
 napi-derive = "2.14.0"
-i-slint-compiler = { features = ["default"] , version = "=1.6.0", default-features = false }
-i-slint-core = { features = ["default"] , version = "=1.6.0", default-features = false }
-i-slint-backend-selector = { version = "=1.6.0", default-features = false }
-slint-interpreter = { default-features = false , features = ["display-diagnostics", "internal", "compat-1-2"] , version = "=1.6.0"}
-spin_on = "0.1"
+i-slint-compiler = { features = ["default"] , git = "https://github.com/slint-ui/slint", rev = "cad11c821fc36b4d767b53219fff8fb5c219975b", version = "=1.7.0", default-features = false }
+i-slint-core = { features = ["default"] , git = "https://github.com/slint-ui/slint", rev = "cad11c821fc36b4d767b53219fff8fb5c219975b", version = "=1.7.0", default-features = false }
+i-slint-backend-selector = { git = "https://github.com/slint-ui/slint", rev = "cad11c821fc36b4d767b53219fff8fb5c219975b", version = "=1.7.0", default-features = false }
+slint-interpreter = { default-features = false , features = ["display-diagnostics", "internal", "compat-1-2"] , git = "https://github.com/slint-ui/slint", rev = "cad11c821fc36b4d767b53219fff8fb5c219975b", version = "=1.7.0"}
+spin_on = { version = "0.1" }
 css-color-parser2 = { version = "1.0.1" }
 itertools = { version = "0.12" }
 send_wrapper = { version = "0.6.0" }

package/LICENSE.md

@@ -1,12 +1,12 @@
-<!-- Copyright © SixtyFPS GmbH <info@slint.dev> ; SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial -->
+<!-- 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 -->
 
 # Slint License
 
 You can use Slint under ***any*** of the following licenses, at your choice:
 
-1. [Royalty-free license](LICENSES/LicenseRef-Slint-Royalty-free-1.2.md),
+1. [Royalty-free license](LICENSES/LicenseRef-Slint-Royalty-free-2.0.md),
 2. [GNU GPLv3](LICENSES/GPL-3.0-only.txt),
-3. [Commercial license](LICENSES/LicenseRef-Slint-commercial.md).
+3. [Commercial license](LICENSES/LicenseRef-Slint-Software-3.0.md).
 
 Third party licenses listed in the `LICENSES` folder also apply to parts of the product.
 

package/LICENSES/LicenseRef-Slint-Royalty-free-2.0.md

@@ -0,0 +1,43 @@
+# Slint Royalty-free Desktop, Mobile, and Web Applications License
+
+Version 2.0
+
+## Preamble
+
+Slint is a toolkit that can be used to build user interfaces for applications. Slint (hereafter referred to as **Software**) is made available under different licenses by SixtyFPS GmbH incorporated at Oranienburger Str. 44, 16540 Hohen Neuendorf, Germany (**SixtyFPS**). The **Slint Royalty-free Desktop, Mobile, and Web Applications License** is suitable for those who develop desktop, mobile, or web applications and do not want to use open source components under copyleft licenses.
+
+## 1. Grant of Rights
+
+SixtyFPS hereby grants You a world-wide, royalty-free, non-exclusive license to use, reproduce, make available, modify, display, perform, distribute the Software as part of a Desktop, Mobile, or Web Application.
+
+A **Desktop Application** is a computer program that is designed to run on a general-purpose computer (PC or notebook), typically installed and executed locally on the computer's operating system.
+
+A **Mobile Application** is a computer program that is designed to run on a general-purpose mobile computer (mobile phone or tablet), typically installed and executed locally on the computer's operating system.
+
+A **Web Application** is a computer program that is designed to run in the sandbox environment provided by a web browser.
+
+Desktop Application, Mobile Application, and Web Application are hereafter referred to as **Application**.
+
+## 2. License Conditions - Attribution
+
+You may distribute the Software as part of an Application, modified or unmodified, provided that You do either of the following:
+
+(a) Display the [`AboutSlint`](https://slint.dev/snapshots/master/docs/slint/src/language/widgets/aboutslint.html) widget in an "About" screen or dialog that is accessible from the top level menu of the Application. In the absence of such a screen or dialog, display the widget in the "Splash Screen" of the Application.
+
+(b) Display the [Slint attribution badge](https://github.com/slint-ui/slint/tree/master/logo/MadeWithSlint-logo-whitebg.png) on a public webpage, preferably where the binaries of your Application can be downloaded from, in such a way that it can be easily found by any visitor to that page.
+
+## 3. Limitations
+
+The License does not permit to distribute or make the Software publicly available alone and without integration into an Application. For this purpose you may use the Software under the GNU General Public License, version 3.
+
+The License does not permit the use of the Software within Embedded Systems. An **Embedded System** is a computer system designed to perform a specific task within a larger mechanical or electrical system.
+
+The License does not permit the distribution of Application that exposes the APIs, in part or in total, of the Software.
+
+You may not remove or alter any license notices (including copyright notices, disclaimers of warranty, or limitations of liability) contained within the source code form of the Software.
+
+## 4. Warranty and Liability
+
+SixtyFPS is only liable for conflicting rights of third parties if SixtyFPS was aware of these rights without informing you. Unless required by applicable law or agreed to in writing, SixtyFPS provides the Software on an "as is" basis, without warranties or conditions of any kind, either express or implied, including, without limitation, any warranties or conditions of merchantability, or fitness for a particular purpose.
+
+Unless required by law, SixtyFPS won't be liable for any direct, indirect, incidental, or consequential damages arising in any way out of the use of the Software.

package/LICENSES/LicenseRef-Slint-Software-3.0.md

@@ -0,0 +1,89 @@
+# Slint Software License
+
+Version 3.0
+
+## Preamble
+
+Slint is a toolkit that can be used to build user interfaces for applications. Slint (hereafter referred to as **Software**) is made available under different licenses by SixtyFPS GmbH incorporated at Oranienburger Str. 44, 16540 Hohen Neuendorf, Germany (**SixtyFPS**). The **Slint Software License** is suitable for those who do not want to use open source components under copyleft licenses.
+
+## 1. Grant of Rights
+
+SixtyFPS hereby grants You a world-wide, non-exclusive license to use, reproduce, make available, modify, display, perform, distribute the Software as part of a Desktop, Mobile, or Web Application or as part of an Embedded System (each of which is defined below).
+
+A **Desktop Application** is a computer program that is designed to run on a general-purpose computer (PC or notebook), typically installed and executed locally on the computer's operating system.
+
+A **Mobile Application** is a computer program that is designed to run on a general-purpose mobile computer (mobile phone or tablet), typically installed and executed locally on the computer's operating system.
+
+A **Web Application** is a computer program that is designed to run in the sandbox environment provided by a web browser.
+
+An **Embedded System** is a computer system designed to perform a specific task within a larger mechanical or electrical system.
+
+Desktop Application, Mobile Application, and Web Application are hereafter referred to as **Application**.
+
+## 2. License Conditions
+
+The grant of rights in section 1 are conditional, provided that You do all of the following:
+
+(a) You have purchased an appropriate **Pricing Plan** (*Startup & Individual* / *Small Enterprise* / *Enterprise*) and the required amount of seats to cover all individual users of the Software associated with the designing, developing, or testing your Application or Embedded System. For clarity, each individual user is counted as one seat.
+
+(b) In the case that You are distributing the Software as as part of an Embedded System, You have purchased an appropriate quantity of **Royalties**, one Royalty for each Embedded System.
+
+(c) You have fully paid all applicable fees (**Fees**) pursuant to Section 6.
+
+*Startup & Individual Plan* is limited to individuals as well as individual companies with a staff headcount of less than 10 with either turnover or balance sheet of 2MEUR or less.
+
+*Small Enterprise Plan* is limited to individual companies with a staff headcount of less than 50 with either turnover or balance sheet of 10MEUR or less.
+
+*Enterprise Plan* is available to all individuals and individual companies.
+
+## 3. Limitations
+
+The License does not permit to distribute or make the Software publicly available alone and without integration into an Application or into an Embedded System. For this purpose you may use the Software under the GNU General Public License, version 3.
+
+The License is limited to only the versions of Software that were made available to you under the purchased Pricing Plan. For all other versions, you may use the Software under either the GNU General Public License, version 3 or the Slint Royalty-free Desktop, Mobile, and Web Applications License.
+
+The License does not permit the distribution of Application that exposes the APIs, in part or in total, of the Software.
+
+You may not remove or alter any license notices (including copyright notices, disclaimers of warranty, or limitations of liability) contained within the source code form of the Software.
+
+## 4. Warranty and Liability
+
+SixtyFPS is only liable for conflicting rights of third parties if SixtyFPS was aware of these rights without informing you. Unless required by applicable law or agreed to in writing, SixtyFPS provides the Software on an "as is" basis, without warranties or conditions of any kind, either express or implied, including, without limitation, any warranties or conditions of merchantability, or fitness for a particular purpose.
+
+Unless required by law, SixtyFPS won't be liable for any direct, indirect, incidental, or consequential damages arising in any way out of the use of the Software.
+
+## 5. Audit Rights
+
+SixtyFPS or an independent certified auditor on SixtyFPS's behalf, may, upon its reasonable request, with 30 (thirty) days written notice, and at its sole expense, examine your books and records solely with respect to your use of the Software. Any such audit shall be conducted during regular business hours at your facilities and shall not unreasonably interfere with your business activities. The auditor shall not remove, copy, or redistribute any electronic material during an audit. If an audit reveals that you are using the Software in a way that is in material violation of the terms of this License, then you shall pay SixtyFPS reasonable costs of conducting the audit. The auditor shall only be allowed to report violations of the terms of this License, with a copy to you. You shall be provided the right to provide comments to the report before it is finalized.
+
+## 6. Payment Terms
+
+(a) Fees will be payable upon receipt of an invoice, except for Fees that are disputed in good faith for reasons articulated in writing by You, within thirty (30) days after receiving such invoice.
+
+(b) Any unpaid Fees will become overdue 30 (thirty) days from the date of the applicable invoice and be subject to a 5% (five percent) late fee for each month of delayed payment, with each such 5% (five percent) late fees attaching to such unpaid amounts at the first day of each 30 (thirty) days time increments beginning on the first day that such amounts become overdue.
+
+(c) Fees are exclusive of any and all taxes, including but not limited to VAT and withholding tax, duties, customs, and bank charges, for which You shall be solely responsible.
+
+(d) No term or condition contained in your purchase order will apply unless expressly accepted by SixtyFPS in writing.
+
+## 7. Termination
+
+(a) SixtyFPS may terminate this License if You materially breach any obligation hereunder, provided You have been provided notice of such breach and an opportunity to cure such breach during a period of not less than sixty (60) days following such notice.
+
+(b) You may terminate this License with or without cause upon no less than thirty (30) days advance written notice to SixtyFPS and upon payment of any unpaid Fees and contractual penalties.
+
+(c) Upon termination of this License, You will immediately cease using, reproducing, making available, modifying, displaying, performing, distributing the Software and pay immediately any unpaid Fees and contractual penalties.
+
+(d) Sections 3 through 10 of this License will survive any termination of the License to the extent necessary to implement their objectives.
+
+## 8. Assignment
+
+You may assign this License, in whole or in part (whether by operation of law or otherwise), with prior consent from SixtyFPS, which shall not be unreasonably withheld or delayed. SixtyFPS may assign any of its rights hereunder or delegate any of its obligations hereunder with prior notice to You. Any attempt to assign this License other than in accordance with this Section 8 shall be null and void.
+
+## 9. Severability
+
+In the event that any provision of this License will, for any reason, be determined by any court of competent jurisdiction to be invalid, illegal or unenforceable in any respect, such invalidity, illegality or unenforceability will be interpreted as closely as possible so as not affect any other provision of this License, and such provision will further be modified by said court to permit its enforcement to the maximum extent permitted by law.
+
+## 10. Governing Law
+
+This Agreement shall be construed, interpreted, and governed by the laws of the Federal Republic of Germany.

package/README.md

@@ -1,4 +1,4 @@
-<!-- Copyright © SixtyFPS GmbH <info@slint.dev> ; SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial -->
+<!-- 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 -->
 
 # Slint-node (Beta)
 

package/binaries.json

@@ -1,6 +1,6 @@
 {
   "name": "@slint-ui/slint-ui-binary",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "binaryName": "slint-ui",
   "package": "@slint-ui/slint-ui-binary",
   "napi": {

package/build-on-demand.mjs

@@ -1,5 +1,5 @@
 // Copyright © SixtyFPS GmbH <info@slint.dev>
-// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
+// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
 
 // This file checks if a binary package was installed (through architecture dependencies), and
 // builds slint if no binary was found.

package/build.rs

@@ -1,5 +1,5 @@
 // Copyright © SixtyFPS GmbH <info@slint.dev>
-// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
+// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
 
 fn main() {
     napi_build::setup();

package/index.js

@@ -1,6 +1,6 @@
 "use strict";
 // Copyright © SixtyFPS GmbH <info@slint.dev>
-// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
+// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.quitEventLoop = exports.runEventLoop = exports.loadSource = exports.loadFile = exports.CompileError = exports.private_api = exports.ArrayModel = exports.Model = void 0;
 const napi = require("./rust-module.cjs");
@@ -517,6 +517,22 @@ function loadSlint(loadData) {
                     });
                 }
             });
+            instance.definition().functions.forEach((cb) => {
+                let functionName = cb.replace(/-/g, "_");
+                if (componentHandle[functionName] !== undefined) {
+                    console.warn("Duplicated function name " + functionName);
+                }
+                else {
+                    Object.defineProperty(componentHandle, cb.replace(/-/g, "_"), {
+                        get() {
+                            return function () {
+                                return instance.invoke(cb, Array.from(arguments));
+                            };
+                        },
+                        enumerable: true,
+                    });
+                }
+            });
             // globals
             instance.definition().globals.forEach((globalName) => {
                 if (componentHandle[globalName] !== undefined) {
@@ -560,6 +576,22 @@ function loadSlint(loadData) {
                             });
                         }
                     });
+                    instance.definition().globalFunctions(globalName).forEach((cb) => {
+                        let functionName = cb.replace(/-/g, "_");
+                        if (globalObject[functionName] !== undefined) {
+                            console.warn("Duplicated function name " + cb + " on global " + global);
+                        }
+                        else {
+                            Object.defineProperty(globalObject, cb.replace(/-/g, "_"), {
+                                get() {
+                                    return function () {
+                                        return instance.invokeGlobal(globalName, cb, Array.from(arguments));
+                                    };
+                                },
+                                enumerable: true,
+                            });
+                        }
+                    });
                     Object.defineProperty(componentHandle, globalName, {
                         get() {
                             return globalObject;

package/index.ts

@@ -1,5 +1,5 @@
 // Copyright © SixtyFPS GmbH <info@slint.dev>
-// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
+// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
 
 import * as napi from "./rust-module.cjs";
 export {
@@ -350,7 +350,7 @@ export class ArrayModel<T> extends Model<T> {
 
     /**
      * Removes the last element from the array and returns it.
-     * 
+     *
      * @returns The removed element or undefined if the array is empty.
      */
     pop(): T | undefined {
@@ -780,6 +780,23 @@ function loadSlint(loadData: LoadData): Object {
                 }
             });
 
+            instance!.definition().functions.forEach((cb) => {
+                let functionName = cb.replace(/-/g, "_");
+
+                if (componentHandle[functionName] !== undefined) {
+                    console.warn("Duplicated function name " + functionName);
+                } else {
+                    Object.defineProperty(componentHandle, cb.replace(/-/g, "_"), {
+                        get() {
+                            return function () {
+                                return instance!.invoke(cb, Array.from(arguments));
+                            };
+                        },
+                        enumerable: true,
+                    });
+                }
+            });
+
             // globals
             instance!.definition().globals.forEach((globalName) => {
                 if (componentHandle[globalName] !== undefined) {
@@ -825,6 +842,23 @@ function loadSlint(loadData: LoadData): Object {
                         }
                     });
 
+                    instance!.definition().globalFunctions(globalName).forEach((cb) => {
+                        let functionName = cb.replace(/-/g, "_");
+
+                        if (globalObject[functionName] !== undefined) {
+                            console.warn("Duplicated function name " + cb + " on global " + global);
+                        } else {
+                            Object.defineProperty(globalObject, cb.replace(/-/g, "_"), {
+                                get() {
+                                    return function () {
+                                        return instance!.invokeGlobal(globalName, cb, Array.from(arguments));
+                                    };
+                                },
+                                enumerable: true,
+                            });
+                        }
+                    });
+
                     Object.defineProperty(componentHandle, globalName, {
                         get() {
                             return globalObject;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "slint-ui",
-  "version": "1.6.0",
+  "version": "1.7.0-nightly.2024060603",
   "main": "index.js",
   "types": "index.d.ts",
   "homepage": "https://github.com/slint-ui/slint",
@@ -59,10 +59,10 @@
     "@napi-rs/cli": "^2.16.5"
   },
   "optionalDependencies": {
-    "@slint-ui/slint-ui-binary-linux-x64-gnu": "1.6.0",
-    "@slint-ui/slint-ui-binary-darwin-x64": "1.6.0",
-    "@slint-ui/slint-ui-binary-darwin-arm64": "1.6.0",
-    "@slint-ui/slint-ui-binary-win32-x64-msvc": "1.6.0",
-    "@slint-ui/slint-ui-binary-win32-ia32-msvc": "1.6.0"
+    "@slint-ui/slint-ui-binary-linux-x64-gnu": "1.7.0-nightly.2024060603",
+    "@slint-ui/slint-ui-binary-darwin-x64": "1.7.0-nightly.2024060603",
+    "@slint-ui/slint-ui-binary-darwin-arm64": "1.7.0-nightly.2024060603",
+    "@slint-ui/slint-ui-binary-win32-x64-msvc": "1.7.0-nightly.2024060603",
+    "@slint-ui/slint-ui-binary-win32-ia32-msvc": "1.7.0-nightly.2024060603"
   }
 }

package/rust-module.d.ts

@@ -112,9 +112,11 @@ export class ComponentDefinition {
   constructor()
   get properties(): Array<JsProperty>
   get callbacks(): Array<string>
+  get functions(): Array<string>
   get globals(): Array<string>
   globalProperties(globalName: string): Array<JsProperty> | null
   globalCallbacks(globalName: string): Array<string> | null
+  globalFunctions(globalName: string): Array<string> | null
   create(): JsComponentInstance
   get name(): string
 }

package/src/interpreter/component_compiler.rs

@@ -1,5 +1,5 @@
 // Copyright © SixtyFPS GmbH <info@slint.dev>
-// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
+// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
 
 use std::collections::HashMap;
 use std::path::PathBuf;

package/src/interpreter/component_definition.rs

@@ -1,5 +1,5 @@
 // Copyright © SixtyFPS GmbH <info@slint.dev>
-// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
+// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
 
 use napi::Result;
 use slint_interpreter::ComponentDefinition;
@@ -39,6 +39,11 @@ impl JsComponentDefinition {
         self.internal.callbacks().collect()
     }
 
+    #[napi(getter)]
+    pub fn functions(&self) -> Vec<String> {
+        self.internal.functions().collect()
+    }
+
     #[napi(getter)]
     pub fn globals(&self) -> Vec<String> {
         self.internal.globals().collect()
@@ -57,6 +62,11 @@ impl JsComponentDefinition {
         self.internal.global_callbacks(global_name.as_str()).map(|iter| iter.collect())
     }
 
+    #[napi]
+    pub fn global_functions(&self, global_name: String) -> Option<Vec<String>> {
+        self.internal.global_functions(global_name.as_str()).map(|iter| iter.collect())
+    }
+
     #[napi]
     pub fn create(&self) -> Result<JsComponentInstance> {
         Ok(self.internal.create().map_err(|e| napi::Error::from_reason(e.to_string()))?.into())

package/src/interpreter/component_instance.rs

@@ -1,5 +1,5 @@
 // Copyright © SixtyFPS GmbH <info@slint.dev>
-// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
+// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
 
 use i_slint_compiler::langtype::Type;
 use i_slint_core::window::WindowInner;
@@ -239,29 +239,32 @@ impl JsComponentInstance {
                 )
             })?;
 
-        let args = if let Type::Callback { args, .. } = ty {
-            let count = args.len();
-            let args = arguments
-                .into_iter()
-                .zip(args.into_iter())
-                .map(|(a, ty)| super::value::to_value(&env, a, &ty))
-                .collect::<Result<Vec<_>, _>>()?;
-            if args.len() != count {
+        let args = match ty {
+            Type::Callback { args, .. } | Type::Function { args, .. } => {
+                let count = args.len();
+                let args = arguments
+                    .into_iter()
+                    .zip(args.into_iter())
+                    .map(|(a, ty)| super::value::to_value(&env, a, &ty))
+                    .collect::<Result<Vec<_>, _>>()?;
+                if args.len() != count {
+                    return Err(napi::Error::from_reason(
+                        format!(
+                            "{} expect {} arguments, but {} where provided",
+                            callback_name,
+                            count,
+                            args.len()
+                        )
+                        .as_str(),
+                    ));
+                }
+                args
+            }
+            _ => {
                 return Err(napi::Error::from_reason(
-                    format!(
-                        "{} expect {} arguments, but {} where provided",
-                        callback_name,
-                        count,
-                        args.len()
-                    )
-                    .as_str(),
+                    format!("{} is not a callback or a function", callback_name).as_str(),
                 ));
             }
-            args
-        } else {
-            return Err(napi::Error::from_reason(
-                format!("{} is not a callback", callback_name).as_str(),
-            ));
         };
 
         let result = self
@@ -296,29 +299,36 @@ impl JsComponentInstance {
                 )
             })?;
 
-        let args = if let Type::Callback { args, .. } = ty {
-            let count = args.len();
-            let args = arguments
-                .into_iter()
-                .zip(args.into_iter())
-                .map(|(a, ty)| super::value::to_value(&env, a, &ty))
-                .collect::<Result<Vec<_>, _>>()?;
-            if args.len() != count {
+        let args = match ty {
+            Type::Callback { args, .. } | Type::Function { args, .. } => {
+                let count = args.len();
+                let args = arguments
+                    .into_iter()
+                    .zip(args.into_iter())
+                    .map(|(a, ty)| super::value::to_value(&env, a, &ty))
+                    .collect::<Result<Vec<_>, _>>()?;
+                if args.len() != count {
+                    return Err(napi::Error::from_reason(
+                        format!(
+                            "{} expect {} arguments, but {} where provided",
+                            callback_name,
+                            count,
+                            args.len()
+                        )
+                        .as_str(),
+                    ));
+                }
+                args
+            }
+            _ => {
                 return Err(napi::Error::from_reason(
                     format!(
-                        "{} expect {} arguments, but {} where provided",
-                        callback_name,
-                        count,
-                        args.len()
+                        "{} is not a callback or a function on global {}",
+                        callback_name, global_name
                     )
                     .as_str(),
                 ));
             }
-            args
-        } else {
-            return Err(napi::Error::from_reason(
-                format!("{} is not a callback on global {}", callback_name, global_name).as_str(),
-            ));
         };
 
         let result = self

package/src/interpreter/diagnostic.rs

@@ -1,5 +1,5 @@
 // Copyright © SixtyFPS GmbH <info@slint.dev>
-// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
+// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
 
 use slint_interpreter::{Diagnostic, DiagnosticLevel};
 

package/src/interpreter/value.rs

@@ -1,5 +1,5 @@
 // Copyright © SixtyFPS GmbH <info@slint.dev>
-// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
+// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
 
 use crate::{
     js_into_rust_model, rust_into_js_model, ReadOnlyRustModel, RgbaColor, SlintBrush,

package/src/interpreter/window.rs

@@ -1,5 +1,5 @@
 // Copyright © SixtyFPS GmbH <info@slint.dev>
-// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
+// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
 
 use crate::types::{SlintPoint, SlintSize};
 use i_slint_core::window::WindowAdapterRc;

package/src/interpreter.rs

@@ -1,5 +1,5 @@
 // Copyright © SixtyFPS GmbH <info@slint.dev>
-// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
+// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
 
 mod diagnostic;
 pub use diagnostic::*;

package/src/lib.rs

@@ -1,5 +1,5 @@
 // Copyright © SixtyFPS GmbH <info@slint.dev>
-// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
+// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
 
 mod interpreter;
 pub use interpreter::*;

package/src/types/brush.rs

@@ -1,5 +1,5 @@
 // Copyright © SixtyFPS GmbH <info@slint.dev>
-// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
+// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
 
 use i_slint_core::{graphics::GradientStop, Brush, Color};
 use napi::{bindgen_prelude::External, Error, Result};

package/src/types/image_data.rs

@@ -1,5 +1,5 @@
 // Copyright © SixtyFPS GmbH <info@slint.dev>
-// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
+// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
 
 use std::vec;
 

package/src/types/model.rs

@@ -1,5 +1,5 @@
 // Copyright © SixtyFPS GmbH <info@slint.dev>
-// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
+// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
 
 use std::rc::Rc;
 

package/src/types/point.rs

@@ -1,5 +1,5 @@
 // Copyright © SixtyFPS GmbH <info@slint.dev>
-// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
+// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
 
 use napi::{
     bindgen_prelude::{FromNapiValue, Object},

package/src/types/size.rs

@@ -1,5 +1,5 @@
 // Copyright © SixtyFPS GmbH <info@slint.dev>
-// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
+// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
 
 use napi::{
     bindgen_prelude::{FromNapiValue, Object},

package/src/types.rs

@@ -1,5 +1,5 @@
 // Copyright © SixtyFPS GmbH <info@slint.dev>
-// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
+// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
 
 mod brush;
 pub use brush::*;

package/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md

@@ -1,39 +0,0 @@
-# Slint Royalty-free Desktop, Mobile, and Web Applications License v1.2
-
-## Preamble
-
-Slint is a toolkit that can be used to build user interfaces for applications. Slint (hereafter referred to as "Software") is made available under different licenses by SixtyFPS GmbH incorporated at Oranienburger Str. 44, 16540 Hohen Neuendorf, Germany ("SixtyFPS"). The "Slint Royalty-free Desktop, Mobile, and Web Applications License" is suitable for those who develop desktop, mobile, or web applications and do not want to use open source components under copyleft licenses.
-
-### 1. Grant of Rights
-
-SixtyFPS hereby grants You a world-wide, royalty-free, non-exclusive license to use, reproduce, make available, modify, display, perform, distribute the Software as part of a Desktop, Mobile, or Web Application.
-
-A Desktop Application is a computer program that is designed to run on a general-purpose computer (PC or notebook), typically installed and executed locally on the computer's operating system.
-
-A Mobile Application is a computer program that is designed to run on a general-purpose mobile computer (mobile phone or tablet), typically installed and executed locally on the computer's operating system.
-
-A Web Application is a computer program that is running on a server and accessed using a web browser or client program.
-
-Desktop Application, Mobile Application, and Web Application are hereafter referred to as "Application".
-
-### 2. License Conditions - Attribution
-
-You may distribute the Software as part of an Application, modified or unmodified, provided that You do either of the following:
-
-(a) Display the [`AboutSlint`](https://slint.dev/snapshots/master/docs/slint/src/language/widgets/aboutslint.html) widget in an "About" screen or dialog that is accessible from the top level menu of the Application. In the absence of such a screen or dialog, display the widget in the "Splash Screen" of the Application.
-
-(b) Display the [Slint attribution badge](https://github.com/slint-ui/slint/tree/master/logo/MadeWithSlint-logo-whitebg.png) on a public webpage, preferably where the binaries of your Application can be downloaded from, in such a way that it can be easily found by any visitor to that page.
-
-### 3. Limitations
-
-The license does not permit to distribute or make the Software publicly available alone and without integration into an Application. For this purpose you may use the Software under the GNU General Public License, version 3.
-
-The license does not permit the use of the Software within Embedded Systems. An Embedded System is a computer system designed to perform a specific task within a larger mechanical or electrical system.
-
-You may not remove or alter any license notices (including copyright notices, disclaimers of warranty, or limitations of liability) contained within the source code form of the Software.
-
-### 4. Warranty and Liability
-
-SixtyFPS is only liable for conflicting rights of third parties if SixtyFPS was aware of these rights without informing you. Unless required by applicable law or agreed to in writing, SixtyFPS provides the SOFTWARE on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE.
-
-UNLESS REQUIRED BY LAW, SIXTYFPS WON'T BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING IN ANY WAY OUT OF THE USE OF THE SOFTWARE.

package/LICENSES/LicenseRef-Slint-commercial.md

@@ -1,256 +0,0 @@
-# Slint Software License Agreement
-
-Version 2.0
-
-Copyright © 2023 SixtyFPS GmbH <https://slint.dev/imprint.html>
-
-SixtyFPS GmbH with offices at Oranienburger Str. 44, 16540 Hohen Neuendorf,
-Germany (**SixtyFPS**, **us**, **we** or **our**) grants a license to the
-software (**Licensed Software**), as specified herein, subject to the Terms and
-Conditions of this Slint Software License Agreement (**Agreement**).
-
-By using the Licensed Software, **you** agree to be bound by this Agreement.
-**If you do not agree, do not use the Licensed Software.** If you are accessing
-and using the Licensed Software on behalf of a company (such as your employer)
-or other legal entity, you represent and warrant that you have the authority to
-bind that company or other legal entity to this Agreement. In that case, **you**
-and **your** will refer to that company or other legal entity.
-
-Each Party to this Agreement may be referred to herein individually as a
-**Party** or collectively as the **Parties**.
-
-## Licensed Software
-
-The Licensed Software includes
-
-1. Slint compiler tool to translate Slint Design Markup Language files to Rust
-    (last stable Rust version at the time of licensed Slint version) and C++
-    (second last C++ version at the time of licensed Slint version),
-
-2. Slint run-time library that can render interactive user-interfaces and
-    provides Rust and C++ APIs (as per above versioning) to control the
-    interfaces,
-
-3. API Documentation for Slint and reference documentation for Slint Design
-    Markup Language, and
-
-4. Source code of Slint.
-
-## Terms and Conditions
-
-1. The Licensed Software is protected by copyright laws and international
-    copyright treaties, as well as other intellectual property laws and
-    treaties. The Licensed Software is licensed, not sold.
-
-2. The Licensed Software may provide links to third Party libraries or code
-    (collectively **Third-Party Libraries**) to implement various functions.
-    Third-Party Libraries do not comprise part of the Licensed Software. In some
-    cases, access to Third-Party Libraries may be included along with the
-    Licensed Software delivery as a convenience for development and testing
-    only. You acknowledge:
-
-    (a) that some Third-Party Libraries may require additional licensing of
-        copyright and/or patents from the owners of such, and
-
-    (b) that distribution of any of the Licensed Software referencing any portion
-        of a Third-Party Library may require appropriate licensing from such
-        third parties. All such Third-Party Libraries, along with applicable
-        copyright notices and licenses, will be listed and made available to
-        you.
-
-3. As part of the license grant, a Slint Software License Certificate
-    (**License Certificate**) will be issued containing details of
-
-    (a) the license grant,
-
-    (b) the permitted scope of your use of the Licensed Software, and
-
-    (c) your contact details.
-
-4. In case of any changes or deviations to the information noted in the License
-    Certificate, you are obliged to notify us in writing, not later than 7 days
-    after any such change or deviation has occurred.
-
-5. The Term of this Agreement shall begin on the date mentioned in the License
-    Certificate (**Effective Date**) and shall continue unless terminated
-    earlier as herein provided (**Term**).
-
-6. New releases of the Licensed Software (**Updates**) will be made available
-    to you for the period (**Maintenance Period**) specified in the License
-    Certificate. Such Updates may be bound by additional license terms. You
-    consent to any such additional license terms, without which you may not
-    install, copy, or otherwise use such Updates.
-
-7. The Licensed Software is to be used exclusively with your software
-    products (**Products**) specified in the License Certificate.
-
-8. We grant you a perpetual, non-exclusive, non-transferable right to use the
-    Licensed Software, including making modifications, for the sole purposes of
-    designing, developing, and testing your Products during the Term. The number
-    of **Users** using the Licensed Software to design, develop, and test your
-    Products is limited to the amount of **User Seats** specified in the License
-    Certificate. For clarity, each unique User is counted as one User Seat.
-
-9. We grant you a perpetual, non-exclusive, non-transferable right to reproduce
-    and distribute the object code form of the Licensed Software, including any
-    modifications made to the Licensed Software, during the Term. Such
-    distributions are permitted only with your Products and limited to the number
-    of **Distributions** specified in the License Certificate.
-
-10. The license grants are conditional on the full and timely payment of all
-    applicable **Fees**; if said Fees are not paid in full and by their due
-    date, the license shall not be granted and your Products shall be deemed as
-    made in breach of the Agreement ex tunc.
-
-11. The Fees and any other charges under this Agreement shall be paid by
-    you no later than thirty (30) days from the date of the applicable
-    invoice from us. A late payment charge of five percent per month over and
-    above the interest rate stipulated by applicable law shall be charged on any
-    unpaid balances that remain past due and which have not been disputed by you
-    in good faith.
-
-12. The Fees and any other charges payable under this Agreement are gross
-    amounts but exclusive of any value added tax, use tax, sales tax,
-    withholding tax and other taxes, duties or tariffs levied directly for the
-    sale, delivery, or use of the Licensed Software pursuant to any applicable
-    law.
-
-13. The Parties also agree to all the following conditions:
-
-    (a) You may not remove or alter any copyright, trademark, or other
-        proprietary rights notice contained in any portion of the Licensed
-        Software,
-
-    (b) Your Products may not compete with the Licensed Software,
-
-    (c) You will indemnify and hold us, our affiliated companies, and our
-        suppliers, harmless from and against any claims or liabilities
-        arising out of the use, reproduction, or distribution of your
-        Products, except as set out in clause 13.(d) immediately below,
-
-    (d) We shall indemnify and hold you harmless from and against any
-        claims from third parties alleging that the use of the Licensed Software
-        as set out in this Agreement infringes or will infringe such third
-        parties' intellectual property rights or other rights,
-
-    (e) A Party shall promptly notify the other Party if it receives a claim that
-        the other Party shall or may be obliged to indemnify. The Parties shall
-        promptly give each other information and other assistance needed for
-        handling the claim. The Indemnifying Party may, at its cost and in its
-        sole discretion, take control of the defense of such claim, including
-        the conduct of any litigation or arbitration and the negotiation of any
-        settlement, in which case the indemnifying Party shall not compromise or
-        settle or otherwise dispose of the claim, in whole or in part, where
-        such compromise or settlement or disposal would require any admission or
-        stipulation which would reasonably be expected to have an adverse effect
-        on the commercial reputation of the indemnified Party, without the prior
-        written consent of the indemnified Party. Where the indemnifying Party
-        has not taken control of the defense of the claim, the indemnified Party
-        shall not compromise or settle or fail adequately to defend or otherwise
-        dispose of a claim, in whole or in part, without the written consent of
-        the indemnifying Party, such consent not to be unreasonably withheld or
-        delayed.
-
-14. The Licensed Software is licensed to you "as is". To the maximum extent
-    permitted by applicable law, we on behalf of us and our suppliers,
-    disclaim all warranties and conditions, either express or implied,
-    including, but not limited to, any implied warranties of merchantability or
-    fitness for a particular purpose, title, and non-infringement with regard to
-    the Licensed Software. The warranty disclaimer in the foregoing
-    notwithstanding, you may have specific legal rights which may vary from
-    state/jurisdiction to state/jurisdiction; as far as legally permissible, you
-    waive any such legal rights vis-à-vis us.
-
-15. We shall not under any circumstances be liable to you based on failure of
-    the Licensed Software if the failure resulted from your changing of the
-    Licensed Software, from your accident, abuse or misapplication, nor shall
-    we except in case of gross negligence or willful misconduct be
-    liable for special damages, punitive or exemplary damages, damages for loss
-    of profits or interruption of business or for loss or corruption of data,
-    nor shall any award of damages exceed the total amount you paid to us in
-    connection with this Agreement.
-
-16. During the Term, an independent, certified auditor on our behalf, may, upon
-    its reasonable request, with 30 (thirty) days written notice, and at its
-    sole expense, examine your books and records solely with respect to your use
-    of the Licensed Software. Any such audit shall be conducted during regular
-    business hours at your facilities and shall not unreasonably interfere with
-    your business activities. Our auditor shall not remove, copy, or
-    redistribute any electronic material during an audit. If an audit reveals that
-    you are using the Licensed Software in a way that is in material violation
-    of the terms of this Agreement, then you shall pay us reasonable costs of
-    conducting the audit. Our auditor shall only be allowed to report violations
-    of the terms of this Agreement, with a copy to you. You shall be provided
-    the right to provide comments to the report before it is finalized.
-
-17. If you materially breach this Agreement, we will provide a 60 (sixty) days
-    written notice to you during which any such breach(es) may be cured, failing
-    which we will terminate the agreement.
-
-18. You may terminate this Agreement at any time for any reason upon 30 (thirty)
-    days notice to us and upon payment of all applicable fees and contractual
-    penalties, if any, in connection with the use of the Licensed Software.
-
-19. No term or condition contained in your purchase order will apply unless
-    expressly accepted by us in writing.
-
-20. All notices and communications between the Parties shall be in writing and
-    shall be deemed given when received. For avoidance of doubt, email is
-    considered a written form of communication.
-
-21. Both Parties shall comply with all applicable laws and regulations relating
-    to the Licensed Software in the countries in which the Parties use or modify
-    the Licensed Software.
-
-22. Each Party shall hold Confidential Information of the other Party, its
-    customers, and licensors in confidence, and without written permission from
-    will not disclose to any person or use for its own benefit, any such
-    information. **Confidential Information** includes without limitation the
-    terms of this Agreement, computer software programs developed or licensed by
-    the Parties, including all documentation and methods or concepts utilized
-    therein, all adaptations and modifications thereto and derivative works
-    thereof, and related materials and information. Confidential Information
-    also includes any other information identified by either Party, its
-    licensors, or customers as proprietary or confidential, or which would
-    reasonably be understood under the circumstances to be confidential. All
-    Confidential Information shall remain the sole property of each respective
-    Party. Information will not be considered as Confidential Information if
-
-    (a) available to the public other than by a breach of this Agreement;
-
-    (b) rightfully received from a third Party not in breach of any obligation of
-        confidentiality;
-
-    (c) independently developed by a Party without access to Confidential
-        Information of the other Party;
-
-    (d) known to the other Party at the time of disclosure;
-
-    (e) produced in compliance with applicable law or a court order, provided the
-        other Party is given notice and opportunity to intervene; or
-
-    (f) it does not constitute a trade secret and more than five (5) years have
-        elapsed from the date of disclosure. In addition to any other rights or
-        remedies available, each Party shall be entitled to enforcement of such
-        obligations by court injunction.
-
-23. This Agreement shall be construed, interpreted, and governed by the laws of
-    the Federal Republic of Germany.
-
-24. You may assign this Agreement, in whole or in part (whether by operation of
-    law or otherwise), with prior consent from us, which shall not be
-    unreasonably withheld or delayed. We may assign this Agreement or any of its
-    rights hereunder or delegate any of its obligations hereunder with prior
-    notice to you. Any attempt to assign this Agreement other than in accordance
-    with this provision shall be null and void.
-
-25. This Agreement constitutes the complete agreement between the Parties and
-    supersedes all prior or contemporaneous discussions, representations, and
-    proposals, written or oral, with respect to the subject matters discussed
-    herein. No modification of this Agreement will be effective unless contained
-    in a written document executed by an authorized representative of each
-    Party. If any provision of the Agreement is found void or unenforceable, the
-    remainder will remain valid and enforceable according to its terms. If any
-    remedy provided is determined to have failed for its essential purpose, all
-    limitations of liability and exclusions of damages set forth in this
-    Agreement shall remain in effect.