topinambour 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c91b7f16f9c3141e6876f79ce6246daf0567c8ff
-  data.tar.gz: b0cf30204239e75195eae1a90101aad66fca0c1c
+  metadata.gz: 76fa93f28cb01a9f218e3f9bc87e64adf76ef14d
+  data.tar.gz: 834c19b5bdc2ea89740083164ef3bed96ef12c15
 SHA512:
-  metadata.gz: 5b30bc9a61ebe66aac157a017481ca40041628623abddd15b62f9b9ba732d1340a8987a6474bf292abe2385d65d9db45302fd2bf0bfb896ea6e681d802a40b16
-  data.tar.gz: 44ddb40ca20348587b194c7d4a36f6cf8b2f7ed971bd22a04824532388adb56b90e8448336a641c49d97f35f754042444a60d5aee2acb17b44505d8fb42ad055
+  metadata.gz: 49e9f72f92b495e00b42802938f22b0359a8c5f48316b50c22ad80b2abb7c4b123a908f5f8d36546fa76535d66f31b1e365c64649fa0d200247f99c8cbdf2777
+  data.tar.gz: 432e048bb7e5546f9e8fe3c053362fe3a0e3d3959c6b921654f6478df01b391f8d2eb0f178e0eda659ab27fa887c5df04b6d6fed3fe00c9c268883e9e8b57ba0

data/README.md

@@ -4,7 +4,9 @@
 [![Code Climate](https://codeclimate.com/github/cedlemo/topinambour/badges/gpa.svg)](https://codeclimate.com/github/cedlemo/topinambour)
 
 
-<a href="https://raw.github.com/cedlemo/topinambour/master/screenshot1.png"><img src="https://raw.github.com/cedlemo/topinambour/master/screenshot1_prev.png" width="576" height="324" alt="Screenshot"></a>
+<a href="https://raw.github.com/cedlemo/topinambour/master/terminal_selector_screen.gif"><img src="https://raw.github.com/cedlemo/topinambour/master/terminal_selector_screen.gif" style="width:576px;height:324px;" alt="Color selection gif"></a>
+
+<a href="https://raw.github.com/cedlemo/topinambour/master/color_selection_screen.gif"><img src="https://raw.github.com/cedlemo/topinambour/master/color_selection_screen.gif" style="width:576px;height:324px;" alt="Color selection gif"></a>
 
 Topinambour is Terminal written with the Gtk3 and Vte3 ruby bindings from the project [ruby-gnome2](https://github.com/ruby-gnome2/ruby-gnome2). I have written it for testing purpose, but Topinambour works well and I use it as my primary terminal emulator.
 

data/bin/topinambour

@@ -46,8 +46,8 @@ end
 resource = Gio::Resource.load(gresource_bin)
 Gio::Resources.register(resource)
 # Load default libraries !!WARNING!! loading order matters
-#%w(actions style_properties css_handler application terminal_regex terminal notebook color_selector font_selector
-%w(actions style_properties css_handler application terminal notebook color_selector font_selector
+#%w(actions style_properties css_handler application terminal notebook color_selector font_selector
+%w(actions style_properties css_handler application terminal_regex terminal notebook color_selector font_selector
 terminal_chooser headerbar shortcuts window resize_message css_editor).each do |l|
   if File.exist?("#{USR_LIB_PATH}/#{l}.rb")
     require "#{USR_LIB_PATH}/#{l}.rb"

data/lib/actions.rb

@@ -53,7 +53,16 @@ module TopinambourActions
 
   def self.generate_term_copy_action(application)
     action = generate_action("term_copy") do |_act, _param|
-      application.windows[0].notebook.current.copy_clipboard
+      term = application.windows[0].notebook.current
+      event = Gtk.current_event
+      
+      _match, regex_type = term.match_check_event(event)
+      if term.has_selection? || regex_type == -1
+        term.copy_clipboard
+      else
+        clipboard = Gtk::Clipboard.get_default(Gdk::Display.default)
+        clipboard.text = term.last_match
+      end
     end
     action
   end

data/lib/application.rb

@@ -53,8 +53,6 @@ class TopinambourApplication < Gtk::Application
     end
   end
 
-  private
-
   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"
@@ -64,8 +62,11 @@ class TopinambourApplication < Gtk::Application
     File.open(USR_CSS, "w") do |file|
       file.puts new_conf
     end
+    @css_content = new_conf
   end
 
+  private
+
   def load_menu_ui_in(application)
     builder = Gtk::Builder.new(:resource => "/com/github/cedlemo/topinambour/app-menu.ui")
     app_menu = builder["appmenu"]
@@ -99,18 +100,6 @@ class TopinambourApplication < Gtk::Application
     end
   end
 
-  def css_properties
-    @props = {}
-    return @props if windows[0].notebook.current.class == TopinambourTerminal
-
-    terminal_colors = windows[0].notebook.current.colors
-    TERMINAL_COLOR_NAMES.each_with_index do |c, i|
-      @props["-TopinambourTerminal-#{c}"] = terminal_colors[i].to_s
-    end
-    @props["-TopinambourTerminal-font"] = DEFAULT_TERMINAL_FONT
-    @props["-TopinambourWindow-shell"] = "\'/usr/bin/fish\'"
-  end
-
   def check_and_create_if_no_config_dir
     Dir.mkdir(CONFIG_DIR) unless Dir.exist?(CONFIG_DIR)
   end

data/lib/css_editor.rb

@@ -20,7 +20,7 @@ class TopinambourCssEditor < Gtk::Grid
     super()
     @window = window
     @provider = window.application.provider
-    @default_css = @provider.to_s
+    @default_css = window.application.css_content
     @modified_css = @default_css
     @tab_label = "Css Editor"
 
@@ -32,14 +32,17 @@ class TopinambourCssEditor < Gtk::Grid
     sw.add(@view)
     attach(sw, 0, 0, 3, 1)
 
-    button = gen_reset_button
+    button = gen_close_button
     attach(button, 0, 1, 1, 1)
 
+    button = gen_reset_button
+    attach(button, 1, 1, 1, 1)
+
     @style_button = gen_style_chooser_button
-    attach(@style_button, 1, 1, 1, 1)
+    attach(@style_button, 2, 1, 1, 1)
 
-    button = gen_save_button
-    attach(button, 2, 1, 1, 1)
+    button = gen_save_button(@view.buffer)
+    attach(button, 3, 1, 1, 1)
     manage_buffer_changes
     manage_css_errors
     show_all
@@ -64,6 +67,16 @@ class TopinambourCssEditor < Gtk::Grid
     @view.smart_backspace = true
   end
 
+  def gen_close_button
+    button = Gtk::Button.new(:label => "Close Tab")
+    button.signal_connect "clicked" do
+      toplevel.close_current_tab
+    end
+    button.vexpand = false
+    button.hexpand = false
+    button
+  end
+
   def gen_reset_button
     button = Gtk::Button.new(:label => "Reset")
     button.signal_connect "clicked" do
@@ -92,10 +105,10 @@ class TopinambourCssEditor < Gtk::Grid
     button
   end
 
-  def gen_save_button
+  def gen_save_button(buffer)
     button = Gtk::Button.new(:label => "Save")
     button.signal_connect "clicked" do
-      @window.application.update_css
+      @window.application.replace_old_conf_with(buffer.text)
       reload_custom_css_properties
     end
     button.vexpand = false

data/lib/notebook.rb

@@ -22,12 +22,13 @@ class TopinambourNotebook < Gtk::Notebook
     signal_connect "hide" do
       @visible = false
     end
+
     signal_connect "show" do
       @visible = true
     end
 
     signal_connect "switch-page" do |_widget, next_page, next_page_num|
-      toplevel.current_label.text = next_page.terminal_title
+      toplevel.current_label.text = next_page.terminal_title if next_page.class == TopinambourTerminal
       toplevel.current_tab.text = "#{next_page_num + 1}/#{n_pages}"
 
       if page >= 0 && @gen_preview

data/lib/terminal.rb

@@ -17,7 +17,7 @@
 ##
 # The default vte terminal customized
 class TopinambourTerminal
-  attr_reader :pid, :menu
+  attr_reader :pid, :menu, :regexes, :last_match
   attr_accessor :preview, :colors, :custom_title
 
   ##
@@ -48,6 +48,7 @@ class TopinambourTerminal
     signal_connect "button-press-event" do |widget, event|
       if event.type == Gdk::EventType::BUTTON_PRESS &&
          event.button == Gdk::BUTTON_SECONDARY
+        manage_regex_on_right_click(widget, event)
         display_copy_past_menu(widget, event)
         true
       elsif event.button == Gdk::BUTTON_PRIMARY
@@ -108,15 +109,15 @@ class TopinambourTerminal
   end
 
   def add_matches
-#    @REGEXES = [:REGEX_URL_AS_IS, :REGEX_URL_FILE, :REGEX_URL_HTTP,
-#                :REGEX_URL_VOIP, :REGEX_EMAIL, :REGEX_NEWS_MAN]
-#    @REGEXES.each do |name|
-#      regex_name = TopinambourRegex.const_get(name)
-#      flags = [GLib::RegexCompileFlags::OPTIMIZE,
-#               GLib::RegexCompileFlags::MULTILINE]
-#      regex = GLib::Regex.new(regex_name, :compile_options => flags)
-#      match_add_gregex(regex, 0)
-#    end
+    @regexes = [:REGEX_URL_AS_IS, :REGEX_URL_FILE, :REGEX_URL_HTTP,
+                :REGEX_URL_VOIP, :REGEX_EMAIL, :REGEX_NEWS_MAN]
+    @regexes.each do |name|
+      regex_name = TopinambourRegex.const_get(name)
+      flags = [GLib::RegexCompileFlags::OPTIMIZE,
+               GLib::RegexCompileFlags::MULTILINE]
+      regex = GLib::Regex.new(regex_name, :compile_options => flags)
+      match_add_gregex(regex, 0)
+    end
   end
 
   def display_copy_past_menu(widget, event)
@@ -130,8 +131,26 @@ class TopinambourTerminal
     widget.menu.show
   end
 
+  def manage_regex_on_right_click(_widget, event)
+    @last_match, _regex_type = match_check_event(event)
+  end
+
   def manage_regex_on_click(_widget, event)
-    _match, _regex_type = match_check_event(event)
+    match, regex_type = match_check_event(event)
+    return nil if regex_type == -1
+    modified_match = case @regexes[regex_type]
+                     when :REGEX_EMAIL
+                       "mailto:" + match
+                     when :REGEX_URL_HTTP
+                       "http://" + match
+                     else
+                       match
+                     end
+    begin
+      Gio::AppInfo.launch_default_for_uri(modified_match)
+    rescue => e
+      puts "error : #{e.message}\n\tfor match: #{match} of type :#{@regexes[regex_type]}"
+    end
   end
 
   def when_terminal_title_change

data/lib/window.rb

@@ -19,7 +19,7 @@ class TopinambourWindow
 
   def initialize(application)
     super(:application => application)
-    set_icon_from_file("#{DATA_PATH}/topinambour-icon.png")
+    set_icon_name("utilities-terminal-symbolic")
     load_css_properties
     set_position(:center)
     create_header_bar
@@ -114,9 +114,9 @@ class TopinambourWindow
                           "comments" => "Terminal Emulator based on the ruby bindings of Gtk3 and Vte3",
                           "copyright" => "Copyright (C) 2015-2016 Cédric Le Moigne",
                           "license" => "This program is licenced under the licence GPL-3.0 and later.",
-                          "logo" => Gdk::Pixbuf.new("#{DATA_PATH}/topinambour-icon-128.png"),
+                          "logo_icon_name" => "utilities-terminal-symbolic",
                           "program_name" => "Topinambour",
-                          "version" => "1.2.3",
+                          "version" => "1.0.7",
                           "website" => "https://github.com/cedlemo/topinambour",
                           "website_label" => "Topinambour github repository"
                          )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: topinambour
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Cédric LE MOIGNE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-28 00:00:00.000000000 Z
+date: 2016-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vte3
@@ -90,11 +90,6 @@ files:
 - data/pan-start-symbolic.svg
 - data/tab-new-symbolic.svg
 - data/terminal-menu.ui
-- data/topinambour-icon-128.png
-- data/topinambour-icon-16.png
-- data/topinambour-icon-32.png
-- data/topinambour-icon-64.png
-- data/topinambour-icon.png
 - data/topinambour.css
 - data/topinambour.gresource.xml
 - data/window-close-symbolic.svg