Merge lp:~artem-anufrij/scratch/terminal-save-settings into lp:~elementary-apps/scratch/scratch

[Artem Anufrij]

- added settings for the terminal plugin
- terminal: save position (bottom / right) of the terminal plugin
- terminal: save last opened path

- added settings for the terminal plugin
- terminal: save position (bottom / right) of the terminal plugin
- terminal: save last opened path

[Robert Roth (evfool)]

I get a new warning while building this:

terminal-save-settings/plugins/terminal/terminal.vala:200.34-200.48: warning: Access to static member `Scratch.Plugins.TerminalViewer.TerminalPosition.BOTTOM' with an instance reference
        if (settings.position == position.BOTTOM)

This should be an easy fix, other then this everything looks fine (can not compile right now because of some problems with the word-completion plugin).

review: Approve (code style)

=== modified file 'plugins/CMakeLists.txt'
--- plugins/CMakeLists.txt	2014-11-05 23:56:27 +0000
+++ plugins/CMakeLists.txt	2015-02-20 00:48:24 +0000
@@ -13,4 +13,4 @@
 add_subdirectory (outline)
 add_subdirectory (vim-emulation)
 add_subdirectory (highlight-word-selection)
-add_subdirectory (clipboard-history)
\ No newline at end of file
+add_subdirectory (clipboard-history)

=== modified file 'plugins/terminal/CMakeLists.txt'
--- plugins/terminal/CMakeLists.txt	2014-11-20 11:50:45 +0000
+++ plugins/terminal/CMakeLists.txt	2015-02-20 00:48:24 +0000
@@ -14,6 +14,7 @@
 
 if (${VTE_VERSION} VERSION_LESS "0.38.0")
 vala_precompile(VALA_C
+    Settings.vala
     terminal.vala
 PACKAGES
     vte-2.90
@@ -32,6 +33,7 @@
 )
 else()
 vala_precompile(VALA_C
+    Settings.vala
     terminal.vala
 PACKAGES
     vte-2.91

=== added file 'plugins/terminal/Settings.vala'
--- plugins/terminal/Settings.vala	1970-01-01 00:00:00 +0000
+++ plugins/terminal/Settings.vala	2015-02-20 00:48:24 +0000
@@ -0,0 +1,41 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/***
+  BEGIN LICENSE
+
+  Copyright (C) 2015 Artem Anufrij <[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
+  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
+  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
+***/
+
+namespace Scratch.Plugins.TerminalViewer {
+
+    public enum TerminalPosition {
+        BOTTOM = 0,
+        RIGHT = 1
+    }
+    /**
+     * Class for interacting with gsettings.
+     */
+    internal class Settings : Granite.Services.Settings {
+
+        private const string SCHEMA = "org.pantheon.scratch.plugins.terminal";
+
+        public int position { get; set; }
+        public string last_opened_path { get; set; }
+
+        public Settings () {
+            base (SCHEMA);
+        }
+    }
+}

=== modified file 'plugins/terminal/terminal.vala'
--- plugins/terminal/terminal.vala	2014-12-16 17:16:17 +0000
+++ plugins/terminal/terminal.vala	2015-02-20 00:48:24 +0000
@@ -27,19 +27,21 @@
 
     MainWindow window = null;
 
+    Scratch.Plugins.TerminalViewer.Settings settings;
+
     Gtk.Notebook? bottombar = null;
     Gtk.Notebook? contextbar = null;
     Scratch.Widgets.Toolbar? toolbar = null;
     Gtk.ToggleToolButton? tool_button = null;
 
-    bool on_bottom = true;
-
     Gtk.RadioMenuItem location_bottom = null;
     Gtk.RadioMenuItem location_right = null;
 
     Vte.Terminal terminal;
     Gtk.Grid grid;
 
+    GLib.Pid child_pid;
+
     Scratch.Services.Interface plugins;
     public Object object { owned get; construct; }
 
@@ -56,6 +58,8 @@
 
             window = w;
             window.key_press_event.connect (switch_focus);
+            window.destroy.connect (save_last_working_directory);
+
         });
 
         plugins.hook_notebook_bottom.connect ((n) => {
@@ -93,29 +97,28 @@
     public void deactivate () {
         if (terminal != null)
             grid.destroy ();
+
         if (tool_button != null)
             tool_button.destroy ();
 
         window.key_press_event.disconnect (switch_focus);
-    }
-
-    void switch_terminal_location () {
-
-        if (bottombar.page_num (grid) == -1 && this.location_bottom.active) {
-
-            contextbar.remove_page (contextbar.page_num (grid));
-            bottombar.set_current_page (bottombar.append_page (grid, new Gtk.Label (_("Terminal"))));
-            on_bottom = true;
-            debug ("Move Terminal: BOTTOMBAR.");
-
-        } else if (contextbar.page_num (grid) == -1 && this.location_right.active) {
-
-            bottombar.remove_page (bottombar.page_num (grid));
-            contextbar.set_current_page (contextbar.append_page (grid, new Gtk.Label (_("Terminal"))));
-            on_bottom = false;
-            debug ("Move Terminal: CONTEXTBAR.");
-
-        }
+        window.destroy.disconnect (save_last_working_directory);
+    }
+
+    void save_last_working_directory () {
+        settings.last_opened_path = get_shell_location ();
+    }
+
+    void move_terminal_bottombar () {
+        contextbar.remove_page (contextbar.page_num (grid));
+        bottombar.set_current_page (bottombar.append_page (grid, new Gtk.Label (_("Terminal"))));
+        debug ("Move Terminal: BOTTOMBAR.");
+    }
+
+    void move_terminal_contextbar () {
+        bottombar.remove_page (bottombar.page_num (grid));
+        contextbar.set_current_page (contextbar.append_page (grid, new Gtk.Label (_("Terminal"))));
+        debug ("Move Terminal: CONTEXTBAR.");
     }
 
     bool switch_focus (Gdk.EventKey event) {
@@ -159,18 +162,20 @@
         tool_button.toggled.connect (() => {
             if (this.tool_button.active) {
                 tool_button.tooltip_text = _("Hide Terminal");
-                if (on_bottom) {
+                if (settings.position == Scratch.Plugins.TerminalViewer.TerminalPosition.BOTTOM) {
                     bottombar.set_current_page (bottombar.append_page (grid, new Gtk.Label (_("Terminal"))));
                 } else {
                     contextbar.set_current_page (contextbar.append_page (grid, new Gtk.Label (_("Terminal"))));
                 }
+                terminal.grab_focus ();
             } else {
                 tool_button.tooltip_text = _("Show Terminal");
-                if (on_bottom) {
+                if (settings.position == Scratch.Plugins.TerminalViewer.TerminalPosition.BOTTOM) {
                     bottombar.remove_page (bottombar.page_num (grid));
                 } else {
                     contextbar.remove_page (contextbar.page_num (grid));
                 }
+                window.get_current_document ().focus ();
             }
         });
 
@@ -179,7 +184,27 @@
         toolbar.pack_end (tool_button);
     }
 
+    public string get_shell_location () {
+        int pid = (!) (this.child_pid);
+
+        try {
+            return GLib.FileUtils.read_link ("/proc/%d/cwd".printf (pid));
+        } catch (GLib.FileError error) {
+            warning ("An error occured while fetching the current dir of shell");
+            return "";
+        }
+    }
+
+    public void settings_changed () {
+        if (settings.position == Scratch.Plugins.TerminalViewer.TerminalPosition.BOTTOM)
+            move_terminal_bottombar ();
+        else
+            move_terminal_contextbar ();
+    }
+
     void on_hook_notebook () {
+        this.settings = new Scratch.Plugins.TerminalViewer.Settings ();
+        settings.changed.connect (settings_changed);
         this.terminal = new Vte.Terminal ();
         this.terminal.scrollback_lines = -1;
 
@@ -291,18 +316,24 @@
         // ON RIGHT
         location_right = new Gtk.RadioMenuItem.with_label (null, _("Terminal on Right"));
         location_right.toggled.connect (() => {
-            switch_terminal_location ();
+            if (settings.position != Scratch.Plugins.TerminalViewer.TerminalPosition.RIGHT)
+                settings.position = Scratch.Plugins.TerminalViewer.TerminalPosition.RIGHT;
         });
         menu.append (location_right);
 
         // ON BOTTOM
         location_bottom = new Gtk.RadioMenuItem.with_label (location_right.get_group (), _("Terminal on Bottom"));
-        location_bottom.active = true;
         location_bottom.toggled.connect (() => {
-            switch_terminal_location ();
+            if (settings.position != Scratch.Plugins.TerminalViewer.TerminalPosition.BOTTOM)
+                settings.position = Scratch.Plugins.TerminalViewer.TerminalPosition.BOTTOM;
         });
         menu.append (location_bottom);
 
+        if (settings.position == Scratch.Plugins.TerminalViewer.TerminalPosition.BOTTOM)
+            location_bottom.active = true;
+        else
+            location_right.active = true;
+
         menu.show_all ();
 
         this.terminal.button_press_event.connect ((event) => {
@@ -314,10 +345,11 @@
         });
 
         try {
+            string last_opened_path = settings.last_opened_path == "" ? "~/" : settings.last_opened_path;
             #if ! VTE291
-            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, last_opened_path, { Vte.get_user_shell () }, null, GLib.SpawnFlags.SEARCH_PATH, null, out child_pid);
             #else
-            this.terminal.spawn_sync (Vte.PtyFlags.DEFAULT, "~/", { Vte.get_user_shell () }, null, GLib.SpawnFlags.SEARCH_PATH, null, null, null);
+            this.terminal.spawn_sync (Vte.PtyFlags.DEFAULT, last_opened_path, { Vte.get_user_shell () }, null, GLib.SpawnFlags.SEARCH_PATH, null, null, out child_pid);
             #endif
         } catch (GLib.Error e) {
             warning (e.message);

=== modified file 'schemas/CMakeLists.txt'
--- schemas/CMakeLists.txt	2013-07-16 15:56:38 +0000
+++ schemas/CMakeLists.txt	2015-02-20 00:48:24 +0000
@@ -1,4 +1,5 @@
 include(GSettings)
 add_schema("org.pantheon.scratch.gschema.xml")
 add_schema("org.pantheon.scratch.plugins.folder-manager.gschema.xml")
-add_schema("org.pantheon.scratch.plugins.file-manager.gschema.xml")
\ No newline at end of file
+add_schema("org.pantheon.scratch.plugins.file-manager.gschema.xml")
+add_schema("org.pantheon.scratch.plugins.terminal.gschema.xml")
\ No newline at end of file

=== added file 'schemas/org.pantheon.scratch.plugins.terminal.gschema.xml'
--- schemas/org.pantheon.scratch.plugins.terminal.gschema.xml	1970-01-01 00:00:00 +0000
+++ schemas/org.pantheon.scratch.plugins.terminal.gschema.xml	2015-02-20 00:48:24 +0000
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+    <schema path="/org/pantheon/scratch/plugins/terminal/" id="org.pantheon.scratch.plugins.terminal" gettext-domain="scratch">
+        <key name="position" type="i">
+            <default>0</default>
+            <summary>Terminal position</summary>
+            <description>0: Position on bottom bar. 1: Postion on right bar.</description>
+        </key>
+        <key name="last-opened-path" type="s">
+            <default>''</default>
+            <summary>Last opened path</summary>
+            <description>Last opened path in the terminal plugin</description>
+        </key>
+    </schema>
+</schemalist>