language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-09-30 22:01:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Replace references to the .60 files that are now renamed with .slint

Browse source
This commit is contained in:
Olivier Goffart 2022-02-02 09:38:28 +01:00
parent 0c0a783095
commit d706d63ce1
65 changed files with 113 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

6
api/node/README.md
View file

@ -29,14 +29,14 @@ let slint = require("slint");
This step also installs a hook in NodeJS that allows you to import `.60` files directly:
```js
let ui = require("../ui/main.60");
let ui = require("../ui/main.slint");
```
Combining these two steps leads us to the obligator "Hello World" example:
```js
require("slint");
let ui = require("../ui/main.60");
let ui = require("../ui/main.slint");
let main = new ui.Main();
main.run();
```
@ -54,7 +54,7 @@ an object which allow to initialize the value of public properties or callbacks.
require("slint");
// In this example, the main.60 file exports a module which
// has a counter property and a clicked callback
let ui = require("ui/main.60");
let ui = require("ui/main.slint");
let component = new ui.MainWindow({
counter: 42,
clicked: function() { console.log("hello"); }

2
api/rs/build/lib.rs
View file

@ -28,7 +28,7 @@ In the `build.rs` file:
```ignore
fn main() {
sixtyfps_build::compile("ui/hello.60").unwrap();
sixtyfps_build::compile("ui/hello.slint").unwrap();
}
```

8
docs/langref.md
View file

@ -808,7 +808,7 @@ export global Logic := {
It's also possible to export globals from other files:
```60,ignore
import { Logic as MathLogic } from "math.60";
import { Logic as MathLogic } from "math.slint";
export { MathLogic } // known as "MathLogic" when using native APIs to access globals
```
@ -858,7 +858,7 @@ export Button := Rectangle {
Similarly, components exported from other files can be accessed by importing them:
```60,ignore
import { Button } from "./button.60";
import { Button } from "./button.slint";
App := Rectangle {
// ...
@ -872,8 +872,8 @@ In the event that two files export a type under the same name, then you have the
of assigning a different name at import time:
```60,ignore
import { Button } from "./button.60";
import { Button as CoolButton } from "../other_theme/button.60";
import { Button } from "./button.slint";
import { Button as CoolButton } from "../other_theme/button.slint";
App := Rectangle {
// ...

2
examples/7gui/booker.rs
View file

@ -4,7 +4,7 @@
use chrono::NaiveDate;
use sixtyfps::SharedString;
sixtyfps::sixtyfps!(import { Booker } from "booker.60";);
sixtyfps::sixtyfps!(import { Booker } from "booker.slint";);
pub fn main() {
let booker = Booker::new();

2
examples/gallery/build.rs
View file

@ -2,5 +2,5 @@
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
fn main() {
sixtyfps_build::compile("gallery.60").unwrap();
sixtyfps_build::compile("gallery.slint").unwrap();
}

4
examples/gallery/index.html
View file

@ -42,10 +42,10 @@
</div>
<canvas id="canvas" width="640" height="480"></canvas>
<p>
<a href="https://github.com/sixtyfpsui/sixtyfps/blob/master/examples/gallery/gallery.60">
<a href="https://github.com/sixtyfpsui/sixtyfps/blob/master/examples/gallery/gallery.slint">
View Source Code on GitHub</a> -
<a
href="https://sixtyfps.io/editor?load_url=https://raw.githubusercontent.com/sixtyfpsui/sixtyfps/master/examples/gallery/gallery.60">
href="https://sixtyfps.io/editor?load_url=https://raw.githubusercontent.com/sixtyfpsui/sixtyfps/master/examples/gallery/gallery.slint">
Edit in the online code editor
</a>
</p>

2
examples/iot-dashboard/main.slint
View file

@ -40,7 +40,7 @@
import { MenuBar, TopBar, Usage, IndoorTemperature, Humidity, MyDevices,
UsageDiagram, LightIntensity, Clock
} from "iot-dashboard.60";
} from "iot-dashboard.slint";
MainContent := VerticalLayout {

2
examples/memory/main.js
View file

@ -3,7 +3,7 @@
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
let slint = require("slint");
let ui = require("./memory.60");
let ui = require("./memory.slint");
let window = new ui.MainWindow();
let initial_tiles = window.memory_tiles;

2
examples/memory/main.rs
View file

@ -9,7 +9,7 @@ use std::time::Duration;
use wasm_bindgen::prelude::*;
sixtyfps::sixtyfps! {
import { MainWindow } from "memory.60";
import { MainWindow } from "memory.slint";
}
#[cfg_attr(target_arch = "wasm32", wasm_bindgen(start))]

2
examples/plotter/main.rs
View file

@ -11,7 +11,7 @@ use wasm_bindgen::prelude::*;
mod wasm_backend;
sixtyfps::sixtyfps! {
import { MainWindow } from "plotter.60";
import { MainWindow } from "plotter.slint";
}
fn pdf(x: f64, y: f64) -> f64 {

2
examples/printerdemo/cpp_interpreted/main.cpp
View file

@ -36,7 +36,7 @@ private:
int main()
{
sixtyfps::interpreter::ComponentCompiler compiler;
auto definition = compiler.build_from_path(SOURCE_DIR "/../ui/printerdemo.60");
auto definition = compiler.build_from_path(SOURCE_DIR "/../ui/printerdemo.slint");
for (auto diagnostic : compiler.diagnostics()) {
std::cerr << (diagnostic.level == sixtyfps::interpreter::DiagnosticLevel::Warning

2
examples/printerdemo/node/main.js
View file

@ -5,7 +5,7 @@
const path = require("path");
let slint = require("slint");
let demo = require("../ui/printerdemo.60");
let demo = require("../ui/printerdemo.slint");
let window = new demo.MainWindow();
window.ink_levels = [

2
examples/printerdemo/rust/build.rs
View file

@ -2,5 +2,5 @@
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
fn main() {
sixtyfps_build::compile("../ui/printerdemo.60").unwrap();
sixtyfps_build::compile("../ui/printerdemo.slint").unwrap();
}

4
examples/printerdemo/rust/index.html
View file

@ -64,10 +64,10 @@
</div>
<canvas id="canvas" width="640" height="480" unselectable="on"></canvas>
<p class="hide-in-mobile-landscape">
<a href="https://github.com/sixtyfpsui/sixtyfps/blob/master/examples/printerdemo/ui/printerdemo.60">
<a href="https://github.com/sixtyfpsui/sixtyfps/blob/master/examples/printerdemo/ui/printerdemo.slint">
View Source Code on GitHub</a> -
<a
href="https://sixtyfps.io/editor?load_url=https://raw.githubusercontent.com/sixtyfpsui/sixtyfps/master/examples/printerdemo/ui/printerdemo.60">
href="https://sixtyfps.io/editor?load_url=https://raw.githubusercontent.com/sixtyfpsui/sixtyfps/master/examples/printerdemo/ui/printerdemo.slint">
Edit in the online code editor
</a>
</p>

4
examples/printerdemo/ui/copy_page.slint
View file

@ -1,8 +1,8 @@
// Copyright © SixtyFPS GmbH <info@sixtyfps.io>
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
import { DemoPalette, Page, SpinBox, Label, ComboBox, PushButton, CheckBox } from "./common.60";
import { PrinterQueue } from "./printer_queue.60";
import { DemoPalette, Page, SpinBox, Label, ComboBox, PushButton, CheckBox } from "./common.slint";
import { PrinterQueue } from "./printer_queue.slint";
export CopyPage := Page {

12
examples/printerdemo/ui/home_page.slint
View file

@ -1,12 +1,12 @@
// Copyright © SixtyFPS GmbH <info@sixtyfps.io>
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
import { DemoPalette, Page, PushButton } from "./common.60";
import { CopyPage } from "./copy_page.60";
import { ScanPage } from "./scan_page.60";
import { PrintPage } from "./print_page.60";
import { PrinterQueueView } from "./printer_queue.60";
import { UsbPage } from "./usb_page.60";
import { DemoPalette, Page, PushButton } from "./common.slint";
import { CopyPage } from "./copy_page.slint";
import { ScanPage } from "./scan_page.slint";
import { PrintPage } from "./print_page.slint";
import { PrinterQueueView } from "./printer_queue.slint";
import { UsbPage } from "./usb_page.slint";
ActionButton := Rectangle {

2
examples/printerdemo/ui/ink_page.slint
View file

@ -1,7 +1,7 @@
// Copyright © SixtyFPS GmbH <info@sixtyfps.io>
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
import { DemoPalette, Page } from "common.60";
import { DemoPalette, Page } from "common.slint";
export struct InkLevel := {
color: color,

4
examples/printerdemo/ui/print_page.slint
View file

@ -1,8 +1,8 @@
// Copyright © SixtyFPS GmbH <info@sixtyfps.io>
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
import { DemoPalette, Page, SpinBox, Label, PushButton } from "./common.60";
import { WidePrinterQueueList } from "./printer_queue.60";
import { DemoPalette, Page, SpinBox, Label, PushButton } from "./common.slint";
import { WidePrinterQueueList } from "./printer_queue.slint";
export PrintPage := Page {

2
examples/printerdemo/ui/printer_queue.slint
View file

@ -1,7 +1,7 @@
// Copyright © SixtyFPS GmbH <info@sixtyfps.io>
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
import { DemoPalette, PushButton } from "./common.60";
import { DemoPalette, PushButton } from "./common.slint";
export struct PrinterQueueItem := {
status: string, // WAITING..., PRINTING

10
examples/printerdemo/ui/printerdemo.slint
View file

@ -1,11 +1,11 @@
// Copyright © SixtyFPS GmbH <info@sixtyfps.io>
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
import { DemoPalette, Page } from "common.60";
import { HomePage } from "./home_page.60";
import { InkLevel, InkPage } from "./ink_page.60";
import { SettingsPage } from "./settings_page.60";
import { PrinterQueue } from "./printer_queue.60";
import { DemoPalette, Page } from "common.slint";
import { HomePage } from "./home_page.slint";
import { InkLevel, InkPage } from "./ink_page.slint";
import { SettingsPage } from "./settings_page.slint";
import { PrinterQueue } from "./printer_queue.slint";
// re-export for the native code
export { PrinterQueue }

4
examples/printerdemo/ui/scan_page.slint
View file

@ -1,8 +1,8 @@
// Copyright © SixtyFPS GmbH <info@sixtyfps.io>
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
import { DemoPalette, Page, SpinBox, Label, ComboBox, PushButton } from "./common.60";
import { PrinterQueue } from "./printer_queue.60";
import { DemoPalette, Page, SpinBox, Label, ComboBox, PushButton } from "./common.slint";
import { PrinterQueue } from "./printer_queue.slint";
export ScanPage := Page {
has-back-button: true;

2
examples/printerdemo/ui/settings_page.slint
View file

@ -1,7 +1,7 @@
// Copyright © SixtyFPS GmbH <info@sixtyfps.io>
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
import { DemoPalette, Page, SpinBox, ComboBox, CheckBox, Label } from "common.60";
import { DemoPalette, Page, SpinBox, ComboBox, CheckBox, Label } from "common.slint";
export SettingsPage := Page {
header: "Settings";

4
examples/printerdemo/ui/usb_page.slint
View file

@ -1,9 +1,9 @@
// Copyright © SixtyFPS GmbH <info@sixtyfps.io>
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
import { DemoPalette, Page, SpinBox, Label, ComboBox, PushButton, CheckBox } from "./common.60";
import { DemoPalette, Page, SpinBox, Label, ComboBox, PushButton, CheckBox } from "./common.slint";
import { StandardListView } from "std-widgets.slint";
import { PrinterQueue } from "./printer_queue.60";
import { PrinterQueue } from "./printer_queue.slint";
export UsbPage := Page {

4
examples/printerdemo_old/node/main.js
View file

@ -4,8 +4,8 @@
// import "sixtyfps";
require("slint");
// import * as demo from "../ui/printerdemo.60";
let demo = require("../ui/printerdemo.60");
// import * as demo from "../ui/printerdemo.slint";
let demo = require("../ui/printerdemo.slint");
let window = new demo.MainWindow();
window.ink_levels = [

2
examples/printerdemo_old/rust/build.rs
View file

@ -2,5 +2,5 @@
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
fn main() {
sixtyfps_build::compile("../ui/printerdemo.60").unwrap();
sixtyfps_build::compile("../ui/printerdemo.slint").unwrap();
}

4
examples/printerdemo_old/rust/index.html
View file

@ -65,10 +65,10 @@
</div>
<canvas id="canvas" width="640" height="480" unselectable="on"></canvas>
<p class="hide-in-mobile-landscape">
<a href="https://github.com/sixtyfpsui/sixtyfps/blob/master/examples/printerdemo_old/ui/printerdemo.60">
<a href="https://github.com/sixtyfpsui/sixtyfps/blob/master/examples/printerdemo_old/ui/printerdemo.slint">
View Source Code on GitHub</a> -
<a
href="https://sixtyfps.io/editor?load_url=https://raw.githubusercontent.com/sixtyfpsui/sixtyfps/master/examples/printerdemo_old/ui/printerdemo.60">
href="https://sixtyfps.io/editor?load_url=https://raw.githubusercontent.com/sixtyfpsui/sixtyfps/master/examples/printerdemo_old/ui/printerdemo.slint">
Edit in the online code editor
</a>
</p>

2
examples/printerdemo_old/ui/copy_page.slint
View file

@ -2,7 +2,7 @@
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
import { SpinBox, Button, CheckBox, Slider, GroupBox, StandardListView, GridBox } from "std-widgets.slint";
import { Label, Page, Preview } from "common.60";
import { Label, Page, Preview } from "common.slint";
export CopyPage := Page {

2
examples/printerdemo_old/ui/fax_page.slint
View file

@ -2,7 +2,7 @@
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
import { SpinBox, Button, CheckBox, Slider, GroupBox, StandardListView } from "std-widgets.slint";
import { Label, Page, Preview } from "common.60";
import { Label, Page, Preview } from "common.slint";
export FaxPage := Page {

2
examples/printerdemo_old/ui/print_page.slint
View file

@ -2,7 +2,7 @@
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
import { SpinBox, Button, CheckBox, Slider, GroupBox, StandardListView, GridBox } from "std-widgets.slint";
import { Label, Page, Preview } from "common.60";
import { Label, Page, Preview } from "common.slint";
PrintPage := Page {

10
examples/printerdemo_old/ui/printerdemo.slint
View file

@ -2,11 +2,11 @@
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
import { SpinBox, Button, CheckBox, Slider, GroupBox, StandardListView } from "std-widgets.slint";
import { Label, Page, Preview } from "common.60";
import { CopyPage } from "copy_page.60";
import { FaxPage } from "fax_page.60";
import { PrintPage } from "print_page.60";
import { SettingsPage } from "settings_page.60";
import { Label, Page, Preview } from "common.slint";
import { CopyPage } from "copy_page.slint";
import { FaxPage } from "fax_page.slint";
import { PrintPage } from "print_page.slint";
import { SettingsPage } from "settings_page.slint";
TopPanel := Rectangle {
property<int> active-page: 0;

2
examples/printerdemo_old/ui/settings_page.slint
View file

@ -2,7 +2,7 @@
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
import { SpinBox, Button, CheckBox, Slider, GroupBox, StandardListView } from "std-widgets.slint";
import { Label, Page, Preview } from "common.60";
import { Label, Page, Preview } from "common.slint";
export SettingsPage := Page {
VerticalLayout {

2
examples/slide_puzzle/build.rs
View file

@ -2,5 +2,5 @@
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
fn main() {
sixtyfps_build::compile("slide_puzzle.60").unwrap();
sixtyfps_build::compile("slide_puzzle.slint").unwrap();
}

2
examples/slide_puzzle/index.html
View file

@ -60,7 +60,7 @@
<a href="https://github.com/sixtyfpsui/sixtyfps/blob/master/examples/slide_puzzle/">
View Source Code on GitHub</a> -
<a
href="https://sixtyfps.io/editor?load_url=https://raw.githubusercontent.com/sixtyfpsui/sixtyfps/master/examples/slide_puzzle/slide_puzzle.60">
href="https://sixtyfps.io/editor?load_url=https://raw.githubusercontent.com/sixtyfpsui/sixtyfps/master/examples/slide_puzzle/slide_puzzle.slint">
Edit in the online code editor
</a>
</p>

4
examples/todo/node/main.js
View file

@ -4,8 +4,8 @@
// import "sixtyfps";
let slint = require("slint");
// import * as demo from "../ui/todo.60";
let demo = require("../ui/todo.60");
// import * as demo from "../ui/todo.slint";
let demo = require("../ui/todo.slint");
let app = new demo.MainWindow();
let model = new slint.ArrayModel([

2
examples/todo/rust/build.rs
View file

@ -2,5 +2,5 @@
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
fn main() {
sixtyfps_build::compile("../ui/todo.60").unwrap();
sixtyfps_build::compile("../ui/todo.slint").unwrap();
}

2
examples/todo/rust/index.html
View file

@ -45,7 +45,7 @@
<a href="https://github.com/sixtyfpsui/sixtyfps/blob/master/examples/todo/">
View Source Code on GitHub</a> -
<a
href="https://sixtyfps.io/editor?load_url=https://raw.githubusercontent.com/sixtyfpsui/sixtyfps/master/examples/todo/ui/todo.60">
href="https://sixtyfps.io/editor?load_url=https://raw.githubusercontent.com/sixtyfpsui/sixtyfps/master/examples/todo/ui/todo.slint">
Edit in the online code editor
</a>
</p>

2
internal/compiler/load_builtins.rs
View file

@ -20,7 +20,7 @@ use crate::typeregister::TypeRegister;
/// At this point, it really should already contain the basic Types (string, int, ...)
pub fn load_builtins(register: &mut TypeRegister) {
let mut diag = crate::diagnostics::BuildDiagnostics::default();
let node = crate::parser::parse(include_str!("builtins.60").into(), None, &mut diag);
let node = crate::parser::parse(include_str!("builtins.slint").into(), None, &mut diag);
if !diag.is_empty() {
let vec = diag.to_string_vec();
#[cfg(feature = "display-diagnostics")]

4
internal/compiler/tests/syntax/imports/cyclic_import.slint
View file

@ -2,8 +2,8 @@
// Copyright © SixtyFPS GmbH <info@sixtyfps.io>
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
import { Rec12 } from "../../typeloader/recursive_import1.60";
// ^error{No exported type called 'Rec12' found in ".*recursive_import1.60"}
import { Rec12 } from "../../typeloader/recursive_import1.slint";
// ^error{No exported type called 'Rec12' found in ".*recursive_import1.slint"}
Blah := Rec12 {
// ^error{Unknown type Rec12}
width: 100px;

2
internal/compiler/tests/syntax/imports/error_in_import.slint
View file

@ -1,7 +1,7 @@
// Copyright © SixtyFPS GmbH <info@sixtyfps.io>
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
import { X } from "../../typeloader/incpath/should_fail2.60";
import { X } from "../../typeloader/incpath/should_fail2.slint";
Foo := Rectangle {
x:= X {

2
internal/compiler/tests/syntax/imports/error_in_import2.slint
View file

@ -1,7 +1,7 @@
// Copyright © SixtyFPS GmbH <info@sixtyfps.io>
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
import { Y } from "../../typeloader/incpath/should_fail3.60";
import { Y } from "../../typeloader/incpath/should_fail3.slint";
Foo := Rectangle {

2
internal/compiler/tests/syntax/imports/error_in_import3.slint
View file

@ -1,7 +1,7 @@
// Copyright © SixtyFPS GmbH <info@sixtyfps.io>
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
import { Z } from "../../typeloader/incpath/should_fail4.60";
import { Z } from "../../typeloader/incpath/should_fail4.slint";
Foo := Rectangle {
Z {

8
internal/compiler/tests/syntax/imports/import_errors.slint
View file

@ -1,16 +1,16 @@
// Copyright © SixtyFPS GmbH <info@sixtyfps.io>
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
import { NotThere } from "file_not_there.60";
// ^error{Cannot find requested import "file_not_there.60" in the include search path}
import { NotThere } from "file_not_there.slint";
// ^error{Cannot find requested import "file_not_there.slint" in the include search path}
import { NotExported } from "../../typeloader/incpath/local_helper_type.60";
import { NotExported } from "../../typeloader/incpath/local_helper_type.slint";
// ^error{No exported type called 'NotExported' found in ".*\.\./\.\./typeloader/incpath/local_helper_type.60}
import { Nothing } from "";
// ^error{Unexpected empty import url}
import "invalid_export.60";
import "invalid_export.slint";
// ^error{Import names are missing. Please specify which types you would like to import}
import "myimage.png";

4
internal/compiler/tests/syntax/imports/visibility_errors.slint
View file

@ -2,9 +2,9 @@
// Copyright © SixtyFPS GmbH <info@sixtyfps.io>
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
import { SomeRect } from "../../typeloader/incpath/local_helper_type.60";
import { SomeRect } from "../../typeloader/incpath/local_helper_type.slint";
import { X } from "../../typeloader/incpath/should_fail.60";
import { X } from "../../typeloader/incpath/should_fail.slint";
Blah := X {
width: 100px;

2
internal/compiler/tests/typeloader/dependency_local.slint
View file

@ -1,6 +1,6 @@
// Copyright © SixtyFPS GmbH <info@sixtyfps.io>
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
import { AnotherType } from "./incpath/dependency_from_incpath.60";
import { AnotherType } from "./incpath/dependency_from_incpath.slint";
export SubType := AnotherType {}

4
internal/compiler/tests/typeloader/dependency_test_main.slint
View file

@ -1,8 +1,8 @@
// Copyright © SixtyFPS GmbH <info@sixtyfps.io>
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
import { SubType } from "./dependency_local.60";
import { AnotherType } from "dependency_from_incpath.60";
import { SubType } from "./dependency_local.slint";
import { AnotherType } from "dependency_from_incpath.slint";
export Main := Rectangle {
SubType {}

2
internal/compiler/tests/typeloader/incpath/dependency_from_incpath.slint
View file

@ -1,6 +1,6 @@
// Copyright © SixtyFPS GmbH <info@sixtyfps.io>
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
import { SomeRect } from "./local_helper_type.60";
import { SomeRect } from "./local_helper_type.slint";
export AnotherType := SomeRect {}

2
internal/compiler/tests/typeloader/recursive_import1.slint
View file

@ -1,7 +1,7 @@
// Copyright © SixtyFPS GmbH <info@sixtyfps.io>
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
import { Rec2 } from "./recursive_import2.60";
import { Rec2 } from "./recursive_import2.slint";
export Rec1 := Rectangle {
property <int> Hello: 42;

2
internal/compiler/tests/typeloader/recursive_import2.slint
View file

@ -1,7 +1,7 @@
// Copyright © SixtyFPS GmbH <info@sixtyfps.io>
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
import { Rec1 } from "./recursive_import1.60";
import { Rec1 } from "./recursive_import1.slint";
// ^error{Recursive import of .*recursive_import1.60}
export Rec2 := Rectangle {

6
internal/compiler/typeloader.rs
View file

@ -453,7 +453,7 @@ fn test_dependency_loading() {
compiler_config.style = Some("fluent".into());
let mut main_test_path = test_source_path;
main_test_path.push("dependency_test_main.60");
main_test_path.push("dependency_test_main.slint");
let mut test_diags = crate::diagnostics::BuildDiagnostics::default();
let doc_node = crate::parser::parse_file(main_test_path, &mut test_diags).unwrap();
@ -489,7 +489,7 @@ fn test_load_from_callback_ok() {
compiler_config.open_import_fallback = Some(Rc::new(move |path| {
let ok_ = ok_.clone();
Box::pin(async move {
assert_eq!(path, "../FooBar.60");
assert_eq!(path, "../FooBar.slint");
assert!(!ok_.get());
ok_.set(true);
Some(Ok("export XX := Rectangle {} ".to_owned()))
@ -500,7 +500,7 @@ fn test_load_from_callback_ok() {
let doc_node = crate::parser::parse(
r#"
/* ... */
import { XX } from "../FooBar.60";
import { XX } from "../FooBar.slint";
X := XX {}
"#
.into(),

4
internal/compiler/widgets/fluent/std-widgets.slint
View file

@ -1,8 +1,8 @@
// Copyright © SixtyFPS GmbH <info@sixtyfps.io>
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
import { LineEditInner, TextEdit, AboutSixtyFPS } from "../common/common.60";
import { StandardButton } from "../common/standardbutton.60";
import { LineEditInner, TextEdit, AboutSixtyFPS } from "../common/common.slint";
import { StandardButton } from "../common/standardbutton.slint";
import { StyleMetrics, ScrollView, Button, Palette } from "std-widgets-impl.slint";
export { StyleMetrics, ScrollView, Button, StandardButton, TextEdit, AboutSixtyFPS }

2
internal/compiler/widgets/native/std-widgets.slint
View file

@ -1,7 +1,7 @@
// Copyright © SixtyFPS GmbH <info@sixtyfps.io>
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
import { LineEditInner, TextEdit, AboutSixtyFPS } from "../common/common.60";
import { LineEditInner, TextEdit, AboutSixtyFPS } from "../common/common.slint";
import { StyleMetrics, ScrollView } from "std-widgets-impl.slint";
export { StyleMetrics, ScrollView, TextEdit, AboutSixtyFPS }

4
internal/compiler/widgets/ugly/std-widgets.slint
View file

@ -2,8 +2,8 @@
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
import { LineEditInner, TextEdit, AboutSixtyFPS } from "../common/common.60";
import { StandardButton } from "../common/standardbutton.60";
import { LineEditInner, TextEdit, AboutSixtyFPS } from "../common/common.slint";
import { StandardButton } from "../common/standardbutton.slint";
import { StyleMetrics, ScrollView, Button, Palette } from "std-widgets-impl.slint";
export { StyleMetrics, ScrollView, Button, StandardButton, TextEdit, AboutSixtyFPS }

2
tests/cases/globals/global_accessor_api.slint
View file

@ -4,7 +4,7 @@
//include_path: ../../helper_components
import { StyleMetrics } from "std-widgets.slint";
import { ExportedGlobal as ReexportedGlobal } from "export_globals.60";
import { ExportedGlobal as ReexportedGlobal } from "export_globals.slint";
struct MyStruct := { x:int, y: int, }

4
tests/cases/imports/duplicated_name.slint
View file

@ -2,8 +2,8 @@
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
//include_path: ../../helper_components
import { ColorButton } from "test_button.60";
import { TestButton as TheRealTestButton } from "re_export.60";
import { ColorButton } from "test_button.slint";
import { TestButton as TheRealTestButton } from "re_export.slint";
// ColorButton uses TestButtonImpl
TestButtonImpl := Rectangle {

2
tests/cases/imports/external_globals.slint
View file

@ -2,7 +2,7 @@
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
//include_path: ../../helper_components
import { UseGlobal } from "export_globals.60";
import { UseGlobal } from "export_globals.slint";
TestCase := Rectangle {
ug := UseGlobal {}
property<int> p1: ug.used42;

2
tests/cases/imports/external_globals_nameclash.slint
View file

@ -2,7 +2,7 @@
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
//include_path: ../../helper_components
import { UseGlobal, ExportedGlobal as FromExport } from "export_globals.60";
import { UseGlobal, ExportedGlobal as FromExport } from "export_globals.slint";
global NotExported := {
property<int> abc: 1000;

2
tests/cases/imports/external_structs.slint
View file

@ -2,7 +2,7 @@
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
//include_path: ../../helper_components
import { UseStruct , ExportedStruct } from "export_structs.60";
import { UseStruct , ExportedStruct } from "export_structs.slint";
TestCase := Rectangle {
property <ExportedStruct> exp: { d: 3001, e: {a: 2001} };
u := UseStruct {

8
tests/cases/imports/external_type.slint
View file

@ -2,11 +2,11 @@
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
//include_path: ../../helper_components
import { TestButton as RealButton } from "test_button.60";
import { ColorButton } from "../helper_components/test_button.60";
import { TestButton as RealButton } from "test_button.slint";
import { ColorButton } from "../helper_components/test_button.slint";
import { Button } from "std-widgets.slint";
import { TestButton as ReExportedButton } from "re_export.60";
import { Main_Window } from "main_window.60";
import { TestButton as ReExportedButton } from "re_export.slint";
import { Main_Window } from "main_window.slint";
TestCase := Rectangle {
RealButton {} // aliased from external file
ColorButton {} // from external file

2
tests/cases/imports/just_import.slint
View file

@ -2,7 +2,7 @@
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
//include_path: ../../helper_components
import { MainWindow } from "main_window.60";
import { MainWindow } from "main_window.slint";
/*

12
tests/driver/interpreter/main.rs
View file

@ -21,12 +21,12 @@ macro_rules! test_example {
};
}
test_example!(example_printerdemo, "printerdemo/ui/printerdemo.60");
test_example!(example_printerdemo_old, "printerdemo_old/ui/printerdemo.60");
test_example!(example_memory, "memory/memory.60");
test_example!(example_slide_puzzle, "slide_puzzle/slide_puzzle.60");
test_example!(example_todo, "todo/ui/todo.60");
test_example!(example_gallery, "gallery/gallery.60");
test_example!(example_printerdemo, "printerdemo/ui/printerdemo.slint");
test_example!(example_printerdemo_old, "printerdemo_old/ui/printerdemo.slint");
test_example!(example_memory, "memory/memory.slint");
test_example!(example_slide_puzzle, "slide_puzzle/slide_puzzle.slint");
test_example!(example_todo, "todo/ui/todo.slint");
test_example!(example_gallery, "gallery/gallery.slint");
fn main() {
println!("Nothing to see here, please run me through cargo test :)");

2
tests/helper_components/re_export.slint
View file

@ -1,5 +1,5 @@
// Copyright © SixtyFPS GmbH <info@sixtyfps.io>
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
import { TestButton } from "./test_button.60";
import { TestButton } from "./test_button.slint";
export { TestButton }

2
tools/figma_import/src/main.rs
View file

@ -138,7 +138,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
};
let result = rendered::render(node.name.as_str(), render_node, *backgroundColor, &doc)?;
std::fs::write("figma_output/main.60", &result)?;
std::fs::write("figma_output/main.slint", &result)?;
}
}

2
tools/lsp/sixtyfps.ksyntaxhighlighter.xml
View file

@ -3,7 +3,7 @@
<!-- Copyright © SixtyFPS GmbH <info@sixtyfps.io> -->
<!-- # SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) -->
<language name="SixtyFPS" version="1" kateversion="5.0" section="Sources" extensions="*.60" mimetype="text/sixtyfps" indenter="cstyle" license="GPL" author="info@sixtyfps.io" priority="6">
<language name="SixtyFPS" version="1" kateversion="5.0" section="Sources" extensions="*.slint" mimetype="text/sixtyfps" indenter="cstyle" license="GPL" author="info@sixtyfps.io" priority="6">
<highlighting>
<list name="types">
<item>int</item>

6
tools/online_editor/index.html
View file

@ -19,9 +19,9 @@
href="https://github.com/sixtyfpsui/sixtyfps">github.com/sixtyfpsui/sixtyfps</a> </p>
<p>Select a demo to load: <select id="select_combo">
<option value="">-- Select a demo --</option>
<option value="examples/gallery/gallery.60">Gallery</option>
<option value="examples/printerdemo/ui/printerdemo.60">Printer demo</option>
<option value="examples/todo/ui/todo.60">Todo demo</option>
<option value="examples/gallery/gallery.slint">Gallery</option>
<option value="examples/printerdemo/ui/printerdemo.slint">Printer demo</option>
<option value="examples/todo/ui/todo.slint">Todo demo</option>
</select></p>
<p><button type="button" id="compile_button">Compile!</button>
&nbsp; &nbsp;

2
tools/online_editor/index.ts
View file

@ -111,7 +111,7 @@ export Demo := Window {
function tabTitleFromURL(url: string): string {
if (url === "") {
return "unnamed.60";
return "unnamed.slint";
}
try {
let parsed_url = new URL(url);