slint-ui 1.1.0 → 1.2.0

package/LICENSE.md

@@ -1,8 +1,10 @@
+<!-- Copyright © SixtyFPS GmbH <info@slint.dev> ; SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.1 OR LicenseRef-Slint-commercial -->
+
 # 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.0.md),
+1. [Royalty-free license](LICENSES/LicenseRef-Slint-Royalty-free-1.1.md),
 2. [GNU GPLv3](LICENSES/GPL-3.0-only.txt),
 3. [Paid license](https://slint.dev/pricing.html).
 

package/LICENSES/CC0-1.0.txt

@@ -0,0 +1,121 @@
+Creative Commons Legal Code
+
+CC0 1.0 Universal
+
+    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+    LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
+    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+    REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
+    PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
+    THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
+    HEREUNDER.
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator
+and subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for
+the purpose of contributing to a commons of creative, cultural and
+scientific works ("Commons") that the public can reliably and without fear
+of later claims of infringement build upon, modify, incorporate in other
+works, reuse and redistribute as freely as possible in any form whatsoever
+and for any purposes, including without limitation commercial purposes.
+These owners may contribute to the Commons to promote the ideal of a free
+culture and the further production of creative, cultural and scientific
+works, or to gain reputation or greater distribution for their Work in
+part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any
+expectation of additional consideration or compensation, the person
+associating CC0 with a Work (the "Affirmer"), to the extent that he or she
+is an owner of Copyright and Related Rights in the Work, voluntarily
+elects to apply CC0 to the Work and publicly distribute the Work under its
+terms, with knowledge of his or her Copyright and Related Rights in the
+Work and the meaning and intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
+protected by copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but are not
+limited to, the following:
+
+  i. the right to reproduce, adapt, distribute, perform, display,
+     communicate, and translate a Work;
+ ii. moral rights retained by the original author(s) and/or performer(s);
+iii. publicity and privacy rights pertaining to a person's image or
+     likeness depicted in a Work;
+ iv. rights protecting against unfair competition in regards to a Work,
+     subject to the limitations in paragraph 4(a), below;
+  v. rights protecting the extraction, dissemination, use and reuse of data
+     in a Work;
+ vi. database rights (such as those arising under Directive 96/9/EC of the
+     European Parliament and of the Council of 11 March 1996 on the legal
+     protection of databases, and under any national implementation
+     thereof, including any amended or successor version of such
+     directive); and
+vii. other similar, equivalent or corresponding rights throughout the
+     world based on applicable law or treaty, and any national
+     implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention
+of, applicable law, Affirmer hereby overtly, fully, permanently,
+irrevocably and unconditionally waives, abandons, and surrenders all of
+Affirmer's Copyright and Related Rights and associated claims and causes
+of action, whether now known or unknown (including existing as well as
+future claims and causes of action), in the Work (i) in all territories
+worldwide, (ii) for the maximum duration provided by applicable law or
+treaty (including future time extensions), (iii) in any current or future
+medium and for any number of copies, and (iv) for any purpose whatsoever,
+including without limitation commercial, advertising or promotional
+purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
+member of the public at large and to the detriment of Affirmer's heirs and
+successors, fully intending that such Waiver shall not be subject to
+revocation, rescission, cancellation, termination, or any other legal or
+equitable action to disrupt the quiet enjoyment of the Work by the public
+as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason
+be judged legally invalid or ineffective under applicable law, then the
+Waiver shall be preserved to the maximum extent permitted taking into
+account Affirmer's express Statement of Purpose. In addition, to the
+extent the Waiver is so judged Affirmer hereby grants to each affected
+person a royalty-free, non transferable, non sublicensable, non exclusive,
+irrevocable and unconditional license to exercise Affirmer's Copyright and
+Related Rights in the Work (i) in all territories worldwide, (ii) for the
+maximum duration provided by applicable law or treaty (including future
+time extensions), (iii) in any current or future medium and for any number
+of copies, and (iv) for any purpose whatsoever, including without
+limitation commercial, advertising or promotional purposes (the
+"License"). The License shall be deemed effective as of the date CC0 was
+applied by Affirmer to the Work. Should any part of the License for any
+reason be judged legally invalid or ineffective under applicable law, such
+partial invalidity or ineffectiveness shall not invalidate the remainder
+of the License, and in such case Affirmer hereby affirms that he or she
+will not (i) exercise any of his or her remaining Copyright and Related
+Rights in the Work or (ii) assert any associated claims and causes of
+action with respect to the Work, in either case contrary to Affirmer's
+express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+ a. No trademark or patent rights held by Affirmer are waived, abandoned,
+    surrendered, licensed or otherwise affected by this document.
+ b. Affirmer offers the Work as-is and makes no representations or
+    warranties of any kind concerning the Work, express, implied,
+    statutory or otherwise, including without limitation warranties of
+    title, merchantability, fitness for a particular purpose, non
+    infringement, or the absence of latent or other defects, accuracy, or
+    the present or absence of errors, whether or not discoverable, all to
+    the greatest extent permissible under applicable law.
+ c. Affirmer disclaims responsibility for clearing rights of other persons
+    that may apply to the Work or any use thereof, including without
+    limitation any person's Copyright and Related Rights in the Work.
+    Further, Affirmer disclaims responsibility for obtaining any necessary
+    consents, permissions or other rights required for any use of the
+    Work.
+ d. Affirmer understands and acknowledges that Creative Commons is not a
+    party to this document and has no duty or obligation with respect to
+    this CC0 or use of the Work.

package/LICENSES/{LicenseRef-Slint-Royalty-free-1.0.md → LicenseRef-Slint-Royalty-free-1.1.md}

@@ -1,4 +1,4 @@
-# Slint Royalty-free Desktop and Web Applications License, version 1.0
+# Slint Royalty-free Desktop and Web Applications License, version 1.1
 
 ## Preamble
 
@@ -28,8 +28,6 @@ You may distribute the Software as part of an Application, modified or unmodifie
 
 (c) 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.
 
-(d) You allow SixtyFPS to show your Application on <https://madewithslint.com> and in advertising materials of SixtyFPS as a reference and to display your logo and trademark for this purpose.
-
 ### 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.

package/LICENSES/LicenseRef-Slint-commercial.md

@@ -49,10 +49,10 @@ The Licensed Software includes
     Licensed Software delivery as a convenience for development and testing
     only. You acknowledge:
 
-    1. that some Third-Party Libraries may require additional licensing of
+    (a) that some Third-Party Libraries may require additional licensing of
         copyright and/or patents from the owners of such, and
 
-    2. that distribution of any of the Licensed Software referencing any portion
+    (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
@@ -61,11 +61,11 @@ The Licensed Software includes
 3. As part of the license grant, a Slint Software License Certificate
     (**License Certificate**) will be issued containing details of
 
-    1. the license grant,
+    (a) the license grant,
 
-    2. the permitted scope of your use of the Licensed Software, and
+    (b) the permitted scope of your use of the Licensed Software, and
 
-    3. your contact details.
+    (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
@@ -184,20 +184,20 @@ The Licensed Software includes
     Confidential Information shall remain the sole property of each respective
     Party. Information will not be considered as Confidential Information if
 
-    1. available to the public other than by a breach of this Agreement;
+    (a) available to the public other than by a breach of this Agreement;
 
-    2. rightfully received from a third Party not in breach of any obligation of
+    (b) rightfully received from a third Party not in breach of any obligation of
         confidentiality;
 
-    3. independently developed by a Party without access to Confidential
+    (c) independently developed by a Party without access to Confidential
         Information of the other Party;
 
-    4. known to the other Party at the time of disclosure;
+    (d) known to the other Party at the time of disclosure;
 
-    5. produced in compliance with applicable law or a court order, provided the
+    (e) produced in compliance with applicable law or a court order, provided the
         other Party is given notice and opportunity to intervene; or
 
-    6. it does not constitute a trade secret and more than five (5) years have
+    (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.

package/README.md

@@ -1,3 +1,4 @@
+<!-- Copyright © SixtyFPS GmbH <info@slint.dev> ; SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.1 OR LicenseRef-Slint-commercial -->
 # Slint-node (Beta)
 
 [![npm](https://img.shields.io/npm/v/slint-ui)](https://www.npmjs.com/package/slint-ui)

package/cover.md

@@ -1,3 +1,4 @@
+<!-- Copyright © SixtyFPS GmbH <info@slint.dev> ; SPDX-License-Identifier: MIT -->
 # Slint-node (Beta)
 
 [![npm](https://img.shields.io/npm/v/slint-ui)](https://www.npmjs.com/package/slint-ui)

package/lib/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.0 OR LicenseRef-Slint-commercial
+// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.1 OR LicenseRef-Slint-commercial
 
 // Load the native library with `process.dlopen` instead of with `require`.
 // This is only done for autotest that do not require nom or neon_cli to

package/loader.mjs

@@ -1,5 +1,5 @@
 // Copyright © SixtyFPS GmbH <info@slint.dev>
-// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.0 OR LicenseRef-Slint-commercial
+// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.1 OR LicenseRef-Slint-commercial
 
 import { URL, pathToFileURL } from 'url';
 

package/native/Cargo.toml

@@ -1,15 +1,15 @@
 # Copyright © SixtyFPS GmbH <info@slint.dev>
-# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.0 OR LicenseRef-Slint-commercial
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.1 OR LicenseRef-Slint-commercial
 
 [package]
 name = "slint-node"
-version = "1.1.0"
+version = "1.2.0"
 authors = ["Slint Developers <info@slint.dev>"]
 edition = "2021"
 build = "build.rs"
 # This is not meant to be used as a library from crate.io
 publish = false
-license = "GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.0 OR LicenseRef-Slint-commercial"
+license = "GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.1 OR LicenseRef-Slint-commercial"
 repository = "https://github.com/slint-ui/slint"
 homepage = "https://slint.dev"
 
@@ -20,9 +20,9 @@ crate-type = ["cdylib"]
 name = "slint_node_native"
 
 [dependencies]
-i-slint-compiler = { version = "=1.1.0"}
-i-slint-core = { version = "=1.1.0"}
-slint-interpreter = { version = "=1.1.0",  features = ["display-diagnostics"] }
+i-slint-compiler = { version = "=1.2.0"}
+i-slint-core = { version = "=1.2.0"}
+slint-interpreter = { version = "=1.2.0",  features = ["display-diagnostics"] }
 
 vtable = { version = "0.1.6"}
 

package/native/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.0 OR LicenseRef-Slint-commercial
+// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.1 OR LicenseRef-Slint-commercial
 
 fn main() {
     neon_build::setup();

package/native/js_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.0 OR LicenseRef-Slint-commercial
+// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.1 OR LicenseRef-Slint-commercial
 
 use i_slint_compiler::langtype::Type;
 use i_slint_core::model::Model;

package/native/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.0 OR LicenseRef-Slint-commercial
+// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.1 OR LicenseRef-Slint-commercial
 
 use core::cell::RefCell;
 use i_slint_compiler::langtype::Type;
@@ -232,6 +232,7 @@ fn to_eval_value<'cx>(
         | Type::Function { .. }
         | Type::Model
         | Type::Callback { .. }
+        | Type::ComponentFactory { .. }
         | Type::Easing
         | Type::PathData
         | Type::LayoutCache
@@ -491,9 +492,7 @@ declare_types! {
             let this = cx.this();
             let window = cx.borrow(&this, |x| x.0.as_ref().cloned());
             let window_adapter = window.ok_or(()).or_else(|()| cx.throw_error("Invalid type"))?;
-            if let Some(window_adapter) = window_adapter.internal(i_slint_core::InternalToken) {
-                window_adapter.show().unwrap();
-            }
+            window_adapter.window().show().unwrap();
             Ok(JsUndefined::new().as_value(&mut cx))
         }
 
@@ -501,9 +500,7 @@ declare_types! {
             let this = cx.this();
             let window = cx.borrow(&this, |x| x.0.as_ref().cloned());
             let window_adapter = window.ok_or(()).or_else(|()| cx.throw_error("Invalid type"))?;
-            if let Some(window_adapter) = window_adapter.internal(i_slint_core::InternalToken) {
-                window_adapter.hide().unwrap();
-            }
+            window_adapter.window().hide().unwrap();
             Ok(JsUndefined::new().as_value(&mut cx))
         }
 

package/native/persistent_context.rs

@@ -1,5 +1,5 @@
 // Copyright © SixtyFPS GmbH <info@slint.dev>
-// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.0 OR LicenseRef-Slint-commercial
+// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.1 OR LicenseRef-Slint-commercial
 
 /*!
 Since neon does not allow to have a persistent handle, use this hack.

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "slint-ui",
-    "version": "1.1.0",
+    "version": "1.2.0",
     "homepage": "https://github.com/slint-ui/slint",
     "license": "SEE LICENSE IN LICENSE.md",
     "repository": {