diff --git a/src/builders/build_wivrn.rs b/src/builders/build_wivrn.rs index ad41824..588c61b 100644 --- a/src/builders/build_wivrn.rs +++ b/src/builders/build_wivrn.rs @@ -21,7 +21,7 @@ pub fn get_build_wivrn_jobs(profile: &Profile, clean_build: bool) -> VecDeque WivrnApkStandardAction, - "_Pico" => WivrnApkPicoAction, - } - } - } - view! { gtk::Box { set_orientation: gtk::Orientation::Vertical, @@ -100,13 +86,17 @@ impl SimpleComponent for InstallWivrnBox { set_wrap: true, set_wrap_mode: gtk::pango::WrapMode::Word, }, - gtk::MenuButton { + gtk::Button { add_css_class: "suggested-action", set_label: "Install WiVRn", set_halign: gtk::Align::Start, #[track = "model.changed(Self::install_wivrn_status())"] set_sensitive: model.install_wivrn_status != InstallWivrnStatus::InProgress, - set_menu_model: Some(&install_wivrn_menu), + connect_clicked[sender] => move |_| { + sender.input(Self::Input::InstallWivrnApk( + "https://github.com/WiVRn/WiVRn/releases/latest/download/WiVRn-standard-release.apk".into() + )) + }, }, gtk::Label { add_css_class: "error", @@ -244,40 +234,6 @@ impl SimpleComponent for InstallWivrnBox { let widgets = view_output!(); - let mut actions = RelmActionGroup::::new(); - - stateless_action!( - actions, - WivrnApkStandardAction, - clone!( - #[strong] - sender, - move |_| { - sender.input(Self::Input::InstallWivrnApk( - "https://github.com/Meumeu/WiVRn/releases/latest/download/WiVRn-standard-release.apk".into() - )); - } - ) - ); - stateless_action!( - actions, - WivrnApkPicoAction, - clone!( - #[strong] - sender, - move |_| { - sender.input(Self::Input::InstallWivrnApk( - "https://github.com/Meumeu/WiVRn/releases/latest/download/WiVRn-pico-release.apk".into() - )); - } - ) - ); - - root.insert_action_group( - InstallWivrnActionGroup::NAME, - Some(&actions.into_action_group()), - ); - ComponentParts { model, widgets } } }