Germinal 1.2.3 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1579e313faeaff4192cfd683b8c2cd15e3318be0
-  data.tar.gz: 3042b6c45b20080aa6f953619ba19656c85283cb
+  metadata.gz: f7729cf82193fd7907e5f37569fd895ce386805f
+  data.tar.gz: a136e4d7effc44ba8de5a5799c8beb387d27badc
 SHA512:
-  metadata.gz: cabf90971caa3c42e2c0d9c6b6b8b742bd5e865c8e26c0dc38a6e678464fe5ffee3b05d33cdc5680b9fa4d9240111fe55e7e6ec561a83bf87a1199b48816de85
-  data.tar.gz: 29592d26427c67d074825932061a3051b59b7a7738af563fb2d2d05f90220887341a59a576abae255caa005f4752cd2721d69d3cc49f83e08b7fa0756c549cc0
+  metadata.gz: 9c8c8f621fdb0575ffc697b13ebcd031c1a119a27c850a177877abf81612c0737415b33ad422292abe44b341279aefff7534280d52ec15dc36f1ee29bd98e8bf
+  data.tar.gz: 7475f134f688f0f5b86a091e58b21ca2fcce9a61f739f55686378329630adef130d33d180c745fc3f275dc93cd0d3cc80b9edb8560a3910ebb2032d1671122e1

data/README.md

@@ -1,5 +1,7 @@
 # Germinal
 
+[![Gem Version](https://badge.fury.io/rb/Germinal.svg)](https://badge.fury.io/rb/Germinal)
+
 <a href="https://raw.github.com/cedlemo/germinal/master/screenshot1.png"><img src="https://raw.github.com/cedlemo/germinal/master/screenshot1_prev.png" width="576" height="324" alt="Screenshot"></a>
 
 Germinal 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 Germinal works well and I use it as my primary terminal emulator.

data/bin/Germinal

@@ -45,9 +45,9 @@ end
 
 resource = Gio::Resource.load(gresource_bin)
 Gio::Resources.register(resource)
-# Load default libraries
-%w(application terminal notebook color_selector font_selector
-terminal_chooser window resize_message css_editor).each do |l|
+# Load default libraries !!WARNING!! loading order matters
+%w(actions style_properties application 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"
   else

data/lib/actions.rb

@@ -0,0 +1,73 @@
+# Copyright 2016 Cédric LE MOIGNE, cedlemo@gmx.com
+# This file is part of Germinal.
+#
+# Germinal is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# any later version.
+#
+# Germinal is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY 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 Germinal.  If not, see <http://www.gnu.org/licenses/>.
+
+module GerminalActions
+  def self.generate_action(name)
+    action = Gio::SimpleAction.new(name)
+    action.signal_connect("activate") do |act, param|
+      yield(act, param) if block_given?
+    end
+    action
+  end
+
+  def self.add_action_to(name, application)
+    method_name = "generate_#{name}_action".to_sym
+    return false unless methods.include?(method_name)
+    action = method(method_name).call(application)
+    application.add_action(action)
+  end
+
+  def self.generate_about_action(application)
+    action = generate_action("about") do |_act, _param|
+      application.windows[0].display_about
+    end
+    action
+  end
+
+  def self.generate_preferences_action(application)
+    action = generate_action("preferences") do |_act, _param|
+      puts "TODO"
+    end
+    action
+  end
+
+  def self.generate_quit_action(application)
+    action = generate_action("quit") do |_act, _param|
+      application.quit
+    end
+    action
+  end
+
+  def self.generate_term_copy_action(application)
+    action = generate_action("term_copy") do |_act, _param|
+      application.windows[0].notebook.current.copy_clipboard
+    end
+    action
+  end
+
+  def self.generate_term_paste_action(application)
+    action = generate_action("term_copy") do |_act, _param|
+      application.windows[0].notebook.current.paste_clipboard
+    end
+    action
+  end
+
+  def self.add_actions_to(application)
+    %w(about preferences quit term_copy term_paste).each do |name|
+      add_action_to(name, application)
+    end
+  end
+end

data/lib/application.rb

@@ -21,43 +21,10 @@ class GerminalApplication < Gtk::Application
 
     signal_connect "startup" do |application|
       load_css_config
-      display = Gdk::Display.default
-      screen = display.default_screen
+      screen = Gdk::Display.default.default_screen
       Gtk::StyleContext.add_provider_for_screen(screen, @provider, Gtk::StyleProvider::PRIORITY_USER)
-
-      action = Gio::SimpleAction.new("preferences")
-      action.signal_connect("activate") do |_action, _parameter|
-        puts "TODO"
-      end
-      application.add_action(action)
-
-      action = Gio::SimpleAction.new("about")
-      action.signal_connect("activate") do |_action, _parameter|
-        application.windows[0].display_about
-      end
-      application.add_action(action)
-
-      action = Gio::SimpleAction.new("quit")
-      action.signal_connect("activate") do |_action, _parameter|
-        application.quit
-      end
-      application.add_action(action)
-
-      action = Gio::SimpleAction.new("term_copy")
-      action.signal_connect("activate") do |_action, _parameter|
-        application.windows[0].notebook.current.copy_clipboard
-      end
-      application.add_action(action)
-
-      action = Gio::SimpleAction.new("term_paste")
-      action.signal_connect("activate") do |_action, _parameter|
-        application.windows[0].notebook.current.paste_clipboard
-      end
-      application.add_action(action)
-
-      builder = Gtk::Builder.new(:resource => "/com/github/cedlemo/germinal/app-menu.ui")
-      app_menu = builder.get_object("appmenu")
-      application.set_app_menu(app_menu)
+      GerminalActions.add_actions_to(application)
+      load_menu_ui_in(application)
     end
 
     signal_connect "activate" do |application|
@@ -87,6 +54,12 @@ class GerminalApplication < Gtk::Application
 
   private
 
+  def load_menu_ui_in(application)
+    builder = Gtk::Builder.new(:resource => "/com/github/cedlemo/germinal/app-menu.ui")
+    app_menu = builder["appmenu"]
+    application.app_menu = app_menu
+  end
+
   def load_css_config
     @provider = Gtk::CssProvider.new
     default_css = Gio::Resources.lookup_data("/com/github/cedlemo/germinal/germinal.css", 0)
@@ -146,13 +119,13 @@ class GerminalApplication < Gtk::Application
 
   def css_properties
     @props = {}
-    if windows[0].notebook.current.class == GerminalTerminal
-      terminal_colors = windows[0].notebook.current.colors
-      TERMINAL_COLOR_NAMES.each_with_index do |c, i|
-        @props["-GerminalTerminal-#{c}"] = terminal_colors[i].to_s
-      end
-      @props["-GerminalTerminal-font"] = DEFAULT_TERMINAL_FONT
-      @props["-GerminalWindow-shell"] = "\'/usr/bin/fish\'"
+    return @props if windows[0].notebook.current.class == GerminalTerminal
+
+    terminal_colors = windows[0].notebook.current.colors
+    TERMINAL_COLOR_NAMES.each_with_index do |c, i|
+      @props["-GerminalTerminal-#{c}"] = terminal_colors[i].to_s
     end
+    @props["-GerminalTerminal-font"] = DEFAULT_TERMINAL_FONT
+    @props["-GerminalWindow-shell"] = "\'/usr/bin/fish\'"
   end
 end

data/lib/color_selector.rb

@@ -18,24 +18,24 @@ class GerminalColorSelector < Gtk::Box
   def initialize(window)
     @window = window
     super(:horizontal, 0)
-    
+
     reset_button = Gtk::Button.new(:label => "Reset")
     reset_button.signal_connect "clicked" do
-      get_default_colors
+      initialize_default_colors
       children[1..-2].each_with_index do |child, i|
         child.rgba = @default_colors[i]
       end
       apply_new_colors
     end
     pack_start(reset_button, :expand => false, :fill => false, :padding => 0)
-    
-    get_default_colors
+
+    initialize_default_colors
     add_color_selectors
 
     save_button = Gtk::Button.new(:label => "Save")
-    save_button.signal_connect "clicked" do 
-      new_props={}
-      TERMINAL_COLOR_NAMES.each_with_index do |c,i|
+    save_button.signal_connect "clicked" do
+      new_props = {}
+      TERMINAL_COLOR_NAMES.each_with_index do |c, i|
         new_props["-GerminalTerminal-#{c}"] = @colors[i].to_s
       end
       toplevel.application.update_css(new_props)
@@ -48,7 +48,7 @@ class GerminalColorSelector < Gtk::Box
       toplevel.exit_overlay_mode
     end
     pack_start(save_button, :expand => false, :fill => false, :padding => 0)
-    
+
     show_all
     set_halign(:center)
     set_valign(:end)
@@ -57,7 +57,7 @@ class GerminalColorSelector < Gtk::Box
 
   private
 
-  def get_default_colors
+  def initialize_default_colors
     @default_colors = @window.notebook.current.get_css_colors
     @colors = @default_colors.dup
   end
@@ -79,4 +79,3 @@ class GerminalColorSelector < Gtk::Box
     @window.notebook.current.apply_colors
   end
 end
-

data/lib/css_editor.rb

@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Germinal.  If not, see <http://www.gnu.org/licenses/>.
 require "gtksourceview3"
-class GerminalCssEditor <  Gtk::Grid
+class GerminalCssEditor < Gtk::Grid
   attr_accessor :tab_label, :preview
   def initialize(window)
     super()
@@ -23,7 +23,7 @@ class GerminalCssEditor <  Gtk::Grid
     @default_css = @provider.to_s
     @modified_css = @default_css
     @tab_label = "Css Editor"
-    
+
     gen_source_view
 
     sw = Gtk::ScrolledWindow.new(nil, nil)
@@ -35,7 +35,7 @@ class GerminalCssEditor <  Gtk::Grid
     button = gen_reset_button
     attach(button, 0, 1, 1, 1)
 
-    @style_button = gen_style_chooser_button    
+    @style_button = gen_style_chooser_button
     attach(@style_button, 1, 1, 1, 1)
 
     button = gen_save_button
@@ -52,7 +52,7 @@ class GerminalCssEditor <  Gtk::Grid
     @manager = GtkSource::LanguageManager.new
     @language = @manager.get_language("css")
     @sm = GtkSource::StyleSchemeManager.default
-    
+
     @view.show_line_numbers = true
     @view.insert_spaces_instead_of_tabs = true
     @view.buffer.language = @language
@@ -63,17 +63,17 @@ class GerminalCssEditor <  Gtk::Grid
     @view.right_margin_position = 80
     @view.smart_backspace = true
   end
- 
+
   def gen_reset_button
     button = Gtk::Button.new(:label => "Reset")
-    button.signal_connect "clicked" do 
+    button.signal_connect "clicked" do
       @view.buffer.text = @default_css
     end
     button.vexpand = false
     button.hexpand = false
     button
   end
-  
+
   def gen_style_chooser_button
     style_scheme = nil
     if @sm.scheme_ids.include?(@window.css_editor_style)
@@ -81,7 +81,7 @@ class GerminalCssEditor <  Gtk::Grid
     else
       style_scheme = @sm.get_scheme("classic")
     end
-    @view.buffer.style_scheme = style_scheme 
+    @view.buffer.style_scheme = style_scheme
     button = GtkSource::StyleSchemeChooserButton.new
     button.vexpand = false
     button.hexpand = true
@@ -94,7 +94,7 @@ class GerminalCssEditor <  Gtk::Grid
 
   def gen_save_button
     button = Gtk::Button.new(:label => "Save")
-    button.signal_connect "clicked" do 
+    button.signal_connect "clicked" do
       @window.application.update_css
       reload_custom_css_properties
     end
@@ -102,6 +102,7 @@ class GerminalCssEditor <  Gtk::Grid
     button.hexpand = false
     button
   end
+
   def manage_buffer_changes
     @view.buffer.signal_connect "changed" do |buffer|
       @modified_css = buffer.get_text(buffer.start_iter,
@@ -122,19 +123,19 @@ class GerminalCssEditor <  Gtk::Grid
         style_scheme = @sm.get_scheme("classic")
       end
       @view.buffer.style_scheme = style_scheme
-      @style_button.style_scheme =  style_scheme
+      @style_button.style_scheme = style_scheme
     end
   end
 
   def manage_css_errors
     @provider.signal_connect "parsing-error" do |_css_provider, section, error|
-      #@start_i = @view.buffer.get_iter_at(:line => section.start_line,
-      #                                   :index => section.start_position)
-      #@end_i =  @view.buffer.get_iter_at(:line => section.end_line,
-      #                                  :index => section.end_position)
-      #if error == Gtk::CssProviderError::DEPRECATED
-      #else
-      #end
+      # @start_i = @view.buffer.get_iter_at(:line => section.start_line,
+      #                                    :index => section.start_position)
+      # @end_i =  @view.buffer.get_iter_at(:line => section.end_line,
+      #                                   :index => section.end_position)
+      # if error == Gtk::CssProviderError::DEPRECATED
+      # else
+      # end
     end
   end
 
@@ -145,14 +146,13 @@ class GerminalCssEditor <  Gtk::Grid
 
   def reload_terminal_custom_css_properties
     @window.notebook.each do |tab|
-      colors = nil
-      if tab.class == GerminalTerminal
-        colors = tab.get_css_colors unless colors
-        tab.colors = colors
-        tab.apply_colors
-      end
+      next unless tab.class == GerminalTerminal
+      colors = tab.get_css_colors unless colors
+      tab.colors = colors
+      tab.apply_colors
     end
   end
+
   def reload_window_custom_css_properties
     @window.load_css_properties
   end

data/lib/font_selector.rb

@@ -26,7 +26,7 @@ class GerminalFontSelector < Gtk::Box
       @window.notebook.current.set_font(font_desc)
     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)
@@ -38,20 +38,18 @@ class GerminalFontSelector < Gtk::Box
       @window.notebook.current.set_font(font_desc)
     end
     pack_start(font_button, :expand => false, :fill => false, :padding => 0)
-    
+
     save_button = Gtk::Button.new(:label => "Save")
-    save_button.signal_connect "clicked" do 
-      new_props={}
+    save_button.signal_connect "clicked" do
+      new_props = {}
       font = @window.notebook.current.font
       new_props["-GerminalTerminal-font"] = font.to_s
       toplevel.application.update_css(new_props)
       toplevel.notebook.each do |tab|
-        if tab.class == GerminalTerminal
-          tab.set_font(font)
-        end
+        tab.set_font(font) if tab.class == GerminalTerminal
       end
       toplevel.exit_overlay_mode
-    end 
+    end
     pack_start(save_button, :expand => false, :fill => false, :padding => 0)
     set_name("font_selector")
     show_all

data/lib/headerbar.rb

@@ -0,0 +1,127 @@
+# Copyright 2016 Cédric LE MOIGNE, cedlemo@gmx.com
+# This file is part of Germinal.
+#
+# Germinal is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# any later version.
+#
+# Germinal is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY 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 Germinal.  If not, see <http://www.gnu.org/licenses/>.
+
+module GerminalHeaderBar
+  def self.generate_header_bar(window)
+    bar = Gtk::HeaderBar.new
+    bar.title = "Germinal"
+    bar.has_subtitle = false
+    bar.show_close_button = true
+    window.set_titlebar(bar)
+    bar
+  end
+
+  def self.generate_current_label_tooltips(label)
+    label.tooltip_text = <<-TOOLTIP
+Change the name of the tab and hit
+enter in order to validate
+TOOLTIP
+    label.set_icon_tooltip_text(:secondary, <<-SECTOOLTIP)
+Reset your changes and use the
+default label for the current tab
+SECTOOLTIP
+  end
+
+  def self.generate_current_label_signals(label, window)
+    label.signal_connect "activate" do |entry|
+      window.notebook.current.tab_label = entry.text
+    end
+
+    label.signal_connect "icon-release" do |entry, position|
+      if position == :secondary
+        window.notebook.current.tab_label = nil
+        entry.text = window.notebook.current.window_title
+      end
+    end
+  end
+
+  def self.generate_current_label(window)
+    label = Gtk::Entry.new
+    label.has_frame = false
+    label.width_chars = 35
+    label.set_icon_from_icon_name(:secondary, "edit-clear")
+
+    generate_current_label_tooltips(label)
+    generate_current_label_signals(label, window)
+    label
+  end
+
+  def self.generate_prev_button(window)
+    gen_icon_button("pan-start-symbolic", "prev") do
+      window.show_prev_tab
+    end
+  end
+
+  def self.generate_current_tab
+    Gtk::Label.new("1/1")
+  end
+
+  def self.generate_next_button(window)
+    gen_icon_button("pan-end-symbolic", "next") do
+      window.show_next_tab
+    end
+  end
+
+  def self.generate_new_tab_button(window)
+    gen_icon_button("tab-new-symbolic", "New terminal") do
+      window.add_terminal
+    end
+  end
+
+  def self.generate_open_menu_button(window)
+    gen_icon_button("open-menu-symbolic", "Main Menu") do |button|
+      builder = Gtk::Builder.new(:resource => "/com/github/cedlemo/germinal/window-menu.ui")
+      menu = Gtk::Menu.new(builder["winmenu"])
+      menu.attach_to_widget(button)
+      menu.children[0].signal_connect("activate") { window.show_css_editor }
+
+      menu.show_all
+      event = Gtk.current_event
+      menu.popup(nil, nil, event.button, event.time)
+    end
+  end
+
+  def self.generate_font_sel_button(window)
+    gen_icon_button("font-select-symbolic", "Set font") do
+      window.show_font_selector
+    end
+  end
+
+  def self.generate_color_sel_button(window)
+    gen_icon_button("color-select-symbolic", "Set colors") do
+      window.show_color_selector
+    end
+  end
+
+  def self.generate_term_overv_button(window)
+    gen_icon_button("emblem-photos-symbolic", "Terminals overview") do
+      window.show_terminal_chooser
+    end
+  end
+
+  def self.gen_icon_button(icon_name, tooltip)
+    button = Gtk::Button.new
+    image = Gtk::Image.new(:icon_name => icon_name, :size => :button)
+    button.add(image)
+    button.tooltip_text = tooltip
+    if block_given?
+      button.signal_connect "clicked" do |widget|
+        yield(widget)
+      end
+    end
+    button
+  end
+end

data/lib/notebook.rb

@@ -19,40 +19,35 @@ class GerminalNotebook < Gtk::Notebook
   def initialize
     super()
     @gen_preview = true
-    signal_connect "hide" do |widget|
+    signal_connect "hide" do
       @visible = false
     end
-    signal_connect "show" do |widget|
+    signal_connect "show" do
       @visible = true
     end
 
-    signal_connect "switch-page" do |widget, next_page, next_page_num|
-      if next_page.tab_label
-        toplevel.current_label.text = next_page.tab_label
-      else
-        next_label = get_tab_label(next_page)
-        toplevel.current_label.text = next_label.text 
-      end
+    signal_connect "switch-page" do |_widget, next_page, next_page_num|
+      toplevel.current_label.text = next_page.tab_label || get_tab_label(next_page).text
       toplevel.current_tab.text = "#{next_page_num + 1}/#{n_pages}"
-      
-      if page >= 0 && @gen_preview 
+
+      if page >= 0 && @gen_preview
         current.queue_draw
-        _x,_y,w,h = current.allocation.to_a
+        _x, _y, w, h = current.allocation.to_a
         pix = current.window.to_pixbuf(0, 0, w, h)
         current.preview = pix if pix
       elsif !@gen_preview
         @gen_preview = true
-      end    
+      end
     end
-    
-    signal_connect "page-reordered" do |widget, child, new_page_num|
+
+    signal_connect "page-reordered" do
       toplevel.current_tab.text = "#{page + 1}/#{n_pages}"
     end
-    
-    signal_connect "page-removed" do 
+
+    signal_connect "page-removed" do
       toplevel.current_tab.text = "#{page + 1}/#{n_pages}" if toplevel.class == GerminalWindow
     end
-    
+
     set_show_tabs(false)
   end
 

data/lib/resize_message.rb

@@ -16,7 +16,7 @@
 class GerminalResizeMessage < Gtk::Box
   def initialize(text)
     super(:vertical)
-    text = text || ""
+    text ||= ""
     add(Gtk::Label.new(text))
     set_halign(:end)
     set_valign(:end)
@@ -24,7 +24,7 @@ class GerminalResizeMessage < Gtk::Box
     show_all
     set_name("resize_box")
   end
-  
+
   def text=(text)
     children[0].text = text
     show_all

data/lib/shortcuts.rb

@@ -0,0 +1,76 @@
+# Copyright 2016 Cédric LE MOIGNE, cedlemo@gmx.com
+# This file is part of Germinal.
+#
+# Germinal is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# any later version.
+#
+# Germinal is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY 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 Germinal.  If not, see <http://www.gnu.org/licenses/>.
+
+module GerminalShortcuts
+  def self.ctrl_shift?(event)
+    (event.state & (Gdk::ModifierType::CONTROL_MASK |
+                    Gdk::ModifierType::SHIFT_MASK)) ==
+      (Gdk::ModifierType::CONTROL_MASK | Gdk::ModifierType::SHIFT_MASK)
+  end
+
+  def self.handle_simple(keyval, window)
+    case keyval
+    when Gdk::Keyval::KEY_Escape # escape from overlay mode
+      if window.in_overlay_mode?
+        window.exit_overlay_mode
+        window.notebook.current.grab_focus
+      end
+      true
+    end
+  end
+
+  def self.handle_ctrl_shift(keyval, window)
+    case keyval
+    when Gdk::Keyval::KEY_W # close the current tab
+      window.close_current_tab
+      true
+    when Gdk::Keyval::KEY_Q # Quit
+      window.quit_gracefully
+      true
+    when Gdk::Keyval::KEY_T # New tab
+      window.add_terminal
+      true
+    when Gdk::Keyval::KEY_C
+      window.show_color_selector
+      true
+    when Gdk::Keyval::KEY_F
+      window.show_font_selector
+      true
+    when Gdk::Keyval::KEY_Left # previous tab
+      window.show_prev_tab
+      true
+    when Gdk::Keyval::KEY_Right # next tab
+      window.show_next_tab
+      true
+    when Gdk::Keyval::KEY_O # next tab
+      window.show_terminal_chooser
+      true
+    when Gdk::Keyval::KEY_E
+      window.show_css_editor
+      true
+    end
+  end
+
+  def self.handle_key_press(window, event)
+    keyval = event.keyval
+    # puts "#{Gdk::Keyval.to_name(keyval)} = #{keyval}"
+    if ctrl_shift?(event)
+      handle_ctrl_shift(keyval, window)
+    else
+      handle_simple(keyval, window)
+    end
+  end
+end