Merge lp:~elementary-apps/pantheon-terminal/tab-bar-visibility-update into lp:~elementary-apps/pantheon-terminal/trunk

[David Gomes]

Fixes Pantheon Terminal for the latest version of Granite with DynamicNotebook.TabBarVisibility.

https://code.launchpad.net/~elementary-apps/granite/tab-bar-visibility/+merge/202517

Depends on that and uses that fix to refactor some of Pantheon Terminal's code.

[lp:~elementary-apps/pantheon-terminal/tab-bar-visibility-update]

545. By David Gomes on 2014-01-21

Removed trailing white space.

[Niclas Lockner (niclasl)]

Looks good

review: Approve

=== modified file 'org.pantheon.terminal.gschema.xml'
--- org.pantheon.terminal.gschema.xml	2013-08-26 17:04:59 +0000
+++ org.pantheon.terminal.gschema.xml	2014-01-21 18:12:53 +0000
@@ -6,14 +6,14 @@
     <value nick="Fullscreen" value="2" />
   </enum>
 
-  <enum id="pantheon-terminal-tab-bar-behavior">
+  <enum id="dynamic-notebook-tab-bar-behavior">
     <value value="0" nick="Always Show Tabs"/>
     <value value="1" nick="Hide When Single Tab"/>
     <value value="2" nick="Never Show Tabs"/>
   </enum>
 
-  <schema path="/org/pantheon/terminal/saved-state/" 
-  id="org.pantheon.terminal.saved-state" 
+  <schema path="/org/pantheon/terminal/saved-state/"
+  id="org.pantheon.terminal.saved-state"
   gettext-domain="pantheon-terminal">
     <key name="window-width" type="i">
       <default>640</default>
@@ -47,7 +47,7 @@
     </key>
   </schema>
 
-  <schema path="/org/pantheon/terminal/settings/" id="org.pantheon.terminal.settings" 
+  <schema path="/org/pantheon/terminal/settings/" id="org.pantheon.terminal.settings"
   gettext-domain="pantheon-terminal">
     <key name="window-width" type="i">
       <default>640</default>
@@ -133,7 +133,7 @@
       <summary>Whether to allow bold fonts.</summary>
       <description>Defines whether fonts can be bold or not.</description>
     </key>
-    <key name="tab-bar-behavior" enum="pantheon-terminal-tab-bar-behavior">
+    <key name="tab-bar-behavior" enum="dynamic-notebook-tab-bar-behavior">
       <default>'Always Show Tabs'</default>
       <summary>Tab Behavior</summary>
       <description>Whether to always show tabs, hide tabs when there is only one tab and never show tabs.</description>
 
=== modified file 'src/PantheonTerminalWindow.vala'
--- src/PantheonTerminalWindow.vala	2013-12-26 21:48:07 +0000
+++ src/PantheonTerminalWindow.vala	2014-01-21 18:12:53 +0000
@@ -146,14 +146,6 @@
             notebook = new Granite.Widgets.DynamicNotebook ();
             notebook.show_icons = false;
 
-            if (settings.tab_bar_behavior == PantheonTerminalTabBarBehavior.ALWAYS) {
-                notebook.show_tabs = true;
-            } else if (settings.tab_bar_behavior == PantheonTerminalTabBarBehavior.SINGLE) {
-                notebook.show_tabs = false;
-            } else if (settings.tab_bar_behavior == PantheonTerminalTabBarBehavior.NEVER) {
-                notebook.show_tabs = false;
-            }
-
             main_actions.get_action ("Copy").set_sensitive (false);
 
             notebook.tab_added.connect (on_tab_added);
@@ -168,6 +160,7 @@
             notebook.allow_duplication = true;
             notebook.group_name = "pantheon-terminal";
             notebook.can_focus = false;
+            notebook.tab_bar_behavior = settings.tab_bar_behavior;
             add (notebook);
 
             this.key_press_event.connect ((e) => {
@@ -263,7 +256,6 @@
             var t = (tab.page as Gtk.Grid).get_child_at (0, 0) as TerminalWidget;
             terminals.append (t);
             t.window = this;
-            update_tabs_visibility ();
         }
 
         private void on_tab_removed (Granite.Widgets.Tab tab) {
@@ -272,8 +264,6 @@
 
             if (notebook.n_tabs == 0)
                 destroy ();
-            else
-                update_tabs_visibility ();
         }
 
         private bool on_close_tab_requested (Granite.Widgets.Tab tab) {
@@ -313,7 +303,7 @@
             new_notebook.insert_tab (tab, -1);
             new_window.current_terminal = terminal;
         }
-        
+
         private void on_tab_duplicated (Granite.Widgets.Tab tab) {
             var t = (tab.page as Gtk.Grid).get_child_at (0, 0) as TerminalWidget;
             new_tab (t.get_shell_location ());
@@ -373,11 +363,6 @@
             new_tab.page.grab_focus ();
         }
 
-        private void update_tabs_visibility () {
-            if (settings.tab_bar_behavior == PantheonTerminalTabBarBehavior.SINGLE)
-                notebook.show_tabs = notebook.n_tabs > 1;
-        }
-
         private void open_tabs () {
             string tabs = saved_tabs;
             if (tabs == "" || !settings.remember_tabs ||
@@ -392,9 +377,9 @@
         }
 
         private void new_tab (string directory="", string? program=null) {
-            /* 
+            /*
              * If the user choose to use a specific working directory.
-             * Reassigning the directory variable a new value 
+             * Reassigning the directory variable a new value
              * leads to free'd memory being read.
              */
             string location;
 
=== modified file 'src/Settings.vala'
--- src/Settings.vala	2013-08-26 17:04:59 +0000
+++ src/Settings.vala	2014-01-21 18:12:53 +0000
@@ -29,12 +29,6 @@
         FULLSCREEN = 2
     }
 
-    public enum PantheonTerminalTabBarBehavior {
-        ALWAYS = 0,
-        SINGLE = 1,
-        NEVER = 2
-    }
-
     public class SavedState : Granite.Services.Settings {
 
         public int window_width { get; set; }
@@ -69,7 +63,7 @@
         public string encoding { get; set; }
         public string font { get; set; }
         public bool allow_bold { get; set; }
-        public PantheonTerminalTabBarBehavior tab_bar_behavior { get; set; }
+        public Granite.Widgets.DynamicNotebook.TabBarBehavior tab_bar_behavior { get; set; }
 
         public Settings ()  {
             base ("org.pantheon.terminal.settings");