diff --git a/src/main.rs b/src/main.rs index f2ee1a5..a93dd56 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,4 +1,3 @@ -use crate::ui::{app::Msg, cmdline_opts::CmdLineOpts}; use anyhow::Result; use constants::{resources, APP_ID, APP_NAME, GETTEXT_PACKAGE, LOCALE_DIR, RESOURCES_BASE_PATH}; use file_builders::{ @@ -13,7 +12,10 @@ use relm4::{ }; use std::env; use steam_linux_runtime_injector::restore_runtime_entrypoint; -use ui::app::{App, AppInit}; +use ui::{ + app::{App, AppInit, Msg}, + cmdline_opts::CmdLineOpts, +}; pub mod build_tools; pub mod builders; diff --git a/src/ui/app.rs b/src/ui/app.rs index 017790e..9024a7b 100644 --- a/src/ui/app.rs +++ b/src/ui/app.rs @@ -1,62 +1,63 @@ -use super::alert::{alert, alert_w_widget}; -use super::build_window::{BuildStatus, BuildWindow}; -use super::cmdline_opts::CmdLineOpts; -use super::debug_view::{DebugView, DebugViewMsg}; -use super::job_worker::internal_worker::JobWorkerOut; -use super::job_worker::job::{FuncWorkerOut, WorkerJob}; -use super::job_worker::JobWorker; -use super::libsurvive_setup_window::LibsurviveSetupWindow; -use super::main_view::MainViewMsg; -use super::util::{copiable_code_snippet, copy_text, open_with_default_handler}; -use super::wivrn_conf_editor::{WivrnConfEditor, WivrnConfEditorInit, WivrnConfEditorMsg}; -use crate::builders::build_basalt::get_build_basalt_jobs; -use crate::builders::build_libsurvive::get_build_libsurvive_jobs; -use crate::builders::build_mercury::get_build_mercury_jobs; -use crate::builders::build_monado::get_build_monado_jobs; -use crate::builders::build_opencomposite::get_build_opencomposite_jobs; -use crate::builders::build_openhmd::get_build_openhmd_jobs; -use crate::builders::build_wivrn::get_build_wivrn_jobs; -use crate::config::Config; -use crate::constants::APP_NAME; -use crate::dependencies::basalt_deps::get_missing_basalt_deps; -use crate::dependencies::common::dep_pkexec; -use crate::dependencies::libsurvive_deps::get_missing_libsurvive_deps; -use crate::dependencies::mercury_deps::get_missing_mercury_deps; -use crate::dependencies::monado_deps::get_missing_monado_deps; -use crate::dependencies::openhmd_deps::get_missing_openhmd_deps; -use crate::dependencies::wivrn_deps::get_missing_wivrn_deps; -use crate::file_builders::active_runtime_json::{ - set_current_active_runtime_to_profile, set_current_active_runtime_to_steam, +use super::{ + about_dialog::{create_about_dialog, populate_debug_info}, + alert::{alert, alert_w_widget}, + build_window::{BuildStatus, BuildWindow, BuildWindowInit, BuildWindowMsg, BuildWindowOutMsg}, + cmdline_opts::CmdLineOpts, + debug_view::{DebugView, DebugViewInit, DebugViewMsg, DebugViewOutMsg}, + job_worker::{ + internal_worker::JobWorkerOut, + job::{FuncWorkerOut, WorkerJob}, + JobWorker, + }, + libsurvive_setup_window::{LibsurviveSetupMsg, LibsurviveSetupWindow}, + main_view::{MainView, MainViewInit, MainViewMsg, MainViewOutMsg}, + util::{copiable_code_snippet, copy_text, open_with_default_handler}, + wivrn_conf_editor::{WivrnConfEditor, WivrnConfEditorInit, WivrnConfEditorMsg}, }; -use crate::file_builders::openvrpaths_vrpath::{ - set_current_openvrpaths_to_profile, set_current_openvrpaths_to_steam, +use crate::{ + builders::{ + build_basalt::get_build_basalt_jobs, build_libsurvive::get_build_libsurvive_jobs, + build_mercury::get_build_mercury_jobs, build_monado::get_build_monado_jobs, + build_opencomposite::get_build_opencomposite_jobs, build_openhmd::get_build_openhmd_jobs, + build_wivrn::get_build_wivrn_jobs, + }, + config::Config, + constants::APP_NAME, + dependencies::{ + basalt_deps::get_missing_basalt_deps, common::dep_pkexec, + libsurvive_deps::get_missing_libsurvive_deps, mercury_deps::get_missing_mercury_deps, + monado_deps::get_missing_monado_deps, openhmd_deps::get_missing_openhmd_deps, + wivrn_deps::get_missing_wivrn_deps, + }, + file_builders::{ + active_runtime_json::{ + set_current_active_runtime_to_profile, set_current_active_runtime_to_steam, + }, + openvrpaths_vrpath::{ + set_current_openvrpaths_to_profile, set_current_openvrpaths_to_steam, + }, + }, + file_utils::{setcap_cap_sys_nice_eip, setcap_cap_sys_nice_eip_cmd}, + is_appimage::IS_APPIMAGE, + linux_distro::LinuxDistro, + openxr_prober::is_openxr_ready, + paths::{get_data_dir, get_ipc_file_path}, + profile::{Profile, XRServiceType}, + stateless_action, + steam_linux_runtime_injector::{ + restore_runtime_entrypoint, set_runtime_entrypoint_launch_opts_from_profile, + }, + xr_devices::XRDevice, }; -use crate::file_utils::{setcap_cap_sys_nice_eip, setcap_cap_sys_nice_eip_cmd}; -use crate::is_appimage::IS_APPIMAGE; -use crate::linux_distro::LinuxDistro; -use crate::openxr_prober::is_openxr_ready; -use crate::paths::{get_data_dir, get_ipc_file_path}; -use crate::profile::{Profile, XRServiceType}; -use crate::stateless_action; -use crate::steam_linux_runtime_injector::{ - restore_runtime_entrypoint, set_runtime_entrypoint_launch_opts_from_profile, +use adw::{prelude::*, ResponseAppearance}; +use gtk::glib::{self, clone}; +use relm4::{ + actions::{AccelsPlus, ActionGroupName, RelmAction, RelmActionGroup}, + new_action_group, new_stateful_action, new_stateless_action, + prelude::*, + {ComponentParts, ComponentSender, SimpleComponent}, }; -use crate::ui::about_dialog::{create_about_dialog, populate_debug_info}; -use crate::ui::build_window::{BuildWindowInit, BuildWindowMsg, BuildWindowOutMsg}; -use crate::ui::debug_view::{DebugViewInit, DebugViewOutMsg}; -use crate::ui::libsurvive_setup_window::LibsurviveSetupMsg; -use crate::ui::main_view::{MainView, MainViewInit, MainViewOutMsg}; -use crate::xr_devices::XRDevice; -use adw::prelude::*; -use gtk::glib::clone; -use relm4::actions::{AccelsPlus, ActionGroupName, RelmAction, RelmActionGroup}; -use relm4::adw::ResponseAppearance; -use relm4::gtk::glib; -use relm4::{new_action_group, new_stateful_action, new_stateless_action, prelude::*}; -use relm4::{ComponentParts, ComponentSender, SimpleComponent}; -use std::collections::VecDeque; -use std::fs::remove_file; -use std::time::Duration; +use std::{collections::VecDeque, fs::remove_file, time::Duration}; pub struct App { application: adw::Application, diff --git a/src/ui/build_window.rs b/src/ui/build_window.rs index 492e6cb..759af9b 100644 --- a/src/ui/build_window.rs +++ b/src/ui/build_window.rs @@ -1,5 +1,4 @@ -use super::term_widget::TermWidget; -use crate::ui::SENDER_IO_ERR_MSG; +use super::{term_widget::TermWidget, SENDER_IO_ERR_MSG}; use adw::prelude::*; use relm4::prelude::*; diff --git a/src/ui/debug_view.rs b/src/ui/debug_view.rs index f82c5a1..b42583f 100644 --- a/src/ui/debug_view.rs +++ b/src/ui/debug_view.rs @@ -1,13 +1,11 @@ -use super::term_widget::TermWidget; -use super::util::copy_text; -use crate::log_level::LogLevel; -use crate::log_parser::MonadoLog; -use crate::profile::Profile; -use crate::ui::app::{DebugCopyEnvVarsAction, DebugOpenDataAction, DebugOpenPrefixAction}; -use gtk::glib::clone; -use gtk::prelude::*; -use relm4::prelude::*; -use relm4::{ComponentSender, SimpleComponent}; +use super::{ + app::{DebugCopyEnvVarsAction, DebugOpenDataAction, DebugOpenPrefixAction}, + term_widget::TermWidget, + util::copy_text, +}; +use crate::{log_level::LogLevel, log_parser::MonadoLog, profile::Profile}; +use gtk::{glib::clone, prelude::*}; +use relm4::{prelude::*, ComponentSender, SimpleComponent}; #[derive(Debug)] pub enum SearchDirection { diff --git a/src/ui/install_wivrn_box.rs b/src/ui/install_wivrn_box.rs index 4c7cfbd..402c005 100644 --- a/src/ui/install_wivrn_box.rs +++ b/src/ui/install_wivrn_box.rs @@ -13,8 +13,7 @@ use crate::{ profile::{Profile, XRServiceType}, stateless_action, }; -use gtk::prelude::*; -use gtk4::glib::clone; +use gtk::{glib::clone, prelude::*}; use relm4::{ actions::{ActionGroupName, RelmAction, RelmActionGroup}, new_action_group, new_stateless_action, diff --git a/src/ui/main_view.rs b/src/ui/main_view.rs index 20a1376..6bf6737 100644 --- a/src/ui/main_view.rs +++ b/src/ui/main_view.rs @@ -1,33 +1,36 @@ -use std::fs::read_to_string; -use std::io::Write; - -use super::alert::alert; -use super::devices_box::{DevicesBox, DevicesBoxMsg}; -use super::install_wivrn_box::{InstallWivrnBox, InstallWivrnBoxInit, InstallWivrnBoxMsg}; -use super::profile_editor::{ProfileEditor, ProfileEditorMsg, ProfileEditorOutMsg}; -use super::steam_launch_options_box::{SteamLaunchOptionsBox, SteamLaunchOptionsBoxMsg}; -use super::steamvr_calibration_box::SteamVrCalibrationBox; -use crate::config::Config; -use crate::dependencies::common::dep_pkexec; -use crate::file_utils::{get_writer, mount_has_nosuid}; -use crate::gpu_profile::{get_amd_gpu_power_profile, GpuPowerProfile}; -use crate::paths::{get_data_dir, get_home_dir}; -use crate::profile::{LighthouseDriver, Profile, XRServiceType}; -use crate::stateless_action; -use crate::steamvr_utils::chaperone_info_exists; -use crate::ui::app::{ - AboutAction, BuildProfileAction, BuildProfileCleanAction, ConfigureWivrnAction, - DebugViewToggleAction, +use super::{ + alert::alert, + app::{ + AboutAction, BuildProfileAction, BuildProfileCleanAction, ConfigureWivrnAction, + DebugViewToggleAction, + }, + devices_box::{DevicesBox, DevicesBoxMsg}, + install_wivrn_box::{InstallWivrnBox, InstallWivrnBoxInit, InstallWivrnBoxMsg}, + profile_editor::{ProfileEditor, ProfileEditorInit, ProfileEditorMsg, ProfileEditorOutMsg}, + steam_launch_options_box::{SteamLaunchOptionsBox, SteamLaunchOptionsBoxMsg}, + steamvr_calibration_box::{SteamVrCalibrationBox, SteamVrCalibrationBoxMsg}, + util::{limit_dropdown_width, warning_heading}, +}; +use crate::{ + config::Config, + dependencies::common::dep_pkexec, + file_utils::{get_writer, mount_has_nosuid}, + gpu_profile::{get_amd_gpu_power_profile, GpuPowerProfile}, + paths::{get_data_dir, get_home_dir}, + profile::{LighthouseDriver, Profile, XRServiceType}, + stateless_action, + steamvr_utils::chaperone_info_exists, + xr_devices::XRDevice, }; -use crate::ui::profile_editor::ProfileEditorInit; -use crate::ui::steamvr_calibration_box::SteamVrCalibrationBoxMsg; -use crate::ui::util::{limit_dropdown_width, warning_heading}; -use crate::xr_devices::XRDevice; use adw::{prelude::*, ResponseAppearance}; use gtk::glib::clone; -use relm4::actions::{ActionGroupName, RelmAction, RelmActionGroup}; -use relm4::{new_action_group, new_stateless_action, prelude::*}; -use relm4::{ComponentParts, ComponentSender, SimpleComponent}; +use relm4::{ + actions::{ActionGroupName, RelmAction, RelmActionGroup}, + new_action_group, new_stateless_action, + prelude::*, + ComponentParts, ComponentSender, SimpleComponent, +}; +use std::{fs::read_to_string, io::Write}; #[tracker::track] pub struct MainView { diff --git a/src/ui/profile_editor.rs b/src/ui/profile_editor.rs index 792d401..19fe58c 100644 --- a/src/ui/profile_editor.rs +++ b/src/ui/profile_editor.rs @@ -1,15 +1,12 @@ use super::{ alert::alert_w_widget, - factories::env_var_row_factory::{EnvVarModel, EnvVarModelInit}, + factories::env_var_row_factory::{EnvVarModel, EnvVarModelInit, EnvVarModelOutMsg}, + preference_rows::{combo_row, entry_row, path_row, switch_row}, + ADW_DIALOG_WIDTH, }; use crate::{ env_var_descriptions::ENV_VAR_DESCRIPTIONS_AS_PARAGRAPH, profile::{LighthouseDriver, Profile, XRServiceType}, - ui::{ - factories::env_var_row_factory::EnvVarModelOutMsg, - preference_rows::{combo_row, entry_row, path_row, switch_row}, - ADW_DIALOG_WIDTH, - }, }; use adw::prelude::*; use gtk::glib::{self, clone}; diff --git a/src/ui/term_widget.rs b/src/ui/term_widget.rs index cdc74ba..cfae375 100644 --- a/src/ui/term_widget.rs +++ b/src/ui/term_widget.rs @@ -1,6 +1,6 @@ use gtk4::{gdk, glib::clone, prelude::*}; use relm4::adw; -use vte4::{Terminal, TerminalExt, TerminalExtManual}; +use vte4::{prelude::*, Terminal}; use super::util::copy_text;