topinambour 1.0.11 → 1.0.12

data/data/shortcuts.ui

@@ -0,0 +1,130 @@
+<?xml version="1.0"?>
+<interface>
+  <!-- interface-requires gtk+ 3.17 -->
+  <object class="GtkShortcutsWindow" id="shortcuts-window">
+    <property name="modal">1</property>
+    <child>
+      <object class="GtkShortcutsSection">
+        <property name="visible">1</property>
+        <property name="section-name">shortcuts</property>
+        <property name="max-height">12</property>
+        <child>
+          <object class="GtkShortcutsGroup">
+            <property name="visible">1</property>
+            <property name="title" translatable="yes">Terminals :</property>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
+                <property name="accelerator">&lt;ctrl&gt;&lt;Shift&gt;T</property>
+                <property name="title" translatable="yes">Create new terminal</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
+                <property name="accelerator">&lt;ctrl&gt;&lt;Shift&gt;X</property>
+                <property name="title" translatable="yes">Close current terminal</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
+                <property name="accelerator">&lt;ctrl&gt;&lt;Shift&gt;Left</property>
+                <property name="title" translatable="yes">Switch to next terminal</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
+                <property name="accelerator">&lt;ctrl&gt;&lt;Shift&gt;Right</property>
+                <property name="title" translatable="yes">Switch to previous terminal</property>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkShortcutsGroup">
+            <property name="visible">1</property>
+            <property name="title" translatable="yes">Find, search in terminal</property>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
+		<property name="accelerator">&lt;ctrl&gt;&lt;Shift&gt;slash</property>
+                <property name="title" translatable="yes">Find, search</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
+                <property name="accelerator">&lt;ctrl&gt;G</property>
+                <property name="title" translatable="yes">Find the next match</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
+                <property name="accelerator">&lt;ctrl&gt;&lt;Shift&gt;G</property>
+                <property name="title" translatable="yes">Find the previous match</property>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkShortcutsGroup">
+            <property name="visible">1</property>
+            <property name="title" translatable="yes">Overlays</property>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
+                <property name="accelerator">&lt;ctrl&gt;&lt;Shift&gt;C</property>
+                <property name="title" translatable="yes">Display a color scheme selector</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
+                <property name="accelerator">&lt;ctrl&gt;&lt;Shift&gt;F</property>
+                <property name="title" translatable="yes">Display a font selector</property>
+              </object>
+	    </child>
+	    <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
+                <property name="accelerator">&lt;ctrl&gt;&lt;Shift&gt;O</property>
+                <property name="title" translatable="yes">Display a terminal selector</property>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkShortcutsGroup">
+            <property name="visible">1</property>
+            <property name="title" translatable="yes">Miscelaneous</property>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
+                <property name="accelerator">&lt;ctrl&gt;&lt;Shift&gt;Up</property>
+                <property name="title" translatable="yes">Toggle shrink mode (Only Headerbar visible)</property>
+              </object>
+            </child>
+	    <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
+                <property name="accelerator">&lt;ctrl&gt;&lt;Shift&gt;Page_Up</property>
+                <property name="title" translatable="yes">Increase opacity</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
+                <property name="accelerator">&lt;ctrl&gt;&lt;Shift&gt;Page_Down</property>
+                <property name="title" translatable="yes">Decrease opacity</property>
+              </object>
+            </child>
+           </object>
+        </child>
+      </object>
+    </child>
+  </object>
+
+</interface>

data/data/topinambour.gresource.xml

@@ -6,25 +6,8 @@
     <file preprocess="xml-stripblanks">window-menu.ui</file>
     <file preprocess="xml-stripblanks">terminal-menu.ui</file>
     <file preprocess="xml-stripblanks">prefs-dialog.ui</file>
+    <file preprocess="xml-stripblanks">main-menu-popover.ui</file>
     <file preprocess="xml-stripblanks">headerbar.ui</file>
-    <file>topinambour.css</file>
-    <file>application-exit-symbolic.svg</file>
-    <file>color-select-symbolic.svg</file>
-    <file>emblem-photos-symbolic.svg</file>
-    <file>font-select-symbolic.svg</file>
-    <file>pan-end-symbolic.svg</file>
-    <file>pan-start-symbolic.svg</file>
-    <file>tab-new-symbolic.svg</file>
-    <file>window-close-symbolic.svg</file>
-  </gresource>
-  <gresource prefix="/com/github/cedlemo/topinambour/icons">
-    <file>application-exit-symbolic.svg</file>
-    <file>color-select-symbolic.svg</file>
-    <file>emblem-photos-symbolic.svg</file>
-    <file>font-select-symbolic.svg</file>
-    <file>pan-end-symbolic.svg</file>
-    <file>pan-start-symbolic.svg</file>
-    <file>tab-new-symbolic.svg</file>
-    <file>window-close-symbolic.svg</file>
+    <file preprocess="xml-stripblanks">shortcuts.ui</file>
   </gresource>
 </gresources>

data/data/topinambour.gschema.xml

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<schemalist>
+
+    <schema path="/com/github/cedlemo/topinambour/preferences/" id="com.github.cedlemo.topinambour">
+    <key name='colorscheme' type='as'>
+	    <default>['#aeafad', '#323232', '#000000', '#b9214f', '#A6E22E',
+		    '#ff9800', '#3399ff', '#8e33ff', '#06a2dc', '#B0B0B0',
+		    '#5D5D5D', '#ff5c8d', '#CDEE69', '#ffff00', '#9CD9F0',
+		    '#FBB1F9', '#77DFD8', '#F7F7F7']</default>
+	    <summary>Default colorscheme</summary>
+	    <description>:foreground, :background, :black, :red, :green, :yellow,
+                        :blue, :magenta, :cyan, :white, :brightblack,
+                        :brightred, :brightgreen, :brightyellow, :brightblue,
+                        :brightmagenta, :brightcyan, :brightwhite
+	    </description>
+    </key>
+    <key name="default-shell" type="s">
+        <default>"/usr/bin/bash"</default>
+	<summary>Default shell.</summary>
+	<description>This shell is used when a new tab is created</description>
+    </key>
+    <key name="font" type="s">
+	<default>"Monospace 11"</default>
+	<summary>Font of the terminal.</summary>
+    </key>
+     <key name="width" type="i">
+      <range min="1" max="2000"/>
+      <default>800</default>
+    </key>
+     <key name="height" type="i">
+      <range min="1" max="2000"/>
+      <default>500</default>
+    </key>
+    <key name="custom-css" type="b">
+      <default>false</default>
+    </key>
+    <key name="css-file" type="s">
+      <default>"topinambour.css"</default>
+    </key>
+    <key name="allow-bold" type="b">
+      <default>true</default>
+    </key>
+    <key name="audible-bell" type="b">
+      <default>false</default>
+    </key>
+    <key name="scroll-on-output" type="b">
+      <default>true</default>
+    </key>
+    <key name="scroll-on-keystroke" type="b">
+      <default>true</default>
+    </key>
+    <key name="rewrap-on-resize" type="b">
+      <default>true</default>
+    </key>
+    <key name="mouse-autohide" type="b">
+      <default>true</default>
+    </key>
+    <key name="cursor-shape" type="i">
+      <default>0</default>
+    </key>
+    <key name="cursor-blink-mode" type="i">
+      <default>0</default>
+    </key>
+    <key name="backspace-binding" type="i">
+      <default>0</default>
+    </key>
+    <key name="delete-binding" type="i">
+      <default>0</default>
+    </key>
+  </schema>
+</schemalist>

data/lib/actions.rb

@@ -1,4 +1,4 @@
-# Copyright 2016 Cedric LE MOIGNE, cedlemo@gmx.com
+# Copyright 2016-2017 Cedric LE MOIGNE, cedlemo@gmx.com
 # This file is part of Topinambour.
 #
 # Topinambour is free software: you can redistribute it and/or modify
@@ -37,19 +37,10 @@ module TopinambourActions
     action
   end
 
-  def self.generate_css_editor_action(application)
-    action = generate_action("css_editor") do |_act, _param|
-      application.windows[0].show_css_editor
-    end
-    action
-  end
-
   def self.generate_preferences_action(application)
     action = generate_action("preferences") do |_act, _param|
-      dialog = TopinambourPreferences.generate_dialog(application.windows.first)
-
-      dialog.run
-      application.windows.first.notebook.current.term.grab_focus
+      dialog = TopinambourPreferences.new(application.windows.first)
+      dialog.show_all
     end
     action
   end
@@ -84,8 +75,16 @@ module TopinambourActions
     action
   end
 
+  def self.generate_shortcuts_action(application)
+    action = generate_action("shortcuts") do |_act, _param|
+      application.windows[0].show_shortcuts
+    end
+    action
+  end
+
   def self.add_actions_to(application)
-    %w(about preferences quit term_copy term_paste css_editor).each do |name|
+    # preferences
+    %w(about quit term_copy term_paste preferences shortcuts).each do |name|
       add_action_to(name, application)
     end
   end

data/lib/application.rb

@@ -1,4 +1,4 @@
-# Copyright 2016 Cedric LE MOIGNE, cedlemo@gmx.com
+# Copyright 2016-2017 Cedric LE MOIGNE, cedlemo@gmx.com
 # This file is part of Topinambour.
 #
 # Topinambour is free software: you can redistribute it and/or modify
@@ -14,17 +14,22 @@
 # You should have received a copy of the GNU General Public License
 # along with Topinambour.  If not, see <http://www.gnu.org/licenses/>.
 
+require "optparse"
+
 class TopinambourApplication < Gtk::Application
-  attr_reader :provider, :css_file, :css_content
+  attr_accessor :settings
   def initialize
-    super("com.github.cedlemo.topinambour", :non_unique)
+    @options = {}
+    @exit_status = 0
+
+    super("com.github.cedlemo.topinambour", [:non_unique, :handles_command_line])
 
     signal_connect "startup" do |application|
+      ENV["GSETTINGS_SCHEMA_DIR"] = DATA_PATH
+      @settings  = Gio::Settings.new("com.github.cedlemo.topinambour")
+      initialize_css_provider
       load_css_config
-      screen = Gdk::Display.default.default_screen
-      Gtk::StyleContext.add_provider_for_screen(screen,
-                                                @provider,
-                                                Gtk::StyleProvider::PRIORITY_USER)
+
       TopinambourActions.add_actions_to(application)
       load_menu_ui_in(application)
     end
@@ -32,43 +37,34 @@ class TopinambourApplication < Gtk::Application
     signal_connect "activate" do |application|
       window = TopinambourWindow.new(application)
       window.present
-      window.add_terminal
-      window.notebook.current.term.grab_focus
+      window.add_terminal(@options[:execute])
     end
-  end
 
-  def update_css(new_props)
-    props = []
-    new_props.each do |prop|
-      props << {:name => prop[0], :value => prop[1]}
-    end
-    new_css = CssHandler.update_css(@css_file, props)
-    replace_old_conf_with(new_css)
-
-    begin
-      load_custom_css_config
-    rescue => e
-      puts "Bad css file using default css, #{e.message}"
-      load_default_css_config # Use last workin Css instead
-    end
-  end
 
-  def replace_old_conf_with(new_conf)
-    if File.exist?(USR_CSS)
-      new_name = "#{USR_CSS}_#{Time.new.strftime('%Y-%m-%d-%H-%M-%S')}.backup"
-      FileUtils.mv(USR_CSS, new_name)
-    end
-    check_and_create_if_no_config_dir
-    File.open(USR_CSS, "w") do |file|
-      file.puts new_conf
+    signal_connect "command-line" do |_application, command_line|
+      begin
+        parse_command_line(command_line.arguments)
+      rescue SystemExit => error
+        error.status
+      rescue OptionParser::InvalidOption => error
+        STDERR.puts error.message
+        1
+      rescue => error
+        STDERR.puts "#{error.class}: #{error.message}"
+        STDERR.puts error.backtrace
+        1
+      else
+        activate
+        @exit_status
+      end
     end
-    @css_content = new_conf
   end
 
   def reload_css_config
     error_popup = nil
     bad_css = nil
-    if File.exist?(USR_CSS)
+    css_file = check_css_file_path
+    if css_file
       @provider.signal_connect "parsing-error" do |css_provider, section, error|
         buf = Gtk::TextBuffer.new
         buf.text = @css_content
@@ -81,63 +77,80 @@ class TopinambourApplication < Gtk::Application
           bad_css += "#{section.start_line  + 1 + i}  #{line}"
         end
       end
-      css_backup = @css_content
 
       begin
-        load_custom_css_config
+        load_custom_css(css_file)
       rescue => e
+        self.windows.first.exit_overlay_mode
+        # TODO : deal with the preferences window which is a transient one
+        # that keeps the focus even when the popup shows up.
         error_popup = TopinambourCssErrorPopup.new(self.windows.first)
+        error_popup.transient_for = self.windows.first
         error_popup.message = e.message + "\n\n" + bad_css
         error_popup.show_all
-
-        @css_content = css_backup
-        @provider.load(:data => @css_content)
       end
     end
   end
 
+  def check_css_file_path
+    css_file = if File.exist?(@settings["css-file"])
+                 @settings["css-file"]
+               else
+                 "#{CONFIG_DIR}/#{@settings["css-file"]}"
+               end
+    File.exist?(css_file) ? css_file : nil
+  end
+
   private
 
+  def parse_command_line(arguments)
+    parser = OptionParser.new
+    parser.on("-e", "--execute COMMAND", "Run a command") do |cmd|
+      @options[:execute] = cmd
+    end
+    parser.parse(arguments)
+  end
+
+  def initialize_css_provider
+    screen = Gdk::Display.default.default_screen
+    @provider = Gtk::CssProvider.new
+    Gtk::StyleContext.add_provider_for_screen(screen,
+                                              @provider,
+                                              Gtk::StyleProvider::PRIORITY_USER)
+  end
+
   def load_menu_ui_in(application)
     builder = Gtk::Builder.new(:resource => "/com/github/cedlemo/topinambour/app-menu.ui")
     app_menu = builder["appmenu"]
     application.app_menu = app_menu
   end
 
-  def load_default_css_config
-    @css_content = Gio::Resources.lookup_data("/com/github/cedlemo/topinambour/topinambour.css", 0)
-    @css_file = "#{DATA_PATH}/topinambour.css"
-    @provider.load(:data => @css_content)
-  end
-
-  def load_custom_css_config
-    @css_content = File.open(USR_CSS, "r").read
-    @css_file = USR_CSS
-    @provider.load(:data => @css_content)
+  def load_custom_css(file)
+    if @settings["custom-css"]
+      @css_content = File.open(file, "r").read
+      @provider.load(:data => @css_content)
+    else
+      @provider.load(:data => "")
+    end
   end
 
   def load_css_config
-    @provider = Gtk::CssProvider.new
-    if File.exist?(USR_CSS)
+    return unless @settings["custom-css"]
+    css_file = check_css_file_path
+    if css_file
       begin
-        load_custom_css_config
+        load_custom_css(css_file)
       rescue => e
         puts "Bad css file using default css #{e.message}"
         error_popup = TopinambourCssErrorPopup.new(self.windows.first)
         error_popup.message = e.message + "\n\nBad css file using default css"
         error_popup.show_all
-        load_default_css_config
       end
     else
-      puts "No custom CSS, using default css"
-      load_default_css_config
+      puts "No custom CSS, using default theme"
     end
   end
 
-  def write_down_default_css
-    File.open(USR_CSS, "w") { |file| file.write(@css_content) }
-  end
-
   def check_and_create_if_no_config_dir
     Dir.mkdir(CONFIG_DIR) unless Dir.exist?(CONFIG_DIR)
   end

data/lib/color_selector.rb

@@ -1,4 +1,4 @@
-# Copyright 2015-2016 Cedric LE MOIGNE, cedlemo@gmx.com
+# Copyright 2015-2017 Cedric LE MOIGNE, cedlemo@gmx.com
 # This file is part of Topinambour.
 #
 # Topinambour is free software: you can redistribute it and/or modify
@@ -13,6 +13,13 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Topinambour.  If not, see <http://www.gnu.org/licenses/>.
+
+TERMINAL_COLOR_NAMES = [:foreground, :background, :black, :red, :green, :yellow,
+                        :blue, :magenta, :cyan, :white, :brightblack,
+                        :brightred, :brightgreen, :brightyellow, :brightblue,
+                        :brightmagenta, :brightcyan, :brightwhite
+                       ]
+
 class TopinambourColorSelector < Gtk::Box
   attr_reader :colors
   def initialize(window)
@@ -37,7 +44,8 @@ class TopinambourColorSelector < Gtk::Box
   private
 
   def initialize_default_colors
-    @default_colors = @window.notebook.current.term.css_colors
+    colors_strings = @window.application.settings["colorscheme"]
+    @default_colors = colors_strings.map {|c| Gdk::RGBA.parse(c) }
     @colors = @default_colors.dup
   end
 
@@ -53,22 +61,17 @@ class TopinambourColorSelector < Gtk::Box
     button
   end
 
-  def apply_new_css_properties(toplevel, props)
-    toplevel.application.update_css(props)
-    toplevel.notebook.send_to_all_terminals("colors=", [@colors])
-    toplevel.notebook.send_to_all_terminals("apply_colors", nil)
+  def apply_new_properties
+    colors_strings = @colors.map { |c| c.to_s }
+    @window.application.settings["colorscheme"] = colors_strings
+    @window.notebook.send_to_all_terminals(:colors, nil)
+    @window.notebook.send_to_all_terminals(:load_settings, nil)
   end
 
   def generate_save_button
     button = Gtk::Button.new(:label => "Save")
     button.signal_connect "clicked" do |widget|
-      new_props = {}
-      TERMINAL_COLOR_NAMES.each_with_index do |c, i|
-        if @colors[i] != @default_colors[i]
-          new_props["-TopinambourTerminal-#{c}"] = @colors[i].to_s
-        end
-      end
-      apply_new_css_properties(widget.toplevel, new_props)
+      apply_new_properties
       button.toplevel.exit_overlay_mode
     end
     button
@@ -89,6 +92,5 @@ class TopinambourColorSelector < Gtk::Box
 
   def apply_new_colors
     @window.notebook.current.term.colors = @colors
-    @window.notebook.current.term.apply_colors
   end
 end

data/lib/font_selector.rb

@@ -22,30 +22,24 @@ class TopinambourFontSelector < Gtk::Box
 
     reset_button = Gtk::Button.new(:label => "Reset")
     reset_button.signal_connect "clicked" do
-      font_desc = Pango::FontDescription.new(@font)
-      @window.notebook.current.term.set_font(font_desc)
+      @window.notebook.current.term.font = @font
     end
     pack_start(reset_button, :expand => false, :fill => false, :padding => 0)
 
     font_button = Gtk::FontButton.new
-    font_button.set_font(@font)
-    font_button.set_show_style(true)
-    font_button.set_show_size(true)
-    font_button.set_use_font(true)
-    font_button.set_use_size(false)
+    font_button.font = @font.to_s
+    font_button.show_style = true
+    font_button.show_size = true
+    font_button.use_font = true
+    font_button.use_size = false
     font_button.signal_connect "font-set" do
       font_desc = Pango::FontDescription.new(font_button.font_name)
-      @window.notebook.current.term.set_font(font_desc)
+      @window.notebook.current.term.font = font_desc
     end
     pack_start(font_button, :expand => false, :fill => false, :padding => 0)
 
-    save_button = Gtk::Button.new(:label => "Save")
+    save_button = Gtk::Button.new(:label => "Quit")
     save_button.signal_connect "clicked" do
-      new_props = {}
-      font = @window.notebook.current.term.font
-      new_props["-TopinambourTerminal-font"] = font.to_s
-      toplevel.application.update_css(new_props)
-      toplevel.notebook.send_to_all_terminals("set_font", font)
       toplevel.exit_overlay_mode
     end
     pack_start(save_button, :expand => false, :fill => false, :padding => 0)

data/lib/notebook.rb

@@ -1,4 +1,4 @@
-# Copyright 2015-2016 Cedric LE MOIGNE, cedlemo@gmx.com
+# Copyright 2015-2017 Cedric LE MOIGNE, cedlemo@gmx.com
 # This file is part of Topinambour.
 #
 # Topinambour is free software: you can redistribute it and/or modify
@@ -14,16 +14,14 @@
 # You should have received a copy of the GNU General Public License
 # along with Topinambour.  If not, see <http://www.gnu.org/licenses/>.
 class TopinambourNotebook < Gtk::Notebook
-  attr_reader :visible
+  attr_reader :visible, :hidden
+
   def initialize
     super()
-    signal_connect "hide" do
-      @visible = false
-    end
+    @hidden = []
+    signal_connect("hide") { @visible = false }
 
-    signal_connect "show" do
-      @visible = true
-    end
+    signal_connect("show") { @visible = true }
 
     signal_connect "switch-page" do |_widget, next_page, next_page_num|
       toplevel.current_label.text = next_page.term.terminal_title
@@ -35,8 +33,10 @@ class TopinambourNotebook < Gtk::Notebook
       toplevel.current_tab.text = "#{page + 1}/#{n_pages}"
     end
 
-    signal_connect "page-removed" do
-      toplevel.current_tab.text = "#{page + 1}/#{n_pages}" if toplevel.class == TopinambourWindow
+    signal_connect "page-removed" do |_widget, _child, page_num|
+      if toplevel.class == TopinambourWindow
+        toplevel.current_tab.text = "#{page + 1}/#{n_pages}"
+      end
     end
     set_name("topinambour-notebook")
     set_show_tabs(false)
@@ -87,7 +87,18 @@ class TopinambourNotebook < Gtk::Notebook
 
   def send_to_all_terminals(method_name, values)
     each do |tab|
-      tab.send(method_name, *values)
+      tab.term.send(method_name, *values)
     end
   end
+
+  def hide(index)
+    child = get_nth_page(index)
+    @hidden << child
+    remove_page(index)
+  end
+
+  def unhide(index)
+    append_page(@hidden.delete_at(index))
+    toplevel.current_tab.text = "#{current_page + 1}/#{n_pages}"
+  end
 end