new file warning dialog

Author: JonathanKr

src/events.rs

@@ -86,6 +86,7 @@ pub fn new_event(
     mut fixed_timestep: ResMut<Time<Fixed>>,
     mut ids: ResMut<ComponentIDs>,
     mut gradient: ResMut<Gradient>,
+    mut sim_time: ResMut<SimTime>,
 ) {
     for _ in new_ev.read() {
         for (e, _) in sources.iter() {
@@ -107,25 +108,28 @@ pub fn new_event(
         fixed_timestep.set_timestep_hz(ui_state.framerate);
         ids.reset();
         *gradient = Gradient::default();
-
+        sim_time.time_since_start = 0f32;
         // TODO: clear undoer
     }
 }
 
 #[derive(Event)]
-pub struct Save;
+pub struct Save {
+    pub new_file: bool,
+}
 
 pub fn save_event(
     mut commands: Commands,
     mut save_ev: EventReader<Save>,
+    mut new_ev: EventWriter<New>,
     sources: Query<&Source>,
     mics: Query<&Microphone>,
     rect_walls: Query<&RectWall>,
     circ_walls: Query<&CircWall>,
     gradient: Res<Gradient>,
     ui_state: Res<UiState>,
 ) {
-    for _ in save_ev.read() {
+    for event in save_ev.read() {
         let sources = sources.iter().collect::<Vec<_>>();
         let mics = mics.iter().collect::<Vec<_>>();
         let rect_walls = rect_walls.iter().collect::<Vec<_>>();
@@ -149,6 +153,10 @@ pub fn save_event(
             .set_directory("./")
             .set_title("Select a file to save to")
             .save_file::<SaveFileContents>(data);
+
+        if event.new_file {
+            new_ev.send(New);
+        }
     }
 }
 

src/input/systems.rs

@@ -6,7 +6,7 @@ use crate::components::microphone::Microphone;
 use crate::components::source::{Source, SourceType};
 use crate::components::states::{Move, Selected};
 use crate::components::wall::{CircWall, RectWall, WResize, Wall};
-use crate::events::{Load, New, Reset, Save, UpdateWalls};
+use crate::events::{Load, Reset, Save, UpdateWalls};
 use crate::math::transformations::{screen_to_grid, screen_to_nearest_grid};
 use crate::simulation::plugin::ComponentIDs;
 use crate::ui::state::{ClipboardBuffer, PlaceType, ToolType, UiState};
@@ -459,13 +459,12 @@ pub fn button_input(
 pub fn event_input(
     mouse_buttons: Res<ButtonInput<MouseButton>>,
     keys: Res<ButtonInput<KeyCode>>,
-    ui_state: ResMut<UiState>,
+    mut ui_state: ResMut<UiState>,
     mut reset_ev: EventWriter<Reset>,
     mut save_ev: EventWriter<Save>,
     mut load_ev: EventWriter<Load>,
     mut wall_update_ev: EventWriter<UpdateWalls>,
     mut exit_ev: EventWriter<AppExit>,
-    mut new_ev: EventWriter<New>,
     mut selected: Query<Entity, With<Selected>>,
     mut commands: Commands,
 ) {
@@ -493,15 +492,15 @@ pub fn event_input(
 
     // new file
     if ctrl && keys.just_pressed(KeyCode::KeyN) {
-        new_ev.send(New);
+        ui_state.show_new_warning = true;
     }
     // load file
     if ctrl && keys.just_pressed(KeyCode::KeyO) {
         load_ev.send(Load);
     }
     // save file
     if ctrl && keys.just_pressed(KeyCode::KeyS) {
-        save_ev.send(Save);
+        save_ev.send(Save { new_file: false });
     }
     // quit program
     if ctrl && keys.just_pressed(KeyCode::KeyQ) {

src/ui/draw.rs

@@ -221,6 +221,32 @@ pub fn draw_egui(
         ui_state.read_epilepsy_warning = read_epilepsy_warning;
     }
 
+    if ui_state.show_new_warning {
+        let mut show_new_warning = true;
+        egui::Window::new("Save changes")
+            .default_size(Vec2::new(400., 400.))
+            .resizable(false)
+            .collapsible(false)
+            .constrain(true)
+            .show(ctx, |ui| {
+                ui.label("Save changes before closing?");
+                ui.horizontal(|ui| {
+                    if ui.button("Save").clicked() {
+                        show_new_warning = false;
+                        events.save_ev.send(Save { new_file: true });
+                    }
+                    if ui.button("Don't save").clicked() {
+                        show_new_warning = false;
+                        events.new_ev.send(New);
+                    }
+                    if ui.button("Cancel").clicked() {
+                        show_new_warning = false;
+                    }
+                });
+            });
+        ui_state.show_new_warning = show_new_warning;
+    }
+
     egui::TopBottomPanel::top("top_menu")
         .frame(
             Frame::default()
@@ -242,7 +268,7 @@ pub fn draw_egui(
                         .clicked()
                     {
                         ui.close_menu();
-                        events.new_ev.send(New);
+                        ui_state.show_new_warning = true;
                     }
 
                     if ui
@@ -251,7 +277,7 @@ pub fn draw_egui(
                         .clicked()
                     {
                         ui.close_menu();
-                        events.save_ev.send(Save);
+                        events.save_ev.send(Save { new_file: false });
                     }
 
                     if ui

src/ui/state.rs

@@ -101,6 +101,7 @@ pub struct UiState {
     pub max_gradient: f32,
     pub min_gradient: f32,
     pub hide_gizmos: bool,
+    pub show_new_warning: bool,
 }
 
 impl Default for UiState {
@@ -135,6 +136,7 @@ impl Default for UiState {
             max_gradient: 2.,
             min_gradient: -2.,
             hide_gizmos: false,
+            show_new_warning: false,
         }
     }
 }