Merge lp:~artem-anufrij/scratch/Bugfix-1399017-PlugIn-Switcher into lp:~elementary-apps/scratch/scratch

[Artem Anufrij]

#1 Added a toggle button for the "Outline" plugin.

2# Plugin toggle buttons toggle tabs visibility in the "context" - notebook.
- Browser Preview
- Terminal (if it's on the right side)
- Outline

[Artem Anufrij (artem-anufrij)]

which icon can I use for the "ouline" plugin?

[Danielle Foré (danrabbit)]

Hm it seems to me that the Outline plugin is a navigation feature and not a result/utility. I think it doesn't belong in this stack but on the left side in a stack with the folder/file browser.

See this mockup: https://launchpadlibrarian.net/156102789/scratch.png

Otherwise, hiding/showing and switching panes work as expected.

[Artem Anufrij (artem-anufrij)]

Hey Dan,

do you mean this layout?

https://launchpadlibrarian.net/192481005/Screenshot%20from%202014-12-12%2021%3A12%3A18.png

[Robert Roth (evfool)]

Code style looks mostly ok, see a few comments inline, as usual, some nitpicking whitespace comments.

[lp:~artem-anufrij/scratch/Bugfix-1399017-PlugIn-Switcher]

1432. By artem-anufrij on 2014-12-16

fixed code style

[Robert Roth (evfool)]

Found another one, the last one.

[lp:~artem-anufrij/scratch/Bugfix-1399017-PlugIn-Switcher]

1433. By artem-anufrij on 2014-12-16

fixed code style

[Artem Anufrij (artem-anufrij)]

@Robert: done!

[Robert Roth (evfool)]

review: Approve (code)

Unmerged revisions

=== modified file 'plugins/browser-preview/browser-preview.vala'
--- plugins/browser-preview/browser-preview.vala	2014-12-03 22:04:20 +0000
+++ plugins/browser-preview/browser-preview.vala	2014-12-16 18:14:37 +0000
@@ -82,7 +82,7 @@
             var icon = new Gtk.Image.from_icon_name ("emblem-web", Gtk.IconSize.LARGE_TOOLBAR);
             tool_button = new Gtk.ToggleToolButton ();
             tool_button.set_icon_widget (icon);
-            tool_button.tooltip_text = _("Hide Preview");
+            tool_button.tooltip_text = _("Show Preview");
             tool_button.toggled.connect (toggle_plugin_visibility);
 
             tool_button.show_all ();
@@ -95,7 +95,10 @@
                 return;
 
             this.notebook = notebook;
-
+            this.notebook.switch_page.connect ((page, page_num) => {
+                if (tool_button.active != (view.paned == page))
+                    tool_button.active = (view.paned == page);
+            });
             set_current_document (this.doc);
         }
 

=== modified file 'plugins/outline/OutlinePlugin.vala'
--- plugins/outline/OutlinePlugin.vala	2014-04-23 22:33:04 +0000
+++ plugins/outline/OutlinePlugin.vala	2014-12-16 18:14:37 +0000
@@ -46,9 +46,11 @@
 
         public void activate () {
             scratch_interface = (Scratch.Services.Interface)object;
-            scratch_interface.hook_notebook_context.connect (on_hook_context);
+
             scratch_interface.hook_document.connect (on_hook_document);
-            scratch_interface.hook_split_view.connect (on_hook_split_view);
+
+            scratch_interface.hook_notebook_sidebar.connect (on_hook_sidebar);
+
             views = new Gee.LinkedList<SymbolOutline> ();
         }
 
@@ -59,18 +61,20 @@
         public void update_state () {
         }
 
-        void on_hook_context (Gtk.Notebook notebook) {
+        void on_hook_sidebar (Gtk.Notebook notebook) {
             if (container != null)
                 return;
             if (this.notebook == null)
                 this.notebook = notebook;
-                
+
             container = new Gtk.EventBox ();
             container.visible = false;
+            if (this.notebook != null)
+                notebook.append_page (container, new Gtk.Label (_("Symbols")));
         }
 
         void on_hook_document (Scratch.Services.Document doc) {
-            if (current_view != null && current_view.doc == doc) 
+            if (current_view != null && current_view.doc == doc)
                 return;
 
             if (current_view != null)
@@ -83,6 +87,7 @@
                     break;
                 }
             }
+
             if (view == null && doc.file != null) {
                 if (doc.get_mime_type () == "text/x-vala") {
                     view = new ValaSymbolOutline (doc);
@@ -108,28 +113,19 @@
                 remove_container ();
             }
         }
-        
+
         void add_container () {
             if(notebook.page_num (container) == -1) {
                 notebook.append_page (container, new Gtk.Label (_("Symbols")));
                 container.show_all ();
             }
         }
-        
+
         void remove_container () {
             if (notebook.page_num (container) != -1)
                 notebook.remove (container);
         }
-        
-        void on_hook_split_view (Scratch.Widgets.SplitView view) {
-            view.welcome_shown.connect (() => {
-                remove_container ();
-            });
-            view.welcome_hidden.connect (() => {
-                add_container ();
-            });
-        }
-        
+
         void update_timeout () {
             if (refresh_timeout != 0)
                 Source.remove (refresh_timeout);
@@ -163,6 +159,6 @@
 [ModuleInit]
 public void peas_register_types (GLib.TypeModule module)
 {
-  var objmodule = module as Peas.ObjectModule;
-  objmodule.register_extension_type (typeof (Peas.Activatable), typeof (Scratch.Plugins.OutlinePlugin));
-}
\ No newline at end of file
+    var objmodule = module as Peas.ObjectModule;
+    objmodule.register_extension_type (typeof (Peas.Activatable), typeof (Scratch.Plugins.OutlinePlugin));
+}

=== modified file 'plugins/terminal/terminal.vala'
--- plugins/terminal/terminal.vala	2014-12-05 20:58:48 +0000
+++ plugins/terminal/terminal.vala	2014-12-16 18:14:37 +0000
@@ -61,12 +61,20 @@
         plugins.hook_notebook_bottom.connect ((n) => {
             if (bottombar == null) {
                 this.bottombar = n;
+                this.bottombar.switch_page.connect ((page, page_num) => {
+                    if (tool_button.active != (grid == page) && bottombar.page_num (grid) > -1)
+                        tool_button.active = (grid == page);
+                });
             }
         });
 
         plugins.hook_notebook_context.connect ((n) => {
             if (contextbar == null) {
                 this.contextbar = n;
+                this.contextbar.switch_page.connect ((page, page_num) => {
+                    if (tool_button.active != (grid == page) && contextbar.page_num (grid) > -1)
+                        tool_button.active = (grid == page);
+                });
             }
         });