diff --git a/rog-control-center/ui/main_window.slint b/rog-control-center/ui/main_window.slint index d167f6c7..b421fb01 100644 --- a/rog-control-center/ui/main_window.slint +++ b/rog-control-center/ui/main_window.slint @@ -48,6 +48,7 @@ export component MainWindow inherits Window { min-height: AppSize.height; min-width: AppSize.width; background: Palette.alternate-background; + HorizontalLayout { padding: 0px; VerticalLayout { @@ -184,10 +185,6 @@ export component MainWindow inherits Window { y: 0px; width: root.width; height: root.height; - - //padding only has effect on layout elements - //padding: 10px; - background: Palette.background; border-color: Palette.border; border-width: 3px; diff --git a/rog-control-center/ui/pages/about.slint b/rog-control-center/ui/pages/about.slint index 621c2365..b4dd9676 100644 --- a/rog-control-center/ui/pages/about.slint +++ b/rog-control-center/ui/pages/about.slint @@ -1,62 +1,77 @@ -import { AboutSlint, VerticalBox, HorizontalBox } from "std-widgets.slint"; +import { + AboutSlint, + VerticalBox, + HorizontalBox, + ScrollView, +} from "std-widgets.slint"; export component PageAbout inherits VerticalLayout { padding: 10px; spacing: 10px; - Text { - vertical-alignment: TextVerticalAlignment.center; - horizontal-alignment: TextHorizontalAlignment.center; - text: "A UI for asusctl made with slint"; - font-size: 22px; - } + ScrollView { - HorizontalBox { - alignment: LayoutAlignment.center; - VerticalBox { + HorizontalBox { alignment: LayoutAlignment.center; + VerticalBox { + alignment: LayoutAlignment.center; - Text { - wrap: TextWrap.word-wrap; - text: "You need to use kernel version 6.19 to use this software"; - } + Text { + vertical-alignment: TextVerticalAlignment.center; + horizontal-alignment: TextHorizontalAlignment.center; + text: "ROG Control Center"; + font-size: 22px; + } - Text { - vertical-alignment: TextVerticalAlignment.center; - horizontal-alignment: TextHorizontalAlignment.center; - text: "Todo:"; - font-size: 22px; - } + Text { + wrap: TextWrap.word-wrap; + text: "\nA powerful graphical interface for managing ASUS ROG, TUF, and ProArt laptops on Linux. It acts as the official GUI for the asusctl toolset, allowing for seamless hardware tuning without the command line."; + } - Text { - text: "- [ ] Theme the widgets"; - } + Text { + font-weight: 900; + text: "Key Features:"; + } - Text { - text: "- [ ] Add a cpu/gpu temp/fan speed info bar"; - } + Text { + text: " • Performance: Switch power profiles and customize fan curves.\n • Aura Sync: Control keyboard backlighting and LED effects.\n • Battery Health: Set charge limits to extend battery longevity.\n • Display: Toggle Panel Overdrive and refresh rates.\n • AniMe Matrix: Control AniMe Matrix displays."; + } - Text { - text: "- [ ] Include fan speeds, temps in a bottom bar"; - } + Text { + font-weight: 900; + text: "Requirements:"; + } - Text { - text: "- [ ] Slash control"; - } + Text { + text: " • This software requires kernel version 6.19."; + } - Text { - text: "- [ ] Screenpad controls"; - } + Text { + font-weight: 900; + text: "Work in progress:"; + } - Text { - text: "- [ ] ROG Ally specific settings"; + Text { + text: " • Theme the widgets\n • Add a cpu/gpu temp/fan speed info bar\n • Include fan speeds, temps in a bottom bar\n • Slash control\n • Screenpad controls\n • ROG Ally specific settings"; + } + + Text { + font-weight: 900; + text: "License:"; + } + + Text { + text: " This project is open-source software licensed under the Mozilla Public License 2.0 (MPL-2.0)."; + } + + Text { + font-weight: 900; + text: "Links:"; + } + + Text { + text: " Source Code: https://gitlab.com/asus-linux/asusctl\n Website: https://asus-linux.org/"; + } } } } - - Text { - vertical-alignment: TextVerticalAlignment.center; - horizontal-alignment: TextHorizontalAlignment.center; - text: "Work in progress"; - font-size: 22px; - } } diff --git a/rog-control-center/ui/pages/anime.slint b/rog-control-center/ui/pages/anime.slint index 6edb6cc1..7eb28898 100644 --- a/rog-control-center/ui/pages/anime.slint +++ b/rog-control-center/ui/pages/anime.slint @@ -36,12 +36,8 @@ export component PageAnime inherits Rectangle { property show_display_advanced: false; property show_builtin_advanced: false; clip: true; - // TODO: slow with border-radius - //padding only has effect on layout elements - //padding: 8px; - // height: parent.height - infobar.height - mainview.padding - self.padding * 2; - // TODO: border-radius: 8px; - VerticalLayout { + + VerticalLayout { padding: 10px; spacing: 10px; HorizontalLayout { @@ -194,7 +190,7 @@ export component PageAnime inherits Rectangle { Button { x: root.width - self.width - 6px; y: 6px; - text: "X"; + text: "✕"; height: 36px; clicked => { root.show_builtin_advanced = false; @@ -256,7 +252,7 @@ export component PageAnime inherits Rectangle { Button { x: root.width - self.width - 6px; y: 6px; - text: "X"; + text: "✕"; height: 36px; clicked => { root.show_display_advanced = false; diff --git a/rog-control-center/ui/pages/app_settings.slint b/rog-control-center/ui/pages/app_settings.slint index 7acc89cc..95919868 100644 --- a/rog-control-center/ui/pages/app_settings.slint +++ b/rog-control-center/ui/pages/app_settings.slint @@ -15,12 +15,7 @@ export global AppSettingsPageData { export component PageAppSettings inherits VerticalLayout { Rectangle { clip: true; - // TODO: slow with border-radius - //padding only has effect on layout elements - //padding: 8px; - // height: parent.height - infobar.height - mainview.padding - self.padding * 2; - // TODO: border-radius: 8px; mainview := VerticalLayout { padding: 10px; spacing: 10px; diff --git a/rog-control-center/ui/pages/aura.slint b/rog-control-center/ui/pages/aura.slint index dd5d3373..f1cd1cd3 100644 --- a/rog-control-center/ui/pages/aura.slint +++ b/rog-control-center/ui/pages/aura.slint @@ -17,6 +17,7 @@ export component PageAura inherits Rectangle { c2.final_colour = AuraPageData.led_mode_data.colour2; c2.external_colour_change(); } + ScrollView { VerticalLayout { padding: 10px; @@ -114,8 +115,6 @@ export component PageAura inherits Rectangle { min-height: 80px; max-height: 90px; RogItem { - //padding only has effect on layout elements - //padding: 0px; VerticalBox { Text { text: @tr("Zone"); @@ -138,8 +137,6 @@ export component PageAura inherits Rectangle { } RogItem { - //padding only has effect on layout elements - //padding: 0px; VerticalBox { Text { text: @tr("Direction"); @@ -161,8 +158,6 @@ export component PageAura inherits Rectangle { } RogItem { - //padding only has effect on layout elements - //padding: 0px; VerticalBox { Text { text: @tr("Speed"); @@ -246,7 +241,7 @@ export component PageAura inherits Rectangle { Button { x: root.width - self.width - 6px; y: 6px; - text: "X"; + text: "✕"; height: 36px; clicked => { root.show_aura_power = false; @@ -300,7 +295,7 @@ export component PageAura inherits Rectangle { Button { x: root.width - self.width - 6px; y: 6px; - text: "X"; + text: "✕"; height: 36px; clicked => { root.show_aura_power = false; diff --git a/rog-control-center/ui/pages/system.slint b/rog-control-center/ui/pages/system.slint index bcba6f6e..edb74aa1 100644 --- a/rog-control-center/ui/pages/system.slint +++ b/rog-control-center/ui/pages/system.slint @@ -152,8 +152,7 @@ export component PageSystem inherits Rectangle { property show_fade_cover: false; property show_throttle_advanced: false; clip: true; - //padding only has effect on layout elements - //padding: 8px; + ScrollView { VerticalLayout { padding: 12px; @@ -684,7 +683,7 @@ export component PageSystem inherits Rectangle { Button { x: root.width - self.width - 6px; y: 6px; - text: "X"; + text: "✕"; height: 34px; clicked => { root.show_throttle_advanced = false; diff --git a/rog-control-center/ui/widgets/aura_power.slint b/rog-control-center/ui/widgets/aura_power.slint index d084d682..93817e17 100644 --- a/rog-control-center/ui/widgets/aura_power.slint +++ b/rog-control-center/ui/widgets/aura_power.slint @@ -4,8 +4,6 @@ import { PowerZones } from "../types/aura_types.slint"; export component AuraPowerGroup inherits Rectangle { min-width: row.min-width; - // border-radius: 20px; - // background: Palette.alternate-background; opacity: 0.9; in-out property group-title; in-out property boot_checked; @@ -16,6 +14,7 @@ export component AuraPowerGroup inherits Rectangle { callback awake_toggled(bool); callback sleep_toggled(bool); callback shutdown_toggled(bool); + VerticalBox { spacing: 10px; Text { @@ -72,8 +71,6 @@ export component AuraPowerGroup inherits Rectangle { export component AuraPowerGroupOld inherits Rectangle { min-width: row.min-width; - // border-radius: 20px; - // background: Palette.alternate-background; opacity: 0.9; in-out property current_zone; in-out property <[int]> zones; @@ -86,6 +83,7 @@ export component AuraPowerGroupOld inherits Rectangle { callback awake_toggled(bool); callback sleep_toggled(bool); callback selected_zone(int); + VerticalBox { spacing: 10px; Text { diff --git a/rog-control-center/ui/widgets/common.slint b/rog-control-center/ui/widgets/common.slint index 746110f5..5e2e5091 100644 --- a/rog-control-center/ui/widgets/common.slint +++ b/rog-control-center/ui/widgets/common.slint @@ -1,7 +1,6 @@ import { Palette, VerticalBox , StandardButton, Button, HorizontalBox, ComboBox, Switch, Slider} from "std-widgets.slint"; export component RogItem inherits Rectangle { - // background: Palette.control-background; border-color: Palette.border; border-width: 1px; border-radius: 2px; @@ -291,11 +290,7 @@ export component PopupNotification { border-width: 2px; border-color: Palette.accent-background; background: Palette.background; - // TODO: drop shadows slow - // drop-shadow-offset-x: 7px; - // drop-shadow-offset-y: 7px; - // drop-shadow-color: black; - // drop-shadow-blur: 30px; + VerticalLayout { Dialog { VerticalLayout { diff --git a/rog-control-center/ui/widgets/sidebar.slint b/rog-control-center/ui/widgets/sidebar.slint index 48d16e01..f29254e5 100644 --- a/rog-control-center/ui/widgets/sidebar.slint +++ b/rog-control-center/ui/widgets/sidebar.slint @@ -4,8 +4,6 @@ import { Palette, HorizontalBox, VerticalBox } from "std-widgets.slint"; component SideBarItem inherits Rectangle { - // padding only has effect on layout elements - // padding: 10px; in property selected; in property has-focus; in-out property text <=> label.text;