topinambour 1.0.8 → 1.0.9

data/lib/terminal_chooser.rb

@@ -1,4 +1,4 @@
-# Copyright 2015-2016 Cédric LE MOIGNE, cedlemo@gmx.com
+# Copyright 2015-2016 Cedric LE MOIGNE, cedlemo@gmx.com
 # This file is part of Topinambour.
 #
 # Topinambour is free software: you can redistribute it and/or modify
@@ -17,7 +17,7 @@ class TopinambourTermChooser < 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(250, @window.notebook.current.allocation.to_a[3] - 8)
     set_halign(:end)
     set_valign(:center)
     set_name("terminal_chooser")
@@ -43,11 +43,14 @@ class TopinambourTermChooser < Gtk::ScrolledWindow
 
   def fill_grid
     @window.notebook.children.each_with_index do |child, i|
-      button = generate_preview_button(child, i)
+      button = Gtk::Label.new("tab. #{(i + 1).to_s}")
+      button.angle = 45
       @grid.attach(button, 0, i, 1, 1)
+      button = generate_preview_button(child, i)
+      @grid.attach(button, 1, i, 1, 1)
       add_drag_and_drop_functionalities(button)
       button = generate_close_tab_button
-      @grid.attach(button, 1, i, 1, 1)
+      @grid.attach(button, 2, i, 1, 1)
     end
     @grid.attach(generate_separator, 0, @window.notebook.n_pages, 2, 1)
     button = generate_quit_button
@@ -84,21 +87,20 @@ class TopinambourTermChooser < Gtk::ScrolledWindow
 
   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.image = generate_preview_image(child.preview)
+    button.set_tooltip_text((i + 1).to_s)
     button.signal_connect("clicked") { @window.notebook.current_page = i }
     button
   end
 
   def generate_preview_image(pixbuf)
-    scaled_pix = pixbuf.scale(150, 75, Gdk::Pixbuf::INTERP_BILINEAR)
+    scaled_pix = pixbuf.scale(150, 75, :bilinear)
     img = Gtk::Image.new(:pixbuf => scaled_pix)
     img.show
     img
@@ -130,18 +132,19 @@ class TopinambourTermChooser < Gtk::ScrolledWindow
                            [["test", Gtk::TargetFlags::SAME_APP, 12_345]],
                            Gdk::DragAction::COPY |
                            Gdk::DragAction::MOVE)
-    button.drag_source_set_icon_name("grab")
+    #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-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-data-get") do |_widget, _context, selection_data, _info, _time|
-      index = @grid.child_get_property(button, "top-attach")
+    button.signal_connect "drag-begin" do |widget|
+       widget.drag_source_set_icon_pixbuf(widget.image.pixbuf)
+    end
+
+    button.signal_connect("drag-data-get") do |widget, _context, selection_data, _info, _time|
+      index = grid_line_of(widget)
       selection_data.set(Gdk::Selection::TYPE_INTEGER, index.to_s)
     end
     # button.signal_connect "drag-data-delete" do
@@ -169,21 +172,25 @@ class TopinambourTermChooser < Gtk::ScrolledWindow
     button.signal_connect("drag-drop") do |widget, context, _x, _y, time|
       widget.drag_get_data(context, context.targets[0], time)
     end
-    button.signal_connect("drag-data-received") do |_widget, context, _x, _y, selection_data, _info, _time|
-      index = @grid.child_get_property(button, "top-attach")
+    button.signal_connect("drag-data-received") do |widget, context, _x, _y, selection_data, _info, _time|
+      index = grid_line_of(widget)
       index_of_dragged_object = index
       context.targets.each do |target|
         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
+        data_len = selection_data.data.size
+        index_of_dragged_object = selection_data.data.pack("C#{data_len}").to_i
       end
       if index_of_dragged_object != 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)
+          @grid.get_child_at(1, i).image = generate_preview_image(child.preview)
         end
       end
     end
   end
+
+  def grid_line_of(widget)
+    @grid.child_get_property(widget, "top-attach")
+  end
 end

data/lib/terminal_regex.rb

@@ -1,4 +1,4 @@
-# Copyright 2016 Cédric LE MOIGNE, cedlemo@gmx.com
+# Copyright 2016 Cedric LE MOIGNE, cedlemo@gmx.com
 # This file is part of Topinambour.
 #
 # Topinambour is free software: you can redistribute it and/or modify
@@ -108,7 +108,8 @@ RGB_COLOR = "rgb\\s*\\(\\s*#{UINT8_CLASS}\\s*\\,\\s*#{UINT8_CLASS}\\s*\\,\\s*#{U
 RGBPERC_COLOR = "rgb\\s*\\(\\s*#{PERCENT_CLASS}\\s*\\,\\s*#{PERCENT_CLASS}\\s*\\,\\s*#{PERCENT_CLASS}\\s*\\)"
 RGBA_COLOR = "rgba\\s*\\(\\s*#{UINT8_CLASS}\\s*\\,\\s*#{UINT8_CLASS}\\s*\\,\\s*#{UINT8_CLASS}\\s*\\,\\s*[0-1](\\.[0-9]*)?\\s*\\)"
 RGBAPERC_COLOR = "rgba\\s*\\(\\s*#{PERCENT_CLASS}\\s*\\,\\s*#{PERCENT_CLASS}\\s*\\,\\s*#{PERCENT_CLASS}\\s*\\,\\s*[0-1](\\.[0-9]*)?\\s*\\)"
-CSS_COLORS = "#{HEX_COLOR}|#{RGB_COLOR}|#{RGBPERC_COLOR}|#{RGBA_COLOR}|#{RGBAPERC_COLOR}"
+include RgbNames
+CSS_COLORS = "#{HEX_COLOR}|#{RGB_COLOR}|#{RGBPERC_COLOR}|#{RGBA_COLOR}|#{RGBAPERC_COLOR}|#{COLOR_NAMES}"
 end
 
 module TopinambourRegex

data/lib/window.rb

@@ -1,4 +1,4 @@
-# Copyright 2015-2016 Cédric LE MOIGNE, cedlemo@gmx.com
+# Copyright 2015-2016 Cedric LE MOIGNE, cedlemo@gmx.com
 # This file is part of Topinambour.
 #
 # Topinambour is free software: you can redistribute it and/or modify
@@ -15,8 +15,8 @@
 # along with Topinambour.  If not, see <http://www.gnu.org/licenses/>.
 
 class TopinambourWindow
-  attr_reader :notebook, :bar, :overlay, :current_label, :current_tab, :css_editor_style
-
+  attr_reader :notebook, :bar, :overlay, :current_label, :current_tab
+  attr_accessor :shell, :css_editor_style
   def initialize(application)
     super(:application => application)
     set_icon_name("utilities-terminal-symbolic")
@@ -28,6 +28,9 @@ class TopinambourWindow
     signal_connect "key-press-event" do |widget, event|
       TopinambourShortcuts.handle_key_press(widget, event)
     end
+    signal_connect "scroll-event" do |widget, event|
+      TopinambourShortcuts.handle_scroll(widget, event)
+    end
   end
 
   def add_terminal(cmd = @shell)
@@ -82,6 +85,10 @@ class TopinambourWindow
     toggle_overlay(TopinambourTermChooser)
   end
 
+  def show_terminal_chooser2
+    toggle_overlay(TopinambourTermChooserb)
+  end
+
   def exit_overlay_mode
     @overlay.children[1].destroy if in_overlay_mode?
   end
@@ -90,20 +97,19 @@ class TopinambourWindow
     @default_width = style_get_property("width")
     @default_height = style_get_property("height")
     set_default_size(@default_width, @default_height)
-    set_size_request(@default_width, @default_height)
     @shell = style_get_property("shell")
     @css_editor_style = style_get_property("css-editor-style")
   end
 
   def display_about
     Gtk::AboutDialog.show(self,
-                          "authors" => ["Cédric Le Moigne <cedlemo@gmx.com>"],
+                          "authors" => ["Cedric 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",
+                          "copyright" => "Copyright (C) 2015-2016 Cedric Le Moigne",
                           "license" => "This program is licenced under the licence GPL-3.0 and later.",
                           "logo_icon_name" => "utilities-terminal-symbolic",
                           "program_name" => "Topinambour",
-                          "version" => "1.0.7",
+                          "version" => "1.0.9",
                           "website" => "https://github.com/cedlemo/topinambour",
                           "website_label" => "Topinambour github repository"
                          )
@@ -118,11 +124,28 @@ class TopinambourWindow
     @overlay.children.size > 1 ? true : false
   end
 
+  def show_searchbar
+    toggle_overlay(TopinambourSearchBar)
+    overlayed_widget = @overlay.children[1]
+    overlayed_widget.search_mode = true if overlayed_widget
+  end
+
+  def toggle_shrink
+    w, h = size
+    if @shrink_saved_height
+      resize(w, @shrink_saved_height)
+      @shrink_saved_height = nil
+    else
+      resize(w, 1)
+      @shrink_saved_height = h
+    end
+  end
+
   private
 
   def add_overlay(widget)
     @overlay.add_overlay(widget)
-    @overlay.set_overlay_pass_through(widget, true)
+    @overlay.set_overlay_pass_through(widget, false)
   end
 
   def create_containers
@@ -133,33 +156,75 @@ class TopinambourWindow
   end
 
   def create_header_bar
-    @bar = TopinambourHeaderBar.generate_header_bar(self)
-    @current_label = TopinambourHeaderBar.generate_current_label(self)
-    @current_tab = TopinambourHeaderBar.generate_current_tab
-    add_buttons_at_begining
-    add_buttons_at_end
-  end
-
-  def add_buttons_at_begining
-    button = TopinambourHeaderBar.generate_prev_button(self)
-    @bar.pack_start(button)
-    @bar.pack_start(@current_tab)
-    button = TopinambourHeaderBar.generate_next_button(self)
-    @bar.pack_start(button)
-    @bar.pack_start(@current_label)
-    button = TopinambourHeaderBar.generate_new_tab_button(self)
-    @bar.pack_start(button)
-  end
-
-  def add_buttons_at_end
-    button = TopinambourHeaderBar.generate_open_menu_button(self)
-    @bar.pack_end(button)
-    button = TopinambourHeaderBar.generate_font_sel_button(self)
-    @bar.pack_end(button)
-    button = TopinambourHeaderBar.generate_color_sel_button(self)
-    @bar.pack_end(button)
-    button = TopinambourHeaderBar.generate_term_overv_button(self)
-    @bar.pack_end(button)
+    resource_file = "/com/github/cedlemo/topinambour/headerbar.ui"
+    builder = Gtk::Builder.new(:resource => resource_file)
+    set_titlebar(builder["headerbar"])
+    @current_label = builder["current_label"]
+    current_label_signals
+    @current_tab = builder["current_tab"]
+    next_prev_new_signals(builder)
+    overview_font_color_signals(builder)
+    main_menu_signal(builder)
+  end
+
+  def current_label_signals
+    @current_label.signal_connect "activate" do |entry|
+      @notebook.current.custom_title = entry.text
+      @notebook.current.grab_focus
+    end
+
+    @current_label.signal_connect "icon-release" do |entry, position|
+      if position == :primary
+        close_current_tab
+      elsif position == :secondary
+        @notebook.current.custom_title = nil
+        entry.text = @notebook.current.window_title
+      end
+    end
+  end
+
+  def next_prev_new_signals(builder)
+    builder["prev_button"].signal_connect "clicked" do
+      show_prev_tab
+    end
+
+    builder["next_button"].signal_connect "clicked" do
+      show_next_tab
+    end
+
+    builder["new_term"].signal_connect "clicked" do
+      add_terminal
+    end
+  end
+
+  def overview_font_color_signals(builder)
+    builder["term_overv_button"].signal_connect "clicked" do
+      show_terminal_chooser
+    end
+
+    builder["font_sel_button"].signal_connect "clicked" do
+      show_font_selector
+    end
+
+    builder["colors_sel_button"].signal_connect "clicked" do
+      show_color_selector
+    end
+  end
+
+  def main_menu_signal(builder)
+    builder["menu_button"].signal_connect "clicked" do |button|
+      ui_file = "/com/github/cedlemo/topinambour/window-menu.ui"
+      winmenu = Gtk::Builder.new(:resource => ui_file)["winmenu"]
+      event = Gtk.current_event
+      menu = Gtk::Popover.new(button, winmenu)
+      x, y = event.window.coords_to_parent(event.x,
+                                         event.y)
+      rect = Gdk::Rectangle.new(x - button.allocation.x,
+                                y - button.allocation.y,
+                                1, 1)
+      menu.set_pointing_to(rect)
+      menu.show
+    end
   end
 
   def toggle_overlay(klass)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: topinambour
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
-- Cédric LE MOIGNE
+- Cedric LE MOIGNE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-23 00:00:00.000000000 Z
+date: 2016-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vte3
@@ -19,7 +19,7 @@ dependencies:
         version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.7
+        version: 3.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.7
+        version: 3.0.9
 - !ruby/object:Gem::Dependency
   name: gtksourceview3
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.7
+        version: 3.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.7
+        version: 3.0.9
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
@@ -86,8 +86,10 @@ files:
 - data/color-select-symbolic.svg
 - data/emblem-photos-symbolic.svg
 - data/font-select-symbolic.svg
+- data/headerbar.ui
 - data/pan-end-symbolic.svg
 - data/pan-start-symbolic.svg
+- data/prefs-dialog.ui
 - data/tab-new-symbolic.svg
 - data/terminal-menu.ui
 - data/topinambour.css
@@ -102,9 +104,11 @@ files:
 - lib/css_editor.rb
 - lib/css_handler.rb
 - lib/font_selector.rb
-- lib/headerbar.rb
 - lib/notebook.rb
+- lib/preferences.rb
 - lib/resize_message.rb
+- lib/rgb_names_regexes.rb
+- lib/searchbar.rb
 - lib/shortcuts.rb
 - lib/style_properties.rb
 - lib/terminal.rb
@@ -136,4 +140,3 @@ signing_key:
 specification_version: 4
 summary: Ruby-gnome2 Terminal emulator
 test_files: []
-has_rdoc: 

data/lib/headerbar.rb

@@ -1,126 +0,0 @@
-# Copyright 2016 Cédric LE MOIGNE, cedlemo@gmx.com
-# This file is part of Topinambour.
-#
-# Topinambour 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.
-#
-# Topinambour 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 Topinambour.  If not, see <http://www.gnu.org/licenses/>.
-
-module TopinambourHeaderBar
-  def self.generate_header_bar(window)
-    bar = Gtk::HeaderBar.new
-    bar.title = "Topinambour"
-    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.custom_title = entry.text
-    end
-
-    label.signal_connect "icon-release" do |entry, position|
-      if position == :secondary
-        window.notebook.current.custom_title = 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/topinambour/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