move color handling to popover

Author: teamcons

src/Application.vala

@@ -207,7 +207,7 @@ Please wait while the app remembers all the things...
 
     private void action_save () {
         debug ("[ACTION] Saving...");
-        manager.save_all.begin ();
+        manager.save_all ();
     }
 
     private void action_reset_settings () {

src/Services/NoteManager.vala

@@ -74,12 +74,12 @@ public class Jorts.NoteManager : Object {
             random_data = Jorts.Utils.golden_sticky (random_data);
             note = new StickyNoteWindow (application, random_data);
         }
-
+        
         /* LETSGO */
         open_notes.add (note);
         note.show ();
         note.present ();
-        note.changed.connect (save_all);
+        save_all ();
 
 	}
 
@@ -120,16 +120,15 @@ public class Jorts.NoteManager : Object {
 
         open_notes.remove (note);
         note.close ();
-        save_all.begin ();
+        save_all ();
 	}
 
     /*************************************************/
     /**
     * Cue to immediately write from the active list to the storage
     */
-    public async void save_all () {
+    public void save_all () {
         debug ("[MANAGER] Save the stickies!");
-
         var array = new Json.Array ();
 
         foreach (Jorts.StickyNoteWindow note in open_notes) {

src/Views/PopoverView.vala

@@ -15,9 +15,10 @@ public class Jorts.PopoverView : Gtk.Popover {
     private Jorts.MonospaceBox monospace_box;
     private Jorts.ZoomBox font_size_box;
 
+    private Themes _old_color = Jorts.Constants.DEFAULT_THEME;
     public Themes color {
-        get {return color_button_box.color;}
-        set {color_button_box.color = value;}
+        get {return _old_color;}
+        set {on_color_changed (value);}
     }
 
     public bool monospace {
@@ -58,13 +59,42 @@ public class Jorts.PopoverView : Gtk.Popover {
 
         child = view;
 
-        color_button_box.theme_changed.connect ((selected) => {theme_changed (selected);});
+        color_button_box.theme_changed.connect (on_color_changed);
         monospace_box.monospace_changed.connect (on_monospace_changed);
         font_size_box.zoom_changed.connect (on_zoom_changed);
     }
 
 
 
+    /**
+    * Switches stylesheet
+    * First use appropriate stylesheet, Then switch the theme classes
+    */  
+    private void on_color_changed (Jorts.Themes new_theme) {
+        debug ("Updating theme to %s".printf (new_theme.to_string ()));
+
+        // Avoid deathloop where the handler calls itself
+        color_button_box.theme_changed.disconnect (on_color_changed);
+
+        // Accent
+        var stylesheet = "io.elementary.stylesheet." + new_theme.to_css_class ();
+        parent_window.gtk_settings.gtk_theme_name = stylesheet;
+
+        // Add remove class
+        if (_old_color.to_string () in parent_window.css_classes) {
+            parent_window.remove_css_class (_old_color.to_string ());
+        }
+        parent_window.add_css_class (new_theme.to_string ());
+
+        // Propagate values
+        _old_color = new_theme;
+        color_button_box.color = new_theme;
+        NoteData.latest_theme = new_theme;
+
+        // Cleanup
+        ((Jorts.Application)parent_window.application).manager.save_all ();
+        color_button_box.theme_changed.connect (on_color_changed);
+    }
 
     /**
     * Switches the .monospace class depending on the note setting
@@ -84,7 +114,8 @@ public class Jorts.PopoverView : Gtk.Popover {
         parent_window.view.textview.monospace = monospace;
         monospace_box.monospace = monospace;
         Jorts.NoteData.latest_mono = monospace;
-        parent_window.changed ();
+
+                ((Jorts.Application)parent_window.application).manager.save_all ();
     }
 
 
@@ -104,7 +135,7 @@ public class Jorts.PopoverView : Gtk.Popover {
             case Zoomkind.ZOOM_OUT:             zoom_out (); break;
             default:                            zoom_default (); break;
         }
-        ((Jorts.Application)parent_window.application).manager.save_all.begin ();
+        ((Jorts.Application)parent_window.application).manager.save_all ();
     }
 
     /**

src/Windows/StickyNoteWindow.vala

@@ -33,12 +33,6 @@ public class Jorts.StickyNoteWindow : Gtk.ApplicationWindow {
     private PopoverView popover;
     public TextView textview;
 
-    private Themes _old_color;
-    public Jorts.Themes color {
-        get { return popover.color;}
-        set { popover.color = value; on_theme_changed (value);}
-    }
-
     public NoteData data {
         owned get { return packaged ();}
         set { load_data (value);}
@@ -47,9 +41,6 @@ public class Jorts.StickyNoteWindow : Gtk.ApplicationWindow {
 
     private static uint debounce_timer_id;
 
-    // Connected to by the NoteManager to know it is time to save
-    public signal void changed ();
-
     private const string ACTION_PREFIX = "app.";
     private const string ACTION_DELETE = "action_delete";
     private const string ACTION_SHOW_EMOJI = "action_show_emoji";
@@ -140,8 +131,6 @@ public class Jorts.StickyNoteWindow : Gtk.ApplicationWindow {
         editableheader.changed.connect (on_editable_changed);
         view.textview.buffer.changed.connect (debounce_save);
 
-        popover.theme_changed.connect (on_theme_changed);
-
         // Use the color theme of this sticky note when focused
         this.notify["is-active"].connect (on_focus_changed);
 
@@ -190,7 +179,7 @@ public class Jorts.StickyNoteWindow : Gtk.ApplicationWindow {
 
         debounce_timer_id = Timeout.add (Jorts.Constants.DEBOUNCE, () => {
             debounce_timer_id = 0;
-            changed ();
+            ((Jorts.Application)application).manager.save_all ();
             return GLib.Source.REMOVE;
         });
     }
@@ -225,7 +214,7 @@ public class Jorts.StickyNoteWindow : Gtk.ApplicationWindow {
         debug ("Focus changed!");
 
         if (this.is_active) {
-            var stylesheet = "io.elementary.stylesheet." + color.to_string ().ascii_down ();
+            var stylesheet = "io.elementary.stylesheet." + popover.color.to_string ().ascii_down ();
             gtk_settings.gtk_theme_name = stylesheet;
         }
 
@@ -253,13 +242,15 @@ public class Jorts.StickyNoteWindow : Gtk.ApplicationWindow {
 
         var data = new NoteData (
                 editableheader.text,
-            color,
+            popover.color,
             content,
-            view.textview.monospace,
+            popover.monospace,
             popover.zoom,
                 width,
                 height);
 
+                print (" " + popover.color.to_string ());
+
         return data;
     }
 
@@ -276,29 +267,7 @@ public class Jorts.StickyNoteWindow : Gtk.ApplicationWindow {
 
         popover.zoom = data.zoom;
         popover.monospace = data.monospace;
-        color = data.theme;
-    }
-
-    /**
-    * Switches stylesheet
-    * First use appropriate stylesheet, Then switch the theme classes
-    */  
-    private void on_theme_changed (Jorts.Themes new_theme) {
-        debug ("Updating theme to %s".printf (new_theme.to_string ()));
-
-        print (" - " + new_theme.to_nicename ());
-
-        var stylesheet = "io.elementary.stylesheet." + new_theme.to_css_class ();
-        this.gtk_settings.gtk_theme_name = stylesheet;
-
-        if (_old_color.to_string () in css_classes) {
-            remove_css_class (_old_color.to_string ());
-        }
-
-        _old_color = new_theme;
-        add_css_class (new_theme.to_string ());
-        NoteData.latest_theme = new_theme;
-        changed ();
+        popover.color = data.theme;
     }
 
     private void action_focus_title () {set_focus (editableheader); editableheader.editing = true;}