src/Builder4/MainWindow.bjs

src/Builder4/MainWindow.vala

diff --git a/src/Builder4/MainWindow.bjs b/src/Builder4/MainWindow.bjs
index fa1eaab..866de98 100644 (file)
--- a/src/Builder4/MainWindow.bjs
+++ b/src/Builder4/MainWindow.bjs
@@ -48,25 +48,7 @@
            "  ( ) => {",
            "  \t_this.splitview.el.show_sidebar = !_this.splitview.el.show_sidebar;",
            "  \tif (_this.splitview.el.show_sidebar) {",
-           "  \t\t_this.filesearch.el.grab_focus();",
-           "  \t\t_this.winloading = true;",
-           "  \t\t_this.winmodel.el.remove_all();",
-           "  \t\t_this.filesearch.el.set_text(\"\");",
-           "  \t\tfor(var i = 0;i < BuilderApplication.windowlist.get_n_items(); i++) {",
-           "\t\t\t_this.winmodel.el.append( BuilderApplication.windowlist.get_item(i));",
-           "\t\t}",
-           "\t\t_this.winsel.selectCurrent();",
-           "\t\t_this.winloading = false;",
-           "\t\t",
-           "\t\t _this.treeview.el.set_model(new Gtk.SingleSelection(null));",
-           "\t\t",
-           "\t\t_this.windowstate.project.loadDirsIntoStore(_this.treemodel.el);",
-           "\t\t",
-           "\t\t_this.treeview.el.set_model(_this.treeselmodel.el);",
-           "\t\t",
-           "\t \t _this.treeselmodel.el.selected = Gtk.INVALID_LIST_POSITION;",
-           "\t\t",
-           "\t\t",
+           "  \t\t_this.sidebar.show(); ",
            " \t}",
            "}"
           ]

diff --git a/src/Builder4/MainWindow.vala b/src/Builder4/MainWindow.vala
index bd69211..a898d87 100644 (file)
--- a/src/Builder4/MainWindow.vala
+++ b/src/Builder4/MainWindow.vala
@@ -268,25 +268,7 @@ public class Xcls_MainWindow : Object
                        this.el.clicked.connect( ( ) => {
                                _this.splitview.el.show_sidebar = !_this.splitview.el.show_sidebar;
                                if (_this.splitview.el.show_sidebar) {
-                                       _this.filesearch.el.grab_focus();
-                                       _this.winloading = true;
-                                       _this.winmodel.el.remove_all();
-                                       _this.filesearch.el.set_text("");
-                                       for(var i = 0;i < BuilderApplication.windowlist.get_n_items(); i++) {
-                                               _this.winmodel.el.append( BuilderApplication.windowlist.get_item(i));
-                                       }
-                                       _this.winsel.selectCurrent();
-                                       _this.winloading = false;
-                                       
-                                        _this.treeview.el.set_model(new Gtk.SingleSelection(null));
-                                       
-                                       _this.windowstate.project.loadDirsIntoStore(_this.treemodel.el);
-                                       
-                                       _this.treeview.el.set_model(_this.treeselmodel.el);
-                                       
-                                        _this.treeselmodel.el.selected = Gtk.INVALID_LIST_POSITION;
-                                       
-                                       
+                                       _this.sidebar.show(); 
                                }
                        });
                }