Merge lp:~jcheun93/pantheon-terminal/fix-1169006 into lp:~elementary-apps/pantheon-terminal/trunk

[Jesse Cheun]

Add Preferences Dialog to Terminal. Change basic settings like tab behaviors, font, theme etc. Right click terminal widget and select preference to access.

[Danielle Foré (danrabbit)]

Sorry Jesse. We don't want to add a prefs UI to Terminal

review: Disapprove

Unmerged revisions

581. By Jesse Cheun on 2014-06-29

Add Preferences Dialog to Terminal. Right Click terminal widget to access.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-05-29 10:10:46 +0000
+++ CMakeLists.txt	2014-07-01 03:53:45 +0000
@@ -63,6 +63,7 @@
     src/TerminalWidget.vala
     src/ForegroundProcessDialog.vala
     src/Constants.vala
+    src/PreferencesDialog.vala
 PACKAGES
     vte-2.90
     granite
@@ -89,4 +90,4 @@
 
 install (TARGETS pantheon-terminal RUNTIME DESTINATION bin)
 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/pantheon-terminal.desktop DESTINATION share/applications)
-install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/open-pantheon-terminal-here.desktop DESTINATION share/applications)
+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/open-pantheon-terminal-here.desktop DESTINATION share/applications)
\ No newline at end of file

=== modified file 'src/PantheonTerminal.vala'
--- src/PantheonTerminal.vala	2014-05-29 10:10:46 +0000
+++ src/PantheonTerminal.vala	2014-07-01 03:53:45 +0000
@@ -22,7 +22,7 @@
 
     public class PantheonTerminalApp : Granite.Application {
 
-        private GLib.List <PantheonTerminalWindow> windows;
+        public GLib.List <PantheonTerminalWindow> windows;
 
         private static string app_cmd_name;
         public static string? working_directory = null;
@@ -194,4 +194,4 @@
             return app.run (args_primary_instance);
         }
     }
-} // Namespace
+} // Namespace
\ No newline at end of file

=== modified file 'src/PantheonTerminalWindow.vala'
--- src/PantheonTerminalWindow.vala	2014-04-22 19:32:46 +0000
+++ src/PantheonTerminalWindow.vala	2014-07-01 03:53:45 +0000
@@ -32,7 +32,7 @@
         Pango.FontDescription term_font;
         private Gtk.Clipboard clipboard;
 
-        private GLib.List <TerminalWidget> terminals = new GLib.List <TerminalWidget> ();
+        public GLib.List <TerminalWidget> terminals = new GLib.List <TerminalWidget> ();
         private HashTable<string, TerminalWidget> restorable_terminals;
         private int restorable_counter = 0;
 
@@ -65,6 +65,7 @@
                 <menuitem name="Paste" action="Paste"/>
                 <menuitem name="Select All" action="Select All"/>
                 <separator />
+                <menuitem name="Preference" action="Preference"/>
                 <menuitem name="About" action="About"/>
             </popup>
             </ui>
@@ -589,6 +590,11 @@
                 new_tab ();
         }
 
+        void action_preferences () {
+            var dialog = new PantheonTerminal.Dialogs.Preferences (this);
+            dialog.show_all ();
+        }   
+
         void action_about () {
             app.show_about (this);
         }
@@ -647,6 +653,9 @@
             { "Select All", "gtk-select-all",
               N_("Select All"), "<Control><Shift>a",
               N_("Select all the text in the terminal"), action_select_all },
+ 
+            { "Preference", Gtk.Stock.PREFERENCES, N_("Preference"),
+              null, N_("Show about window"), action_preferences },
 
             { "About", "gtk-about", N_("About"),
               null, N_("Show about window"), action_about },
@@ -672,4 +681,4 @@
               action_fullscreen }
         };
     }
-}
+}
\ No newline at end of file

=== added file 'src/PreferencesDialog.vala'
--- src/PreferencesDialog.vala	1970-01-01 00:00:00 +0000
+++ src/PreferencesDialog.vala	2014-07-01 03:53:45 +0000
@@ -0,0 +1,318 @@
+// Based off of Versable elementary-tweaks terminal tweaks 
+// https://launchpad.net/elementary-community/elementary-tweaks
+
+using Gtk;
+using Granite.Widgets;
+
+struct TerminalTheme
+{
+    public TerminalTheme (string _name, string _cursor, string fg, string bg, string _palette) {
+        name = _name;
+        cursor = _cursor;
+        foreground = fg;
+        background = bg;
+        palette = _palette;
+    }
+    string name;
+    string cursor;
+    string foreground;
+    string background;
+    string palette;
+}
+ 
+const TerminalTheme[] DEFAULT_THEMES = {
+    {
+            "Default",
+            "#839496",
+            "#94a3a5",
+            "#252e32",
+            "#073642:#dc322f:#859900:#b58900:#268bd2:#ec0048:#2aa198:#94a3a5:#586e75:#cb4b16:#859900:#b58900:#268bd2:#d33682:#2aa198:#6c71c4"
+    },
+    {
+            "Solarized Dark",
+            "#0f0f49499999",
+            "#838394949696",
+            "#00002B2B3636",
+            "#070736364242:#DCDC32322F2F:#858599990000:#B5B589890000:#26268B8BD2D2:#D3D336368282:#2A2AA1A19898:#EEEEE8E8D5D5:#00002B2B3636:#CBCB4B4B1616:#58586E6E7575:#65657B7B8383:#838394949696:#6C6C7171C4C4:#9393A1A1A1A1:#FDFDF6F6E3E3"
+    },
+    {
+            "Solarized Light",
+            "#9393a1a1a1a1",
+            "#00002B2B3636",
+            "#fdfdf6f6e3e3",
+            "#070736364242:#dcdc32322f2f:#858599990000:#b5b589890000:#26268ae0d2d2:#d3d336368282:#2a2aa1a19898:#eeeee8e8d5d5:#00002b2b3636:#cbcb4b4b1616:#65657bfb8383:#58586e6e7575:#9393a1a1a1a1:#6c6c7171c4c4:#838394949696:#fdfdf6f6e3e3"
+    },            
+    {       "Jelly Bean",
+            "#d7d7d7",
+            "#d7d7d7",
+            "#121212",
+            "#393939:#ca674a:#96a967:#d3a94a:#5778c1:#9c35ac:#6eb5f3:#a9a9a9:#535551:#ea2828:#87dd32:#f7e44d:#6f9bca:#a97ca4:#32dddd:#e9e9e7"
+    },
+};
+
+
+namespace PantheonTerminal.Dialogs {
+    public class Preferences : Gtk.Dialog {
+        public Preferences (PantheonTerminalWindow window) {
+            // Set window properties
+            set_title (_("Preferences"));
+            //set_transient_for (window); 
+            set_position (WindowPosition.CENTER);
+            set_type_hint (Gdk.WindowTypeHint.DIALOG);
+            set_size_request (630, 330);
+            set_resizable (false);
+
+	        response.connect ((response_id) => { 
+                if (response_id == Gtk.ResponseType.CLOSE)
+		            destroy();
+		    });
+            add_button ("_Close", Gtk.ResponseType.CLOSE);
+
+            var content_area = get_content_area ();
+            
+            var content = new Grid ();
+            content.column_spacing = 5;
+            content.row_spacing = 5;
+            content.margin_left = 15;
+            content.margin_right = 15;
+            content.margin_top = 15;
+            content.margin_bottom = 10;
+            content.row_homogeneous = true;
+            int row = 0;
+
+            add_section (content, new Label (_("General:")), ref row);
+
+            /* Set tab bar behavior */
+            var behavior_label = new Label(_("Tab behavior:"));
+            var behavior_cbox = new ComboBoxText ();
+            behavior_cbox.width_request = 250;
+            behavior_cbox.append ("Always Show Tabs", _("Always Show Tabs"));
+            behavior_cbox.append ("Hide When Single Tab", _("Hide When Single Tab"));
+            behavior_cbox.append ("Never Show Tabs", _("Never Show Tabs"));
+            behavior_cbox.active = settings.tab_bar_behavior;
+            behavior_cbox.changed.connect(() => {
+                settings.tab_bar_behavior = (DynamicNotebook.TabBarBehavior)behavior_cbox.get_active();
+                window.app.windows.foreach ((app) => {
+                    app.notebook.tab_bar_behavior = settings.tab_bar_behavior; 
+                });
+            });
+            add_option (content, behavior_label, behavior_cbox, ref row);
+
+            /* Set allow bold */
+            var bold_label = new Label(_("Allow bold fonts:"));
+            var bold_switch = new Switch();
+            settings.schema.bind ("allow-bold", bold_switch, "active", SettingsBindFlags.DEFAULT);
+            add_option (content, bold_label, bold_switch, ref row);
+            
+            /* Set audible bell */
+            var bell_label = new Label(_("Enable terminal bell:"));
+            var bell_switch = new Switch();
+            settings.schema.bind ("audible-bell", bell_switch, "active", SettingsBindFlags.DEFAULT);
+            add_option (content, bell_label, bell_switch, ref row);
+            
+            /* Set follow last tab */
+            var follow_label = new Label(_("Open last active tab path on new tab:"));
+            var follow_switch = new Switch();
+            settings.schema.bind ("follow-last-tab", follow_switch, "active", SettingsBindFlags.DEFAULT);
+            add_option (content, follow_label, follow_switch, ref row);
+            
+            /* Set remember tabs */
+            var remember_label = new Label(_("Save open tabs:"));
+            var remember_switch = new Switch();
+            settings.schema.bind ("remember-tabs", remember_switch, "active", SettingsBindFlags.DEFAULT);
+            add_option (content, remember_label, remember_switch, ref row);
+            
+            /* Create theme ui */
+            add_section (content, new Label (_("Appearence:")), ref row);
+            theme_ui (content, window, ref row);
+           
+            content_area.add (content);
+        }
+        
+        void theme_ui (Grid grid, PantheonTerminalWindow window, ref int row) {
+            var theme_cbox = new ComboBoxText ();
+            var palette_btns  = create_palette (theme_cbox);
+            
+            /* Select cursor type and color */
+            var cursor_label = new Label(_("Cursor shape:"));
+            var cursor_cbox = new ComboBoxText ();
+            cursor_cbox.width_request = 250; 
+            cursor_cbox.append ("Block", _("Block"));
+            cursor_cbox.append ("I-Beam", _("I-Beam"));
+            cursor_cbox.append ("Underline", _("Underline"));
+            cursor_cbox.active = settings.cursor_shape;
+            cursor_cbox.changed.connect(() => {
+                settings.cursor_shape = (Vte.TerminalCursorShape)cursor_cbox.get_active();
+            });
+            var cursor_color = new ColorButton ();
+            cursor_color.color_set.connect(() => {
+                if (settings.cursor_color != rgba_to_hex (cursor_color.rgba)) {
+                    settings.cursor_color = rgba_to_hex (cursor_color.rgba);
+                    theme_cbox.active = DEFAULT_THEMES.length;
+                }
+            });
+            var cursor_box = new Box (Orientation.HORIZONTAL, 5);
+            cursor_box.pack_start(cursor_cbox, false);
+            cursor_box.pack_start(cursor_color, false);  
+            add_option (grid, cursor_label, cursor_box, ref row);
+            
+            /* Select Font and color */
+            var font_label  = new Label (_("Custom Font:"));              
+
+            var font_select = new FontButton ();
+            font_select.font = settings.font;
+            font_select.width_request = 250;            
+            font_select.font_set.connect(() => {
+                settings.font = font_select.font_desc.to_string ();
+                window.app.windows.foreach ((app) => {
+                    app.terminals.foreach((entry) => {
+                        entry.set_font (font_select.font_desc);
+                    });     
+                });
+            });
+            var fgcolor_btn   = new ColorButton ();
+	        fgcolor_btn.color_set.connect(() => {
+	            if (settings.foreground != rgba_to_hex (fgcolor_btn.rgba)) {
+	                settings.foreground = rgba_to_hex (fgcolor_btn.rgba);
+	                theme_cbox.active = DEFAULT_THEMES.length;
+	            }
+            });
+            
+            var font_box = new Box (Orientation.HORIZONTAL, 5);
+            font_box.pack_start(font_select, false); 
+            font_box.pack_start(fgcolor_btn, false);
+            
+            add_option (grid, font_label, font_box, ref row);
+            
+            /* Set opacity */
+            var opacity_label = new Label(_("Opacity:"));
+            var opacity_spin = new SpinButton.with_range ( 0, 100, 1);;
+            settings.schema.bind ("opacity", opacity_spin, "value", SettingsBindFlags.DEFAULT);
+            add_option (grid, opacity_label, opacity_spin, ref row);
+            
+            /* Background color */
+            var bgcolor_label = new Label(_("Background color:"));
+            var bgcolor_btn   = new ColorButton ();
+	        bgcolor_btn.color_set.connect(() => {
+	            if (settings.background != rgba_to_hex (bgcolor_btn.rgba)) {
+	                settings.background = rgba_to_hex (bgcolor_btn.rgba);
+	                theme_cbox.active = DEFAULT_THEMES.length;
+	            }
+            });
+            add_option (grid, bgcolor_label, bgcolor_btn, ref row);
+            
+            /* Select theme */
+            var theme_label = new Label(_("Theme:"));
+            theme_cbox.width_request = 250;
+            theme_cbox.active = DEFAULT_THEMES.length;
+            for (int i = 0; i < DEFAULT_THEMES.length; ++ i) {
+                theme_cbox.append (DEFAULT_THEMES[i].name, DEFAULT_THEMES[i].name);
+                if (DEFAULT_THEMES[i].palette == settings.palette &&
+                    DEFAULT_THEMES[i].cursor == settings.cursor_color &&
+                    DEFAULT_THEMES[i].foreground == settings.foreground && 
+                    DEFAULT_THEMES[i].background == settings.background)
+                    theme_cbox.active = i;
+            }
+            theme_cbox.append ("Custom", "Custom");
+            if (theme_cbox.active == -1)
+                theme_cbox.active = DEFAULT_THEMES.length;
+            
+            theme_cbox.changed.connect(() => {
+                if (theme_cbox.active != DEFAULT_THEMES.length) {
+                    var i = theme_cbox.active;
+                    settings.palette = DEFAULT_THEMES[i].palette;
+                    settings.cursor_color = DEFAULT_THEMES[i].cursor;
+                    settings.foreground = DEFAULT_THEMES[i].foreground;
+                    settings.background = DEFAULT_THEMES[i].background;
+                    update_btn_color (bgcolor_btn, fgcolor_btn, cursor_color, palette_btns);
+                }
+            });
+            add_option (grid, theme_label, theme_cbox, ref row);
+            
+            /* Color palette */
+            var palette = new Grid ();
+            palette.column_spacing = 5;
+            palette.row_spacing = 5;
+            palette.row_homogeneous = true;
+            for (int i = 0; i < 16; ++ i) {
+		        palette.attach (palette_btns[i], i - ((int)(i / 8) * 8), (i < 8) ? 0 : 1, 1, 1); 
+            }
+            add_option (grid, new Label (_("")), palette, ref row, 2);
+            
+            update_btn_color (bgcolor_btn, fgcolor_btn, cursor_color, palette_btns);
+        }
+        
+        /* Update all color button on theme change */
+        void update_btn_color (ColorButton bg, ColorButton fg, ColorButton cursor, ColorButton[] palette){
+            Gdk.RGBA color = {0};
+            color.parse (settings.background);
+            bg.rgba = color;
+            color.parse (settings.foreground);
+            fg.rgba = color;
+            color.parse (settings.cursor_color);
+            cursor.rgba = color;
+            var sys_color = settings.palette.split(":");
+            for (int index = 0; index < 16; ++ index) {
+                color.parse (sys_color[index]);
+                palette[index].rgba = color;
+            }
+        }
+        
+        
+        /* Create an array of color button */
+        ColorButton[] create_palette (ComboBoxText theme_cbox) {
+            ColorButton[] color_btn = new ColorButton[16];
+            for (int index = 0; index < 16; ++ index) {
+                color_btn[index] = new ColorButton ();
+                color_btn[index].color_set.connect(() => {
+                    if (settings.palette != palette_s (color_btn)) {
+                        settings.palette = palette_s (color_btn);
+                        theme_cbox.active = DEFAULT_THEMES.length;
+                    }
+                });
+            }
+            return color_btn;
+        }
+        
+        /* Convert colorbuttons' color to a palette string */
+        string palette_s (ColorButton[] palette) {
+            var palette_s = new string[palette.length];
+            for (int index = 0; index < palette.length; ++ index) {
+                palette_s[index] = rgba_to_hex (palette[index].rgba);
+            }
+            return string.joinv (":", palette_s);
+        }
+        
+        /* Convert rgba color to hex string */
+        string rgba_to_hex (Gdk.RGBA color) {
+            return "#%02X%02X%02X".printf((int)(color.red * 255),
+                                           (int)(color.green * 255),
+                                           (int)(color.blue * 255));
+        }
+        
+        /* Helper functions for adding elements to grid */
+        void add_section (Grid grid, Label label, ref int row) {           
+            label.set_markup ("<b>%s</b>".printf (label.get_text ()));
+            label.halign = Align.START;
+            grid.attach (label, 0, row, 1, 1);
+            ++ row;
+        }
+        
+        void add_option (Grid grid, Label label, Widget widget, ref int row, int col = 1) {
+            label.halign = Align.END;
+            label.margin_left = 20;
+            label.margin_bottom = (col > 1) ? 5 : 0;
+            widget.halign = Align.FILL;
+            
+            /* don't want it to be expanded */
+            if (widget is Switch || widget is Entry || 
+                widget is ColorButton || widget is ComboBoxText) {
+                widget.halign = Align.START;
+            }
+            
+            grid.attach (label, 0, row, 1, 1);
+            grid.attach_next_to (widget, label, PositionType.RIGHT, 3, col);
+            ++ row;
+        } 
+    }
+}
\ No newline at end of file