Reorder folders on add folder if option true

Author: jeremypw

src/FolderManager/FileView.vala

@@ -63,6 +63,7 @@ public class Scratch.FolderManager.FileView : Code.Widgets.SourceList, Code.Pane
     public ActionGroup toplevel_action_group { get; private set; }
     public string icon_name { get; set; }
     public string title { get; set; }
+    public bool order_folders { get; set; default = true; }
 
     public FileView (Scratch.Services.PluginsManager plugins_manager) {
         plugins = plugins_manager;
@@ -85,6 +86,12 @@ public class Scratch.FolderManager.FileView : Code.Widgets.SourceList, Code.Pane
             toplevel_action_group = get_action_group (MainWindow.ACTION_GROUP);
             assert_nonnull (toplevel_action_group);
         });
+
+        notify["order-folders"].connect (() => {
+            if (order_folders) {
+                reorder_folders ();
+            }
+        });
     }
 
     private void action_close_folder (SimpleAction action, GLib.Variant? parameter) {
@@ -168,9 +175,9 @@ public class Scratch.FolderManager.FileView : Code.Widgets.SourceList, Code.Pane
         }
     }
 
-    public void order_folders () {
+    private void reorder_folders () {
+        // This is not efficient but SourceList does not currently allow `insert_sorted` or setting a sort function
         var list = new Gee.ArrayList<ProjectFolderItem> ();
-
         foreach (var child in root.children) {
             root.remove (child as ProjectFolderItem);
             list.add (child as ProjectFolderItem);
@@ -567,8 +574,12 @@ public class Scratch.FolderManager.FileView : Code.Widgets.SourceList, Code.Pane
         // Process any closed signals emitted before proceeding
         Idle.add (() => {
             var folder_root = new ProjectFolderItem (folder, this); // Constructor adds project to GitManager
-            this.root.add (folder_root);
+            this.root.add (folder_root); // TODO Implement add_sorted;
             rename_items_with_same_name (folder_root);
+            if (order_folders) {
+                reorder_folders ();
+            }
+
 
             folder_root.expanded = expand;
             folder_root.closed.connect (() => {

src/MainWindow.vala

@@ -141,7 +141,7 @@ namespace Scratch {
             { ACTION_OPEN_FOLDER, action_open_folder, "s" },
             { ACTION_OPEN_PROJECT, action_open_project },
             { ACTION_COLLAPSE_ALL_FOLDERS, action_collapse_all_folders },
-            { ACTION_ORDER_FOLDERS, action_order_folders },
+            { ACTION_ORDER_FOLDERS, action_order_folders, null, "true" },
             { ACTION_PREFERENCES, action_preferences },
             { ACTION_REVERT, action_revert },
             { ACTION_SAVE, action_save },
@@ -347,6 +347,10 @@ namespace Scratch {
             sidebar_action.set_state (saved_state.get_boolean ("sidebar-visible"));
             update_toolbar_button (ACTION_TOGGLE_SIDEBAR, saved_state.get_boolean ("sidebar-visible"));
 
+            // var order_folders_action = Utils.action_from_group (ACTION_ORDER_FOLDERS, actions);
+            // order_folders_action.set_state (saved_state.get_boolean ("order-folders"));
+            // update_toolbar_button (ACTION_ORDER_FOLDERS, saved_state.get_boolean ("order-folders"));
+
             var outline_action = Utils.action_from_group (ACTION_TOGGLE_OUTLINE, actions);
             outline_action.set_state (saved_state.get_boolean ("outline-visible"));
             update_toolbar_button (ACTION_TOGGLE_OUTLINE, saved_state.get_boolean ("outline-visible"));
@@ -1126,7 +1130,10 @@ namespace Scratch {
         }
 
         private void action_order_folders () {
-            folder_manager_view.order_folders ();
+            var action = Utils.action_from_group (ACTION_ORDER_FOLDERS, actions);
+            var to_show = !action.get_state ().get_boolean ();
+            action.set_state (to_show);
+            folder_manager_view.order_folders = to_show;
         }
 
         private void action_save () {