Merge branch 'master' into jeremypw/gtk4prep/terminal-context-menu

Author: zeebok

.github/workflows/ci.yml

@@ -18,7 +18,7 @@ jobs:
       image: ghcr.io/elementary/docker:${{ matrix.version }}
 
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
     - name: Install Dependencies
       run: |
         apt update
@@ -50,7 +50,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
 
       - name: Build
         uses: flatpak/flatpak-github-actions/flatpak-builder@v6.7
@@ -71,7 +71,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
 
       - name: Lint
         run: io.elementary.vala-lint -d .

.github/workflows/merge.yml

@@ -9,7 +9,7 @@ jobs:
 
     steps:
     - name: Clone repository
-      uses: actions/checkout@v6
+      uses: actions/checkout@v7
       with:
         token: ${{ secrets.GIT_USER_TOKEN }}
 

.github/workflows/release.yml

@@ -9,7 +9,7 @@ jobs:
      runs-on: ubuntu-latest
      if: github.event.pull_request.merged == true && true == contains(join(github.event.pull_request.labels.*.name), 'Release')
      steps:
-     - uses: actions/checkout@v6
+     - uses: actions/checkout@v7
      - uses: elementary/actions/release@main
        env:
          GIT_USER_TOKEN: "${{ secrets.GIT_USER_TOKEN }}"

plugins/pastebin/pastebin_dialog.vala

@@ -316,8 +316,10 @@ namespace Scratch.Dialogs {
             };
 
             stack = new Gtk.Stack () {
-                margin = 12,
-                margin_top = 0
+                margin_top = 0,
+                margin_bottom = 12,
+                margin_start = 12,
+                margin_end = 12
             };
             stack.add (grid);
             stack.add (spinner);
@@ -362,7 +364,10 @@ namespace Scratch.Dialogs {
             for (var i=0; i < languages.length[0]; i++) {
                 var label = new Gtk.Label (languages[i, 2]) {
                     halign = Gtk.Align.START,
-                    margin = 6
+                    margin_top = 6,
+                    margin_bottom = 6,
+                    margin_start = 6,
+                    margin_end = 6
                 };
 
                 languages_listbox.add (label);
@@ -382,8 +387,10 @@ namespace Scratch.Dialogs {
             select_button.clicked.connect (select_button_clicked);
 
             var frame = new Gtk.Frame (null) {
-                margin = 12,
-                margin_top = 0
+                margin_top = 0,
+                margin_bottom = 12,
+                margin_start = 12,
+                margin_end = 12
             };
             frame.add (languages_scrolled);
 

src/Dialogs/PreferencesDialog.vala

@@ -143,7 +143,10 @@ public class Scratch.Dialogs.Preferences : Granite.Dialog {
         interface_box.add (font_box);
 
         var stack = new Gtk.Stack () {
-            margin = 12,
+            margin_top = 12,
+            margin_bottom = 12,
+            margin_start = 12,
+            margin_end = 12,
             vhomogeneous = true
         };
         stack.add_titled (behavior_box, "behavior", _("Behavior"));

src/MainWindow.vala

@@ -93,7 +93,6 @@ namespace Scratch {
         public const string ACTION_REVERT = "action-revert";
         public const string ACTION_SAVE = "action-save";
         public const string ACTION_SAVE_AS = "action-save-as";
-        public const string ACTION_TEMPLATES = "action-templates";
         public const string ACTION_SHOW_REPLACE = "action-show-replace";
         public const string ACTION_TO_LOWER_CASE = "action-to-lower-case";
         public const string ACTION_TO_UPPER_CASE = "action-to-upper-case";
@@ -149,7 +148,6 @@ namespace Scratch {
             { ACTION_SAVE, action_save },
             { ACTION_SAVE_AS, action_save_as },
             { ACTION_TOGGLE_SHOW_FIND, action_toggle_show_find, null, "false" },
-            { ACTION_TEMPLATES, action_templates },
             { ACTION_GO_TO, action_go_to },
             { ACTION_SORT_LINES, action_sort_lines },
             { ACTION_NEW_TAB, action_new_tab },
@@ -342,10 +340,6 @@ namespace Scratch {
             // Show/Hide widgets
             show_all ();
 
-            toolbar.templates_button.visible = (plugins.plugin_iface.template_manager.template_available);
-            plugins.plugin_iface.template_manager.notify["template_available"].connect (() => {
-                toolbar.templates_button.visible = (plugins.plugin_iface.template_manager.template_available);
-            });
 
             // Create folder for unsaved documents
             create_unsaved_documents_directory ();
@@ -1371,9 +1365,6 @@ namespace Scratch {
             toolbar.format_bar.line_menubutton.active = true;
         }
 
-        private void action_templates () {
-            plugins.plugin_iface.template_manager.show_window (this);
-        }
 
         private void action_to_lower_case () {
             var doc = document_view.current_document;

src/Services/Document.vala

@@ -256,24 +256,16 @@ namespace Scratch.Services {
 
             this.source_view.buffer.create_tag ("highlight_search_all", "background", "yellow", null);
 
-            // Focus in event for SourceView
-            // Check if file changed externally or permissions changed
-            this.source_view.focus_in_event.connect (() => {
-                if (!locked && !is_file_temporary) {
-                    check_undoable_actions ();
-                    check_file_status.begin ();
-                }
-
-                return false;
-            });
-
-            // Focus out event for SourceView
-            this.source_view.focus_out_event.connect (() => {
-                if (!locked && Scratch.settings.get_boolean ("autosave")) {
-                    save_with_hold.begin ();
+            this.source_view.notify["is-focus"].connect (() => {
+                return_if_fail (!locked);
+                if (source_view.is_focus) {
+                    if (!is_file_temporary) {
+                        check_undoable_actions ();
+                        check_file_status.begin ();
+                    }
+                } else if (Scratch.settings.get_boolean ("autosave")) {
+                        save_with_hold.begin ();
                 }
-
-                return false;
             });
 
             source_view.buffer.changed.connect (() => {

src/Services/PluginManager.vala

@@ -22,7 +22,6 @@ public class Scratch.Services.Interface : GLib.Object {
     public signal void hook_preferences_dialog (Scratch.Dialogs.Preferences dialog);
     public signal void hook_folder_item_change (File file, File? other_file, FileMonitorEvent event_type);
 
-    public Scratch.TemplateManager template_manager { get; private set; }
     public Scratch.Services.PluginsManager manager { get; construct; }
 
     public Interface (Scratch.Services.PluginsManager _manager) {
@@ -31,10 +30,6 @@ public class Scratch.Services.Interface : GLib.Object {
         );
     }
 
-    construct {
-        template_manager = new Scratch.TemplateManager ();
-    }
-
     public Scratch.Services.Document open_file (File file) {
         var doc = new Scratch.Services.Document (manager.window.actions, file);
         manager.window.open_document.begin (doc);