Germinal 1.1.7 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b24f02bcd5fa9f53e135f09240c96da374286ef
-  data.tar.gz: 0b186193374daecfedb80955a2188b12a29b2ae1
+  metadata.gz: 857ce9762355a5dd4ed9d4512d320cd8b11e56cb
+  data.tar.gz: fa872d399fc923051d3954ea33525c579800187e
 SHA512:
-  metadata.gz: dbefcb109b6cdb9b3001450cfbd10300917b47141eac0246fe6c06c7ceed81e7a92a9ee80cadaec7a6cdea75deb66ebd1ad10a9d48cb335015b9d97a696b697a
-  data.tar.gz: e0cb378ea82fc8035dd13155dab54a30ddb9de1d56f9c1b6780ae36c6cd7ee8dc76b9ae98e20049d7a813c3fa0957b9bdaf07d5788dced00b6caa8e5d2340bf8
+  metadata.gz: a2e32a81a5278fafeba205c6cd1e75c141be1231046e695754a9344caa64bdbb6e94523a05c6e015bc1c69e60abb2f12191d9387f7a2a355fe181e071047fb42
+  data.tar.gz: 32f34c05a3c5b5221f868da1f923146c5588cea2ca446fb26807dba345c8bf581f0a86d472d46698420a16960c6ee44c2ffbd26c9ce5d01d0a89ee885cd2dec5

data/README.md

@@ -10,7 +10,7 @@ Germinal is Terminal written with the Gtk3 and Vte3 ruby bindings from the proje
 *    tabs can be reordered or selected through the preview mode ( `Shift + Ctrl + o` )
 <a href="https://raw.github.com/cedlemo/germinal/master/screenshot2.png"><img src="https://raw.github.com/cedlemo/germinal/master/screenshot2_prev.png" width="576" height="324" alt="Screenshot"></a>
 
-*    Each tab can be renammed
+*    Each tab can be named.
 *    The configuration can be done via a Css file
 *    Terminal colors can be changed on the fly and saved in the CSS configuration file
 <a href="https://raw.github.com/cedlemo/germinal/master/screenshot3.png"><img src="https://raw.github.com/cedlemo/germinal/master/screenshot3_prev.png" width="576" height="324" alt="Screenshot"></a>
@@ -23,6 +23,8 @@ Germinal is Terminal written with the Gtk3 and Vte3 ruby bindings from the proje
 ##  TODO:
 *   Regex support in the terminals in order to launch web navigator if there is an url or launch a media player if there is a match for avi file for example.
 *   Create more Css properties in oder to configure the terminals (cursor shape or blink mode, audible bell or not ...)
+*   Make Germinal allows users to modify existing modules. For example if a user copy the css_editor.rb in the directory *~/.config/Germinal/lib/css_editor.rb*, he should be able to modify it in order to fit its needs. 
+*   Make Germinal allows users to easily create their own modules. For example create a tab that will act as a MPD client. There will be widgets that control a MPD server and a GtkTree widget that displays the playlist of the MPD server for example.
 
 ## Shortcuts
 
@@ -36,7 +38,7 @@ Germinal is Terminal written with the Gtk3 and Vte3 ruby bindings from the proje
     
 *    `Shift + Ctrl + right` next tab
     
-*    ` Shift + Ctrl + c` display color selectors for the vte in overlay mod (Esc to leave)
+*    `Shift + Ctrl + c` display color selectors for the vte in overlay mod (Esc to leave)
      
 *    `Shift + Ctrl + f` display font selector for the vte in overlay mod (Esc to leave)
     
@@ -80,9 +82,8 @@ It can be found in the file `$HOME/.config/Germinal/germinal.css` (Be carefull b
 GerminalWindow GtkHeaderBar GtkEntry{
   border-radius: 4px;
 }
-
 GerminalWindow GtkOverlay GtkBox#resize_box{
-    background-color: rgba(49, 150, 188, 0.5);
+    background: rgba(49, 150, 188, 0.5);
     border-top: 1px;
     border-left: 1px;
     border-bottom: 1px;
@@ -90,7 +91,6 @@ GerminalWindow GtkOverlay GtkBox#resize_box{
     border-color: rgba(49, 150, 188, 1);
     border-radius: 6px 0px 0px 0px;
 }
-
 GerminalWindow GtkOverlay GtkScrolledWindow#terminal_chooser GtkBox{
     background-color: rgba(49, 150, 188, 0.5);
     border-top: 1px;
@@ -101,13 +101,22 @@ GerminalWindow GtkOverlay GtkScrolledWindow#terminal_chooser GtkBox{
     border-radius: 6px 0px 0px 6px;
 }
 
-GerminalWindow GtkOverlay GtkScrolledWindow GtkBox GtkButton {
+GerminalWindow GtkOverlay GtkScrolledWindow GtkGrid GtkButton {
   margin: 0px;
   padding: 0px;
 }
-GerminalWindow GtkOverlay GtkScrolledWindow GtkBox GtkImage {
+
+GerminalWindow GtkOverlay GtkScrolledWindow GtkGrid GtkButton GtkImage {
   border: solid 3px rgba(0, 0, 0, 0.0);
 }
+
+.tooltip {
+  background:rgba(50, 50, 50,0.5);
+  border:none;
+  color: #ddd;
+  border-top-right-radius: 6px;
+  border-bottom-left-radius: 6px;
+}
 ```
 
 Each time you modify this configuration via the interface of Germinal (terminal colors selector, terminal font selector, css editor) and that you save your modifications, Germinal create a copy of your previous Css file under a new name with :
@@ -147,7 +156,7 @@ the ruby gem binaries (for example).
 
     git clone https://github.com/cedlemo/germinal.git
     cd germinal/bin
-
+    
 ##### Edit the files Germinal and test
   The filenames correspond to their functionnalities.
   Simply run `./Germinal` when you have done your modifications.

data/bin/Germinal

@@ -18,6 +18,7 @@
 # Germinal is a terminal emulator written with the ruby gtk3 and
 # vte 3 bindings.
 # Author:: Cedlemo (mailto:cedlemo@gmx.com)
+
 require "gtk3"
 require "vte3"
 require "fileutils"
@@ -26,9 +27,9 @@ require "sass"
 CURRENT_PATH = File.expand_path(File.dirname(__FILE__))
 LIB_PATH = "#{CURRENT_PATH}/../lib"
 DATA_PATH = "#{CURRENT_PATH}/../data"
-CONFIG_DIR = "#{ENV['HOME']}/.config/Germinal"
+CONFIG_DIR = File.expand_path("#{ENV['HOME']}/.config/Germinal")
 USR_CSS = "#{CONFIG_DIR}/germinal.css"
-
+USR_LIB_PATH  = "#{CONFIG_DIR}/lib"
 gresource_bin = "#{DATA_PATH}/germinal.gresource"
 gresource_xml = "#{DATA_PATH}/germinal.gresource.xml"
 
@@ -43,122 +44,13 @@ end
 
 resource = Gio::Resource.load(gresource_bin)
 Gio::Resources.register(resource)
-
-require "#{LIB_PATH}/terminal.rb"
-require "#{LIB_PATH}/notebook.rb"
-require "#{LIB_PATH}/color_selector.rb"
-require "#{LIB_PATH}/font_selector.rb"
-require "#{LIB_PATH}/terminal_chooser.rb"
-require "#{LIB_PATH}/window.rb"
-require "#{LIB_PATH}/resize_message.rb"
-require "#{LIB_PATH}/css_editor.rb"
-
-class GerminalApplication < Gtk::Application
-  attr_reader :provider
-  def initialize
-    super("com.github.cedlemo.germinal", :non_unique)
-
-    signal_connect "startup" do
-      load_css_config
-      display = Gdk::Display.default
-      screen = display.default_screen
-      Gtk::StyleContext.add_provider_for_screen(screen, @provider, Gtk::StyleProvider::PRIORITY_USER)
-    end
-
-    signal_connect "activate" do |application|
-      window = GerminalWindow.new(application)
-      window.present
-      window.add_terminal
-      window.notebook.current.grab_focus
-    end
-  end
-
-  def update_css(new_props = nil)
-    css_properties
-    @props.merge!(new_props) if new_props
-    css = update_css_properties
-    merged_css = Sass::Engine.new(css, :syntax => :scss).render
-    if File.exist?(USR_CSS)
-      FileUtils.mv(USR_CSS, "#{USR_CSS}_#{Time.new.strftime('%Y-%m-%d-%H-%M-%S')}.backup")
-      File.open(USR_CSS, "w") do |file|
-        file.puts merged_css
-      end
-    else
-      File.open(USR_CSS, "w") do |file|
-        file.puts merged_css
-      end
-    end
-  end
-
-  private
-
-  def load_css_config
-    @provider = Gtk::CssProvider.new
-    default_css = Gio::Resources.lookup_data("/com/github/cedlemo/germinal/germinal.css", 0)
-    if File.exist?(USR_CSS)
-      begin
-        @provider.load(:path => USR_CSS)
-      rescue
-        puts "Bad css file using default css"
-        @provider.load(:data => default_css)
-      end
-    else
-      puts "No custom CSS, using default css"
-      @provider.load(:data => default_css)
-    end
-  end
-
-  def load_css_to_tree
-    engine = Sass::Engine.new(@provider.to_s, :syntax => :scss)
-    engine.to_tree
-  end
-
-  def update_css_properties
-    modified_sass = change_existing_properties
-    sass_to_add = @props.empty? ? "" : add_new_css_properties
-    Sass::Engine.new(sass_to_add + modified_sass, :syntax => :sass).render
-  end
-
-  def add_new_css_properties
-    new_sass = "*"
-    @props.each do |k, v|
-      new_sass += "\n  #{k}: #{v}"
-    end
-    new_sass + "\n"
-  end
-
-  def change_existing_properties
-    keys_found = []
-    tree = load_css_to_tree
-    # we search for properties that are already configured
-    tree.children.each do |node|
-      node.each do |prop|
-        next if prop.class != Sass::Tree::PropNode
-        name = prop.name[0]
-        next unless @props[name]
-        keys_found << name unless keys_found.include?(name)
-        if @props[name] != prop.value.value
-          value_object = prop.value.value.class.new(@props[name])
-          prop.value = Sass::Script::Tree::Literal.new(value_object)
-        end
-      end
-    end
-    keys_found.each do |k|
-      @props.delete(k)
-    end
-    tree.to_sass
-  end
-
-  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\'"
-    end
+# Load default libraries
+%w(application terminal notebook color_selector font_selector
+terminal_chooser window resize_message css_editor).each do |l|
+  if File.exist?("#{USR_LIB_PATH}/#{l}.rb")
+    require "#{USR_LIB_PATH}/#{l}.rb"
+  else
+    require "#{LIB_PATH}/#{l}.rb"
   end
 end
 

data/data/germinal.css

@@ -24,6 +24,7 @@
   -GerminalWindow-height: 500;
   -GerminalWindow-width: 1000;*/
 }
+
 GerminalWindow GtkHeaderBar GtkEntry{
   border-radius: 4px;
 }
@@ -45,10 +46,20 @@ GerminalWindow GtkOverlay GtkScrolledWindow#terminal_chooser GtkBox{
     border-color: rgba(49, 150, 188, 1);
     border-radius: 6px 0px 0px 6px;
 }
+
 GerminalWindow GtkOverlay GtkScrolledWindow GtkGrid GtkButton {
   margin: 0px;
   padding: 0px;
 }
+
 GerminalWindow GtkOverlay GtkScrolledWindow GtkGrid GtkButton GtkImage {
   border: solid 3px rgba(0, 0, 0, 0.0);
 }
+
+.tooltip {
+  background:rgba(50, 50, 50,0.5);
+  border:none;
+  color: #ddd;
+  border-top-right-radius: 6px;
+  border-bottom-left-radius: 6px;
+}

data/lib/application.rb

@@ -0,0 +1,124 @@
+# 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/>.
+
+class GerminalApplication < Gtk::Application
+  attr_reader :provider
+  def initialize
+    super("com.github.cedlemo.germinal", :non_unique)
+    
+    signal_connect "startup" do
+      load_css_config
+      display = Gdk::Display.default
+      screen = display.default_screen
+      Gtk::StyleContext.add_provider_for_screen(screen, @provider, Gtk::StyleProvider::PRIORITY_USER)
+    end
+
+    signal_connect "activate" do |application|
+      window = GerminalWindow.new(application)
+      window.present
+      window.add_terminal
+      window.notebook.current.grab_focus
+    end
+  end
+
+  def update_css(new_props = nil)
+    css_properties
+    @props.merge!(new_props) if new_props
+    css = update_css_properties
+    merged_css = Sass::Engine.new(css, :syntax => :scss).render
+    if File.exist?(USR_CSS)
+      FileUtils.mv(USR_CSS, "#{USR_CSS}_#{Time.new.strftime('%Y-%m-%d-%H-%M-%S')}.backup")
+      File.open(USR_CSS, "w") do |file|
+        file.puts merged_css
+      end
+    else
+      File.open(USR_CSS, "w") do |file|
+        file.puts merged_css
+      end
+    end
+  end
+
+  private
+
+  def load_css_config
+    @provider = Gtk::CssProvider.new
+    default_css = Gio::Resources.lookup_data("/com/github/cedlemo/germinal/germinal.css", 0)
+    if File.exist?(USR_CSS)
+      begin
+        @provider.load(:path => USR_CSS)
+      rescue
+        puts "Bad css file using default css"
+        @provider.load(:data => default_css)
+      end
+    else
+      puts "No custom CSS, using default css"
+      @provider.load(:data => default_css)
+    end
+  end
+
+  def load_css_to_tree
+    engine = Sass::Engine.new(@provider.to_s, :syntax => :scss)
+    engine.to_tree
+  end
+
+  def update_css_properties
+    modified_sass = change_existing_properties
+    sass_to_add = @props.empty? ? "" : add_new_css_properties
+    Sass::Engine.new(sass_to_add + modified_sass, :syntax => :sass).render
+  end
+
+  def add_new_css_properties
+    new_sass = "*"
+    @props.each do |k, v|
+      new_sass += "\n  #{k}: #{v}"
+    end
+    new_sass + "\n"
+  end
+
+  def change_existing_properties
+    keys_found = []
+    tree = load_css_to_tree
+    # we search for properties that are already configured
+    tree.children.each do |node|
+      node.each do |prop|
+        next if prop.class != Sass::Tree::PropNode
+        name = prop.name[0]
+        next unless @props[name]
+        keys_found << name unless keys_found.include?(name)
+        if @props[name] != prop.value.value
+          value_object = prop.value.value.class.new(@props[name])
+          prop.value = Sass::Script::Tree::Literal.new(value_object)
+        end
+      end
+    end
+    keys_found.each do |k|
+      @props.delete(k)
+    end
+    tree.to_sass
+  end
+
+  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\'"
+    end
+  end
+end

data/lib/terminal_chooser.rb

@@ -115,8 +115,12 @@ class GerminalTermChooser < Gtk::ScrolledWindow
     button.tooltip_text = "Quit Germinal"
     image = Gtk::Image.new(:stock => Gtk::Stock::QUIT, :size => :button)
     button.add(image)
+    button.signal_connect "button_press_event" do
+      @window.quit_gracefully
+    end
     button
   end
+  
   def generate_previews_pixbufs
     current_page = @window.notebook.page
     

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: Germinal
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.2.0
 platform: ruby
 authors:
 - Cédric LE MOIGNE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-01 00:00:00.000000000 Z
+date: 2016-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vte3
@@ -84,6 +84,7 @@ files:
 - data/germinal.css
 - data/germinal.gresource.xml
 - data/window.ui
+- lib/application.rb
 - lib/color_selector.rb
 - lib/css_editor.rb
 - lib/font_selector.rb