From 0fb587027cd1fadb14738d28aa417bb824eec56f Mon Sep 17 00:00:00 2001
From: futile <git@futile.eu>
Date: Thu, 20 Nov 2025 16:02:03 +0000
Subject: [PATCH] nicen up settings

---
 src/gui/app.rs      | 42 +++++++++++++++++++++++-------------------
 src/gui/settings.rs | 28 ++++++++++++++--------------
 2 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/src/gui/app.rs b/src/gui/app.rs
index a65d66a..3095025 100644
--- a/src/gui/app.rs
+++ b/src/gui/app.rs
@@ -198,27 +198,31 @@ impl App {
     }
 
     fn show_settings_stage(&mut self, ctx: &egui::Context, ui: &mut egui::Ui) {
-        ui.horizontal(|ui| {
-            ui.label("Launch version");
-            egui::ComboBox::from_id_salt("Launch version")
-                .selected_text(self.settings.launch_version.to_string())
-                .show_ui(ui, |ui| {
-                    ui.build_menu(&mut self.settings.launch_version);
-                });
+        ui.collapsing("General", |ui| {
+            ui.checkbox(&mut self.settings.start_elevated, "Always start elevated");
+            ui.horizontal(|ui| {
+                let selection = self.settings.theme;
+                egui::ComboBox::from_id_salt("Theme")
+                    .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| {
-            let selection = self.settings.theme;
-            ui.label("Theme");
-            egui::ComboBox::from_id_salt("Theme")
-                .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.collapsing("Game", |ui| {
+            ui.horizontal(|ui| {
+                egui::ComboBox::from_id_salt("Launch version")
+                    .selected_text(self.settings.launch_version.to_string())
+                    .show_ui(ui, |ui| {
+                        ui.build_menu(&mut self.settings.launch_version);
+                    });
+                ui.label("Launch version");
+            });
         });
-        ui.checkbox(&mut self.settings.start_elevated, "Always start elevated");
     }
 
     fn show_about_stage(&self, _ctx: &egui::Context, ui: &mut egui::Ui) {
diff --git a/src/gui/settings.rs b/src/gui/settings.rs
index 81ed5e1..9d67f7d 100644
--- a/src/gui/settings.rs
+++ b/src/gui/settings.rs
@@ -14,14 +14,14 @@ pub enum Theme {
     #[default]
     #[strum(to_string = "Auto")]
     Auto,
-    #[strum(to_string = "Catppuccin Latte")]
-    CatppuccinLatte,
-    #[strum(to_string = "Catppuccin Frappe")]
-    CatppuccinFrappe,
-    #[strum(to_string = "Catppuccin Macchiato")]
-    CatppuccinMacchiato,
-    #[strum(to_string = "Catppuccin Mocha")]
-    CatppuccinMocha,
+    #[strum(to_string = "Latte")]
+    Latte,
+    #[strum(to_string = "Frappe")]
+    Frappe,
+    #[strum(to_string = "Macchiato")]
+    Macchiato,
+    #[strum(to_string = "Mocha")]
+    Mocha,
 }
 
 impl From<Theme> for catppuccin_egui::Theme {
@@ -34,17 +34,17 @@ impl From<Theme> for catppuccin_egui::Theme {
                     catppuccin_egui::MOCHA
                 }
             }
-            Theme::CatppuccinLatte => catppuccin_egui::LATTE,
-            Theme::CatppuccinFrappe => catppuccin_egui::FRAPPE,
-            Theme::CatppuccinMacchiato => catppuccin_egui::MACCHIATO,
-            Theme::CatppuccinMocha => catppuccin_egui::MOCHA,
+            Theme::Latte => catppuccin_egui::LATTE,
+            Theme::Frappe => catppuccin_egui::FRAPPE,
+            Theme::Macchiato => catppuccin_egui::MACCHIATO,
+            Theme::Mocha => catppuccin_egui::MOCHA,
         }
     }
 }
 
 #[derive(Clone, Debug, Default, Serialize, Deserialize)]
 pub struct Settings {
-    pub launch_version: LaunchVersion,
-    pub theme: Theme,
     pub start_elevated: bool,
+    pub theme: Theme,
+    pub launch_version: LaunchVersion,
 }