chore: group imports

This commit is contained in:
Gabriele Musco 2024-08-06 11:36:32 +02:00
commit dc752463ef
8 changed files with 105 additions and 106 deletions

View file

@ -1,4 +1,3 @@
use crate::ui::{app::Msg, cmdline_opts::CmdLineOpts};
use anyhow::Result; use anyhow::Result;
use constants::{resources, APP_ID, APP_NAME, GETTEXT_PACKAGE, LOCALE_DIR, RESOURCES_BASE_PATH}; use constants::{resources, APP_ID, APP_NAME, GETTEXT_PACKAGE, LOCALE_DIR, RESOURCES_BASE_PATH};
use file_builders::{ use file_builders::{
@ -13,7 +12,10 @@ use relm4::{
}; };
use std::env; use std::env;
use steam_linux_runtime_injector::restore_runtime_entrypoint; 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 build_tools;
pub mod builders; pub mod builders;

View file

@ -1,62 +1,63 @@
use super::alert::{alert, alert_w_widget}; use super::{
use super::build_window::{BuildStatus, BuildWindow}; about_dialog::{create_about_dialog, populate_debug_info},
use super::cmdline_opts::CmdLineOpts; alert::{alert, alert_w_widget},
use super::debug_view::{DebugView, DebugViewMsg}; build_window::{BuildStatus, BuildWindow, BuildWindowInit, BuildWindowMsg, BuildWindowOutMsg},
use super::job_worker::internal_worker::JobWorkerOut; cmdline_opts::CmdLineOpts,
use super::job_worker::job::{FuncWorkerOut, WorkerJob}; debug_view::{DebugView, DebugViewInit, DebugViewMsg, DebugViewOutMsg},
use super::job_worker::JobWorker; job_worker::{
use super::libsurvive_setup_window::LibsurviveSetupWindow; internal_worker::JobWorkerOut,
use super::main_view::MainViewMsg; job::{FuncWorkerOut, WorkerJob},
use super::util::{copiable_code_snippet, copy_text, open_with_default_handler}; JobWorker,
use super::wivrn_conf_editor::{WivrnConfEditor, WivrnConfEditorInit, WivrnConfEditorMsg}; },
use crate::builders::build_basalt::get_build_basalt_jobs; libsurvive_setup_window::{LibsurviveSetupMsg, LibsurviveSetupWindow},
use crate::builders::build_libsurvive::get_build_libsurvive_jobs; main_view::{MainView, MainViewInit, MainViewMsg, MainViewOutMsg},
use crate::builders::build_mercury::get_build_mercury_jobs; util::{copiable_code_snippet, copy_text, open_with_default_handler},
use crate::builders::build_monado::get_build_monado_jobs; wivrn_conf_editor::{WivrnConfEditor, WivrnConfEditorInit, WivrnConfEditorMsg},
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 crate::file_builders::openvrpaths_vrpath::{ use crate::{
set_current_openvrpaths_to_profile, set_current_openvrpaths_to_steam, 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 adw::{prelude::*, ResponseAppearance};
use crate::is_appimage::IS_APPIMAGE; use gtk::glib::{self, clone};
use crate::linux_distro::LinuxDistro; use relm4::{
use crate::openxr_prober::is_openxr_ready; actions::{AccelsPlus, ActionGroupName, RelmAction, RelmActionGroup},
use crate::paths::{get_data_dir, get_ipc_file_path}; new_action_group, new_stateful_action, new_stateless_action,
use crate::profile::{Profile, XRServiceType}; prelude::*,
use crate::stateless_action; {ComponentParts, ComponentSender, SimpleComponent},
use crate::steam_linux_runtime_injector::{
restore_runtime_entrypoint, set_runtime_entrypoint_launch_opts_from_profile,
}; };
use crate::ui::about_dialog::{create_about_dialog, populate_debug_info}; use std::{collections::VecDeque, fs::remove_file, time::Duration};
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;
pub struct App { pub struct App {
application: adw::Application, application: adw::Application,

View file

@ -1,5 +1,4 @@
use super::term_widget::TermWidget; use super::{term_widget::TermWidget, SENDER_IO_ERR_MSG};
use crate::ui::SENDER_IO_ERR_MSG;
use adw::prelude::*; use adw::prelude::*;
use relm4::prelude::*; use relm4::prelude::*;

View file

@ -1,13 +1,11 @@
use super::term_widget::TermWidget; use super::{
use super::util::copy_text; app::{DebugCopyEnvVarsAction, DebugOpenDataAction, DebugOpenPrefixAction},
use crate::log_level::LogLevel; term_widget::TermWidget,
use crate::log_parser::MonadoLog; util::copy_text,
use crate::profile::Profile; };
use crate::ui::app::{DebugCopyEnvVarsAction, DebugOpenDataAction, DebugOpenPrefixAction}; use crate::{log_level::LogLevel, log_parser::MonadoLog, profile::Profile};
use gtk::glib::clone; use gtk::{glib::clone, prelude::*};
use gtk::prelude::*; use relm4::{prelude::*, ComponentSender, SimpleComponent};
use relm4::prelude::*;
use relm4::{ComponentSender, SimpleComponent};
#[derive(Debug)] #[derive(Debug)]
pub enum SearchDirection { pub enum SearchDirection {

View file

@ -13,8 +13,7 @@ use crate::{
profile::{Profile, XRServiceType}, profile::{Profile, XRServiceType},
stateless_action, stateless_action,
}; };
use gtk::prelude::*; use gtk::{glib::clone, prelude::*};
use gtk4::glib::clone;
use relm4::{ use relm4::{
actions::{ActionGroupName, RelmAction, RelmActionGroup}, actions::{ActionGroupName, RelmAction, RelmActionGroup},
new_action_group, new_stateless_action, new_action_group, new_stateless_action,

View file

@ -1,33 +1,36 @@
use std::fs::read_to_string; use super::{
use std::io::Write; alert::alert,
app::{
use super::alert::alert; AboutAction, BuildProfileAction, BuildProfileCleanAction, ConfigureWivrnAction,
use super::devices_box::{DevicesBox, DevicesBoxMsg}; DebugViewToggleAction,
use super::install_wivrn_box::{InstallWivrnBox, InstallWivrnBoxInit, InstallWivrnBoxMsg}; },
use super::profile_editor::{ProfileEditor, ProfileEditorMsg, ProfileEditorOutMsg}; devices_box::{DevicesBox, DevicesBoxMsg},
use super::steam_launch_options_box::{SteamLaunchOptionsBox, SteamLaunchOptionsBoxMsg}; install_wivrn_box::{InstallWivrnBox, InstallWivrnBoxInit, InstallWivrnBoxMsg},
use super::steamvr_calibration_box::SteamVrCalibrationBox; profile_editor::{ProfileEditor, ProfileEditorInit, ProfileEditorMsg, ProfileEditorOutMsg},
use crate::config::Config; steam_launch_options_box::{SteamLaunchOptionsBox, SteamLaunchOptionsBoxMsg},
use crate::dependencies::common::dep_pkexec; steamvr_calibration_box::{SteamVrCalibrationBox, SteamVrCalibrationBoxMsg},
use crate::file_utils::{get_writer, mount_has_nosuid}; util::{limit_dropdown_width, warning_heading},
use crate::gpu_profile::{get_amd_gpu_power_profile, GpuPowerProfile}; };
use crate::paths::{get_data_dir, get_home_dir}; use crate::{
use crate::profile::{LighthouseDriver, Profile, XRServiceType}; config::Config,
use crate::stateless_action; dependencies::common::dep_pkexec,
use crate::steamvr_utils::chaperone_info_exists; file_utils::{get_writer, mount_has_nosuid},
use crate::ui::app::{ gpu_profile::{get_amd_gpu_power_profile, GpuPowerProfile},
AboutAction, BuildProfileAction, BuildProfileCleanAction, ConfigureWivrnAction, paths::{get_data_dir, get_home_dir},
DebugViewToggleAction, 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 adw::{prelude::*, ResponseAppearance};
use gtk::glib::clone; use gtk::glib::clone;
use relm4::actions::{ActionGroupName, RelmAction, RelmActionGroup}; use relm4::{
use relm4::{new_action_group, new_stateless_action, prelude::*}; actions::{ActionGroupName, RelmAction, RelmActionGroup},
use relm4::{ComponentParts, ComponentSender, SimpleComponent}; new_action_group, new_stateless_action,
prelude::*,
ComponentParts, ComponentSender, SimpleComponent,
};
use std::{fs::read_to_string, io::Write};
#[tracker::track] #[tracker::track]
pub struct MainView { pub struct MainView {

View file

@ -1,15 +1,12 @@
use super::{ use super::{
alert::alert_w_widget, 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::{ use crate::{
env_var_descriptions::ENV_VAR_DESCRIPTIONS_AS_PARAGRAPH, env_var_descriptions::ENV_VAR_DESCRIPTIONS_AS_PARAGRAPH,
profile::{LighthouseDriver, Profile, XRServiceType}, 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 adw::prelude::*;
use gtk::glib::{self, clone}; use gtk::glib::{self, clone};

View file

@ -1,6 +1,6 @@
use gtk4::{gdk, glib::clone, prelude::*}; use gtk4::{gdk, glib::clone, prelude::*};
use relm4::adw; use relm4::adw;
use vte4::{Terminal, TerminalExt, TerminalExtManual}; use vte4::{prelude::*, Terminal};
use super::util::copy_text; use super::util::copy_text;