Make NoteManager keep track of some values

Author: teamcons

src/Services/NoteManager.vala

@@ -11,9 +11,9 @@ public class Jorts.NoteManager : Object {
     public Gee.ArrayList<StickyNoteWindow> open_notes = new Gee.ArrayList<StickyNoteWindow> ();
     public Gtk.Application application;
 
-    public int latest_zoom;
-    public bool latest_mono;
-    public string latest_theme;
+    public static int latest_zoom;
+    public static bool latest_mono;
+    public static string latest_theme;
 
     public NoteManager (Jorts.Application app) {
         this.application = app;
@@ -63,7 +63,7 @@ public class Jorts.NoteManager : Object {
 
             random_data = Jorts.Utils.golden_sticky (random_data);
 
-            random_data.zoom = this.latest_zoom;
+            random_data.zoom = latest_zoom;
             note = new StickyNoteWindow (application, random_data);
         }
 
@@ -90,7 +90,7 @@ public class Jorts.NoteManager : Object {
             StickyNoteWindow last_note = open_notes.last ();
             string skip_theme = last_note.theme;
             var random_data = Jorts.Utils.random_note (skip_theme);
-            random_data.zoom = this.latest_zoom;
+            random_data.zoom = latest_zoom;
             note = new StickyNoteWindow (application, random_data);
             open_notes.add (note);
                     print ("new");

src/Services/Storage.vala

@@ -15,7 +15,7 @@ public class Jorts.Storage {
 
     private string data_directory;
     private string storage_path;
-    private string save_file;
+    private File save_file;
 
     construct {
         data_directory = Environment.get_user_data_dir ();
@@ -99,8 +99,7 @@ public class Jorts.Storage {
                     loaded_data = Jorts.Jason.load_parser(parser);
 
                 } catch (Error e) {
-                    print("[WARNING] Failed to load from storage (Attempt 3)!!! " + e.message.to_string() + "\n");
-                    quit ();
+                    critical ("[WARNING] Failed to load from storage (Attempt 3)!!! " + e.message.to_string() + "\n");
                 }
             }
 

src/Windows/StickyNoteWindow.vala

@@ -271,7 +271,7 @@ public class Jorts.StickyNoteWindow : Gtk.ApplicationWindow {
 
         _theme = new_theme;
         add_css_class (new_theme);
-
+        NoteManager.latest_theme = new_theme;
         ((Application)this.application).manager.save_to_stash ();
     }
 
@@ -291,6 +291,7 @@ public class Jorts.StickyNoteWindow : Gtk.ApplicationWindow {
         }
         view.textview.monospace = monospace;
         popover.monospace_box.monospace = monospace;
+        NoteManager.latest_mono = monospace;
         ((Application)this.application).manager.save_to_stash ();
     }
 
@@ -346,7 +347,7 @@ public class Jorts.StickyNoteWindow : Gtk.ApplicationWindow {
 
         // Keep it for next new notes
         //((Application)this.application).latest_zoom = zoom;
-        ((Jorts.Application)this.application).manager.latest_zoom = zoom;
+        NoteManager.latest_zoom = zoom;
     }
 
     private void action_focus_title () {set_focus (editableheader); editableheader.editing = true;}

src/meson.build

@@ -3,6 +3,7 @@ sources = files (
     'Objects' / 'Themes.vala',
     'Objects' / 'NoteData.vala',
 
+    'Services' / 'Storage.vala',
     'Services' / 'NoteManager.vala',
     'Services' / 'Constants.vala',
     'Services' / 'Jason.vala',