overhaul. New storage, nimbler theming

Author: teamcons

README.md

@@ -91,6 +91,10 @@ flatpak-builder --force-clean --user --install-deps-from=appcenter --install bui
 
 ## 💾 Notes Storage
 
-Notes are stored in `~/.var/app/io.github.ellie_commons.jorts/`
+Notes are stored in `~/.var/app/io.github.ellie_commons.jorts/data`
 
-locate the saved_state.json
+You can get it all by
+
+```bash
+cp ~/.var/app/io.github.ellie_commons.jorts/data .
+```

data/Application.css

@@ -4,6 +4,11 @@ window {
     transition: background-color 800ms cubic-bezier(0.4, 0, 0.2, 1);
 }
 
+window decoration {
+    transition: border-color 800ms cubic-bezier(0.4, 0, 0.2, 1);
+}
+
+
 undershoot.top {
     transition: background 800ms cubic-bezier(0.4, 0, 0.2, 1);
 }
@@ -12,32 +17,34 @@ undershoot.bottom {
     transition: background 800ms cubic-bezier(0.4, 0, 0.2, 1);
 }
 
-.jorts-view text selection {
+.sourceview text selection {
     transition: color 800ms cubic-bezier(0.4, 0, 0.2, 1);
     transition: background-color 800ms cubic-bezier(0.4, 0, 0.2, 1);
 }
 
-.jorts-title image,
-.jorts-label {
+.titlebar image,
+.editablelabel {
     box-shadow: none;
     transition: color 800ms cubic-bezier(0.4, 0, 0.2, 1);
 }
 
-.jorts-bar {
+.actionbar {
+    transition: color 800ms cubic-bezier(0.4, 0, 0.2, 1);
     box-shadow: none;
     background: transparent;
     padding: 3px;
 }
 
-.jorts-bar image {
-    padding: 3px;
+.actionbar image {
+    transition: color 800ms cubic-bezier(0.4, 0, 0.2, 1);
     box-shadow: none;
     background-image: none;
+    padding: 3px;
 }
 
-.jorts-view,
-.jorts-view text,
-.jorts-title {
+.sourceview,
+.sourceview text,
+.titlebar {
     background-image: none;
     font-weight: 500;
     font-size: 1.2em;
@@ -60,48 +67,38 @@ entry.flat {
         0 1px 0 0 alpha (@bg_highlight_color, 0.3);
 }
 
-.color-button:hover,
-.color-button:focus {
-    border: 1px solid @inset_dark_color;
-}
+.color-button.strawberry {background-color: @STRAWBERRY_100;}
+.color-button.strawberry:hover {border: 1px solid @STRAWBERRY_500;}
+.color-button.orange {background-color: @ORANGE_100;}
+.color-button.orange:hover {border: 1px solid @ORANGE_500;}
 
-.color-button.slate {
-    background-color: @SLATE_100;
-}
+.color-button.banana {background-color: @BANANA_100;}
+.color-button.banana:hover {border: 1px solid @BANANA_500;}
 
-.color-button.silver {
-    background-color: @SILVER_100;
-}
+.color-button.lime {background-color: @LIME_100;}
+.color-button.lime:hover {border: 1px solid @LIME_500;}
 
-.color-button.strawberry {
-    background-color: @STRAWBERRY_100;
-}
+.color-button.blueberry {background-color: @BLUEBERRY_100;}
+.color-button.blueberry:hover {border: 1px solid @BLUEBERRY_500;}
 
-.color-button.orange {
-    background-color: @ORANGE_100;
-}
+.color-button.bubblegum {background-color: @BUBBLEGUM_100;}
+.color-button.bubblegum:hover {border: 1px solid @BUBBLEGUM_500;}
 
-.color-button.banana {
-    background-color: @BANANA_100;
-}
+.color-button.grape {background-color: @GRAPE_100;}
+.color-button.grape:hover {border: 1px solid @GRAPE_500;}
 
-.color-button.lime {
-    background-color: @LIME_100;
-}
+.color-button.cocoa {background-color: @COCOA_100;}
+.color-button.cocoa {border: 1px solid @COCOA_500;}
 
-.color-button.blueberry {
-    background-color: @BLUEBERRY_100;
-}
+.color-button.slate {background-color: @SLATE_100;}
+.color-button.slate:hover {border: 1px solid @SLATE_500;}
+
+.color-button.silver {background-color: @SILVER_100;}
+.color-button.silver:hover {border: 1px solid @SILVER_500;}
 
-.color-button.grape {
-    background-color: @GRAPE_100;
-}
 
-.color-button.cocoa {
-    background-color: @COCOA_100;
-}
 
-.jorts-bar box {
+.actionbar box {
     border: none;
 }
 
@@ -124,7 +121,7 @@ entry.flat {
     box-shadow: none;
 }
 
-.jorts-label {
+.editablelabel {
     font-weight: 700;
     font-size: 0.88em;
 }

meson.build

@@ -56,11 +56,13 @@ cc = meson.get_compiler('c')
 executable(
     meson.project_name(),
     gresource,
-    'src/Widgets/EditableLabel.vala',
+    'src/noteData.vala',    
+    'src/Services/Stash.vala',
     'src/Services/NoteManager.vala',
     'src/Services/Storage.vala',
     'src/Services/Themer.vala',
     'src/Services/Utils.vala',
+    'src/Widgets/EditableLabel.vala',
     'src/Application.vala',
     'src/MainWindow.vala',
     c_args: c_args,

src/Application.vala

@@ -31,6 +31,17 @@ namespace jorts {
         public override void startup () {
             base.startup ();
 
+            // Ok first check if we have a directory to store data
+            var data_directory  = File.new_for_path(Environment.get_user_data_dir ());	
+            try {
+                if (!data_directory.query_exists()) {
+                    data_directory.make_directory();
+                    print("Prepared target data directory");
+                }
+            } catch (Error e) {
+                warning ("Failed to prepare target data directory %s\n", e.message);
+            }
+        
             // This is automatic in GTK4, so can be removed after porting
             var app_provider = new Gtk.CssProvider ();
             app_provider.load_from_resource ("/io/github/ellie_commons/jorts/Application.css");
@@ -41,16 +52,16 @@ namespace jorts {
             );
 
             string[] themes = {
+                "STRAWBERRY",
+                "ORANGE",
                 "BANANA",
+                "LIME",
                 "BLUEBERRY",
                 "BUBBLEGUM",
-                "COCOA",
                 "GRAPE",
-                "LIME",
-                "ORANGE",
+                "COCOA",
                 "SILVER",
-                "SLATE",
-                "STRAWBERRY"
+                "SLATE"
             };
 
             foreach (unowned var theme in themes) {

src/MainWindow.vala

@@ -85,10 +85,8 @@ namespace jorts {
             }
 
             // add required base classes
-            //this.get_style_context().add_class(this.uid.to_string ());
             this.get_style_context().add_class("rounded");
-            this.get_style_context().add_class("default-decoration");
-            this.get_style_context().add_class("jorts-window");
+
             this.uid = uid_counter++;
 
             // Rebuild the whole theming
@@ -99,7 +97,7 @@ namespace jorts {
             // Define the header
             header = new Gtk.HeaderBar();
             header.get_style_context ().add_class (Gtk.STYLE_CLASS_FLAT);
-            header.get_style_context().add_class("jorts-title");
+            //header.get_style_context().add_class("jorts-title");
             header.has_subtitle = false;
             header.set_show_close_button (true);
             header.decoration_layout = "close:";
@@ -113,7 +111,7 @@ namespace jorts {
 
             // Bar at the bottom
             actionbar = new Gtk.ActionBar ();
-            actionbar.get_style_context().add_class("jorts-bar");
+            actionbar.get_style_context().add_class("actionbar");
             create_actionbar ();
             create_app_menu ();
 
@@ -188,8 +186,16 @@ namespace jorts {
 
         // Save everything
         private void update_storage () {
+            int width, height;
+
             get_storage_note();
             ((Application)this.application).update_storage();
+
+            this.get_size (out width, out height);
+
+            var everythingnote = new noteData(this.uid, this.title, this.theme, this.content, 0, width, height);
+
+            save_to_stash(everythingnote);
         }
 
 
@@ -292,7 +298,7 @@ namespace jorts {
             color_button_bubblegum.width_request = 24;
             color_button_bubblegum.tooltip_text = _("Bubblegum");
 
-            var color_button_bubblegum_context = color_button_blueberry.get_style_context ();
+            var color_button_bubblegum_context = color_button_bubblegum.get_style_context ();
             color_button_bubblegum_context.add_class ("color-button");
             color_button_bubblegum_context.add_class ("bubblegum");
 
@@ -350,6 +356,7 @@ namespace jorts {
             color_button_box.pack_start (color_button_banana, false, true, 0);
             color_button_box.pack_start (color_button_lime, false, true, 0);
             color_button_box.pack_start (color_button_blueberry, false, true, 0);
+            color_button_box.pack_start (color_button_bubblegum, false, true, 0);
             color_button_box.pack_start (color_button_grape, false, true, 0);
             color_button_box.pack_start (color_button_cocoa, false, true, 0);
             color_button_box.pack_start (color_button_silver, false, true, 0);
@@ -518,13 +525,6 @@ namespace jorts {
         }
 
 
-
-
-
-        // TODO: A theming service or something. Something cleaner than this in all cases
-        // Basically the menu button defines two public variables
-        // And then this reconstructs a whole ass theme out of these two
-        // Either it can be a service, or just all defined in CSS and add/remove css
         private void update_theme(string theme) {
 
             // in GTK4 we can replace this with setting css_classes