Merge lp:~artem-anufrij/scratch/hide-plugins-on-welcome-screen into lp:~elementary-apps/scratch/scratch

[Artem Anufrij]

Hide the bottom and right side plugins on welcome screen (lp:1390895)

Hide the bottom and right side plugins on welcome screen.

[Robert Roth (evfool)]

Branch works as expected, code style is fine, approving.

review: Approve

=== modified file 'plugins/browser-preview/browser-preview.vala'
--- plugins/browser-preview/browser-preview.vala	2014-11-09 16:08:42 +0000
+++ plugins/browser-preview/browser-preview.vala	2014-11-10 18:12:24 +0000
@@ -41,12 +41,12 @@
         public void activate () {
             plugins = (Scratch.Services.Interface) object;
 
-            plugins.hook_document.connect ((d) => {
-                this.doc = d;
-                this.doc.doc_saved.disconnect (show_preview);
-                this.doc.doc_saved.connect (show_preview);
+            plugins.hook_window.connect ((w) => {
+                set_current_document (w.get_current_document ());
             });
 
+            plugins.hook_document.connect (set_current_document);
+
             plugins.hook_split_view.connect (on_hook_split_view);
 
             plugins.hook_notebook_context.connect (on_hook_context);
@@ -60,23 +60,15 @@
 
             if (plugin_tab != null)
                 plugin_tab.destroy ();
-
         }
 
         void on_hook_split_view (Scratch.Widgets.SplitView view) {
             this.tool_button.visible = ! view.is_empty ();
-            this.tool_button.no_show_all = view.is_empty ();
             view.welcome_shown.connect (() => {
                 this.tool_button.visible = false;
-                this.tool_button.no_show_all = true;
-                if (notebook.page_num (plugin_tab) != -1)
-                    notebook.remove (plugin_tab);
             });
             view.welcome_hidden.connect (() => {
                 this.tool_button.visible = true;
-                this.tool_button.no_show_all = false;
-                if (notebook.page_num (plugin_tab) == -1)
-                    notebook.append_page (plugin_tab, new Gtk.Label (_("Web preview")));
             });
         }
 
@@ -86,10 +78,8 @@
 
             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 = _("Get preview!");
-            tool_button.clicked.connect (() => {
-                show_preview () ;
-            });
+            tool_button.tooltip_text = _("Hide preview");
+            tool_button.clicked.connect (toggle_plugin_visibility);
 
             icon.show ();
             tool_button.show ();
@@ -104,6 +94,7 @@
             this.notebook = notebook;
 
             plugin_tab = new Gtk.Paned (Gtk.Orientation.VERTICAL);
+            
             view = new BrowserPreview.BrowserView (plugin_tab);
 
             notebook.append_page (plugin_tab, new Gtk.Label (_("Web preview")));
@@ -111,6 +102,25 @@
             plugin_tab.show_all ();
         }
 
+        void toggle_plugin_visibility () {            
+            if (notebook.page_num (plugin_tab) == -1) {
+                notebook.append_page (plugin_tab, new Gtk.Label (_("Web preview")));
+                tool_button.tooltip_text = _("Hide preview");
+            } else {
+                notebook.remove (plugin_tab);
+                tool_button.tooltip_text = _("Show preview");
+            }
+        }
+
+        void set_current_document (Scratch.Services.Document? d) {
+            if (d != null) {
+                this.doc = d;
+                this.doc.doc_saved.disconnect (show_preview);
+                this.doc.doc_saved.connect (show_preview);
+                show_preview ();
+            }
+        }
+
         void show_preview () {
             // Get uri
             if (this.doc.file == null)

=== modified file 'plugins/terminal/terminal.vala'
--- plugins/terminal/terminal.vala	2014-11-08 20:46:59 +0000
+++ plugins/terminal/terminal.vala	2014-11-10 18:12:24 +0000
@@ -29,7 +29,6 @@
     Gtk.Notebook? bottombar = null;
     Vte.Terminal terminal;
     Gtk.Grid grid;
-    ulong? connect_handler;
 
     Scratch.Services.Interface plugins;
     public Object object { owned get; construct; }
@@ -45,22 +44,7 @@
                 return;
                 
             window = w;
-            connect_handler = window.key_press_event.connect ((event) => {
-                if (event.keyval == Gdk.Key.t
-                    && Gdk.ModifierType.MOD1_MASK in event.state
-                    && Gdk.ModifierType.CONTROL_MASK in event.state) {
-                    if (terminal.has_focus && window.get_current_document () != null) {
-                        window.get_current_document ().focus ();
-                        debug ("Move focus: EDITOR.");
-                        return true;
-                    } else if (window.get_current_document () != null && window.get_current_document ().source_view.has_focus) {
-                        terminal.grab_focus ();
-                        debug ("Move focus: TERMINAL.");
-                        return true;
-                    }
-                }
-                return false;
-            });
+            window.key_press_event.connect (switch_focus);
         });
 
         plugins.hook_notebook_bottom.connect ((n) => {
@@ -76,8 +60,25 @@
     public void deactivate () {
         if (terminal != null)
             grid.destroy ();
-        if (connect_handler != null)
-            window.disconnect ((ulong)connect_handler);
+        if (window != null)
+            window.key_press_event.disconnect (switch_focus);
+    }
+
+    bool switch_focus (Gdk.EventKey event) {
+        if (event.keyval == Gdk.Key.t
+            && Gdk.ModifierType.MOD1_MASK in event.state
+            && Gdk.ModifierType.CONTROL_MASK in event.state) {
+            if (terminal.has_focus && window.get_current_document () != null) {
+                window.get_current_document ().focus ();
+                debug ("Move focus: EDITOR.");
+                return true;
+            } else if (window.get_current_document () != null && window.get_current_document ().source_view.has_focus) {
+                terminal.grab_focus ();
+                debug ("Move focus: TERMINAL.");
+                return true;
+            }
+        }
+        return false;
     }
 
     void on_hook (Gtk.Notebook notebook) {

=== modified file 'src/MainWindow.vala'
--- src/MainWindow.vala	2014-11-02 11:16:30 +0000
+++ src/MainWindow.vala	2014-11-10 18:12:24 +0000
@@ -175,7 +175,6 @@
             // Signals
             this.split_view.welcome_shown.connect (() => {
                 set_widgets_sensitive (false);
-
             });
             this.split_view.welcome_hidden.connect (() => {
                 set_widgets_sensitive (true);
@@ -278,15 +277,15 @@
                 plugins.hook_notebook_sidebar (this.sidebar);
                 plugins.hook_notebook_context (this.contextbar);
                 plugins.hook_notebook_bottom (this.bottombar);
-                this.split_view.document_change.connect ((doc) => {
-                    plugins.hook_document (doc);
-                });
+                this.split_view.document_change.connect ((doc) => { plugins.hook_document (doc); });
                 plugins.hook_split_view (this.split_view);
             };
             plugins.extension_added.connect (() => {
                 hook_func ();
             });
             hook_func ();
+
+            set_widgets_sensitive (!split_view.is_empty ());
         }
 
          private void on_plugin_toggled (Gtk.Notebook notebook) {
@@ -317,6 +316,15 @@
             main_actions.get_action ("Redo").sensitive = val;
             main_actions.get_action ("Revert").sensitive = val;
             this.toolbar.share_app_menu.sensitive = val;
+
+            // PlugIns
+            if (val) {
+                on_plugin_toggled (this.contextbar);
+                on_plugin_toggled (this.bottombar);
+            } else {
+                this.contextbar.visible = val;
+                this.bottombar.visible = val;
+            }
         }
 
         // Get current view
@@ -335,7 +343,7 @@
         // Get current document
         public Scratch.Services.Document? get_current_document () {
             Scratch.Services.Document? doc = null;
-            
+
             var view = this.get_current_view ();
             if (view != null)
                 doc = view.get_current_document ();
@@ -897,4 +905,4 @@
                                          action_fullscreen }
         };
     }
-}
\ No newline at end of file
+}