Merge lp:~superscript18/scratch/fix-1013421 into lp:~elementary-apps/scratch/scratch

[SuperScript]

Added Terminal plugin toggle button. Fixes bug 1013421

Added Terminal plugin toggle button. Fixes bug 1013421

[lp:~superscript18/scratch/fix-1013421]

1419. By SuperScript on 2014-11-27

Fixed not removing icon with plugin. Also not showing is default now.

[Artem Anufrij (artem-anufrij)]

Please resolve the code conflicts.
(brz merge lp:scratch)

Caution: Terminal can be switched between the bottombar or contextbar (right).

https://bugs.launchpad.net/scratch/+bug/1085718

review: Needs Fixing (code)

[lp:~superscript18/scratch/fix-1013421]

1420. By SuperScript on 2014-12-01

Trying to fix with new sidebar stuff.

1421. By SuperScript on 2014-12-01

Merged in code for right-side switch. Now working again.

[Artem Anufrij (artem-anufrij)]

Tooltip should switch between "Show terminal" and "hide Terminal" like browser toggle button.

See line comments

review: Needs Fixing (code)

[Artem Anufrij (artem-anufrij)]

http://bazaar.launchpad.net/~elementary-apps/scratch/scratch/view/head:/plugins/browser-preview/browser-preview.vala

[lp:~superscript18/scratch/fix-1013421]

1422. By SuperScript on 2014-12-03

Made the tooltip toggle between show and hide.

1423. By SuperScript on 2014-12-03

Made the tooltip toggle between show and hide.

[Artem Anufrij (artem-anufrij)]

After "Show Terminal" Terminal should be showed in the foreground.

See my screencast:
https://bugs.launchpad.net/scratch/+bug/1013421/+attachment/4273655/+files/Screencast%202014-12-03%2020%3A41%3A01.mp4

review: Needs Fixing (ux)

[lp:~superscript18/scratch/fix-1013421]

1424. By SuperScript on 2014-12-03

Terminal goes to foreground now.

[Artem Anufrij (artem-anufrij)]

line comments

review: Needs Fixing (code style)

[lp:~superscript18/scratch/fix-1013421]

1425. By SuperScript on 2014-12-03

Fixed coding style, removed junk.

[Artem Anufrij (artem-anufrij)]

Works as expected. Code style was reviewed!

Great work! Thank you!

review: Approve (code & ux)

=== modified file 'plugins/terminal/terminal.vala'
--- plugins/terminal/terminal.vala	2014-11-30 23:20:55 +0000
+++ plugins/terminal/terminal.vala	2014-12-03 20:42:43 +0000
@@ -29,7 +29,11 @@
 
     Gtk.Notebook? bottombar = null;
     Gtk.Notebook? contextbar = null;
-    
+    Scratch.Widgets.Toolbar? toolbar = null;
+    Gtk.ToggleToolButton? toolbutton = null;
+
+    bool on_bottom = true;
+
     Gtk.RadioMenuItem location_bottom = null;
     Gtk.RadioMenuItem location_right = null;
 
@@ -58,7 +62,6 @@
             if (bottombar == null) {
                 this.bottombar = n;
             }
-            switch_terminal_location ();
         });
 
         plugins.hook_notebook_context.connect ((n) => {
@@ -67,28 +70,39 @@
             }
         });
 
-        on_hook ();
+        plugins.hook_toolbar.connect ((n) => {
+            if (toolbar == null) {
+                this.toolbar = n;
+                on_hook_toolbar (this.toolbar);
+            }
+        });
+
+        on_hook_notebook ();
     }
 
     public void deactivate () {
         if (terminal != null)
             grid.destroy ();
+        if (toolbutton != null)
+            toolbutton.destroy ();
 
         window.key_press_event.disconnect (switch_focus);
     }
 
     void switch_terminal_location () {
-     
+
      	if (bottombar.page_num (grid) == -1 && this.location_bottom.active) {
 
             contextbar.remove_page (contextbar.page_num (grid));
-            bottombar.append_page (grid, new Gtk.Label (_("Terminal")));
+            bottombar.set_current_page (bottombar.append_page (grid, new Gtk.Label (_("Terminal"))));
+            on_bottom = true;
             debug ("Move Terminal: BOTTOMBAR.");
-            
+
         } else if (contextbar.page_num (grid) == -1 && this.location_right.active) {
 
             bottombar.remove_page (bottombar.page_num (grid));
-            contextbar.append_page (grid, new Gtk.Label (_("Terminal")));
+            contextbar.set_current_page (contextbar.append_page (grid, new Gtk.Label (_("Terminal"))));
+            on_bottom = false;
             debug ("Move Terminal: CONTEXTBAR.");
 
         }
@@ -116,7 +130,36 @@
         return false;
     }
 
-    void on_hook () {
+    void on_hook_toolbar (Scratch.Widgets.Toolbar toolbar) {
+        var icon = new Gtk.Image.from_icon_name ("utilities-terminal", Gtk.IconSize.LARGE_TOOLBAR);
+        toolbutton = new Gtk.ToggleToolButton ();
+        toolbutton.set_icon_widget (icon);
+        toolbutton.set_active (false);
+        toolbutton.tooltip_text = _("Show Terminal");
+        toolbutton.toggled.connect (() => {
+            if (this.toolbutton.active) {
+                toolbutton.tooltip_text = _("Hide Terminal");
+                if (on_bottom) {
+                    bottombar.set_current_page (bottombar.append_page (grid, new Gtk.Label (_("Terminal"))));
+                } else {
+                    contextbar.set_current_page (contextbar.append_page (grid, new Gtk.Label (_("Terminal"))));
+                }
+            } else {
+                toolbutton.tooltip_text = _("Show Terminal");
+                if (on_bottom) {
+                    bottombar.remove_page (bottombar.page_num (grid));
+                } else {
+                    contextbar.remove_page (contextbar.page_num (grid));
+                }
+            }
+        });
+
+        toolbutton.show_all ();
+
+        toolbar.pack_start (toolbutton);
+    }
+
+    void on_hook_notebook () {
         this.terminal = new Vte.Terminal ();
         this.terminal.scrollback_lines = -1;