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

[Artem Anufrij]

Press CTRL+ALT+t for switching between terminal and editor.

Press CTRL+ALT+t for switching between terminal and editor.

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

1403. By artem-anufrij on 2014-11-01

diconnect key_event on deactivate terminal plug in

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

improved code design

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

code design was improved

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

code design was improved

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

check if windown != null

[Robert Roth (evfool)]

Code-wise this looks OK, but we need an UX review based on comment https://bugs.launchpad.net/scratch/+bug/1032565/comments/2 tomake sure they are OK with F12 (I also use that shortcut for my dropdown terminal).

review: Approve (code)

[Robert Roth (evfool)]

The proposal is almost perfect code-wise, see my only inline comment :)

[Cody Garver (codygarver)]

I'm concerned about hardcoding this to F12. As commented on the bug report, that's a popular key. Is it possible to make this easily configurable somehow in dconf? Not only for the users, but we (OS team) could even end up reconfiguring this in the future at Design Team's request and a dconf entry is convenient for all who are concerned.

If it's not simple, let's further discuss if F12 is what we really want before merging this.

[Artem Anufrij (artem-anufrij)]

Hey Cody. Yes, it's possible. We need to create a new settings item, than I can use it for this plug in.

[Danielle Foré (danrabbit)]

Yeah I'm -1 on using F keys. Especially because on keyboards with media keys this can mean you need to hold down the "Fn" key first. So it's kind of inconvenient.

We should probably be using something Ctrl based. If it's not already being used for something in Scratch, it seems like "Ctrl T" would be the most logical.

review: Needs Fixing

[Artem Anufrij (artem-anufrij)]

Give me 5 minutes ... :)

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

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

Hotkey: CTRL+ALT+t

[Artem Anufrij (artem-anufrij)]

Hotkey: CTRL+ALT+t

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

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

merge lp:scratch

=== modified file 'plugins/terminal/terminal.vala'
--- plugins/terminal/terminal.vala	2014-08-07 00:33:31 +0000
+++ plugins/terminal/terminal.vala	2014-11-09 10:53:41 +0000
@@ -1,21 +1,21 @@
 // -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
 /***
   BEGIN LICENSE
-	
+
   Copyright (C) 2011-2013 Mario Guerriero <[e-mail]>
-  This program is free software: you can redistribute it and/or modify it	
-  under the terms of the GNU Lesser General Public License version 3, as published	
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License version 3, as published
   by the Free Software Foundation.
-	
-  This program is distributed in the hope that it will be useful, but	
-  WITHOUT ANY WARRANTY; without even the implied warranties of	
-  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR	
+
+  This program is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranties of
+  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
   PURPOSE.  See the GNU General Public License for more details.
-	
-  You should have received a copy of the GNU General Public License along	
-  with this program.  If not, see <http://www.gnu.org/licenses/>	
-  
-  END LICENSE	
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>
+
+  END LICENSE
 ***/
 
 using Vte;
@@ -24,20 +24,46 @@
 public const string DESCRIPTION = N_("A terminal in your text editor");
 
 public class Scratch.Plugins.Terminal : Peas.ExtensionBase,  Peas.Activatable {
-    
+
+    MainWindow window = null;
     Gtk.Notebook? bottombar = null;
     Vte.Terminal terminal;
     Gtk.Grid grid;
-    
+    ulong? connect_handler;
+
     Scratch.Services.Interface plugins;
     public Object object { owned get; construct; }
-   
+
     public void update_state () {
     }
 
     public void activate () {
-        plugins = (Scratch.Services.Interface) object;        
-        plugins.hook_notebook_bottom.connect ((n) => { 
+        plugins = (Scratch.Services.Interface) object;
+
+        plugins.hook_window.connect ((w) => {
+            if (window != null)
+                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;
+            });
+        });
+
+        plugins.hook_notebook_bottom.connect ((n) => {
             if (bottombar == null) {
                 this.bottombar = n;
                 on_hook (this.bottombar);
@@ -50,12 +76,14 @@
     public void deactivate () {
         if (terminal != null)
             grid.destroy ();
+        if (connect_handler != null)
+            window.disconnect ((ulong)connect_handler);
     }
-    
+
     void on_hook (Gtk.Notebook notebook) {
         this.terminal = new Vte.Terminal ();
         this.terminal.scrollback_lines = -1;
-        
+
         // Set terminal font to system default font
         var system_settings = new GLib.Settings ("org.gnome.desktop.interface");
         string font_name = system_settings.get_string ("monospace-font-name");
@@ -117,21 +145,21 @@
 
         // Popup menu
         var menu = new Gtk.Menu ();
-            
+
         var copy = new Gtk.MenuItem.with_label (_("Copy"));
         copy.activate.connect (() => {
             terminal.copy_clipboard ();
         });
         menu.append (copy);
         copy.show ();
-            
+
         var paste = new Gtk.MenuItem.with_label (_("Paste"));
         paste.activate.connect (() => {
             terminal.paste_clipboard ();
         });
         menu.append (paste);
         paste.show ();
-            
+
         this.terminal.button_press_event.connect ((event) => {
             if (event.button == 3) {
                 menu.select_first (false);
@@ -139,24 +167,24 @@
             }
             return false;
         });
-            
+       
         try {
-           this.terminal.fork_command_full (Vte.PtyFlags.DEFAULT, "~/", { Vte.get_user_shell () }, null, GLib.SpawnFlags.SEARCH_PATH, null, null);
+            this.terminal.fork_command_full (Vte.PtyFlags.DEFAULT, "~/", { Vte.get_user_shell () }, null, GLib.SpawnFlags.SEARCH_PATH, null, null);
         } catch (GLib.Error e) {
             warning (e.message);
         }
-            
+
         grid = new Gtk.Grid ();
         var sb = new Gtk.Scrollbar (Gtk.Orientation.VERTICAL, terminal.vadjustment);
         grid.attach (terminal, 0, 0, 1, 1);
         grid.attach (sb, 1, 0, 1, 1);
-            
+
         // Make the terminal occupy the whole GUI
         terminal.vexpand = true;
         terminal.hexpand = true;
-            
+
         notebook.append_page (grid, new Gtk.Label (_("Terminal")));
-        
+
         grid.show_all ();
 
     }
@@ -167,4 +195,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-10-30 19:06:19 +0000
+++ src/MainWindow.vala	2014-11-09 10:53:41 +0000
@@ -334,8 +334,13 @@
 
         // Get current document
         public Scratch.Services.Document? get_current_document () {
+            Scratch.Services.Document? doc = null;
+            
             var view = this.get_current_view ();
-            return view.get_current_document ();
+            if (view != null)
+                doc = view.get_current_document ();
+
+            return doc;
         }
 
         // Add new view