From b2362489f013a7fa7bf46b6f654ee2acbcf16a66 Mon Sep 17 00:00:00 2001 From: Roy Date: Wed, 13 Mar 2019 03:28:16 -0600 Subject: [PATCH 01/10] User can see close focused project folder, alphabetize folders, and collapse folders. --- src/FolderManager/FileView.vala | 35 +++++++++++++++++++++++++++++++ src/FolderManager/FolderItem.vala | 2 +- src/MainWindow.vala | 31 ++++++++++++++++++++++++++- src/Widgets/Pane.vala | 35 +++++++++++++++++++++++++++---- 4 files changed, 97 insertions(+), 6 deletions(-) diff --git a/src/FolderManager/FileView.vala b/src/FolderManager/FileView.vala index f7c065c65e..e18af91865 100644 --- a/src/FolderManager/FileView.vala +++ b/src/FolderManager/FileView.vala @@ -74,6 +74,41 @@ namespace Scratch.FolderManager { write_settings (); } + public void close_active_folder () { + ProjectFolderItem project_root; + + if (selected is FileItem) { + project_root = (selected.parent as FolderItem).get_root_folder (); + } else { + project_root = (selected as FolderItem).get_root_folder (); + } + + project_root.closed(); + } + + public void collapse_all () { + foreach (var child in root.children) { + (child as ProjectFolderItem).collapse_all (); + } + } + + public void order_folders () { + var list = new Gee.ArrayList (); + + foreach (var child in root.children) { + root.remove (child as ProjectFolderItem); + list.add (child as ProjectFolderItem); + } + + list.sort ( (a, b) => { + return a.name.down () > b.name.down () ? 0 : -1; + }); + + foreach (var item in list) { + root.add (item); + } + } + public void select_path (string path) { selected = find_path (root, path); } diff --git a/src/FolderManager/FolderItem.vala b/src/FolderManager/FolderItem.vala index 14d42e6994..55ef37e1f3 100644 --- a/src/FolderManager/FolderItem.vala +++ b/src/FolderManager/FolderItem.vala @@ -296,7 +296,7 @@ namespace Scratch.FolderManager { } } - private ProjectFolderItem? get_root_folder (Granite.Widgets.SourceList.ExpandableItem? start = null) { + public ProjectFolderItem? get_root_folder (Granite.Widgets.SourceList.ExpandableItem? start = null) { if (start == null) { start = this; } diff --git a/src/MainWindow.vala b/src/MainWindow.vala index 39e5a2b4a0..2c1640b14d 100644 --- a/src/MainWindow.vala +++ b/src/MainWindow.vala @@ -63,6 +63,9 @@ namespace Scratch { public const string ACTION_FIND_PREVIOUS = "action_find_previous"; public const string ACTION_OPEN = "action_open"; public const string ACTION_OPEN_FOLDER = "action_open_folder"; + public const string ACTION_CLOSE_ACTIVE_FOLDER = "action_close_active_folder"; + public const string ACTION_COLLAPSE_ALL_FOLDERS = "action_collapse_all_folders"; + public const string ACTION_ORDER_FOLDERS = "action_order_folders"; public const string ACTION_GO_TO = "action_go_to"; public const string ACTION_NEW_VIEW = "action_new_view"; public const string ACTION_SORT_LINES = "action_sort_lines"; @@ -97,6 +100,9 @@ namespace Scratch { { ACTION_FIND_PREVIOUS, action_find_previous }, { ACTION_OPEN, action_open }, { ACTION_OPEN_FOLDER, action_open_folder }, + { ACTION_CLOSE_ACTIVE_FOLDER, action_close_active_folder }, + { ACTION_COLLAPSE_ALL_FOLDERS, action_collapse_all_folders }, + { ACTION_ORDER_FOLDERS, action_order_folders }, { ACTION_PREFERENCES, action_preferences }, { ACTION_REVERT, action_revert }, { ACTION_SAVE, action_save }, @@ -296,6 +302,7 @@ namespace Scratch { // Set actions sensitive property Utils.action_from_group (ACTION_SAVE_AS, actions).set_enabled (doc.file != null); + Utils.action_from_group (ACTION_CLOSE_ACTIVE_FOLDER, actions).set_enabled (folder_manager_view.selected != null); doc.check_undoable_actions (); }); @@ -303,15 +310,21 @@ namespace Scratch { folder_manager_view = new FolderManager.FileView (); + folder_manager_view.item_selected.connect (() => { + Utils.action_from_group (ACTION_CLOSE_ACTIVE_FOLDER, actions).set_enabled (folder_manager_view.selected != null); + }); + folder_manager_view.select.connect ((a) => { var file = new Scratch.FolderManager.File (a); var doc = new Scratch.Services.Document (actions, file.file); - + if (file.is_valid_textfile) { open_document (doc); } else { open_binary (file.file); } + + Utils.action_from_group (ACTION_CLOSE_ACTIVE_FOLDER, actions).set_enabled (folder_manager_view.selected != null); }); folder_manager_view.root.child_added.connect (() => { @@ -319,12 +332,16 @@ namespace Scratch { project_pane.add_tab (folder_manager_view); folder_manager_view.show_all (); } + + Utils.action_from_group (ACTION_CLOSE_ACTIVE_FOLDER, actions).set_enabled (folder_manager_view.selected != null); }); folder_manager_view.root.child_removed.connect (() => { if (folder_manager_view.get_n_visible_children (folder_manager_view.root) == 1) { folder_manager_view.parent.remove (folder_manager_view); } + + Utils.action_from_group (ACTION_CLOSE_ACTIVE_FOLDER, actions).set_enabled (folder_manager_view.selected != null); }); folder_manager_view.restore_saved_state (); @@ -811,6 +828,18 @@ namespace Scratch { chooser.destroy (); } + private void action_close_active_folder () { + folder_manager_view.close_active_folder (); + } + + private void action_collapse_all_folders () { + folder_manager_view.collapse_all (); + } + + private void action_order_folders () { + folder_manager_view.order_folders (); + } + private void action_save () { var doc = get_current_document (); /* may return null */ if (doc != null) { diff --git a/src/Widgets/Pane.vala b/src/Widgets/Pane.vala index 94290a2bd8..17504923b6 100644 --- a/src/Widgets/Pane.vala +++ b/src/Widgets/Pane.vala @@ -39,11 +39,38 @@ public class Code.Pane : Gtk.Grid { toolbar.get_style_context ().add_class (Gtk.STYLE_CLASS_INLINE_TOOLBAR); toolbar.icon_size = Gtk.IconSize.SMALL_TOOLBAR; - var add_button = new Gtk.ToolButton (new Gtk.Image.from_icon_name ("folder-open-symbolic", Gtk.IconSize.BUTTON), null); - add_button.action_name = Scratch.MainWindow.ACTION_PREFIX + Scratch.MainWindow.ACTION_OPEN_FOLDER; - add_button.tooltip_text = _("Add Project Folder…"); + var add_folder_button = new Gtk.ToolButton (new Gtk.Image.from_icon_name ("folder-open-symbolic", Gtk.IconSize.BUTTON), null); + add_folder_button.action_name = Scratch.MainWindow.ACTION_PREFIX + Scratch.MainWindow.ACTION_OPEN_FOLDER; + add_folder_button.tooltip_text = _("Add Project Folder…"); - toolbar.add (add_button); + var remove_folder_button = new Gtk.ToolButton (new Gtk.Image.from_icon_name ("folder-move-symbolic", Gtk.IconSize.BUTTON), null); + remove_folder_button.action_name = Scratch.MainWindow.ACTION_PREFIX + Scratch.MainWindow.ACTION_CLOSE_ACTIVE_FOLDER; + remove_folder_button.tooltip_text = _("Remove Project Folder"); + + var project_more_button = new Gtk.MenuToolButton (null, null); + project_more_button.tooltip_text = _("More…"); + + var collapse_all_menu_item = new Gtk.MenuItem.with_label (_("Collapse Project Folders")); + collapse_all_menu_item.action_name = Scratch.MainWindow.ACTION_PREFIX + Scratch.MainWindow.ACTION_COLLAPSE_ALL_FOLDERS; + + var order_projects_menu_item = new Gtk.MenuItem.with_label (_("Alphabetize Project Folders")); + order_projects_menu_item.action_name = Scratch.MainWindow.ACTION_PREFIX + Scratch.MainWindow.ACTION_ORDER_FOLDERS; + + var project_menu = new Gtk.Menu (); + project_menu.append (collapse_all_menu_item); + project_menu.append (new Gtk.SeparatorMenuItem ()); + project_menu.append (order_projects_menu_item); + project_menu.show_all (); + project_more_button.set_menu (project_menu); + + var separator_tool_item = new Gtk.SeparatorToolItem (); + separator_tool_item.set_expand (true); + separator_tool_item.draw = false; + + toolbar.add (add_folder_button); + toolbar.add (remove_folder_button); + toolbar.add (separator_tool_item); + toolbar.add (project_more_button); add (stack_switcher); add (stack); From 263b57cc6cc9f0c26f221461aec44d753d8573e5 Mon Sep 17 00:00:00 2001 From: Roy Date: Wed, 27 Mar 2019 22:45:35 -0600 Subject: [PATCH 02/10] removed close folder icon/functionality in the inline toolbar --- src/FolderManager/FileView.vala | 12 ------------ src/FolderManager/FolderItem.vala | 2 +- src/MainWindow.vala | 17 ----------------- src/Widgets/Pane.vala | 5 ----- 4 files changed, 1 insertion(+), 35 deletions(-) diff --git a/src/FolderManager/FileView.vala b/src/FolderManager/FileView.vala index e18af91865..cb70736b1a 100644 --- a/src/FolderManager/FileView.vala +++ b/src/FolderManager/FileView.vala @@ -74,18 +74,6 @@ namespace Scratch.FolderManager { write_settings (); } - public void close_active_folder () { - ProjectFolderItem project_root; - - if (selected is FileItem) { - project_root = (selected.parent as FolderItem).get_root_folder (); - } else { - project_root = (selected as FolderItem).get_root_folder (); - } - - project_root.closed(); - } - public void collapse_all () { foreach (var child in root.children) { (child as ProjectFolderItem).collapse_all (); diff --git a/src/FolderManager/FolderItem.vala b/src/FolderManager/FolderItem.vala index 55ef37e1f3..14d42e6994 100644 --- a/src/FolderManager/FolderItem.vala +++ b/src/FolderManager/FolderItem.vala @@ -296,7 +296,7 @@ namespace Scratch.FolderManager { } } - public ProjectFolderItem? get_root_folder (Granite.Widgets.SourceList.ExpandableItem? start = null) { + private ProjectFolderItem? get_root_folder (Granite.Widgets.SourceList.ExpandableItem? start = null) { if (start == null) { start = this; } diff --git a/src/MainWindow.vala b/src/MainWindow.vala index 2c1640b14d..3aba03b5e8 100644 --- a/src/MainWindow.vala +++ b/src/MainWindow.vala @@ -63,7 +63,6 @@ namespace Scratch { public const string ACTION_FIND_PREVIOUS = "action_find_previous"; public const string ACTION_OPEN = "action_open"; public const string ACTION_OPEN_FOLDER = "action_open_folder"; - public const string ACTION_CLOSE_ACTIVE_FOLDER = "action_close_active_folder"; public const string ACTION_COLLAPSE_ALL_FOLDERS = "action_collapse_all_folders"; public const string ACTION_ORDER_FOLDERS = "action_order_folders"; public const string ACTION_GO_TO = "action_go_to"; @@ -100,7 +99,6 @@ namespace Scratch { { ACTION_FIND_PREVIOUS, action_find_previous }, { ACTION_OPEN, action_open }, { ACTION_OPEN_FOLDER, action_open_folder }, - { ACTION_CLOSE_ACTIVE_FOLDER, action_close_active_folder }, { ACTION_COLLAPSE_ALL_FOLDERS, action_collapse_all_folders }, { ACTION_ORDER_FOLDERS, action_order_folders }, { ACTION_PREFERENCES, action_preferences }, @@ -302,7 +300,6 @@ namespace Scratch { // Set actions sensitive property Utils.action_from_group (ACTION_SAVE_AS, actions).set_enabled (doc.file != null); - Utils.action_from_group (ACTION_CLOSE_ACTIVE_FOLDER, actions).set_enabled (folder_manager_view.selected != null); doc.check_undoable_actions (); }); @@ -310,10 +307,6 @@ namespace Scratch { folder_manager_view = new FolderManager.FileView (); - folder_manager_view.item_selected.connect (() => { - Utils.action_from_group (ACTION_CLOSE_ACTIVE_FOLDER, actions).set_enabled (folder_manager_view.selected != null); - }); - folder_manager_view.select.connect ((a) => { var file = new Scratch.FolderManager.File (a); var doc = new Scratch.Services.Document (actions, file.file); @@ -323,8 +316,6 @@ namespace Scratch { } else { open_binary (file.file); } - - Utils.action_from_group (ACTION_CLOSE_ACTIVE_FOLDER, actions).set_enabled (folder_manager_view.selected != null); }); folder_manager_view.root.child_added.connect (() => { @@ -332,16 +323,12 @@ namespace Scratch { project_pane.add_tab (folder_manager_view); folder_manager_view.show_all (); } - - Utils.action_from_group (ACTION_CLOSE_ACTIVE_FOLDER, actions).set_enabled (folder_manager_view.selected != null); }); folder_manager_view.root.child_removed.connect (() => { if (folder_manager_view.get_n_visible_children (folder_manager_view.root) == 1) { folder_manager_view.parent.remove (folder_manager_view); } - - Utils.action_from_group (ACTION_CLOSE_ACTIVE_FOLDER, actions).set_enabled (folder_manager_view.selected != null); }); folder_manager_view.restore_saved_state (); @@ -828,10 +815,6 @@ namespace Scratch { chooser.destroy (); } - private void action_close_active_folder () { - folder_manager_view.close_active_folder (); - } - private void action_collapse_all_folders () { folder_manager_view.collapse_all (); } diff --git a/src/Widgets/Pane.vala b/src/Widgets/Pane.vala index 17504923b6..5ba93d7038 100644 --- a/src/Widgets/Pane.vala +++ b/src/Widgets/Pane.vala @@ -43,10 +43,6 @@ public class Code.Pane : Gtk.Grid { add_folder_button.action_name = Scratch.MainWindow.ACTION_PREFIX + Scratch.MainWindow.ACTION_OPEN_FOLDER; add_folder_button.tooltip_text = _("Add Project Folder…"); - var remove_folder_button = new Gtk.ToolButton (new Gtk.Image.from_icon_name ("folder-move-symbolic", Gtk.IconSize.BUTTON), null); - remove_folder_button.action_name = Scratch.MainWindow.ACTION_PREFIX + Scratch.MainWindow.ACTION_CLOSE_ACTIVE_FOLDER; - remove_folder_button.tooltip_text = _("Remove Project Folder"); - var project_more_button = new Gtk.MenuToolButton (null, null); project_more_button.tooltip_text = _("More…"); @@ -68,7 +64,6 @@ public class Code.Pane : Gtk.Grid { separator_tool_item.draw = false; toolbar.add (add_folder_button); - toolbar.add (remove_folder_button); toolbar.add (separator_tool_item); toolbar.add (project_more_button); From afda8bbbc2e9e166bfed5fea14f68cdc466fcf73 Mon Sep 17 00:00:00 2001 From: Cassidy James Blaede Date: Fri, 29 Mar 2019 00:17:29 -0600 Subject: [PATCH 03/10] Update src/Widgets/Pane.vala Co-Authored-By: roymckenzie <1065321+roymckenzie@users.noreply.github.com> --- src/Widgets/Pane.vala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Widgets/Pane.vala b/src/Widgets/Pane.vala index 5ba93d7038..dbe3808915 100644 --- a/src/Widgets/Pane.vala +++ b/src/Widgets/Pane.vala @@ -46,7 +46,7 @@ public class Code.Pane : Gtk.Grid { var project_more_button = new Gtk.MenuToolButton (null, null); project_more_button.tooltip_text = _("More…"); - var collapse_all_menu_item = new Gtk.MenuItem.with_label (_("Collapse Project Folders")); + var collapse_all_menu_item = new Gtk.MenuItem.with_label (_("Collapse All")); collapse_all_menu_item.action_name = Scratch.MainWindow.ACTION_PREFIX + Scratch.MainWindow.ACTION_COLLAPSE_ALL_FOLDERS; var order_projects_menu_item = new Gtk.MenuItem.with_label (_("Alphabetize Project Folders")); From 3d00e5eaa2dc3973fcb0cbc589e36e7b27f6f0cf Mon Sep 17 00:00:00 2001 From: Cassidy James Blaede Date: Fri, 29 Mar 2019 00:18:47 -0600 Subject: [PATCH 04/10] Update src/Widgets/Pane.vala Co-Authored-By: roymckenzie <1065321+roymckenzie@users.noreply.github.com> --- src/Widgets/Pane.vala | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Widgets/Pane.vala b/src/Widgets/Pane.vala index dbe3808915..41d290e25e 100644 --- a/src/Widgets/Pane.vala +++ b/src/Widgets/Pane.vala @@ -54,7 +54,6 @@ public class Code.Pane : Gtk.Grid { var project_menu = new Gtk.Menu (); project_menu.append (collapse_all_menu_item); - project_menu.append (new Gtk.SeparatorMenuItem ()); project_menu.append (order_projects_menu_item); project_menu.show_all (); project_more_button.set_menu (project_menu); From bb658af563b5b119319019b7510a51c8b1785214 Mon Sep 17 00:00:00 2001 From: Cassidy James Blaede Date: Fri, 29 Mar 2019 00:20:18 -0600 Subject: [PATCH 05/10] Update src/Widgets/Pane.vala Co-Authored-By: roymckenzie <1065321+roymckenzie@users.noreply.github.com> --- src/Widgets/Pane.vala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Widgets/Pane.vala b/src/Widgets/Pane.vala index 41d290e25e..d876c1f8d5 100644 --- a/src/Widgets/Pane.vala +++ b/src/Widgets/Pane.vala @@ -44,7 +44,7 @@ public class Code.Pane : Gtk.Grid { add_folder_button.tooltip_text = _("Add Project Folder…"); var project_more_button = new Gtk.MenuToolButton (null, null); - project_more_button.tooltip_text = _("More…"); + project_more_button.tooltip_text = _("Manage project folders…"); var collapse_all_menu_item = new Gtk.MenuItem.with_label (_("Collapse All")); collapse_all_menu_item.action_name = Scratch.MainWindow.ACTION_PREFIX + Scratch.MainWindow.ACTION_COLLAPSE_ALL_FOLDERS; From e619a89f7b8084d58d3f5db9ccf225015126aa59 Mon Sep 17 00:00:00 2001 From: Cassidy James Blaede Date: Fri, 29 Mar 2019 12:01:00 -0600 Subject: [PATCH 06/10] Update src/Widgets/Pane.vala Co-Authored-By: roymckenzie <1065321+roymckenzie@users.noreply.github.com> --- src/Widgets/Pane.vala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Widgets/Pane.vala b/src/Widgets/Pane.vala index d876c1f8d5..6c11a446fb 100644 --- a/src/Widgets/Pane.vala +++ b/src/Widgets/Pane.vala @@ -49,7 +49,7 @@ public class Code.Pane : Gtk.Grid { var collapse_all_menu_item = new Gtk.MenuItem.with_label (_("Collapse All")); collapse_all_menu_item.action_name = Scratch.MainWindow.ACTION_PREFIX + Scratch.MainWindow.ACTION_COLLAPSE_ALL_FOLDERS; - var order_projects_menu_item = new Gtk.MenuItem.with_label (_("Alphabetize Project Folders")); + var order_projects_menu_item = new Gtk.MenuItem.with_label (_("Alphabetize")); order_projects_menu_item.action_name = Scratch.MainWindow.ACTION_PREFIX + Scratch.MainWindow.ACTION_ORDER_FOLDERS; var project_menu = new Gtk.Menu (); From fb06222c1484251bf437439d32cf7d151b0440eb Mon Sep 17 00:00:00 2001 From: Jeremy Wootten Date: Tue, 19 Nov 2019 19:45:16 +0000 Subject: [PATCH 07/10] Move headerbar open folder button to inline toolbar --- src/Widgets/HeaderBar.vala | 5 ----- src/Widgets/Pane.vala | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/Widgets/HeaderBar.vala b/src/Widgets/HeaderBar.vala index 0c0896ce4d..ef3ab0f52e 100644 --- a/src/Widgets/HeaderBar.vala +++ b/src/Widgets/HeaderBar.vala @@ -43,10 +43,6 @@ namespace Scratch.Widgets { _("Open a file") ); - var open_folder_button = new Gtk.Button.from_icon_name ("folder-saved-search", Gtk.IconSize.LARGE_TOOLBAR); - open_folder_button.action_name = MainWindow.ACTION_PREFIX + MainWindow.ACTION_OPEN_FOLDER; - open_folder_button.tooltip_text = _("Open a folder"); - templates_button = new Gtk.Button.from_icon_name ("text-x-generic-template", Gtk.IconSize.LARGE_TOOLBAR); templates_button.action_name = MainWindow.ACTION_PREFIX + MainWindow.ACTION_TEMPLATES; templates_button.tooltip_text = _("Project templates"); @@ -188,7 +184,6 @@ namespace Scratch.Widgets { set_custom_title (format_bar); pack_start (open_button); - pack_start (open_folder_button); pack_start (templates_button); pack_start (save_button); pack_start (save_as_button); diff --git a/src/Widgets/Pane.vala b/src/Widgets/Pane.vala index 6c11a446fb..d8e81d0e23 100644 --- a/src/Widgets/Pane.vala +++ b/src/Widgets/Pane.vala @@ -39,7 +39,7 @@ public class Code.Pane : Gtk.Grid { toolbar.get_style_context ().add_class (Gtk.STYLE_CLASS_INLINE_TOOLBAR); toolbar.icon_size = Gtk.IconSize.SMALL_TOOLBAR; - var add_folder_button = new Gtk.ToolButton (new Gtk.Image.from_icon_name ("folder-open-symbolic", Gtk.IconSize.BUTTON), null); + var add_folder_button = new Gtk.ToolButton (new Gtk.Image.from_icon_name ("folder-saved-search", Gtk.IconSize.BUTTON), null); add_folder_button.action_name = Scratch.MainWindow.ACTION_PREFIX + Scratch.MainWindow.ACTION_OPEN_FOLDER; add_folder_button.tooltip_text = _("Add Project Folder…"); From 380167e0e8c53350c0e782bdb3ce534233dd4257 Mon Sep 17 00:00:00 2001 From: Jeremy Wootten Date: Tue, 19 Nov 2019 19:51:21 +0000 Subject: [PATCH 08/10] Fix lint errors --- src/Widgets/Pane.vala | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Widgets/Pane.vala b/src/Widgets/Pane.vala index 9b8468898f..f764ba17e4 100644 --- a/src/Widgets/Pane.vala +++ b/src/Widgets/Pane.vala @@ -46,7 +46,7 @@ public class Code.Pane : Gtk.Grid { var project_more_button = new Gtk.MenuToolButton (null, null); project_more_button.tooltip_text = _("Manage project folders…"); - + var collapse_all_menu_item = new Gtk.MenuItem.with_label (_("Collapse All")); collapse_all_menu_item.action_name = Scratch.MainWindow.ACTION_PREFIX + Scratch.MainWindow.ACTION_COLLAPSE_ALL_FOLDERS; @@ -109,4 +109,3 @@ public class Code.Pane : Gtk.Grid { }); } } - From 01c5d76bf84ae9e5faa8695b0e72cc7286cca572 Mon Sep 17 00:00:00 2001 From: Jeremy Wootten Date: Tue, 19 Nov 2019 20:08:57 +0000 Subject: [PATCH 09/10] Revert icon change --- src/Widgets/Pane.vala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Widgets/Pane.vala b/src/Widgets/Pane.vala index f764ba17e4..d4da084557 100644 --- a/src/Widgets/Pane.vala +++ b/src/Widgets/Pane.vala @@ -40,7 +40,7 @@ public class Code.Pane : Gtk.Grid { toolbar.get_style_context ().add_class (Gtk.STYLE_CLASS_INLINE_TOOLBAR); toolbar.icon_size = Gtk.IconSize.SMALL_TOOLBAR; - var add_folder_button = new Gtk.ToolButton (new Gtk.Image.from_icon_name ("folder-saved-search", Gtk.IconSize.BUTTON), null); + var add_folder_button = new Gtk.ToolButton (new Gtk.Image.from_icon_name ("folder-open-symbolic", Gtk.IconSize.BUTTON), null); add_folder_button.action_name = Scratch.MainWindow.ACTION_PREFIX + Scratch.MainWindow.ACTION_OPEN_FOLDER; add_folder_button.tooltip_text = _("Add Project Folder…"); From c3a429d048e4c4dd29d1378a9d6c8ff982e02ab3 Mon Sep 17 00:00:00 2001 From: Jeremy Wootten Date: Tue, 19 Nov 2019 20:13:31 +0000 Subject: [PATCH 10/10] Fix lint error (again) --- src/Widgets/Pane.vala | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Widgets/Pane.vala b/src/Widgets/Pane.vala index faa0a95a75..d4da084557 100644 --- a/src/Widgets/Pane.vala +++ b/src/Widgets/Pane.vala @@ -109,4 +109,3 @@ public class Code.Pane : Gtk.Grid { }); } } -