Merge lp:~artem-anufrij/scratch/button-aligment-to-the-right-side into lp:~elementary-apps/scratch/scratch

[Artem Anufrij]

Align plugin toolbar buttons to the right side (lp:1398965)

Plugin buttons was aligned to the right side. Browser Preview button was changed to a ToggleToolButton.

https://launchpadlibrarian.net/191787737/Screenshot%20from%202014-12-03%2023%3A09%3A30.png

[Danielle Foré (danrabbit)]

UX approve :)

review: Approve (ux)

[Robert Roth (evfool)]

Code looks clean and does the job well, code approved, UX already approved, so approving branch.

review: Approve (code)

=== modified file 'plugins/browser-preview/browser-preview.vala'
--- plugins/browser-preview/browser-preview.vala	2014-12-03 21:01:42 +0000
+++ plugins/browser-preview/browser-preview.vala	2014-12-03 22:06:35 +0000
@@ -25,7 +25,7 @@
 
     public class BrowserPreviewPlugin : Peas.ExtensionBase,  Peas.Activatable {
 
-        Gtk.ToolButton? tool_button = null;
+        Gtk.ToggleToolButton? tool_button = null;
         GLib.HashTable<Scratch.Services.Document, BrowserPreview.BrowserView> previews = new  GLib.HashTable<Scratch.Services.Document, BrowserPreview.BrowserView> (null, null);
 
         BrowserPreview.BrowserView? view = null;
@@ -80,14 +80,14 @@
                 return;
 
             var icon = new Gtk.Image.from_icon_name ("emblem-web", Gtk.IconSize.LARGE_TOOLBAR);
-            tool_button = new Gtk.ToolButton (icon, _("Get preview!"));
-            tool_button.tooltip_text = _("Hide preview");
-            tool_button.clicked.connect (toggle_plugin_visibility);
-
-            icon.show ();
-            tool_button.show ();
-
-            toolbar.pack_start (tool_button);
+            tool_button = new Gtk.ToggleToolButton ();
+            tool_button.set_icon_widget (icon);
+            tool_button.tooltip_text = _("Hide Preview");
+            tool_button.toggled.connect (toggle_plugin_visibility);
+
+            tool_button.show_all ();
+
+            toolbar.pack_end (tool_button);
         }
 
         void on_hook_context (Gtk.Notebook notebook) {
@@ -100,12 +100,12 @@
         }
 
         void toggle_plugin_visibility () {
-            if (notebook.page_num (view.paned) == -1) {
-                notebook.set_current_page (notebook.append_page (view.paned, new Gtk.Label (_("Web preview"))));
-                tool_button.tooltip_text = _("Hide preview");
+            if (tool_button.active) {
+                notebook.set_current_page (notebook.append_page (view.paned, new Gtk.Label (_("Web Preview"))));
+                tool_button.tooltip_text = _("Hide Preview");
             } else {
                 notebook.remove (view.paned);
-                tool_button.tooltip_text = _("Show preview");
+                tool_button.tooltip_text = _("Show Preview");
             }
         }
 
@@ -143,8 +143,8 @@
             view.paned.show_all ();
 
             // Check if removed tab was visible
-            if (tab_page_number > -1) {
-                notebook.insert_page (view.paned, new Gtk.Label (_("Web preview")), tab_page_number);
+            if (tool_button.active) {
+                notebook.insert_page (view.paned, new Gtk.Label (_("Web Preview")), tab_page_number);
 
                 // Select new tab if the removed tab was selected
                 if (tab_is_selected)

=== modified file 'plugins/terminal/terminal.vala'
--- plugins/terminal/terminal.vala	2014-12-03 20:42:30 +0000
+++ plugins/terminal/terminal.vala	2014-12-03 22:06:35 +0000
@@ -156,7 +156,7 @@
 
         toolbutton.show_all ();
 
-        toolbar.pack_start (toolbutton);
+        toolbar.pack_end (toolbutton);
     }
 
     void on_hook_notebook () {