diff --git a/ui/app.slint b/ui/app.slint index a8a04f02..af206407 100644 --- a/ui/app.slint +++ b/ui/app.slint @@ -7,7 +7,7 @@ export component App inherits Window { width: ROOT-GLOBAL.window-width; title: "SAST Evento"; icon: @image-url("assets/app_icon.png"); - main_view := MainView { - y: 200px; + main-view := MainView { + y: 120px; } } diff --git a/ui/assets/evento_black.png b/ui/assets/evento_black.png new file mode 100644 index 00000000..8ead56f7 Binary files /dev/null and b/ui/assets/evento_black.png differ diff --git a/ui/assets/evento_white.png b/ui/assets/evento_white.png new file mode 100644 index 00000000..4a345a70 Binary files /dev/null and b/ui/assets/evento_white.png differ diff --git a/ui/assets/surrealism.png b/ui/assets/surrealism.png deleted file mode 100644 index a5130873..00000000 Binary files a/ui/assets/surrealism.png and /dev/null differ diff --git a/ui/assets/surrealism.svg b/ui/assets/surrealism.svg deleted file mode 100644 index de944b5f..00000000 --- a/ui/assets/surrealism.svg +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - diff --git a/ui/global.slint b/ui/global.slint index cf57fa24..34560e92 100644 --- a/ui/global.slint +++ b/ui/global.slint @@ -1,7 +1,7 @@ //! global styles export global ROOT_GLOBAL { - in-out property window-height : 600px; - in-out property window-width : 800px; + in-out property window-height : 760px; + in-out property window-width : 1340px; in-out property font-size : 16px; in-out property padding : 0px; } \ No newline at end of file diff --git a/ui/views/main.slint b/ui/views/main.slint index 0d05edfb..c9df85a0 100644 --- a/ui/views/main.slint +++ b/ui/views/main.slint @@ -2,36 +2,43 @@ import { Hello } from "../components/index.slint"; import { SText, SButton } from "../modules/surrealism-ui/index.slint"; export component MainView { - callback startLink; - - eventoLogo := Image { - width: 150px; - height: 150px; - x: (root.width - self.width) / 2; - source: @image-url("../assets/app_icon.svg"); + callback startLink <=> link-button.clicked; + evento-image := Image { + height: 240px; + width: 700px; + source: @image-url("../assets/evento_black.png"); } - title := SText { - x: (root.width - self.width) / 2; - y: eventoLogo.y + eventoLogo.height; - text: "SAST Evento"; + link-button := SButton { + width: 400px; + height: 80px; + y: evento-image.y + evento-image.height + 140px; + text: "使用Link登录"; font-size: 35px; + theme: Dark; + border-radius: 12px; + show-icon: true; + icon: @image-url("../assets/sast_link.svg"); } - linkButton := SButton { - x: (root.width - self.width) / 2; - y: title.y + title.height + 30px; + visitor-button := SButton { + y: link-button.y + link-button.height + 30px; + text: "访客登录"; + theme: Light; + border-radius: 8px; show-icon: true; - icon: @image-url("../assets/sast_link.svg"); - text: "使用Link登入"; - clicked => { - root.startLink(); - } + icon: @image-url("../modules/surrealism-ui/icons/user.svg"); } - infoText := SText { - x: (root.width - self.width) / 2; - y: linkButton.y + linkButton.height + 30px; + group-label := SText { + y: visitor-button.y + visitor-button.height + 20px; text: "SAST-C++组开发"; + theme: Light; + } + + version-label := SText { + y: group-label.y + group-label.height + 5px; + text: "v0.0.0-alpha"; + theme: Light; } }