From d4c1130130c15725687111f5aa7efa0cd05577d0 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Wed, 2 Feb 2022 17:19:00 +0100 Subject: [PATCH] Rename more occurences --- LICENSE.md | 4 ++-- api/cpp/docs/index.rst | 4 ++-- docs/tutorial/cpp/src/getting_started.md | 8 ++++---- docs/tutorial/cpp/src/main_game_logic.cpp | 2 +- docs/tutorial/cpp/src/main_initial.cpp | 2 +- docs/tutorial/cpp/src/main_tiles_from_cpp.cpp | 2 +- docs/tutorial/cpp/src/memory.slint | 2 +- docs/tutorial/cpp/src/polishing_the_tile.md | 2 +- examples/bash/sysinfo_linux.sh | 2 +- examples/bash/sysinfo_macos.sh | 2 +- examples/slide_puzzle/README.md | 2 +- internal/compiler/load_builtins.rs | 4 ++-- .../passes/apply_default_properties_from_style.rs | 2 +- .../compiler/tests/syntax/basic/easing_not_called.slint | 2 +- .../compiler/tests/syntax/basic/linear-gradient.slint | 2 -- tools/lsp/sublime/Slint.sublime-syntax | 2 +- vscode_extension/package.json | 2 +- 17 files changed, 22 insertions(+), 24 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 4a673261a84..c1e34981f11 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ -# SixtyFPS license +# Slint License -SixtyFPS is available under either a [commercial license](LICENSES/LicenseRef-SixtyFPS-commercial.md) +Slint is available under either a [commercial license](LICENSES/LicenseRef-SixtyFPS-commercial.md) or at your choice under [GPL 3.0](LICENSES/GPL-3.0-only.txt). Third party licenses listed in the `LICENSES` folder also apply to parts of the product. diff --git a/api/cpp/docs/index.rst b/api/cpp/docs/index.rst index 8d8d5335905..5be7214ef7c 100644 --- a/api/cpp/docs/index.rst +++ b/api/cpp/docs/index.rst @@ -87,10 +87,10 @@ is compiled to native code. Developing ========== -You can create and edit `.60` files using our `Slint Visual Studio Code Extension `_, +You can create and edit `.slint` files using our `Slint Visual Studio Code Extension `_, which features syntax highlighting and live design preview. For a quick edit and preview cycle, you can also use the :code:`slint-viewer` command line tool, which can be installed using :code:`cargo install slint-viewer`, -if you have `Cargo `_ installed. +if you have `Cargo `_ installed. In the next section you will learn how to install the Slint C++ library and the CMake build system integration. diff --git a/docs/tutorial/cpp/src/getting_started.md b/docs/tutorial/cpp/src/getting_started.md index 472ec6e2db6..c7d9490d4dd 100644 --- a/docs/tutorial/cpp/src/getting_started.md +++ b/docs/tutorial/cpp/src/getting_started.md @@ -34,11 +34,11 @@ slint_target_sources(memory_game memory.slint) This should look familiar to people familiar with CMake. We see that this CMakeLists.txt references a `main.cpp`, which we will add later, and it also has a line `slint_target_sources(memory_game memory.slint)`, which is a Slint function used to -add the `memory.60` file to the target. We must then create, in the same directory, -the `memory.60` file. Let's just fill it with a hello world for now: +add the `memory.slint` file to the target. We must then create, in the same directory, +the `memory.slint` file. Let's just fill it with a hello world for now: ```slint -{{#include memory.60:main_window}} +{{#include memory.slint:main_window}} ``` What's still missing is the `main.cpp`: @@ -47,7 +47,7 @@ What's still missing is the `main.cpp`: {{#include main_initial.cpp:main}} ``` -To recap, we now have a directory with a `CMakeLists.txt`, `memory.60` and `main.cpp`. +To recap, we now have a directory with a `CMakeLists.txt`, `memory.slint` and `main.cpp`. We can now compile and run this program: diff --git a/docs/tutorial/cpp/src/main_game_logic.cpp b/docs/tutorial/cpp/src/main_game_logic.cpp index d8571b9f1f3..dd4560e9848 100644 --- a/docs/tutorial/cpp/src/main_game_logic.cpp +++ b/docs/tutorial/cpp/src/main_game_logic.cpp @@ -4,7 +4,7 @@ // clang-format off // main.cpp -#include "memory_game_logic.h" // generated header from memory_game_logic.60 +#include "memory_game_logic.h" // generated header from memory_game_logic.slint #include // Added diff --git a/docs/tutorial/cpp/src/main_initial.cpp b/docs/tutorial/cpp/src/main_initial.cpp index 1f28ea637f4..295d96c6cba 100644 --- a/docs/tutorial/cpp/src/main_initial.cpp +++ b/docs/tutorial/cpp/src/main_initial.cpp @@ -4,7 +4,7 @@ // ANCHOR: main // main.cpp -#include "memory.h" // generated header from memory.60 +#include "memory.h" // generated header from memory.slint int main() { diff --git a/docs/tutorial/cpp/src/main_tiles_from_cpp.cpp b/docs/tutorial/cpp/src/main_tiles_from_cpp.cpp index 8dfd2df4e90..606c806f167 100644 --- a/docs/tutorial/cpp/src/main_tiles_from_cpp.cpp +++ b/docs/tutorial/cpp/src/main_tiles_from_cpp.cpp @@ -3,7 +3,7 @@ // main.cpp -#include "memory_tiles_from_cpp.h" // generated header from memory_tiles_from_cpp.60 +#include "memory_tiles_from_cpp.h" // generated header from memory_tiles_from_cpp.slint // ANCHOR: main // ... diff --git a/docs/tutorial/cpp/src/memory.slint b/docs/tutorial/cpp/src/memory.slint index d93e88ed4ab..299f09463b6 100644 --- a/docs/tutorial/cpp/src/memory.slint +++ b/docs/tutorial/cpp/src/memory.slint @@ -2,7 +2,7 @@ // SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) // ANCHOR: main_window -// memory.60 +// memory.slint MainWindow := Window { Text { text: "hello world"; diff --git a/docs/tutorial/cpp/src/polishing_the_tile.md b/docs/tutorial/cpp/src/polishing_the_tile.md index 95a3d5d58d3..b6123cb8708 100644 --- a/docs/tutorial/cpp/src/polishing_the_tile.md +++ b/docs/tutorial/cpp/src/polishing_the_tile.md @@ -16,7 +16,7 @@ more in detail: In order to make our tile extensible, the hard-coded icon name is replaced with an *icon* property that can be set from the outside when instantiating the element. For the final polish, we add a *solved* property that we use to animate the color to a shade of green when we've found a pair, later. We -replace the code inside the `memory.60` file with the following: +replace the code inside the `memory.slint` file with the following: ```slint {{#include ../../rust/src/main_polishing_the_tile.rs:tile}} diff --git a/examples/bash/sysinfo_linux.sh b/examples/bash/sysinfo_linux.sh index 6a0162bbaa0..135a4ad321c 100755 --- a/examples/bash/sysinfo_linux.sh +++ b/examples/bash/sysinfo_linux.sh @@ -19,7 +19,7 @@ swap_total_kb=`sed -n -e "s,SwapTotal:\s\+\(.*\)\s\+.\+,\1,p"< /proc/meminfo` swap_free_kb=`sed -n -e "s,SwapFree:\s\+\(.*\)\s\+.\+,\1,p"< /proc/meminfo` swap_used_kb=$((swap_total_kb - swap_free_kb)) -slint-viewer `dirname $0`/sysinfo.60 --load-data - <, style_metrics: &Rc, diff --git a/internal/compiler/tests/syntax/basic/easing_not_called.slint b/internal/compiler/tests/syntax/basic/easing_not_called.slint index 7d49efd0352..c12327bd93c 100644 --- a/internal/compiler/tests/syntax/basic/easing_not_called.slint +++ b/internal/compiler/tests/syntax/basic/easing_not_called.slint @@ -1,7 +1,7 @@ // Copyright © SixtyFPS GmbH // SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) -// Cannot be put in the easing.60 test because it is in a different pass +// Cannot be put in the easing.slint test because it is in a different pass X := Rectangle { property g; animate g { easing: cubic-bezier; } diff --git a/internal/compiler/tests/syntax/basic/linear-gradient.slint b/internal/compiler/tests/syntax/basic/linear-gradient.slint index ff30fef2dcf..98c17d44b0d 100644 --- a/internal/compiler/tests/syntax/basic/linear-gradient.slint +++ b/internal/compiler/tests/syntax/basic/linear-gradient.slint @@ -1,8 +1,6 @@ // Copyright © SixtyFPS GmbH // SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) -// Cannot be put in the easing.60 test because it is in a different pass - X := Rectangle { property g1: @linear-gradient(); // ^error{Expected angle expression} diff --git a/tools/lsp/sublime/Slint.sublime-syntax b/tools/lsp/sublime/Slint.sublime-syntax index 86cac653ff6..0f868fcd122 100644 --- a/tools/lsp/sublime/Slint.sublime-syntax +++ b/tools/lsp/sublime/Slint.sublime-syntax @@ -6,7 +6,7 @@ # See http://www.sublimetext.com/docs/3/syntax.html name: Slint file_extensions: - - '60' + - 'slint' scope: source.slint contexts: diff --git a/vscode_extension/package.json b/vscode_extension/package.json index 37169a9d3ab..b069bda7ded 100644 --- a/vscode_extension/package.json +++ b/vscode_extension/package.json @@ -3,7 +3,7 @@ "displayName": "Slint", "description": "Slint Language extension", "version": "0.2.0", - "publisher": "SixtyFPS", + "publisher": "Slint", "icon": "extension-logo.png", "license": "GPL-3.0", "repository": {