Merge lp:~mefrio-g/scratch/fix-1258291 into lp:~elementary-apps/scratch/scratch

[Mario Guerriero]

Don't show browser pane if no files open. Fixes bug #1258291.

[Victor Martinez (victored)]

Works fine here

review: Approve

=== modified file 'plugins/browser-preview/browser-preview.vala'
--- plugins/browser-preview/browser-preview.vala	2013-11-30 22:43:00 +0000
+++ plugins/browser-preview/browser-preview.vala	2014-04-05 19:16:04 +0000
@@ -30,6 +30,8 @@
     Gtk.ScrolledWindow? scrolled = null;
     Scratch.Services.Document? doc = null;
 
+    Gtk.Notebook notebook;
+
     Scratch.Services.Interface plugins;
     public Object object { owned get; construct; }
 
@@ -65,10 +67,14 @@
         view.welcome_shown.connect (() => {
             this.tool_button.visible = false;
             this.tool_button.no_show_all = true;
+            if (notebook.page_num (scrolled) != -1)
+                notebook.remove (scrolled);
         });
         view.welcome_hidden.connect (() => {
             this.tool_button.visible = true;
             this.tool_button.no_show_all = false;
+            if (notebook.page_num (scrolled) == -1)
+                notebook.append_page (scrolled, new Gtk.Label (_("Web preview")));
         });
     }
     
@@ -94,24 +100,25 @@
         tool_button.show ();
 
         toolbar.pack_start (tool_button);
-        //toolbar.insert (tool_button, toolbar.get_item_index (toolbar.find_button) + 1);
     }
 
     void on_hook_context (Gtk.Notebook notebook) {
-    	if (scrolled != null)
-    	    return;
-
-    	view = new WebView ();
-    	// Enable local loading
-    	var settings = view.get_settings ();
-    	settings.enable_file_access_from_file_uris = true;
-
-    	scrolled = new Gtk.ScrolledWindow (null, null);
-    	scrolled.add (view);
-
-    	notebook.append_page (scrolled, new Gtk.Label (_("Web preview")));
-
-    	scrolled.show_all ();
+        if (scrolled != null)
+            return;
+
+        this.notebook = notebook;
+
+        view = new WebView ();
+        // Enable local loading
+        var settings = view.get_settings ();
+        settings.enable_file_access_from_file_uris = true;
+
+        scrolled = new Gtk.ScrolledWindow (null, null);
+        scrolled.add (view);
+
+        notebook.append_page (scrolled, new Gtk.Label (_("Web preview")));
+
+        scrolled.show_all ();
     }
 
 }
@@ -121,4 +128,4 @@
     var objmodule = module as Peas.ObjectModule;
     objmodule.register_extension_type (typeof (Peas.Activatable),
                                      typeof (Scratch.Plugins.BrowserPreview));
-}
+}
 \ No newline at end of file