Make active_project_path local per window

jeremypw · jeremypw · commit 6308224c6a8c · 2025-07-02T20:21:05.000+01:00
diff --git a/src/FolderManager/FileView.vala b/src/FolderManager/FileView.vala
@@ -39,14 +39,14 @@ public class Scratch.FolderManager.FileView : Code.Widgets.SourceList, Code.Pane
     public const string ACTION_SET_ACTIVE_PROJECT = "set-active-project";
 
     private const ActionEntry[] PRIMARY_ONLY_ACTION_ENTRIES = {
-        { ACTION_SHOW_APP_CHOOSER, action_show_app_chooser, "s" },
         { ACTION_SET_ACTIVE_PROJECT, action_set_active_project, "s"},
         { ACTION_RENAME_FILE, action_rename_file, "s" },
         { ACTION_RENAME_FOLDER, action_rename_folder, "s" }
     };
 
     private const ActionEntry[] ACTION_ENTRIES = {
         { ACTION_LAUNCH_APP_WITH_FILE_PATH, action_launch_app_with_file_path, "as" },
+        { ACTION_SHOW_APP_CHOOSER, action_show_app_chooser, "s" },
         { ACTION_EXECUTE_CONTRACT_WITH_FILE_PATH, action_execute_contract_with_file_path, "as" },
         { ACTION_DELETE, action_delete, "s" },
         { ACTION_NEW_FILE, add_new_file, "s" },
@@ -57,6 +57,7 @@ public class Scratch.FolderManager.FileView : Code.Widgets.SourceList, Code.Pane
 
     private GLib.Settings settings;
     private Scratch.Services.GitManager git_manager;
+    private unowned Scratch.MainWindow window;
 
     public Scratch.Services.PluginsManager plugins { get; construct; }
     public bool is_primary { get; construct; }
@@ -100,6 +101,10 @@ public class Scratch.FolderManager.FileView : Code.Widgets.SourceList, Code.Pane
         });
 
         show_all ();
+
+        realize.connect (() => {
+            window = (Scratch.MainWindow) (this.get_toplevel ());
+        });
     }
 
     private void action_close_folder (SimpleAction action, GLib.Variant? parameter) {
@@ -137,7 +142,7 @@ public class Scratch.FolderManager.FileView : Code.Widgets.SourceList, Code.Pane
         }
 
         //Make remaining project the active one
-        git_manager.active_project_path = path;
+        window.active_project_path = path;  //Temporary fix
 
         write_settings ();
     }
@@ -153,7 +158,7 @@ public class Scratch.FolderManager.FileView : Code.Widgets.SourceList, Code.Pane
             return;
         }
 
-        git_manager.active_project_path = path;
+        window.active_project_path = path;
 
         write_settings ();
     }
@@ -210,7 +215,7 @@ public class Scratch.FolderManager.FileView : Code.Widgets.SourceList, Code.Pane
 
     public void collapse_other_projects () {
         unowned string path;
-        path = git_manager.active_project_path;
+        path = window.active_project_path;
 
         foreach (var child in root.children) {
             var project_folder = ((ProjectFolderItem) child);
diff --git a/src/FolderManager/FolderItem.vala b/src/FolderManager/FolderItem.vala
@@ -116,7 +116,7 @@ namespace Scratch.FolderManager {
             } else {
                 var root = get_root_folder ();
                 if (root != null &&
-                    root.monitored_repo != null) {
+                    root.has_monitored_repo) {
                     //When toggled closed, update status to reflect hidden contents
                     root.update_item_status (this);
                 }
diff --git a/src/FolderManager/ProjectFolderItem.vala b/src/FolderManager/ProjectFolderItem.vala
@@ -31,7 +31,13 @@ namespace Scratch.FolderManager {
 
         public signal void closed ();
 
-        public Scratch.Services.MonitoredRepository? monitored_repo { get; private set; default = null; }
+        // public Scratch.Services.MonitoredRepository? monitored_repo { get; private set; default = null; }
+        private Scratch.Services.MonitoredRepository? monitored_repo;
+        public bool has_monitored_repo {
+            get {
+                return monitored_repo != null;
+            }
+        }
         // Cache the visible item in the project.
         private List<VisibleItem?> visible_item_list = null;
 
@@ -41,6 +47,7 @@ namespace Scratch.FolderManager {
             }
         }
 
+        public bool is_readonly { get; private set; }
         private Ggit.Repository? git_repo {
             get {
                 return (is_git_repo ? monitored_repo.git_repo : null);
@@ -74,7 +81,7 @@ namespace Scratch.FolderManager {
         }
 
         construct {
-            monitored_repo = Scratch.Services.GitManager.get_instance ().add_project (this);
+            is_readonly = Scratch.Services.GitManager.get_instance ().add_project (this, out monitored_repo);
             notify["name"].connect (branch_or_name_changed);
             if (monitored_repo != null) {
                 checkout_local_branch_action = new SimpleAction.stateful (
@@ -142,7 +149,7 @@ namespace Scratch.FolderManager {
             }
 
             MenuItem set_active_folder_item;
-            if (is_git_repo) {
+            if (is_git_repo && !is_readonly) {
                 set_active_folder_item = new GLib.MenuItem (
                     _("Set as Active Project"),
                     GLib.Action.print_detailed_name (
diff --git a/src/MainWindow.vala b/src/MainWindow.vala
@@ -28,6 +28,8 @@ namespace Scratch {
         public Scratch.Application app { get; private set; }
         public bool restore_docs { get; construct; }
         public RestoreOverride restore_override { get; construct set; }
+        public string active_project_path { get; set; }
+
         public string default_globalsearch_path {
             owned get {
                 if (document_view.current_document != null) {
@@ -36,7 +38,7 @@ namespace Scratch {
                     }
                 }
 
-                return git_manager.active_project_path;
+                return active_project_path;
             }
         }
 
@@ -373,6 +375,11 @@ namespace Scratch {
 
             Unix.signal_add (Posix.Signal.INT, quit_source_func, Priority.HIGH);
             Unix.signal_add (Posix.Signal.TERM, quit_source_func, Priority.HIGH);
+
+            bind_property ("active-project-path", sidebar.choose_project_button, "active-project-path", BIDIRECTIONAL);
+            if (is_primary) {
+                settings.bind ("active-project-path", this, "active-project-path", DEFAULT);
+            }
         }
 
         private void update_style () {
@@ -1063,8 +1070,8 @@ namespace Scratch {
 
         private void action_clone_repo (SimpleAction action, Variant? param) {
             var default_projects_folder = Scratch.settings.get_string ("default-projects-folder");
-            if (default_projects_folder == "" && git_manager.active_project_path != "") {
-                default_projects_folder = Path.get_dirname (git_manager.active_project_path);
+            if (default_projects_folder == "" && active_project_path != "") {
+                default_projects_folder = Path.get_dirname (active_project_path);
             }
 
             var default_remote = Scratch.settings.get_string ("default-remote");
@@ -1356,7 +1363,7 @@ namespace Scratch {
                 Utils.action_from_group (ACTION_TOGGLE_SHOW_FIND, actions).set_enabled (is_current_doc);
                 Utils.action_from_group (ACTION_FIND_NEXT, actions).set_enabled (is_current_doc);
                 Utils.action_from_group (ACTION_FIND_PREVIOUS, actions).set_enabled (is_current_doc);
-                var can_global_search = is_current_doc || git_manager.active_project_path != null;
+                var can_global_search = is_current_doc || active_project_path != null;
                 Utils.action_from_group (ACTION_FIND_GLOBAL, actions).set_enabled (can_global_search);
 
                 return Source.REMOVE;
@@ -1536,7 +1543,7 @@ namespace Scratch {
              }
 
              if (path == "") { // Happens when keyboard accelerator is used
-                 path = git_manager.active_project_path;
+                 path = active_project_path;
                  if (use_build_dir) {
                      path = git_manager.get_default_build_dir (path);
                  }
diff --git a/src/Services/GitManager.vala b/src/Services/GitManager.vala
@@ -21,7 +21,6 @@
 namespace Scratch.Services {
     public class GitManager : Object {
         public ListStore project_liststore { get; private set; }
-        public string active_project_path { get; set; default = "";}
 
         static Gee.HashMap<string, MonitoredRepository> project_gitrepo_map;
         static GitManager? instance;
@@ -47,29 +46,27 @@ namespace Scratch.Services {
         construct {
             // Used to populate the ChooseProject popover in sorted order
             project_liststore = new ListStore (typeof (FolderManager.ProjectFolderItem));
-            settings.bind ("active-project-path", this, "active-project-path", DEFAULT);
         }
 
-        public MonitoredRepository? add_project (FolderManager.ProjectFolderItem root_folder) {
+        public bool add_project (FolderManager.ProjectFolderItem root_folder, out MonitoredRepository? monitored_repo) {
             var root_path = root_folder.path;
-            MonitoredRepository? monitored_repo = null;
+            monitored_repo = null;
             uint position;
             if (project_liststore.find_with_equal_func (
                     root_folder,
                     (a, b) => { return ((FolderManager.Item) a).equal ((FolderManager.Item) b); },
                     out position
                 )) {
 
-                var repo = project_gitrepo_map.@get (root_path);
-                return repo;
+                monitored_repo = project_gitrepo_map.@get (root_path);
+                return true;
             }
 
             try {
                 var git_repo = Ggit.Repository.open (root_folder.file.file);
                 if (!project_gitrepo_map.has_key (root_path)) {
                     monitored_repo = new MonitoredRepository (git_repo);
                     project_gitrepo_map.@set (root_path, monitored_repo);
-                    return project_gitrepo_map.@get (root_path);
                 }
             } catch (Error e) {
                 debug (
@@ -85,7 +82,8 @@ namespace Scratch.Services {
             }
 
             // No longer need to set default project (restored from settings or left unset)
-            return project_gitrepo_map.@get (root_path);
+            monitored_repo = project_gitrepo_map.@get (root_path);
+            return false;
         }
 
         [CCode (instance_pos = -1)]
@@ -111,17 +109,16 @@ namespace Scratch.Services {
         }
 
         // @project_path is the root of a project or null
-        public string get_default_build_dir (string? project_path) {
-            string build_path = project_path != null ? project_path : active_project_path;
+        public string get_default_build_dir (string project_path) {
             var default_build_dir = Scratch.settings.get_string ("default-build-directory");
-            var build_file = GLib.File.new_for_path (Path.build_filename (build_path, default_build_dir));
+            var build_file = GLib.File.new_for_path (Path.build_filename (project_path, default_build_dir));
             if (build_file.query_exists ()) {
-                build_path = build_file.get_path ();
+                return build_file.get_path ();
             } else {
                 warning ("build path not found %s", build_file.get_path ());
             }
 
-            return build_path;
+            return project_path;
         }
 
         public async bool clone_repository (
diff --git a/src/Widgets/ChooseProjectButton.vala b/src/Widgets/ChooseProjectButton.vala
@@ -21,6 +21,7 @@ public class Code.ChooseProjectButton : Gtk.MenuButton {
     private const string PROJECT_TOOLTIP = N_("Active Git Project: %s");
     private Gtk.Label label_widget;
     private Gtk.ListBox project_listbox;
+    public string active_project_path { get; set; }
 
     public signal void project_chosen ();
 
@@ -128,40 +129,38 @@ public class Code.ChooseProjectButton : Gtk.MenuButton {
 
         project_listbox.remove.connect ((row) => {
             var project_row = row as ProjectRow;
-            var current_project = Scratch.Services.GitManager.get_instance ().active_project_path;
+            var current_project = active_project_path;
             if (project_row.project_path == current_project) {
-                Scratch.Services.GitManager.get_instance ().active_project_path = "";
+                active_project_path = "";
                 // Label and active_path will be updated automatically
             }
         });
 
         project_listbox.row_activated.connect ((row) => {
             var project_entry = ((ProjectRow) row);
-            git_manager.active_project_path = project_entry.project_path;
+            active_project_path = project_entry.project_path;
             project_chosen ();
         });
 
         toggled.connect (() => {
             if (active) {
-                unowned var active_path = Scratch.Services.GitManager.get_instance ().active_project_path;
                 foreach (var child in project_listbox.get_children ()) {
                     var project_row = ((ProjectRow) child);
                     // All paths must not end in directory separator so can be compared directly
-                    project_row.active = active_path == project_row.project_path;
+                    project_row.active = active_project_path == project_row.project_path;
                 }
             }
         });
 
-        git_manager.notify["active-project-path"].connect (update_button);
+        notify["active-project-path"].connect (update_button);
         update_button ();
     }
 
     // Set appearance (only) of project chooser button and list according to active path
     private void update_button () {
-        unowned var active_path = Scratch.Services.GitManager.get_instance ().active_project_path;
-        if (active_path != "") {
-            label_widget.label = Path.get_basename (active_path);
-            tooltip_text = _(PROJECT_TOOLTIP).printf (Scratch.Utils.replace_home_with_tilde (active_path));
+        if (active_project_path != "") {
+            label_widget.label = Path.get_basename (active_project_path);
+            tooltip_text = _(PROJECT_TOOLTIP).printf (Scratch.Utils.replace_home_with_tilde (active_project_path));
         } else {
             label_widget.label = Path.get_basename (_(NO_PROJECT_SELECTED));
             tooltip_text = _(PROJECT_TOOLTIP).printf (_(NO_PROJECT_SELECTED));

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ namespace Scratch.FolderManager {`
`116`	`116`	`} else {`
`117`	`117`	`var root = get_root_folder ();`
`118`	`118`	`if (root != null &&`
`119`		`- root.monitored_repo != null) {`
	`119`	`+ root.has_monitored_repo) {`
`120`	`120`	`//When toggled closed, update status to reflect hidden contents`
`121`	`121`	`root.update_item_status (this);`
`122`	`122`	`}`