futile/gta-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

nicen up settings

Browse Source
This commit is contained in:
futile
2025-11-20 16:02:03 +00:00
parent 0424b7b114
commit 0fb587027c
2 changed files with 37 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/app.rs
+23 -19
View File
@@ -198,27 +198,31 @@ impl App {
} }
fn show_settings_stage(&mut self, ctx: &egui::Context, ui: &mut egui::Ui) { fn show_settings_stage(&mut self, ctx: &egui::Context, ui: &mut egui::Ui) {
ui.horizontal(|ui| { ui.collapsing("General", |ui| {
ui.label("Launch version"); ui.checkbox(&mut self.settings.start_elevated, "Always start elevated");
egui::ComboBox::from_id_salt("Launch version") ui.horizontal(|ui| {
.selected_text(self.settings.launch_version.to_string()) let selection = self.settings.theme;
.show_ui(ui, |ui| { egui::ComboBox::from_id_salt("Theme")
ui.build_menu(&mut self.settings.launch_version); .selected_text(self.settings.theme.to_string())
}); .show_ui(ui, |ui| {
ui.build_menu(&mut self.settings.theme);
});
if selection != self.settings.theme {
catppuccin_egui::set_theme(ctx, self.settings.theme.into());
}
ui.label("Theme");
});
}); });
ui.horizontal(|ui| { ui.collapsing("Game", |ui| {
let selection = self.settings.theme; ui.horizontal(|ui| {
ui.label("Theme"); egui::ComboBox::from_id_salt("Launch version")
egui::ComboBox::from_id_salt("Theme") .selected_text(self.settings.launch_version.to_string())
.selected_text(self.settings.theme.to_string()) .show_ui(ui, |ui| {
.show_ui(ui, |ui| { ui.build_menu(&mut self.settings.launch_version);
ui.build_menu(&mut self.settings.theme); });
}); ui.label("Launch version");
if selection != self.settings.theme { });
catppuccin_egui::set_theme(ctx, self.settings.theme.into());
}
}); });
ui.checkbox(&mut self.settings.start_elevated, "Always start elevated");
} }
fn show_about_stage(&self, _ctx: &egui::Context, ui: &mut egui::Ui) { fn show_about_stage(&self, _ctx: &egui::Context, ui: &mut egui::Ui) {
src/gui/settings.rs
+14 -14
View File
@@ -14,14 +14,14 @@ pub enum Theme {
#[default] #[default]
#[strum(to_string = "Auto")] #[strum(to_string = "Auto")]
Auto, Auto,
#[strum(to_string = "Catppuccin Latte")] #[strum(to_string = "Latte")]
CatppuccinLatte, Latte,
#[strum(to_string = "Catppuccin Frappe")] #[strum(to_string = "Frappe")]
CatppuccinFrappe, Frappe,
#[strum(to_string = "Catppuccin Macchiato")] #[strum(to_string = "Macchiato")]
CatppuccinMacchiato, Macchiato,
#[strum(to_string = "Catppuccin Mocha")] #[strum(to_string = "Mocha")]
CatppuccinMocha, Mocha,
} }
impl From<Theme> for catppuccin_egui::Theme { impl From<Theme> for catppuccin_egui::Theme {
@@ -34,17 +34,17 @@ impl From<Theme> for catppuccin_egui::Theme {
catppuccin_egui::MOCHA catppuccin_egui::MOCHA
} }
} }
Theme::CatppuccinLatte => catppuccin_egui::LATTE, Theme::Latte => catppuccin_egui::LATTE,
Theme::CatppuccinFrappe => catppuccin_egui::FRAPPE, Theme::Frappe => catppuccin_egui::FRAPPE,
Theme::CatppuccinMacchiato => catppuccin_egui::MACCHIATO, Theme::Macchiato => catppuccin_egui::MACCHIATO,
Theme::CatppuccinMocha => catppuccin_egui::MOCHA, Theme::Mocha => catppuccin_egui::MOCHA,
} }
} }
} }
#[derive(Clone, Debug, Default, Serialize, Deserialize)] #[derive(Clone, Debug, Default, Serialize, Deserialize)]
pub struct Settings { pub struct Settings {
pub launch_version: LaunchVersion,
pub theme: Theme,
pub start_elevated: bool, pub start_elevated: bool,
pub theme: Theme,
pub launch_version: LaunchVersion,
} }