Choose project popover

src/Dialogs/NewBranchDialog.vala

@@ -20,8 +20,7 @@
 */
 
 public class Scratch.Dialogs.NewBranchDialog : Granite.MessageDialog {
-    public FolderManager.ProjectFolderItem? active_project { get; construct; }
-    public unowned List<FolderManager.ProjectFolderItem> project_list { get; construct; }
+    public FolderManager.ProjectFolderItem active_project { get; construct; }
 
     private Granite.ValidatedEntry new_branch_name_entry;
     public string new_branch_name {
@@ -30,66 +29,53 @@ public class Scratch.Dialogs.NewBranchDialog : Granite.MessageDialog {
         }
     }
 
-    public NewBranchDialog (FolderManager.ProjectFolderItem? project, List<FolderManager.ProjectFolderItem> project_list) {
+    public NewBranchDialog (FolderManager.ProjectFolderItem project) {
         Object (
             transient_for: ((Gtk.Application)(GLib.Application.get_default ())).get_active_window (),
             active_project: project,
-            project_list: project_list,
             image_icon: new ThemedIcon ("git")
         );
     }
 
     construct {
-        if (active_project != null) {
-            assert (active_project.is_git_repo);
-            primary_text = _("Create a new branch of “%s/%s”").printf (
-                active_project.file.file.get_basename (),
-                active_project.get_current_branch_name ()
-            );
-            ///TRANSLATORS "Git" is a proper name and must not be translated
-            secondary_text = _("The branch name must be unique and follow Git naming rules.");
-            badge_icon = new ThemedIcon ("list-add");
-
-            new_branch_name_entry = new Granite.ValidatedEntry () {
-                activates_default = true
-            };
-
-            custom_bin.add (new_branch_name_entry);
+        assert (active_project.is_git_repo);
+        add_button (_("Cancel"), Gtk.ResponseType.CANCEL);
+        primary_text = _("Create a new branch of “%s/%s”").printf (
+            active_project.file.file.get_basename (),
+            active_project.get_current_branch_name ()
+        );
+        ///TRANSLATORS "Git" is a proper name and must not be translated
+        secondary_text = _("The branch name must be unique and follow Git naming rules.");
+        badge_icon = new ThemedIcon ("list-add");
+        new_branch_name_entry = new Granite.ValidatedEntry () {
+            activates_default = true
+        };
 
-            var create_button = (Gtk.Button) add_button (_("Create Branch"), Gtk.ResponseType.APPLY);
-            create_button.can_default = true;
-            create_button.has_default = true;
-            create_button.get_style_context ().add_class (Gtk.STYLE_CLASS_SUGGESTED_ACTION);
+        custom_bin.add (new_branch_name_entry);
 
-            new_branch_name_entry.bind_property (
-                "is-valid", create_button, "sensitive", BindingFlags.DEFAULT | BindingFlags.SYNC_CREATE
-            );
+        var create_button = (Gtk.Button) add_button (_("Create Branch"), Gtk.ResponseType.APPLY);
+        create_button.can_default = true;
+        create_button.has_default = true;
+        create_button.get_style_context ().add_class (Gtk.STYLE_CLASS_SUGGESTED_ACTION);
 
-            new_branch_name_entry.changed.connect (() => {
-                unowned var new_name = new_branch_name_entry.text;
-                if (!active_project.is_valid_new_branch_name (new_name)) {
-                    new_branch_name_entry.is_valid = false;
-                    return;
-                }
+        new_branch_name_entry.bind_property (
+            "is-valid", create_button, "sensitive", BindingFlags.DEFAULT | BindingFlags.SYNC_CREATE
+        );
 
-                if (active_project.has_local_branch_name (new_name)) {
-                    new_branch_name_entry.is_valid = false;
-                    return;
-                }
+        new_branch_name_entry.changed.connect (() => {
+            unowned var new_name = new_branch_name_entry.text;
+            if (!active_project.is_valid_new_branch_name (new_name)) {
+                new_branch_name_entry.is_valid = false;
+                return;
+            }
 
-                //Do we need to check remote branches as well?
-                new_branch_name_entry.is_valid = true;
-            });
-        } else {
-            primary_text = _("You must have an active Git project before creating a new branch.");
-            badge_icon = new ThemedIcon ("dialog-warning");
-            if (project_list.length () == 0) {
-                secondary_text = _("Open a Git project folder in the sidebar.");
-            } else {
-                secondary_text = _("Open a document in a Git project folder in the sidebar or use a project context menu.");
+            if (active_project.has_local_branch_name (new_name)) {
+                new_branch_name_entry.is_valid = false;
+                return;
             }
-        }
 
-        add_button (_("Cancel"), Gtk.ResponseType.CANCEL);
+            //Do we need to check remote branches as well?
+            new_branch_name_entry.is_valid = true;
+        });
     }
 }

src/FolderManager/FileView.vala

@@ -163,50 +163,26 @@ namespace Scratch.FolderManager {
             }
         }
 
-        public void new_branch (GLib.File? current_doc_file) {
-            GLib.List<ProjectFolderItem> project_list;
+        public void new_branch (string active_project_path) {
+            unowned var active_project = (ProjectFolderItem)(find_path (root, active_project_path));
+            if (active_project == null || !active_project.is_git_repo) {
+                Gdk.beep ();
+                return;
+            }
+
             string? branch_name = null;
-            unowned var active_project = get_active_project (current_doc_file, out project_list);
-            var dialog = new Dialogs.NewBranchDialog (active_project, project_list);
+            var dialog = new Dialogs.NewBranchDialog (active_project);
             dialog.show_all ();
             if (dialog.run () == Gtk.ResponseType.APPLY) {
                 branch_name = dialog.new_branch_name;
             }
 
             dialog.destroy ();
-            if (active_project != null && branch_name != null) {
+            if (branch_name != null) {
                 active_project.new_branch (branch_name);
             }
         }
 
-        public unowned ProjectFolderItem? get_active_project (GLib.File? active_file, out List<ProjectFolderItem> project_list) {
-            unowned ProjectFolderItem? project = null;
-            project_list = null;
-            foreach (var child in root.children) {
-                project = (ProjectFolderItem)child;
-                if (!project.is_git_repo) {
-                    // Ignore sidebar folders that are not git repos
-                    continue;
-                }
-
-                if (active_file != null)
-                    if (project.file.file.equal (active_file) ||
-                        project.file.file.get_relative_path (active_file) != null) {
-
-                    return project;
-                }
-
-                project_list.prepend (project);
-            }
-
-            if (project_list.length () == 1) {
-                //There was only one project so use that
-                return project_list.data;
-            }
-
-            return null;
-        }
-
         private void add_folder (File folder, bool expand) {
             if (is_open (folder)) {
                 warning ("Folder '%s' is already open.", folder.path);
@@ -216,20 +192,23 @@ namespace Scratch.FolderManager {
                 return;
             }
 
-            var folder_root = new ProjectFolderItem (folder, this);
+            var folder_root = new ProjectFolderItem (folder, this); // Constructor adds project to GitManager
             this.root.add (folder_root);
 
             folder_root.expanded = expand;
             folder_root.closed.connect (() => {
                 close_all_docs_from_path (folder_root.file.path);
                 root.remove (folder_root);
+                Scratch.Services.GitManager.get_instance ().remove_project (folder_root.file.file);
                 write_settings ();
             });
 
             folder_root.close_all_except.connect (() => {
                 foreach (var child in root.children) {
-                    if (child != folder_root) {
-                        root.remove (child);
+                    var project_folder_item = (ProjectFolderItem)child;
+                    if (project_folder_item != folder_root) {
+                        root.remove (project_folder_item);
+                        Scratch.Services.GitManager.get_instance ().remove_project (project_folder_item.file.file);
                     }
                 }
 

src/FolderManager/ProjectFolderItem.vala

@@ -97,7 +97,9 @@ namespace Scratch.FolderManager {
 
         public override Gtk.Menu? get_context_menu () {
             var close_item = new Gtk.MenuItem.with_label (_("Close Folder"));
-            close_item.activate.connect (() => { closed (); });
+            close_item.activate.connect (() => {
+                closed ();
+            });
 
             var close_all_except_item = new Gtk.MenuItem.with_label (_("Close Other Folders"));
             close_all_except_item.activate.connect (() => { close_all_except (); });

src/MainWindow.vala

@@ -876,19 +876,7 @@ namespace Scratch {
         }
 
         private void action_find_global (SimpleAction action, Variant? param) {
-            string path = "";
-            if (param != null) {
-                path = param.get_string ();
-            }
-
-            if (path == "") {
-                var current_doc = get_current_document ();
-                if (current_doc != null) {
-                    path = current_doc.file.get_path ();
-                }
-            }
-
-            folder_manager_view.search_global (path);
+            folder_manager_view.search_global (get_target_path_for_git_actions (param));
         }
 
         private void set_search_text () {
@@ -1006,22 +994,28 @@ namespace Scratch {
         }
 
         private void action_new_branch (SimpleAction action, Variant? param) {
-            string path = "";
-            File? file = null;
-            if (param != null) {
-                path = param.get_string ();
-            }
-
-            if (path == "") {
-                var current_doc = get_current_document ();
-                if (current_doc != null) {
-                    file = current_doc.file;
-                }
-            } else {
-                file = File.new_for_path (path);
-            }
-
-            folder_manager_view.new_branch (file);
-        }
+            folder_manager_view.new_branch (get_target_path_for_git_actions (param));
+        }
+
+        private string? get_target_path_for_git_actions (Variant? path_variant) {
+             string? path = "";
+             if (path_variant != null) {
+                 path = path_variant.get_string ();
+             }
+
+             if (path == "") { // Happens when keyboard accelerator is used
+                 path = Services.GitManager.get_instance ().active_project_path;
+                 if (path == null) {
+                     var current_doc = get_current_document ();
+                     if (current_doc != null) {
+                         path = current_doc.file.get_path ();
+                     } else {
+                         return null; // Cannot determine target project
+                     }
+                 }
+             }
+
+             return path;
+         }
     }
 }

src/Services/GitManager.vala

@@ -20,6 +20,9 @@
 
 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;
 
@@ -37,9 +40,13 @@ namespace Scratch.Services {
             return instance;
         }
 
-        private GitManager () {}
+        private GitManager () {
+            project_liststore = new ListStore (typeof (File));
+        }
 
         public MonitoredRepository? add_project (GLib.File root_folder) {
+            project_liststore.insert_sorted (root_folder, (CompareDataFunc<GLib.Object>) project_sort_func);
+
             var root_path = root_folder.get_path ();
             try {
                 var git_repo = Ggit.Repository.open (root_folder);
@@ -57,8 +64,21 @@ namespace Scratch.Services {
             }
         }
 
+        [CCode (instance_pos = -1)]
+        private int project_sort_func (File a, File b) {
+            return Path.get_basename (a.get_path ()).collate (Path.get_basename (b.get_path ()));
+        }
+
         public void remove_project (GLib.File root_folder) {
             var root_path = root_folder.get_path ();
+
+            uint position;
+            if (project_liststore.find (root_folder, out position)) {
+                project_liststore.remove (position);
+            } else {
+                critical ("Can't remove: %s", root_path);
+            }
+
             if (project_gitrepo_map.has_key (root_path)) {
                 project_gitrepo_map.unset (root_path);
             }