Merge lp:~artem-anufrij/scratch/Bugfix-1085718 into lp:~elementary-apps/scratch/scratch

[Artem Anufrij]

Terminal switches automatically to the left side if width of the window is > 1366pix

[lp:~artem-anufrij/scratch/Bugfix-1085718]

1404. By artem-anufrij on 2014-11-05

remove [tabulator] -> [4 x spase]

1405. By artem-anufrij on 2014-11-05

Disconnect size_allocate when PlugIn deactivate

[Danielle Foré (danrabbit)]

I would prefer not to set a static px limit here. We should change based on the side of the Line Width Guide and also if there are other panes open like the Folder Browser.

review: Needs Fixing (ux)

[Artem Anufrij (artem-anufrij)]

Hey Dan,

I didn't get any feedback on slack.com about this behavior. I use since a week this branch on my system and it's very helpful, although it will be checked the window width in pix, and not line width.

I think we can merge this branch.

What do you think about?

review: Needs Information ((ux))

[lp:~artem-anufrij/scratch/Bugfix-1085718]

1406. By artem-anufrij on 2014-11-12

move terminal back to bottombar if open two code views

1407. By artem-anufrij on 2014-11-12

move terminal back to bottombar if open two code views

1408. By artem-anufrij on 2014-11-24

Switching terminal location via context menu.

1409. By artem-anufrij on 2014-11-24

Change Menu items: Terminal on Right | Terminal on Bottom

Unmerged revisions

=== modified file 'plugins/terminal/terminal.vala'
--- plugins/terminal/terminal.vala	2014-11-10 18:09:21 +0000
+++ plugins/terminal/terminal.vala	2014-11-12 20:23:16 +0000
@@ -26,7 +26,9 @@
 public class Scratch.Plugins.Terminal : Peas.ExtensionBase,  Peas.Activatable {
 
     MainWindow window = null;
+    Scratch.Widgets.SplitView splitview = null;
     Gtk.Notebook? bottombar = null;
+    Gtk.Notebook? contextbar = null;
     Vte.Terminal terminal;
     Gtk.Grid grid;
 
@@ -37,51 +39,93 @@
     }
 
     public void activate () {
+
         plugins = (Scratch.Services.Interface) object;
 
         plugins.hook_window.connect ((w) => {
             if (window != null)
                 return;
-                
+
             window = w;
+            window.size_allocate.connect (set_terminal_location);
             window.key_press_event.connect (switch_focus);
         });
 
         plugins.hook_notebook_bottom.connect ((n) => {
             if (bottombar == null) {
                 this.bottombar = n;
-                on_hook (this.bottombar);
-            }
-        });
-        if (bottombar != null)
-            on_hook (this.bottombar);
+            }
+        });
+
+        plugins.hook_notebook_context.connect ((n) => {
+            if (contextbar == null) {
+                this.contextbar = n;
+            }
+        });
+
+        plugins.hook_split_view.connect ((s) => {
+            if (splitview != null)
+                return;
+
+            this.splitview = s;
+            splitview.views_changed.connect ((u) => { set_terminal_location (); });
+        });
+
+        on_hook ();
+        set_terminal_location ();
     }
 
     public void deactivate () {
         if (terminal != null)
             grid.destroy ();
-        if (window != null)
-            window.key_press_event.disconnect (switch_focus);
+
+        window.size_allocate.disconnect (set_terminal_location);
+        window.key_press_event.disconnect (switch_focus);
+    }
+
+    void set_terminal_location (Gtk.Allocation? alloc = null) {
+        if (alloc == null) {
+            window.get_allocation (out alloc);
+        }
+
+        if (alloc.width > 1366 && splitview.views.length () == 1 && contextbar.page_num (grid) == -1 ) {
+
+            bottombar.remove_page (bottombar.page_num (grid));
+            contextbar.append_page (grid, new Gtk.Label (_("Terminal")));
+            debug ("Move Terminal: CONTEXTBAR.");
+
+        } else if ((alloc.width <= 1366 || splitview.views.length () > 1) && bottombar.page_num (grid) == -1) {
+
+            contextbar.remove_page (contextbar.page_num (grid));
+            bottombar.append_page (grid, new Gtk.Label (_("Terminal")));
+            debug ("Move Terminal: BOTTOMBAR.");
+
+        }
     }
 
     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) {
+    void on_hook () {
         this.terminal = new Vte.Terminal ();
         this.terminal.scrollback_lines = -1;
 
@@ -168,7 +212,7 @@
             }
             return false;
         });
-       
+
         try {
             this.terminal.fork_command_full (Vte.PtyFlags.DEFAULT, "~/", { Vte.get_user_shell () }, null, GLib.SpawnFlags.SEARCH_PATH, null, null);
         } catch (GLib.Error e) {
@@ -184,10 +228,7 @@
         terminal.vexpand = true;
         terminal.hexpand = true;
 
-        notebook.append_page (grid, new Gtk.Label (_("Terminal")));
-
         grid.show_all ();
-
     }
 }
 
@@ -196,4 +237,4 @@
     var objmodule = module as Peas.ObjectModule;
     objmodule.register_extension_type (typeof (Peas.Activatable),
                                      typeof (Scratch.Plugins.Terminal));
-}
\ No newline at end of file
+}

=== modified file 'src/MainWindow.vala'
--- src/MainWindow.vala	2014-11-10 18:09:21 +0000
+++ src/MainWindow.vala	2014-11-12 20:23:16 +0000
@@ -215,13 +215,21 @@
 
             this.contextbar = new Gtk.Notebook ();
             this.contextbar.no_show_all = true;
-            this.contextbar.page_added.connect (() => { on_plugin_toggled (contextbar); });
             this.contextbar.page_removed.connect (() => { on_plugin_toggled (contextbar); });
+            this.contextbar.page_added.connect (() => { 
+                if (!this.split_view.is_empty ())
+                    on_plugin_toggled (contextbar); 
+            });
+            
+
 
             this.bottombar = new Gtk.Notebook ();
             this.bottombar.no_show_all = true;
-            this.bottombar.page_added.connect (() => { on_plugin_toggled (bottombar); });
             this.bottombar.page_removed.connect (() => { on_plugin_toggled (bottombar); });
+            this.bottombar.page_added.connect (() => { 
+                if (!this.split_view.is_empty ())
+                    on_plugin_toggled (bottombar); 
+            });            
 
             hp1 = new Granite.Widgets.ThinPaned ();
             hp2 = new Granite.Widgets.ThinPaned ();
@@ -288,7 +296,7 @@
             set_widgets_sensitive (!split_view.is_empty ());
         }
 
-         private void on_plugin_toggled (Gtk.Notebook notebook) {
+        private void on_plugin_toggled (Gtk.Notebook notebook) {
             var pages = notebook.get_n_pages ();
             notebook.set_show_tabs (pages > 1);
             notebook.no_show_all = (pages == 0);

=== modified file 'src/Widgets/SplitView.vala'
--- src/Widgets/SplitView.vala	2014-10-26 08:26:36 +0000
+++ src/Widgets/SplitView.vala	2014-11-12 20:23:16 +0000
@@ -35,6 +35,7 @@
         public signal void welcome_shown ();
         public signal void welcome_hidden ();
         public signal void document_change (Scratch.Services.Document document);
+        public signal void views_changed (uint count);
 
         private weak MainWindow window;
 
@@ -126,7 +127,6 @@
 
             // Enbale/Disable useless GtkActions about views
             check_actions ();
-
             return view;
         }
 
@@ -199,6 +199,8 @@
         private void check_actions () {
             window.main_actions.get_action ("NewView").sensitive = (views.length () < 2);
             window.main_actions.get_action ("RemoveView").sensitive = (views.length () > 1);
+
+            views_changed (views.length ());
         }
     }
 }
\ No newline at end of file

=== modified file 'src/Widgets/ToolBar.vala'
--- src/Widgets/ToolBar.vala	2014-10-28 18:20:18 +0000
+++ src/Widgets/ToolBar.vala	2014-11-12 20:23:16 +0000
@@ -91,6 +91,7 @@
             pack_start (revert_button);
             pack_start (new SeparatorToolItem ());
             pack_start (find_button);
+            pack_start (find_button);
            
             pack_end (share_app_menu);
             pack_end (zoom_default);
@@ -106,4 +107,4 @@
 
         }
     }
-}
\ No newline at end of file
+}