diff --git a/ui/appwindow.slint b/ui/appwindow.slint index b90caa8..77c2637 100644 --- a/ui/appwindow.slint +++ b/ui/appwindow.slint @@ -11,16 +11,16 @@ export component AppWindow inherits Window { preferred-width: 1280px; preferred-height: 720px; VerticalBox { - j-rounding: 0px; - j-padding: Metrics.padding-sm; - j-spacing: Metrics.spacing-sm; + p-rounding: 0px; + p-padding: Metrics.padding-sm; + p-spacing: Metrics.spacing-sm; background: DarkPalette.background[0]; EditorBar { } HorizontalBox { background: DarkPalette.background[0]; - j-padding: 0px; - j-spacing: Metrics.spacing-sm; + p-padding: 0px; + p-spacing: Metrics.spacing-sm; ToolBar { } diff --git a/ui/editor_bar.slint b/ui/editor_bar.slint index a7a7492..3d62a74 100644 --- a/ui/editor_bar.slint +++ b/ui/editor_bar.slint @@ -3,8 +3,8 @@ import { HorizontalBox } from "widgets/layout.slint"; export component EditorBar inherits HorizontalBox { height: Metrics.size-xl; - j-spacing: Metrics.spacing-xl; - j-alignment: start; + p-spacing: Metrics.spacing-xl; + p-alignment: start; Text { color: DarkPalette.text[4]; diff --git a/ui/object_tool_panel.slint b/ui/object_tool_panel.slint index 9c79a27..9f5ee53 100644 --- a/ui/object_tool_panel.slint +++ b/ui/object_tool_panel.slint @@ -15,14 +15,14 @@ export component ObjectToolPanel inherits VerticalBox { } Panel { - j-alignment: start; - title: @tr("Favourites"); - j-elevation: 2; + p-alignment: start; + p-title: @tr("Favourites"); + p-elevation: 2; Panel { - title: "Group Name"; - title-alignment: center; - j-spacing: 0px; + p-title: "Group Name"; + p-title-alignment: center; + p-spacing: 0px; Text { height: Metrics.size-md; @@ -50,9 +50,9 @@ export component ObjectToolPanel inherits VerticalBox { } Panel { - title: "Group Name"; - title-alignment: center; - j-spacing: 0px; + p-title: "Group Name"; + p-title-alignment: center; + p-spacing: 0px; Text { height: Metrics.size-md; @@ -81,14 +81,14 @@ export component ObjectToolPanel inherits VerticalBox { } Panel { - title: @tr("Hierarchy"); - j-elevation: 2; + p-title: @tr("Hierarchy"); + p-elevation: 2; vertical-stretch: 1; HorizontalBox { - j-elevation: 2; - j-padding: 0px; - j-spacing: Metrics.spacing-md; + p-elevation: 2; + p-padding: 0px; + p-spacing: Metrics.spacing-md; height: Metrics.size-md; Text { @@ -99,7 +99,7 @@ export component ObjectToolPanel inherits VerticalBox { } Box { - j-padding: 0px; + p-padding: 0px; Text { color: DarkPalette.text[4]; @@ -112,14 +112,14 @@ export component ObjectToolPanel inherits VerticalBox { Box { width: Metrics.size-md; - j-elevation: 3; + p-elevation: 3; Rectangle { } } Box { width: Metrics.size-md; - j-elevation: 3; + p-elevation: 3; Rectangle { } } diff --git a/ui/status_bar.slint b/ui/status_bar.slint index 4d8ccd3..495f32a 100644 --- a/ui/status_bar.slint +++ b/ui/status_bar.slint @@ -4,8 +4,8 @@ import { HorizontalBox } from "widgets/layout.slint"; export component StatusBar inherits HorizontalBox { height: Metrics.size-lg; - j-spacing: Metrics.spacing-lg; - j-alignment: start; + p-spacing: Metrics.spacing-lg; + p-alignment: start; Text { color: DarkPalette.text[4]; diff --git a/ui/tool_bar.slint b/ui/tool_bar.slint index 3d58b34..6786ac2 100644 --- a/ui/tool_bar.slint +++ b/ui/tool_bar.slint @@ -11,7 +11,7 @@ component ToolBarItem inherits Button { export component ToolBar inherits VerticalBox { width: Metrics.size-xl; - j-alignment: start; + p-alignment: start; ToolBarItem { p-text: "s"; diff --git a/ui/widgets/layout.slint b/ui/widgets/layout.slint index f87a383..c3c1cb4 100644 --- a/ui/widgets/layout.slint +++ b/ui/widgets/layout.slint @@ -1,60 +1,54 @@ import {Metrics, DarkPalette} from "../theme.slint"; -struct BorderStyle { - border-width: length, - border-color: brush, - border-radius: length, -} - export component HorizontalBox inherits Rectangle { // TODO: border, shadow - in property j-elevation: 1; - in property j-rounding: Metrics.radius-md; - in property j-padding: Metrics.padding-md; - in property j-spacing: Metrics.spacing-md; - in property j-alignment: stretch; + in property p-elevation: 1; + in property p-rounding: Metrics.radius-md; + in property p-padding: Metrics.padding-md; + in property p-spacing: Metrics.spacing-md; + in property p-alignment: stretch; - background: DarkPalette.background[j-elevation]; - border-radius: j-rounding; + background: DarkPalette.background[p-elevation]; + border-radius: p-rounding; clip: true; - HorizontalLayout { - alignment: j-alignment; - padding: j-padding; - spacing: j-spacing; + c-layout := HorizontalLayout { + alignment: p-alignment; + padding: p-padding; + spacing: p-spacing; @children } } export component VerticalBox inherits Rectangle { // TODO: border, shadow - in property j-elevation: 1; - in property j-rounding: Metrics.radius-md; - in property j-padding: Metrics.padding-md; - in property j-spacing: Metrics.spacing-md; - in property j-alignment: stretch; + in property p-elevation: 1; + in property p-rounding: Metrics.radius-md; + in property p-padding: Metrics.padding-md; + in property p-spacing: Metrics.spacing-md; + in property p-alignment: stretch; - background: DarkPalette.background[j-elevation]; - border-radius: j-rounding; + background: DarkPalette.background[p-elevation]; + border-radius: p-rounding; clip: true; - VerticalLayout { - alignment: j-alignment; - padding: j-padding; - spacing: j-spacing; + c-layout := VerticalLayout { + alignment: p-alignment; + padding: p-padding; + spacing: p-spacing; @children } } export component Box inherits Rectangle { - in property j-elevation: 1; - in property j-rounding: Metrics.radius-md; - in property j-padding: Metrics.padding-md; + in property p-elevation: 1; + in property p-rounding: Metrics.radius-md; + in property p-padding: Metrics.padding-md; - background: DarkPalette.background[j-elevation]; - border-radius: j-rounding; + background: DarkPalette.background[p-elevation]; + border-radius: p-rounding; clip: true; - padding: j-padding; + padding: p-padding; @children } diff --git a/ui/widgets/panel.slint b/ui/widgets/panel.slint index ae14f37..01aec42 100644 --- a/ui/widgets/panel.slint +++ b/ui/widgets/panel.slint @@ -2,16 +2,16 @@ import { Metrics, DarkPalette } from "../theme.slint"; import { VerticalBox } from "layout.slint"; export component Panel inherits VerticalBox { - in property title: "Title"; - in property title-alignment: left; + in property p-title: "Title"; + in property p-title-alignment: left; - Text { + c-title := Text { height: Metrics.size-md; color: DarkPalette.text[4]; font-size: Metrics.font-md; - text: title; + text: p-title; vertical-alignment: center; - horizontal-alignment: title-alignment; + horizontal-alignment: p-title-alignment; } @children