Germinal 1.2.3 → 1.3.0

data/lib/style_properties.rb

@@ -0,0 +1,56 @@
+# 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 GerminalStyleProperties
+  def generate_string_rw_property(name, args)
+    GLib::Param::String.new(name.downcase,
+                            name.capitalize,
+                            name.upcase,
+                            args,
+                            GLib::Param::READABLE |
+                            GLib::Param::WRITABLE)
+  end
+
+  def generate_int_rw_property(name, args)
+    GLib::Param::Int.new(name.downcase,
+                         name.capitalize,
+                         name.upcase,
+                         *args,
+                         GLib::Param::READABLE |
+                         GLib::Param::WRITABLE)
+  end
+
+  def generate_boxed_rw_property(name, args)
+    GLib::Param::Boxed.new(name.downcase,
+                           name.capitalize,
+                           name.upcase,
+                           args,
+                           GLib::Param::READABLE |
+                           GLib::Param::WRITABLE)
+  end
+
+  def generate_rw_property(type, name, args)
+    type = type.to_s.downcase
+    method_name = "generate_#{type}_rw_property"
+    return false unless methods.include?(method_name.to_sym)
+    method(method_name.to_sym).call(name, args)
+  end
+
+  def install_style(type, name, args)
+    property = generate_rw_property(type, name, args)
+    install_style_property(property) if property
+  end
+end

data/lib/terminal.rb

@@ -18,32 +18,24 @@ TERMINAL_COLOR_NAMES = [:foreground, :background, :black, :red, :green, :yellow,
                         :brightblack, :brightred, :brightgreen, :brightyellow, :brightblue, :brightmagenta, :brightcyan, :brightwhite]
 DEFAULT_TERMINAL_COLORS = %w(#aeafad #323232 #000000 #b9214f #A6E22E #ff9800 #3399ff #8e33ff #06a2dc
                              #B0B0B0 #5D5D5D #ff5c8d #CDEE69 #ffff00 #9CD9F0 #FBB1F9 #77DFD8 #F7F7F7)
-DEFAULT_TERMINAL_FONT = "Monospace 11" 
+DEFAULT_TERMINAL_FONT = "Monospace 11"
 ##
 # The default vte terminal customized
 class GerminalTerminal < Vte::Terminal
+  extend GerminalStyleProperties
   attr_reader :pid, :menu
   attr_accessor :preview, :colors, :tab_label
   type_register
-  TERMINAL_COLOR_NAMES.each_with_index do |c, i|
+  TERMINAL_COLOR_NAMES.each_with_index do |c|
     name = c.to_s
-    install_style_property(
-      GLib::Param::Boxed.new(name, # name
-                             name.capitalize, # nick
-                             name.upcase, # blurb
-                             GLib::Type["GdkRGBA"],
-                             GLib::Param::READABLE |
-                             GLib::Param::WRITABLE)
-                            )
+    self.install_style("boxed",
+                        name,
+                        GLib::Type["GdkRGBA"])
   end
-  install_style_property(
-    GLib::Param::Boxed.new("font", # name
-                           "font".capitalize, # nick
-                           "font".upcase, # blurb
-                            GLib::Type["PangoFontDescription"],
-                            GLib::Param::READABLE |
-                            GLib::Param::WRITABLE)
-                        )
+  self.install_style("boxed",
+                     "font",
+                     GLib::Type["PangoFontDescription"])
+
   ##
   # Create a new GerminalTerminal instance that runs command_string
   def initialize(command_string, working_dir = nil)
@@ -80,7 +72,7 @@ class GerminalTerminal < Vte::Terminal
 
     builder = Gtk::Builder.new(:resource => "/com/github/cedlemo/germinal/terminal-menu.ui")
     @menu = Gtk::Popover.new(self, builder["termmenu"])
-    
+
     signal_connect "button-press-event" do |widget, event|
       if event.type == Gdk::EventType::BUTTON_PRESS &&
          event.button == Gdk::BUTTON_SECONDARY
@@ -101,7 +93,7 @@ class GerminalTerminal < Vte::Terminal
     configure
   end
 
-  def get_pid_dir
+  def pid_dir
     File.readlink("/proc/#{@pid}/cwd")
   end
 
@@ -117,7 +109,7 @@ class GerminalTerminal < Vte::Terminal
     end
     [background, foreground] + colors
   end
-  
+
   def get_css_font
     font = style_get_property("font")
     unless font
@@ -125,7 +117,7 @@ class GerminalTerminal < Vte::Terminal
     end
     font
   end
-  
+
   def apply_colors
     set_colors(@colors[0], @colors[1], @colors[2..-1])
   end

data/lib/terminal_chooser.rb

@@ -17,11 +17,11 @@ class GerminalTermChooser < Gtk::ScrolledWindow
   def initialize(window)
     super(nil, nil)
     @window = window
-    set_size_request( 184, @window.notebook.current.allocation.to_a[3] - 8)
+    set_size_request(184, @window.notebook.current.allocation.to_a[3] - 8)
     set_halign(:end)
     set_valign(:center)
     set_name("terminal_chooser")
-    
+
     generate_previews_pixbufs
     generate_grid
     fill_grid
@@ -32,6 +32,7 @@ class GerminalTermChooser < Gtk::ScrolledWindow
   end
 
   private
+
   def generate_grid
     @grid = Gtk::Grid.new
     @grid.valign = :start
@@ -40,18 +41,18 @@ class GerminalTermChooser < Gtk::ScrolledWindow
   end
 
   def fill_grid
-    @window.notebook.children.each_with_index do |child,i|
-      button = generate_preview_button(child, i)    
-      @grid.attach(button, 0 , i, 1, 1)
+    @window.notebook.children.each_with_index do |child, i|
+      button = generate_preview_button(child, i)
+      @grid.attach(button, 0, i, 1, 1)
       add_drag_and_drop_functionalities(button)
       button = generate_close_tab_button
-      @grid.attach(button, 1 ,  i, 1, 1)
+      @grid.attach(button, 1, i, 1, 1)
     end
     @grid.attach(generate_separator, 0, @window.notebook.n_pages, 2, 1)
     button = generate_quit_button
     @grid.attach(button, 0, @window.notebook.n_pages + 1, 2, 1)
   end
-  
+
   def generate_close_tab_button
     button = Gtk::EventBox.new
     button.tooltip_text = "Close Tab"
@@ -65,33 +66,33 @@ class GerminalTermChooser < Gtk::ScrolledWindow
       n = @grid.child_get_property(button, "top-attach")
       tab = @window.notebook.get_nth_page(n)
       if  @window.notebook.n_pages == 1
-        @window.quit_gracefully 
+        @window.quit_gracefully
       else
         remove_tab(tab, n)
       end
     end
-    button  
+    button
   end
-  
+
   def remove_tab(tab, n)
     @window.notebook.remove(tab)
     @grid.remove_row(n)
     last_tab = @window.notebook.n_pages - 1
     update_preview_button_tooltip(n..last_tab)
   end
-  
+
   def update_preview_button_tooltip(range)
     (range).each do |j|
       puts j
       @grid.get_child_at(0, j).tooltip_text = j.to_s
     end
   end
-  
+
   def generate_preview_button(child, i)
     button = Gtk::Button.new
     button.add(generate_preview_image(child.preview))
     button.set_tooltip_text(i.to_s)
-    button.signal_connect "clicked" do 
+    button.signal_connect "clicked" do
       @window.notebook.gen_preview = false
       @window.notebook.set_current_page(i)
     end
@@ -99,7 +100,6 @@ class GerminalTermChooser < Gtk::ScrolledWindow
   end
 
   def generate_preview_image(pixbuf)
-    ratio = pixbuf.width / pixbuf.height
     scaled_pix = pixbuf.scale(150, 75, Gdk::Pixbuf::INTERP_BILINEAR)
     img = Gtk::Image.new(:pixbuf => scaled_pix)
     img.show
@@ -120,24 +120,24 @@ class GerminalTermChooser < Gtk::ScrolledWindow
     end
     button
   end
-  
+
   def generate_previews_pixbufs
     current_page = @window.notebook.page
-    
+
     if @window.notebook.children.size == 1
-    # If we have only one vte, just generate the preview
-      _x,_y,w,h = @window.notebook.current.allocation.to_a
-      @window.notebook.current.preview = @window.notebook.current.window.to_pixbuf(0, 0, w, h) 
+      # If we have only one vte, just generate the preview
+      _x, _y, w, h = @window.notebook.current.allocation.to_a
+      @window.notebook.current.preview = @window.notebook.current.window.to_pixbuf(0, 0, w, h)
     else
-    # If we have more terminals, just cycle through them
-    # the previews will be generated in the "switch-page" event of the notebook
+      # If we have more terminals, just cycle through them
+      # the previews will be generated in the "switch-page" event of the notebook
       begin
         @window.notebook.cycle_next_page
       end while @window.notebook.page == current_page
-    # Here I disable the preview generation in the notebook "switch-page" event
-    # before returning to the current page.
-    # This is a Hack, If I don't disable the preview, all the previews will be
-    # the same.
+      # Here I disable the preview generation in the notebook "switch-page" event
+      # before returning to the current page.
+      # This is a Hack, If I don't disable the preview, all the previews will be
+      # the same.
       @window.notebook.gen_preview = false
       @window.notebook.set_current_page(current_page)
     end
@@ -147,50 +147,49 @@ class GerminalTermChooser < Gtk::ScrolledWindow
     add_dnd_source(button)
     add_dnd_destination(button)
   end
-  
+
   def add_dnd_source(button)
     button.drag_source_set(Gdk::ModifierType::BUTTON1_MASK |
-                       Gdk::ModifierType::BUTTON2_MASK,
-                       [["test", Gtk::TargetFlags::SAME_APP, 12_345]],
-                       Gdk::DragAction::COPY |
-                       Gdk::DragAction::MOVE)
+                           Gdk::ModifierType::BUTTON2_MASK,
+                           [["test", Gtk::TargetFlags::SAME_APP, 12_345]],
+                           Gdk::DragAction::COPY |
+                           Gdk::DragAction::MOVE)
     button.drag_source_set_icon_name("grab")
     # Drag source signals
     # drag-begin	User starts a drag	Set-up drag icon
     # drag-data-get	When drag data is requested by the destination	Transfer drag data from source to destination
-    # drag-data-delete	When a drag with the action Gdk.DragAction.MOVE is completed	Delete data from the source to complete the ‘move’
+    # drag-data-delete	When a drag with the action Gdk.DragAction.MOVE is completed	Delete data from the source to complete the "move"
     # drag-end	When the drag is complete	Undo anything done in drag-begin
-    
-    #button.signal_connect "drag-begin" do 
-    #  puts "drag begin for #{index}"
-    #end
+
+    # button.signal_connect "drag-begin" do
+    #   puts "drag begin for #{index}"
+    # end
     button.signal_connect("drag-data-get") do |_widget, _context, selection_data, _info, _time|
-      
       index = @grid.child_get_property(button, "top-attach")
       selection_data.set(Gdk::Selection::TYPE_INTEGER, index.to_s)
     end
-    #button.signal_connect "drag-data-delete" do 
-    #  puts "drag data delete for #{inex}"
-    #end
-    #button.signal_connect "drag-end" do 
-    #  puts "drag end for #{index}"
-    #end
+    # button.signal_connect "drag-data-delete" do
+    #   puts "drag data delete for #{inex}"
+    # end
+    # button.signal_connect "drag-end" do
+    #   puts "drag end for #{index}"
+    # end
   end
-  
+
   def add_dnd_destination(button)
     button.drag_dest_set(Gtk::DestDefaults::MOTION |
-                     Gtk::DestDefaults::HIGHLIGHT,
-                     [["test", :same_app, 12_345]],
-                     Gdk::DragAction::COPY |
-                     Gdk::DragAction::MOVE)
-    
+                         Gtk::DestDefaults::HIGHLIGHT,
+                         [["test", :same_app, 12_345]],
+                         Gdk::DragAction::COPY |
+                         Gdk::DragAction::MOVE)
+
     # Drag destination signals
     # drag-motion	Drag icon moves over a drop area	Allow only certain areas to be dropped onto
     # drag-drop	Icon is dropped onto a drag area	Allow only certain areas to be dropped onto
-    # drag-data-received	When drag data is received by the destination	Transfer drag data from source to destination     
-    #button.signal_connect "drag-motion" do 
-    #  puts "drag motion for #{index}"
-    #end
+    # drag-data-received	When drag data is received by the destination	Transfer drag data from source to destination
+    # button.signal_connect "drag-motion" do
+    #   puts "drag motion for #{index}"
+    # end
     button.signal_connect("drag-drop") do |widget, context, _x, _y, time|
       widget.drag_get_data(context, context.targets[0], time)
     end
@@ -198,17 +197,13 @@ class GerminalTermChooser < Gtk::ScrolledWindow
       index = @grid.child_get_property(button, "top-attach")
       index_of_dragged_object = index
       context.targets.each do |target|
-        if target.name == "test" ||
-          selection_data.type == Gdk::Selection::TYPE_INTEGER
-          data_len = selection_data.data[1]
-          index_of_dragged_object = selection_data.data[0].pack("C#{data_len}").to_i
-        else
-          next
-        end
+        next unless target.name == "test" || selection_data.type == :type_integer
+        data_len = selection_data.data[1]
+        index_of_dragged_object = selection_data.data[0].pack("C#{data_len}").to_i
       end
       if index_of_dragged_object != index
-        child = @window.notebook.get_nth_page(index_of_dragged_object)
-        @window.notebook.reorder_child(child, index)
+        dragged = @window.notebook.get_nth_page(index_of_dragged_object)
+        @window.notebook.reorder_child(dragged, index)
         @window.notebook.children.each_with_index do |child, i|
           @grid.get_child_at(0, i).image = generate_preview_image(child.preview)
         end