mirrors/envision
1
0
Fork 0
mirror of https://gitlab.com/gabmus/envision.git synced 2025-04-20 19:44:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: profile switcher to bottom; create profile button; config contains user profiles list

Browse source
This commit is contained in:
Gabriele Musco 2023-06-24 10:14:32 +02:00
parent 69e54abb33
commit 8182718430
No known key found for this signature in database
GPG key ID: 1068D795C80E51DE
4 changed files with 76 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/config.rs
View file

@ -10,6 +10,7 @@ use std::{fs::File, io::BufReader};
pub struct Config {
pub selected_profile_name: String,
pub debug_view_enabled: bool,
pub user_profiles: Vec<Profile>,
}
impl Default for Config {
@ -18,6 +19,7 @@ impl Default for Config {
// TODO: handle first start with no profile selected
selected_profile_name: "".to_string(),
debug_view_enabled: false,
user_profiles: vec![],
}
}
}

28
src/profile.rs
View file

@ -1,6 +1,6 @@
use crate::{
file_utils::get_writer,
paths::{BWRAP_SYSTEM_PREFIX, SYSTEM_PREFIX},
file_utils::{get_data_dir, get_writer},
paths::{data_monado_path, data_opencomposite_path, BWRAP_SYSTEM_PREFIX, SYSTEM_PREFIX},
};
use expect_dialog::ExpectDialog;
use serde::{Deserialize, Serialize};
@ -37,6 +37,30 @@ impl Display for Profile {
}
}
impl Default for Profile {
fn default() -> Self {
Self {
name: "Default profile name".into(),
xrservice_path: data_monado_path(),
xrservice_type: XRServiceType::Monado,
opencomposite_path: data_opencomposite_path(),
basalt_path: None,
mercury_path: None,
libsurvive_path: None,
basalt_enabled: false,
mercury_enabled: false,
libsurvive_enabled: false,
environment: HashMap::new(),
prefix: format!(
"{data}/prefixes/default_profile_prefix",
data = get_data_dir()
),
can_be_built: true,
editable: true,
}
}
}
impl Profile {
pub fn get_steam_launch_options(&self) -> String {
let mut opts = vec![];

3
src/ui/app.rs
View file

@ -350,11 +350,12 @@ impl SimpleComponent for App {
sender: ComponentSender<Self>,
) -> ComponentParts<Self> {
let config = Config::get_config();
let profiles = vec![
let mut profiles = vec![
valve_index_profile(),
system_valve_index_profile(),
wivrn_profile(),
];
profiles.extend(config.user_profiles.clone());
let dependencies_dialog = adw::MessageDialog::builder()
.modal(true)
.transient_for(root)

71
src/ui/main_view.rs
View file

@ -49,6 +49,7 @@ pub enum MainViewMsg {
ProfileSelected(u32),
UpdateSelectedProfile(Profile),
EditProfile,
CreateProfile,
DuplicateProfile,
}
@ -104,30 +105,6 @@ impl SimpleComponent for MainView {
set_icon_name: icon_name::MENU,
set_menu_model: Some(&app_menu),
},
pack_start = &gtk::Box {
set_orientation: gtk::Orientation::Horizontal,
add_css_class: "linked",
#[name(profiles_dropdown)]
gtk::DropDown {
set_tooltip_text: Some("Profiles"),
#[track = "model.changed(Self::profile_names())"]
set_model: Some(&{
let names: Vec<_> = model.profile_names.iter().map(String::as_str).collect();
gtk::StringList::new(&names)
}),
connect_selected_item_notify[sender] => move |this| {
sender.input(MainViewMsg::ProfileSelected(this.selected()));
},
},
gtk::Button {
set_icon_name: icon_name::EDIT,
add_css_class: "suggested-action",
set_tooltip_text: Some("Edit Profile"),
connect_clicked[sender] => move |_| {
sender.input(Self::Input::EditProfile);
}
}
},
#[track = "model.changed(Self::enable_debug_view())"]
set_show_end_title_buttons: !model.enable_debug_view,
},
@ -162,6 +139,47 @@ impl SimpleComponent for MainView {
model.steam_launch_options_box.widget(),
model.install_wivrn_box.widget(),
}
},
gtk::Separator {
set_orientation: gtk::Orientation::Horizontal,
set_hexpand: true,
},
gtk::Box {
set_orientation: gtk::Orientation::Horizontal,
set_spacing: 12,
add_css_class: "toolbar",
add_css_class: "view",
gtk::Box {
set_orientation: gtk::Orientation::Horizontal,
add_css_class: "linked",
#[name(profiles_dropdown)]
gtk::DropDown {
set_hexpand: true,
set_tooltip_text: Some("Profiles"),
#[track = "model.changed(Self::profile_names())"]
set_model: Some(&{
let names: Vec<_> = model.profile_names.iter().map(String::as_str).collect();
gtk::StringList::new(&names)
}),
connect_selected_item_notify[sender] => move |this| {
sender.input(MainViewMsg::ProfileSelected(this.selected()));
},
},
gtk::Button {
set_icon_name: icon_name::EDIT,
set_tooltip_text: Some("Edit Profile"),
connect_clicked[sender] => move |_| {
sender.input(Self::Input::EditProfile);
}
},
gtk::Button {
set_icon_name: "list-add-symbolic",
set_tooltip_text: Some("Create Profile"),
connect_clicked[sender] => move |_| {
sender.input(Self::Input::CreateProfile);
}
}
},
}
}
}
@ -243,8 +261,11 @@ impl SimpleComponent for MainView {
self.profile_not_editable_dialog.present();
}
}
Self::Input::CreateProfile => {
println!("create");
}
Self::Input::DuplicateProfile => {
println!("dup")
println!("dup");
}
}
}