From a271ffbb109a680d9c7b46f70e36335b332e99b0 Mon Sep 17 00:00:00 2001 From: "Luke D. Jones" Date: Thu, 4 Apr 2024 09:58:40 +1300 Subject: [PATCH] rcc: run as app only on Ally --- asusd/src/ctrl_aura/controller.rs | 13 +- rog-control-center/src/main.rs | 11 +- .../translations/en/rog-control-center.po | 276 +++++++++--------- 3 files changed, 157 insertions(+), 143 deletions(-) diff --git a/asusd/src/ctrl_aura/controller.rs b/asusd/src/ctrl_aura/controller.rs index 463ff9ad..0a906640 100644 --- a/asusd/src/ctrl_aura/controller.rs +++ b/asusd/src/ctrl_aura/controller.rs @@ -353,6 +353,7 @@ mod tests { use crate::ctrl_aura::controller::LEDNode; #[test] + #[ignore = "Unable to run in CI as the HIDRAW device is required"] fn create_multizone_if_no_config() { // Checking to ensure set_mode errors when unsupported modes are tried let config = AuraConfig::from_default_support(AuraDevice::X19b6, &LaptopLedData::default()); @@ -366,7 +367,10 @@ mod tests { }; let mut controller = CtrlKbdLed { led_prod: AuraDevice::X19b6, - led_node: LEDNode::Rog(KeyboardLed::default(), HidRaw::new("id_product").unwrap()), + led_node: LEDNode::Rog( + KeyboardLed::default(), + HidRaw::new(AuraDevice::X19b6.into()).unwrap(), + ), supported_data: supported_basic_modes, per_key_mode_active: false, config, @@ -391,6 +395,8 @@ mod tests { } #[test] + #[ignore = "Unable to run in CI as the HIDRAW device is required"] + // TODO: use sim device fn next_mode_create_multizone_if_no_config() { // Checking to ensure set_mode errors when unsupported modes are tried let config = AuraConfig::from_default_support(AuraDevice::X19b6, &LaptopLedData::default()); @@ -404,7 +410,10 @@ mod tests { }; let mut controller = CtrlKbdLed { led_prod: AuraDevice::X19b6, - led_node: LEDNode::Rog(KeyboardLed::default(), HidRaw::new("id_product").unwrap()), + led_node: LEDNode::Rog( + KeyboardLed::default(), + HidRaw::new(AuraDevice::X19b6.into()).unwrap(), + ), supported_data: supported_basic_modes, per_key_mode_active: false, config, diff --git a/rog-control-center/src/main.rs b/rog-control-center/src/main.rs index fbda2320..e754a3f8 100644 --- a/rog-control-center/src/main.rs +++ b/rog-control-center/src/main.rs @@ -94,18 +94,23 @@ fn main() -> Result<()> { if cli_parsed.height_fullscreen != 0 { config.fullscreen_height = cli_parsed.height_fullscreen; } - config.write(); } else if cli_parsed.windowed { config.start_fullscreen = false; - config.write(); + } + + if is_rog_ally { + config.enable_notifications = false; + config.enable_tray_icon = false; + config.run_in_background = false; + config.startup_in_background = false; } if config.startup_in_background { config.run_in_background = true; - config.write(); } else { get_ipc_file().unwrap().write_all(&[SHOW_GUI, 0]).unwrap(); } + config.write(); let enabled_notifications = EnabledNotifications::tokio_mutex(&config); let aura_creation = AuraCreation::new(cli_parsed.board_name, cli_parsed.layout_viewing)?; diff --git a/rog-control-center/translations/en/rog-control-center.po b/rog-control-center/translations/en/rog-control-center.po index c61cc146..394fb28a 100644 --- a/rog-control-center/translations/en/rog-control-center.po +++ b/rog-control-center/translations/en/rog-control-center.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2024-04-03 03:14+0000\n" +"POT-Creation-Date: 2024-04-03 20:51+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -12,46 +12,6 @@ msgstr "" "Language: \n" "Plural-Forms: nplurals=1; plural=0;\n" -#: rog-control-center/ui/main_window.slint:50 -msgctxt "MainWindow" -msgid "ROG" -msgstr "" - -#: rog-control-center/ui/main_window.slint:52 -msgctxt "Menu1" -msgid "System Control" -msgstr "" - -#: rog-control-center/ui/main_window.slint:53 -msgctxt "Menu2" -msgid "Keyboard Aura" -msgstr "" - -#: rog-control-center/ui/main_window.slint:54 -msgctxt "Menu3" -msgid "AniMe Matrix" -msgstr "" - -#: rog-control-center/ui/main_window.slint:55 -msgctxt "Menu4" -msgid "Fan Curves" -msgstr "" - -#: rog-control-center/ui/main_window.slint:56 -msgctxt "Menu5" -msgid "App Settings" -msgstr "" - -#: rog-control-center/ui/main_window.slint:57 -msgctxt "Menu6" -msgid "About" -msgstr "" - -#: rog-control-center/ui/main_window.slint:69 -msgctxt "MainWindow" -msgid "Quit" -msgstr "" - #: rog-control-center/ui/pages/anime.slint:6 msgctxt "Anime Brightness" msgid "Off" @@ -197,91 +157,6 @@ msgctxt "PageAppSettings" msgid "Enable change notifications" msgstr "" -#: rog-control-center/ui/pages/aura.slint:27 -msgctxt "PageAura" -msgid "Brightness" -msgstr "" - -#: rog-control-center/ui/pages/aura.slint:38 -msgctxt "PageAura" -msgid "Aura mode" -msgstr "" - -#: rog-control-center/ui/pages/aura.slint:56 -msgctxt "PageAura" -msgid "Colour 1" -msgstr "" - -#: rog-control-center/ui/pages/aura.slint:82 -msgctxt "PageAura" -msgid "Colour 2" -msgstr "" - -#: rog-control-center/ui/pages/aura.slint:114 -msgctxt "PageAura" -msgid "Zone" -msgstr "" - -#: rog-control-center/ui/pages/aura.slint:137 -msgctxt "PageAura" -msgid "Direction" -msgstr "" - -#: rog-control-center/ui/pages/aura.slint:159 -msgctxt "PageAura" -msgid "Speed" -msgstr "" - -#: rog-control-center/ui/pages/aura.slint:180 -msgctxt "PageAura" -msgid "Power Settings" -msgstr "" - -#: rog-control-center/ui/pages/aura.slint:211 rog-control-center/ui/pages/aura.slint:369 rog-control-center/ui/pages/aura.slint:434 -msgctxt "PageAura" -msgid "Keyboard" -msgstr "" - -#: rog-control-center/ui/pages/aura.slint:235 -msgctxt "PageAura" -msgid "Lid Logo" -msgstr "" - -#: rog-control-center/ui/pages/aura.slint:259 -msgctxt "PageAura" -msgid "Lightbar" -msgstr "" - -#: rog-control-center/ui/pages/aura.slint:283 -msgctxt "PageAura" -msgid "Lid Zone" -msgstr "" - -#: rog-control-center/ui/pages/aura.slint:307 -msgctxt "PageAura" -msgid "Rear Glow" -msgstr "" - -#: rog-control-center/ui/pages/aura.slint:375 rog-control-center/ui/pages/aura.slint:440 -msgctxt "PageAura" -msgid "Boot" -msgstr "" - -#: rog-control-center/ui/pages/aura.slint:380 rog-control-center/ui/pages/aura.slint:445 -msgctxt "PageAura" -msgid "Awake" -msgstr "" - -#: rog-control-center/ui/pages/aura.slint:385 rog-control-center/ui/pages/aura.slint:450 -msgctxt "PageAura" -msgid "Sleep" -msgstr "" - -#: rog-control-center/ui/pages/aura.slint:390 rog-control-center/ui/pages/aura.slint:455 -msgctxt "PageAura" -msgid "Shutdown" -msgstr "" - #: rog-control-center/ui/pages/fans.slint:27 msgctxt "FanTab" msgid "This fan is not avilable on this machine" @@ -487,6 +362,111 @@ msgctxt "PageSystem" msgid "Throttle Policy on AC" msgstr "" +#: rog-control-center/ui/pages/aura.slint:27 +msgctxt "PageAura" +msgid "Brightness" +msgstr "" + +#: rog-control-center/ui/pages/aura.slint:38 +msgctxt "PageAura" +msgid "Aura mode" +msgstr "" + +#: rog-control-center/ui/pages/aura.slint:56 +msgctxt "PageAura" +msgid "Colour 1" +msgstr "" + +#: rog-control-center/ui/pages/aura.slint:82 +msgctxt "PageAura" +msgid "Colour 2" +msgstr "" + +#: rog-control-center/ui/pages/aura.slint:114 +msgctxt "PageAura" +msgid "Zone" +msgstr "" + +#: rog-control-center/ui/pages/aura.slint:137 +msgctxt "PageAura" +msgid "Direction" +msgstr "" + +#: rog-control-center/ui/pages/aura.slint:159 +msgctxt "PageAura" +msgid "Speed" +msgstr "" + +#: rog-control-center/ui/pages/aura.slint:180 +msgctxt "PageAura" +msgid "Power Settings" +msgstr "" + +#: rog-control-center/ui/pages/aura.slint:211 rog-control-center/ui/pages/aura.slint:369 rog-control-center/ui/pages/aura.slint:434 +msgctxt "PageAura" +msgid "Keyboard" +msgstr "" + +#: rog-control-center/ui/pages/aura.slint:235 +msgctxt "PageAura" +msgid "Lid Logo" +msgstr "" + +#: rog-control-center/ui/pages/aura.slint:259 +msgctxt "PageAura" +msgid "Lightbar" +msgstr "" + +#: rog-control-center/ui/pages/aura.slint:283 +msgctxt "PageAura" +msgid "Lid Zone" +msgstr "" + +#: rog-control-center/ui/pages/aura.slint:307 +msgctxt "PageAura" +msgid "Rear Glow" +msgstr "" + +#: rog-control-center/ui/pages/aura.slint:375 rog-control-center/ui/pages/aura.slint:440 +msgctxt "PageAura" +msgid "Boot" +msgstr "" + +#: rog-control-center/ui/pages/aura.slint:380 rog-control-center/ui/pages/aura.slint:445 +msgctxt "PageAura" +msgid "Awake" +msgstr "" + +#: rog-control-center/ui/pages/aura.slint:385 rog-control-center/ui/pages/aura.slint:450 +msgctxt "PageAura" +msgid "Sleep" +msgstr "" + +#: rog-control-center/ui/pages/aura.slint:390 rog-control-center/ui/pages/aura.slint:455 +msgctxt "PageAura" +msgid "Shutdown" +msgstr "" + +#: rog-control-center/ui/widgets/aura_power.slint:32 +msgctxt "AuraPowerGroup" +msgid "Boot" +msgstr "" + +#: rog-control-center/ui/widgets/aura_power.slint:42 +msgctxt "AuraPowerGroup" +msgid "Awake" +msgstr "" + +#: rog-control-center/ui/widgets/aura_power.slint:52 +msgctxt "AuraPowerGroup" +msgid "Sleep" +msgstr "" + +#: rog-control-center/ui/widgets/aura_power.slint:62 +msgctxt "AuraPowerGroup" +msgid "Shutdown" +msgstr "" + #: rog-control-center/ui/types/aura_types.slint:69 msgctxt "Aura brightness" msgid "Off" @@ -647,23 +627,43 @@ msgctxt "Aura speed" msgid "High" msgstr "" -#: rog-control-center/ui/widgets/aura_power.slint:32 -msgctxt "AuraPowerGroup" -msgid "Boot" +#: rog-control-center/ui/main_window.slint:50 +msgctxt "MainWindow" +msgid "ROG" msgstr "" -#: rog-control-center/ui/widgets/aura_power.slint:42 -msgctxt "AuraPowerGroup" -msgid "Awake" +#: rog-control-center/ui/main_window.slint:52 +msgctxt "Menu1" +msgid "System Control" msgstr "" -#: rog-control-center/ui/widgets/aura_power.slint:52 -msgctxt "AuraPowerGroup" -msgid "Sleep" +#: rog-control-center/ui/main_window.slint:53 +msgctxt "Menu2" +msgid "Keyboard Aura" msgstr "" -#: rog-control-center/ui/widgets/aura_power.slint:62 -msgctxt "AuraPowerGroup" -msgid "Shutdown" +#: rog-control-center/ui/main_window.slint:54 +msgctxt "Menu3" +msgid "AniMe Matrix" +msgstr "" + +#: rog-control-center/ui/main_window.slint:55 +msgctxt "Menu4" +msgid "Fan Curves" +msgstr "" + +#: rog-control-center/ui/main_window.slint:56 +msgctxt "Menu5" +msgid "App Settings" +msgstr "" + +#: rog-control-center/ui/main_window.slint:57 +msgctxt "Menu6" +msgid "About" +msgstr "" + +#: rog-control-center/ui/main_window.slint:69 +msgctxt "MainWindow" +msgid "Quit" msgstr ""