Germinal 1.2.3 → 1.3.0

data/lib/window.rb

@@ -15,118 +15,34 @@
 # along with Germinal.  If not, see <http://www.gnu.org/licenses/>.
 
 class GerminalWindow < Gtk::ApplicationWindow
+  extend GerminalStyleProperties
   attr_reader :notebook, :bar, :overlay, :current_label, :current_tab, :css_editor_style
 
   type_register
-  install_style_property(
-    GLib::Param::String.new("shell", # name
-                            "shell".capitalize, # nick
-                            "shell".upcase, # blurb
-                            "/usr/bin/fish", # default
-                            GLib::Param::READABLE |
-                            GLib::Param::WRITABLE)
-  )
-  install_style_property(
-    GLib::Param::Int.new("width", # name
-                         "width".capitalize, # nick
-                         "width".upcase, # blurb
-                         -1,
-                         2000,
-                         1000,
-                         GLib::Param::READABLE |
-                         GLib::Param::WRITABLE)
-  )
-  install_style_property(
-    GLib::Param::Int.new("height", # name
-                         "height".capitalize, # nick
-                         "height".upcase, # blurb
-                         -1,
-                         2000,
-                         500,
-                         GLib::Param::READABLE |
-                         GLib::Param::WRITABLE)
-  )
-  install_style_property(
-    GLib::Param::String.new("css-editor-style", # name
-                            "css-editor-style".capitalize, # nick
-                            "css-editor-style".upcase, # blurb
-                            "classic", # default
-                            GLib::Param::READABLE |
-                            GLib::Param::WRITABLE)
-  )
+  install_style("string", "shell", "/usr/bin/fish")
+  install_style("int", "width", [-1, 2000, 1000])
+  install_style("int", "height", [-1, 2000, 500])
+  install_style("string", "css-editor-style", "classic")
+
   def initialize(application)
     super(:application => application)
     set_icon_from_file("#{DATA_PATH}/germinal-icon.png")
     load_css_properties
     set_position(:center)
     create_header_bar
-    @notebook = GerminalNotebook.new
-    @overlay = Gtk::Overlay.new
-    @overlay.add(@notebook)
-    add(@overlay)
-
+    create_containers
     show_all
     signal_connect "key-press-event" do |widget, event|
-      keyval = event.keyval
-      if (event.state & (Gdk::ModifierType::CONTROL_MASK | Gdk::ModifierType::SHIFT_MASK)) ==
-          (Gdk::ModifierType::CONTROL_MASK | Gdk::ModifierType::SHIFT_MASK)
-        widget.grab_focus
-        case
-        when keyval == Gdk::Keyval::KEY_W # close the current tab
-          exit_overlay_mode
-          @notebook.remove_current_page
-          true
-        when keyval == Gdk::Keyval::KEY_Q # Quit
-          exit_overlay_mode
-          quit_gracefully
-          true
-        when keyval == Gdk::Keyval::KEY_T # New tab
-          exit_overlay_mode
-          add_terminal
-          @notebook.set_page(@notebook.n_pages - 1)
-          true
-        when keyval == Gdk::Keyval::KEY_C
-          toggle_overlay(GerminalColorSelector) if @notebook.current.class == GerminalTerminal
-          true
-        when keyval == Gdk::Keyval::KEY_F
-          toggle_overlay(GerminalFontSelector) if @notebook.current.class == GerminalTerminal
-          true
-        when keyval == Gdk::Keyval::KEY_Left # previous tab
-          exit_overlay_mode
-          @notebook.cycle_prev_page
-          true
-        when keyval == Gdk::Keyval::KEY_Right # next tab
-          exit_overlay_mode
-          @notebook.cycle_next_page
-          true
-        when keyval == Gdk::Keyval::KEY_O # next tab
-          toggle_overlay(GerminalTermChooser)
-          true
-        when keyval == Gdk::Keyval::KEY_E
-          css_editor = GerminalCssEditor.new(self)
-          @notebook.append_page(css_editor, Gtk::Label.new)
-          @notebook.set_page(@notebook.n_pages - 1)
-          true
-        end
-      else
-        grab_focus
-        case
-        when in_overlay_mode? && keyval == Gdk::Keyval::KEY_Escape # escape from overlay mode
-          exit_overlay_mode
-          @notebook.current.grab_focus
-          true
-        else
-          false
-        end
-      end
+      GerminalShortcuts.handle_key_press(widget, event)
     end
   end
 
   def add_terminal(cmd = @shell)
+    exit_overlay_mode
     working_dir = nil
     # Check if current tab is a GerminalTerminal (can be GerminalCssEditor)
     if @notebook.current.class == GerminalTerminal && @notebook.n_pages > 0
-      working_dir = @notebook.current.get_pid_dir
+      working_dir = @notebook.current.pid_dir
     end
 
     terminal = GerminalTerminal.new(cmd, working_dir)
@@ -146,33 +62,45 @@ class GerminalWindow < Gtk::ApplicationWindow
     end
     @notebook.append_page(terminal, Gtk::Label.new)
     @notebook.set_tab_reorderable(terminal, true)
+    @notebook.set_page(@notebook.n_pages - 1)
   end
 
   def quit_gracefully
+    exit_overlay_mode
     @notebook.remove_all_pages
     application.quit
   end
+  
+  def show_color_selector
+    toggle_overlay(GerminalColorSelector) if @notebook.current.class == GerminalTerminal
+  end
 
-  def in_overlay_mode?
-    @overlay.children.size > 1 ? true : false
+  def show_prev_tab
+    exit_overlay_mode
+    @notebook.cycle_prev_page
   end
 
-  def add_overlay(widget)
-    @overlay.add_overlay(widget)
-    @overlay.set_overlay_pass_through(widget, true)
+  def show_next_tab
+    exit_overlay_mode
+    @notebook.cycle_next_page
+  end
+  
+  def show_terminal_chooser
+    toggle_overlay(GerminalTermChooser)
   end
 
-  def exit_overlay_mode
-    @overlay.children[1].destroy if in_overlay_mode?
+  def show_font_selector
+    toggle_overlay(GerminalFontSelector) if @notebook.current.class == GerminalTerminal
   end
 
-  def add_resize_timeout
-    @resize_timeout = GLib::Timeout.add_seconds(2) do
-      second_child = @overlay.children[1] || nil
-      if second_child && second_child.class == GerminalResizeMessage
-        @overlay.children[1].hide
-      end
-    end
+  def show_css_editor
+    css_editor = GerminalCssEditor.new(self)
+    @notebook.append_page(css_editor, Gtk::Label.new)
+    @notebook.set_page(window.notebook.n_pages - 1)
+  end
+
+  def exit_overlay_mode
+    @overlay.children[1].destroy if in_overlay_mode?
   end
 
   def load_css_properties
@@ -186,112 +114,78 @@ class GerminalWindow < Gtk::ApplicationWindow
 
   def display_about
     Gtk::AboutDialog.show(self,
-		      "authors" => ["Cédric Le Moigne <cedlemo@gmx.com>"],
-		      "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}/germinal-icon-128.png"),
-		      "program_name" => "Germinal",
-		      "version" => "1.2.3",
-		      "website" => "https://github.com/cedlemo/germinal",
-		      "website_label" => "Germinal github repository"
-		      )
+                          "authors" => ["Cédric Le Moigne <cedlemo@gmx.com>"],
+                          "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}/germinal-icon-128.png"),
+                          "program_name" => "Germinal",
+                          "version" => "1.2.3",
+                          "website" => "https://github.com/cedlemo/germinal",
+                          "website_label" => "Germinal github repository"
+                         )
+  end
+  
+  def close_current_tab
+    exit_overlay_mode
+    @notebook.remove_current_page
+  end
+
+  def in_overlay_mode?
+    @overlay.children.size > 1 ? true : false
   end
+
   private
 
+  def add_overlay(widget)
+    @overlay.add_overlay(widget)
+    @overlay.set_overlay_pass_through(widget, true)
+  end
+
+  def create_containers
+    @notebook = GerminalNotebook.new
+    @overlay = Gtk::Overlay.new
+    @overlay.add(@notebook)
+    add(@overlay)
+  end
+  
   def create_header_bar
-    gen_entry_label
-    @current_tab = Gtk::Label.new("1/1")
-    @bar = Gtk::HeaderBar.new
-    @bar.set_title("Germinal")
-    @bar.set_has_subtitle(false)
-    @bar.set_show_close_button(true)
-    set_titlebar(@bar)
+    @bar = GerminalHeaderBar.generate_header_bar(self)
+    @current_label = GerminalHeaderBar.generate_current_label(self)
+    @current_tab = GerminalHeaderBar.generate_current_tab
     add_buttons_at_begining
     add_buttons_at_end
   end
 
   def add_buttons_at_begining
-    button = gen_icon_button("pan-start-symbolic", "prev") { @notebook.cycle_prev_page }
+    button = GerminalHeaderBar.generate_prev_button(self)
     @bar.pack_start(button)
-    
     @bar.pack_start(@current_tab)
-    
-    button = gen_icon_button("pan-end-symbolic", "next") { @notebook.cycle_next_page }
+    button = GerminalHeaderBar.generate_next_button(self)
     @bar.pack_start(button)
-    
     @bar.pack_start(@current_label)
-    
-    button = gen_icon_button("tab-new-symbolic", "New terminal") do
-      add_terminal
-      @notebook.set_page(@notebook.n_pages - 1)
-    end
+    button = GerminalHeaderBar.generate_new_tab_button(self)
     @bar.pack_start(button)
   end
 
   def add_buttons_at_end
-    button = gen_icon_button("open-menu-symbolic", "Main Menu") do
-      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" do
-        css_editor = GerminalCssEditor.new(self)
-        @notebook.append_page(css_editor, Gtk::Label.new)
-        @notebook.set_page(@notebook.n_pages - 1)
-      end
-      
-      menu.show_all
-      event = Gtk.current_event
-      menu.popup(nil, nil, event.button, event.time)
-    end
+    button = GerminalHeaderBar.generate_open_menu_button(self)
     @bar.pack_end(button)
-
-    button = gen_icon_button("font-select-symbolic", "Set font") do
-      toggle_overlay(GerminalFontSelector) if @notebook.current.class == GerminalTerminal
-    end
+    button = GerminalHeaderBar.generate_font_sel_button(self)
     @bar.pack_end(button)
-    
-    button = gen_icon_button("color-select-symbolic", "Set colors") do
-      toggle_overlay(GerminalColorSelector) if @notebook.current.class == GerminalTerminal
-    end
+    button = GerminalHeaderBar.generate_color_sel_button(self)
     @bar.pack_end(button)
-    
-    button = gen_icon_button("emblem-photos-symbolic", "Terminals overview") do
-      toggle_overlay(GerminalTermChooser)
-    end
+    button = GerminalHeaderBar.generate_term_overv_button(self)
     @bar.pack_end(button)
   end
 
-  def 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
-        yield
-      end
-    end
-    button
-  end
-
-  def gen_entry_label
-    @current_label = Gtk::Entry.new
-    @current_label.has_frame = false
-    @current_label.width_chars = 35
-    @current_label.signal_connect "activate" do |entry|
-      @notebook.current.tab_label = entry.text
-    end
-    @current_label.tooltip_text = "Change the name of the tab and hit enter in order to validate"
-    @current_label.set_icon_from_icon_name(:secondary, "edit-clear")
-    @current_label.signal_connect "icon-release" do |entry, position|
-      if position == :secondary
-        @notebook.current.tab_label = nil
-        entry.text = @notebook.current.window_title
+  def add_resize_timeout
+    @resize_timeout = GLib::Timeout.add_seconds(2) do
+      second_child = @overlay.children[1] || nil
+      if second_child && second_child.class == GerminalResizeMessage
+        @overlay.children[1].hide
       end
     end
-    @current_label.set_icon_tooltip_text(:secondary, "Reset your changes and use the default label for the current tab")
   end
 
   def toggle_overlay(klass)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: Germinal
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.0
 platform: ruby
 authors:
 - Cédric LE MOIGNE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-16 00:00:00.000000000 Z
+date: 2016-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vte3
@@ -100,15 +100,18 @@ files:
 - data/window-close-symbolic.svg
 - data/window-menu.ui
 - data/window.ui
+- lib/actions.rb
 - lib/application.rb
 - lib/color_selector.rb
 - lib/css_editor.rb
 - lib/font_selector.rb
+- lib/headerbar.rb
 - lib/notebook.rb
 - lib/resize_message.rb
+- lib/shortcuts.rb
+- lib/style_properties.rb
 - lib/terminal.rb
 - lib/terminal_chooser.rb
-- lib/terminal_overview.rb
 - lib/window.rb
 homepage: https://github.com/cedlemo/germinal
 licenses:

data/lib/terminal_overview.rb

@@ -1,60 +0,0 @@
-# Copyright 2015-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 GerminalTermOverview < Gtk::ScrolledWindow
-  def initialize(window)
-    puts "new term chooser"
-    @window = window
-    super(nil, nil)
-    vbox = Gtk::Box.new(:vertical, 0)
-    add(vbox)
-    current_page = @window.notebook.page
-    @window.notebook.children.each_with_index do |child, i|
-      child.show
-      _x,_y,w,h = child.allocation.to_a
-      done, x, y = child.translate_coordinates(@window.notebook, 0, 0)
-      t_hadjustment = child.hadjustment
-      t_vadjustment = child.vadjustment
-      
-      puts t_hadjustment.class
-      #@window.notebook.set_current_page(i)
-      #@window.notebook.queue_draw
-      #@window.show_all
-      child.window.show
-      term_pixbuf = child.window.to_pixbuf(0,0,w,h)
-      #surf = child.window.create_similar_surface(Cairo::CONTENT_COLOR,
-      #                                          w,
-      #                                          h)
-      #an = surf.to_pixbuf(0,0,w,h) 
-      #child.unmap
-      ratio = term_pixbuf.width / term_pixbuf.height
-      term_pixbuf = term_pixbuf.scale(100, 100 / ratio, Gdk::Pixbuf::INTERP_BILINEAR)
-      img = Gtk::Image.new(:pixbuf => term_pixbuf)
-      img.show
-      vbox.pack_start(img, :expand => true, :fill => true)
-    end
-    @window.notebook.current.window.show
-    @window.notebook.current.window.raise
-#vbox.pack_start(img, :expand => true, :fill => true)
-#    img = Gtk::Image.new(:file => "2.png")
-#    img.show
-#    vbox.pack_start(img, :expand => true, :fill => true)
-    vbox.show
-    set_size_request(75,100)
-    set_halign(:end)
-    set_valign(:center)
-    show_all
-  end
-end