Merge branch 'main' into autosave-dir

Author: wpkelso

data/io.github.wpkelso.slate.desktop.in

@@ -8,3 +8,4 @@ Terminal=false
 Type=Application
 StartupNotify=true
 Categories=Utility;GTK;Office;Development;TextTools;TextEditor;
+MimeType=text/plain;

po/POTFILES

@@ -1,2 +1,3 @@
 src/Application.vala
 src/Window.vala
+src/Utils.vala

po/de.po

@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: io.github.wpkelso.slate\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-06-12 19:53+0200\n"
+"POT-Creation-Date: 2025-06-15 14:50+0200\n"
 "PO-Revision-Date: 2025-06-09 HO:MI+ZONE\n"
 "Last-Translator: Teamcons - teamcons.carrd.co\n"
 "Language-Team: DE <[email protected]>\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/Application.vala:107 src/Window.vala:24
+#: src/Window.vala:24 src/Utils.vala:9
 msgid "New Document"
 msgstr "Neues Dokument"
 

po/es.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: io.github.wpkelso.slate\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-06-12 19:53+0200\n"
+"POT-Creation-Date: 2025-06-15 14:50+0200\n"
 "PO-Revision-Date: 2025-06-11 HO:MI+ZONE\n"
 "Last-Translator: Teamcons - teamcons.carrd.co\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/Application.vala:107 src/Window.vala:24
+#: src/Window.vala:24 src/Utils.vala:9
 msgid "New Document"
 msgstr "Nuevo Documento"
 

po/fr.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: io.github.wpkelso.slate\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-06-12 19:53+0200\n"
+"POT-Creation-Date: 2025-06-15 14:50+0200\n"
 "PO-Revision-Date: 2025-06-11 HO:MI+ZONE\n"
 "Last-Translator: Teamcons - teamcons.carrd.co\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/Application.vala:107 src/Window.vala:24
+#: src/Window.vala:24 src/Utils.vala:9
 msgid "New Document"
 msgstr "Nouveau Document"
 

po/io.github.wpkelso.slate.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: io.github.wpkelso.slate\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-06-12 19:53+0200\n"
+"POT-Creation-Date: 2025-06-15 14:50+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/Application.vala:107 src/Window.vala:24
+#: src/Window.vala:24 src/Utils.vala:9
 msgid "New Document"
 msgstr ""
 

src/Application.vala

@@ -79,7 +79,7 @@ public class Application : Gtk.Application {
     protected override void activate () {
 
         // Reopen all the unsaved documents we have in datadir
-        check_if_data_dir ();
+        Utils.check_if_data_dir ();
 
         try {
             var pile_unsaved_documents = Dir.open (data_dir_path);
@@ -112,51 +112,26 @@ public class Application : Gtk.Application {
     protected override void open (File[] files, string hint) {
         foreach (var file in files) {
             debug ("Creating window with file: %s", file.get_basename ());
-            open_file (file);
-        }
-    }
-
-    string get_new_document_name () {
-        var name = _("New Document");
-        if (created_documents > 1) {
-            name = name + " " + created_documents.to_string ();
-        }
-
-        debug ("New document name is: %s", name);
-
-        created_documents++;
-
-        return name;
-    }
-
-    public static void check_if_data_dir () {
-        debug ("Do we have a data directory?");
-        var data_directory = File.new_for_path (data_dir_path);
-        try {
-            if (!data_directory.query_exists ()) {
-                data_directory.make_directory ();
-                debug ("No, creating data directory");
-            } else {
-                debug ("Yes, data directory exists!");
-            }
-        } catch (Error e) {
-            warning ("Failed to prepare target data directory %s\n", e.message);
+            open_window_with_file (file);
         }
     }
 
     public static int main (string[] args) {
         return new Application ().run (args);
     }
 
+    /* ---------------- HANDLERS ---------------- */
     public void on_new_document () {
-        var name = get_new_document_name ();
-        var path = Path.build_filename (data_dir_path, name);
-        var file = File.new_for_path (path);
 
-        check_if_data_dir ();
+        var name = Utils.get_new_document_name ();
+        var path = Path.build_filename (Environment.get_user_data_dir (), name);
+        var file = File.new_for_path (path);
 
+        Utils.check_if_data_dir ();
+        
         try {
             file.create_readwrite (GLib.FileCreateFlags.REPLACE_DESTINATION);
+
         } catch (Error e) {
             warning ("Failed to prepare target file %s\n", e.message);
         }
@@ -165,7 +140,7 @@ public class Application : Gtk.Application {
 
     }
 
-    public bool open_file (File file) {
+    public bool open_window_with_file (File file) {
         if (file.query_file_type (FileQueryInfoFlags.NONE) != FileType.REGULAR) {
             warning ("Couldn't open, not a regular file.");
             return false;
@@ -176,13 +151,13 @@ public class Application : Gtk.Application {
         new_window.present ();
         return true;
     }
-
+    
     public void on_open_document () {
         var open_dialog = new Gtk.FileDialog ();
         open_dialog.open.begin (this.active_window, null, (obj, res) => {
             try {
                 var file = open_dialog.open.end (res);
-                open_file (file);
+                open_window_with_file (file);
             } catch (Error err) {
                 warning ("Failed to select file to open: %s", err.message);
             }

src/Utils.vala

@@ -0,0 +1,34 @@
+/*
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ * SPDX-FileCopyrightText: 2025 William Kelso <[email protected]>
+ */
+
+ namespace Utils {
+
+    public string get_new_document_name () {
+        var name = _("New Document");
+
+        if (Application.created_documents > 1) {
+            name = name + " " + Application.created_documents.to_string ();
+        }
+
+        debug ("New document name is: %s", name);
+
+        Application.created_documents++;
+
+        return name;
+    }
+
+    public static void check_if_datadir () {
+        debug ("do we have a data directory?");
+
+        var data_directory = File.new_for_path (Environment.get_user_data_dir ());
+        try {
+            if (!data_directory.query_exists ()) {
+                data_directory.make_directory ();
+            }
+        } catch (Error e) {
+            warning ("Failed to prepare target data directory %s\n", e.message);
+        }
+    }
+ }

src/Window.vala

@@ -6,6 +6,7 @@
 public class AppWindow : Gtk.Window {
     public File file { get; set; }
     private Gtk.TextBuffer buf;
+    private Gtk.HeaderBar header;
     public string file_name { get; set; }
 
     // Add a debounce so we aren't writing the entire buffer every character input
@@ -44,9 +45,9 @@ public class AppWindow : Gtk.Window {
         actions_box.append (open_button);
         actions_box.append (save_as_button);
 
-
         var header = new Gtk.HeaderBar () {
-            show_title_buttons = true
+            show_title_buttons = true,
+            tooltip_text = ""
         };
         header.add_css_class (Granite.STYLE_CLASS_FLAT);
         header.pack_start (actions_box);
@@ -76,41 +77,43 @@ public class AppWindow : Gtk.Window {
         default_width = 300;
         titlebar = header;
 
-        debug ("Connecting signals");
+        debug ("Binding window title to file_name");
+        bind_property ("file_name", this, "title");
+        debug ("Success!");
+
+        open_file (file);
 
+        debug ("Connecting signals");
         // Signal callbacks are heavily derived from similar operations in
         // elementary/code
         save_as_button.clicked.connect (on_save_as);
         this.close_request.connect (on_close);
         buf.changed.connect (on_buffer_changed);
 
-        debug ("Binding window title to file_name");
-
-        bind_property ("file_name", this, "title");
-
-        debug ("Success!");
-
-        open_file (file);
     }
 
 
     /* ---------------- FILE OPERATIONS ---------------- */
     public void open_file (File file = this.file) {
-        this.file = file;
         debug ("Attempting to open file %s", file.get_basename ());
+
         try {
-            this.file_name = file.get_basename ();
             var distream = new DataInputStream (file.read (null));
             var contents = distream.read_upto ("", -1, null);
-            buf.set_text (contents);
+            buf.set_text (contents ?? "");
+
+            this.file = file;
+            this.file_name = file.get_basename ();
+            this.tooltip_text = file.get_path ();
+
         } catch (Error err) {
             warning ("Couldn't open file: %s", err.message);
         }
     }
 
     public void save_file (File file = this.file) {
         if (Application.data_dir_path in this.file.get_path ()) {
-            Application.check_if_data_dir ();
+            Utils.check_if_datadir ();
         }
 
         try {
@@ -126,27 +129,34 @@ public class AppWindow : Gtk.Window {
 
             var contents = buf.text;
             dostream.put_string (contents);
+
         } catch (Error err) {
             warning ("Couldn't save file: %s", err.message);
         }
     }
 
-
     /* ---------------- HANDLERS ---------------- */
     public void on_save_as () {
         debug ("Save event!");
-        var save_dialog = new Gtk.FileDialog () { initial_name = file_name };
+
         File oldfile = this.file;
-        bool delete_after = (Application.data_dir_path in this.file.get_path ());
+        bool is_unsaved_doc = (Application.data_dir_path in this.file.get_path ());
+        
+        var save_dialog = new Gtk.FileDialog () {
+            initial_name = (is_unsaved_doc ? file_name + ".txt" : file_name)
+        };
 
         save_dialog.save.begin (this, null, (obj, res) => {
             try {
 
                 file = save_dialog.save.end (res);
-                file_name = file.get_basename ();
                 save_file (file);
 
-                if ((delete_after) && (oldfile != file)) {
+                this.file = file;
+                file_name = file.get_basename ();
+                this.tooltip_text = file.get_path ();
+
+                if ((is_unsaved_doc) && (oldfile != file)) {
                     oldfile.delete ();
                 }
 
@@ -184,6 +194,7 @@ public class AppWindow : Gtk.Window {
 
             try {
                 this.file.delete ();
+
             } catch (Error err) {
                     warning ("Failed to delete empty temp file: %s", err.message);
             }

src/meson.build

@@ -1,4 +1,5 @@
 sources += files(
     'Window.vala',
     'Application.vala',
+    'Utils.vala',
 )