topinambour 1.0.11 → 1.0.12

data/lib/terminal_chooser.rb

@@ -1,4 +1,4 @@
-# Copyright 2015-2016 Cedric LE MOIGNE, cedlemo@gmx.com
+# Copyright 2017 Cedric LE MOIGNE, cedlemo@gmx.com
 # This file is part of Topinambour.
 #
 # Topinambour is free software: you can redistribute it and/or modify
@@ -17,59 +17,227 @@ class TopinambourTermChooser < Gtk::ScrolledWindow
   def initialize(window)
     super(nil, nil)
     @window = window
+    @notebook = @window.notebook
+    @notebook.generate_tab_preview
+    initialize_list_box
+    initialize_hidden_list_box
+    initialize_main_box
+    configure_window
+  end
+
+  private
+
+  def configure_window
     set_halign(:end)
     set_valign(:center)
     set_policy(:never, :automatic)
     set_name("terminal_chooser")
+    add(@box)
+    set_size_request(-1, @notebook.current.term.allocation.to_a[3] - 8)
+  end
 
-    window.notebook.generate_tab_preview
-    generate_grid
-    fill_grid
-
+  def initialize_main_box
     @box = Gtk::Box.new(:vertical, 4)
     @box.name = "topinambour-overview-box"
-    @box.pack_start(@grid, :expand => true, :fill => true, :padding => 4)
-    add(@box)
-    set_size_request(-1, @window.notebook.current.term.allocation.to_a[3] - 8)
+    @box.pack_start(main_title, :expand => false, :fill => true, :padding => 6)
+    @box.pack_start(@listbox, :expand => true, :fill => true, :padding => 12)
+    @box.pack_start(box_title("Hidden terminals"),
+                    :expand => false, :fill => true, :padding => 6)
+    @box.pack_start(@listbox_hidden, :expand => true, :fill => true,
+                                     :padding => 12)
   end
 
-  private
+  def main_title
+    hbox = Gtk::Box.new(:horizontal, 6)
+    hbox.pack_start(box_title("Terminals"),
+                    :expand => true, :fill => true, :padding => 6)
+    hbox.pack_start(box_close_button,
+                    :expand => false, :fill => false, :padding => 6)
+    hbox
+  end
 
-  def generate_grid
-    @grid = Gtk::Grid.new
-    @grid.row_spacing = 4
-    @grid.column_spacing = 6
+  def box_title(label)
+    title = Gtk::Label.new("> #{label} :")
+    title.halign = :start
+    title
   end
 
-  def fill_grid
-    @window.notebook.children.each_with_index do |child, i|
-      generate_row_grid(child.term, i)
+  def box_close_button
+    button = Gtk::Button.new(:icon_name => "window-close-symbolic",
+                             :size => :button)
+    button.relief = :none
+    button.signal_connect("clicked") { @window.exit_overlay_mode }
+    button
+  end
+
+  def initialize_list_box
+    @listbox = Gtk::ListBox.new
+    @listbox.margin = 12
+    @listbox.selection_mode = :single
+    fill_list_box
+  end
+
+  def initialize_hidden_list_box
+    @listbox_hidden = Gtk::ListBox.new
+    @listbox_hidden.placeholder = Gtk::Label.new("Hidden terminals")
+    @listbox_hidden.margin = 12
+    @listbox_hidden.show_all
+    @listbox_hidden.selection_mode = :single
+    fill_hidden_list_box
+  end
+
+  def fill_list_box
+    @listbox.signal_connect "row-selected" do |_list, row|
+      @notebook.current_page = row.nil? ? @notebook.children.size : row.index
+    end
+
+    @notebook.children.each_with_index do |child, i|
+      row = generate_list_box_row(child.term, i)
+      @listbox.insert(row, i)
+    end
+    current_row = @listbox.get_row_at_index(@notebook.current_page)
+    @listbox.select_row(current_row)
+    current_row.grab_focus
+  end
+
+  def fill_hidden_list_box
+    @notebook.hidden.each_with_index do |child, i|
+      row = generate_hidden_list_box_row(child.term, i)
+      @listbox_hidden.insert(row, i)
     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_row_grid(term, index)
-    button = Gtk::Label.new("tab. #{index + 1}")
-    button.angle = 45
-    @grid.attach(button, 0, index, 1, 1)
-    button = generate_preview_button(term, index)
-    @grid.attach(button, 1, index, 1, 1)
+  def generate_list_box_row(term, index)
+    list_box_row = Gtk::ListBoxRow.new
+    hbox = _generate_hbox_list_box_row(list_box_row, term, index)
+    button = generate_hide_button(list_box_row)
+    hbox.pack_start(button, :expand => false, :fill => false, :padding => 6)
+    list_box_row.add(hbox)
+  end
+
+  def generate_hidden_list_box_row(term, index)
+    list_box_row = Gtk::ListBoxRow.new
+    hbox = _generate_hbox_list_box_row(list_box_row, term, index)
+    button = generate_show_button(list_box_row)
+    hbox.pack_start(button, :expand => false, :fill => false, :padding => 6)
+    list_box_row.add(hbox)
+  end
+
+  def _generate_hbox_list_box_row(list_box_row, term, index)
+    hbox = Gtk::Box.new(:horizontal, 6)
+    label = leaning_label(index)
+    hbox.pack_start(label, :expand => false, :fill => false, :padding => 6)
+    button = generate_preview_button(term, list_box_row)
     add_drag_and_drop_functionalities(button)
+    hbox.pack_start(button, :expand => false, :fill => false, :padding => 6)
     label = generate_label(term)
-    @grid.attach(label, 2, index, 1, 1)
-    button = generate_close_tab_button
-    @grid.attach(button, 3, index, 1, 1)
+    hbox.pack_start(label, :expand => true, :fill => false, :padding => 6)
+    button = generate_hidden_list_box_row_close(list_box_row)
+    hbox.pack_start(button, :expand => false, :fill => false, :padding => 6)
+    hbox
   end
 
-  def add_label_popup_entry_activate_signal(entry, popup, label, term)
-    entry.signal_connect "activate" do |widget|
-      label.text = widget.buffer.text
-      term.custom_title = widget.buffer.text
-      term.toplevel.current_label.text = widget.buffer.text
-      popup.destroy
+  def generate_hidden_list_box_row_close(list_box_row)
+    button = Gtk::Button.new(:icon_name => "window-close-symbolic",
+                             :size => :button)
+    button.relief = :none
+    button.signal_connect "clicked" do
+      @notebook.hidden.delete_at(list_box_row.index)
+      list_box_row.destroy
     end
+    button
+  end
+
+  def leaning_label(index)
+    label = Gtk::Label.new("tab. #{index + 1}")
+    label.angle = 45
+    label
+  end
+
+  def generate_preview_button(child, list_box_row)
+    button = Gtk::Button.new
+    button.image = generate_preview_image(child.preview)
+    button.signal_connect("clicked") do
+      if list_box_row.parent == @listbox
+        @notebook.current_page = list_box_row.index
+      end
+    end
+    button
+  end
+
+  def generate_preview_image(pixbuf)
+    # scaled_pix = pixbuf.scale(150, 75, :bilinear)
+    scaled_pix = pixbuf.scale(200, 100, :bilinear)
+    img = Gtk::Image.new(:pixbuf => scaled_pix)
+    img.show
+    img
+  end
+
+  def generate_hide_button(list_box_row)
+    button = Gtk::Button.new(:label => "Hide")
+    button.valign = :center
+    button.vexpand = false
+    button.signal_connect "clicked" do
+      num = list_box_row.index
+      @notebook.n_pages == 1 ? @window.quit_gracefully : @notebook.hide(num)
+      list_box_row_bkp = change_button_hide_to_show(list_box_row)
+      @listbox.remove(list_box_row)
+      @listbox_hidden.insert(list_box_row_bkp, -1)
+      update_tabs_num_labels
+    end
+    button
+  end
+
+  def generate_show_button(list_box_row)
+    button = Gtk::Button.new(:label => "Show")
+    button.valign = :center
+    button.vexpand = false
+    button.signal_connect "clicked" do
+      tab_num = list_box_row.index
+      @window.notebook.unhide(tab_num)
+      list_box_row_bkp = change_button_show_to_hide(list_box_row)
+      @listbox_hidden.remove(list_box_row)
+      @listbox.insert(list_box_row_bkp, -1)
+      update_tabs_num_labels
+    end
+    button
+  end
+
+  def change_button_hide_to_show(list_box_row)
+    list_box_row_bkp = list_box_row
+    container = list_box_row_bkp.children[0]
+    hide_button = list_box_row_bkp.children[0].children[4]
+    container.remove(hide_button)
+    show_button = generate_show_button(list_box_row_bkp)
+    show_button.show
+    container.pack_start(show_button,
+                         :expand => false, :fill => false, :padding => 6)
+    list_box_row_bkp
+  end
+
+  def change_button_show_to_hide(list_box_row)
+    list_box_row_bkp = list_box_row
+    container = list_box_row_bkp.children[0]
+    show_button = list_box_row_bkp.children[0].children[4]
+    container.remove(show_button)
+    hide_button = generate_hide_button(list_box_row_bkp)
+    hide_button.show
+    container.pack_start(hide_button,
+                         :expand => false, :fill => false, :padding => 6)
+    list_box_row_bkp
+  end
+
+  def generate_close_tab_button(list_box_row)
+    button = Gtk::Button.new(:icon_name => "window-close-symbolic",
+                             :size => :button)
+    button.relief = :none
+    button.signal_connect "clicked" do
+      tab = @notebook.get_nth_page(list_box_row.index)
+      @notebook.n_pages == 1 ? @window.quit_gracefully : @notebook.remove(tab)
+      list_box_row.destroy
+      update_tabs_num_labels
+    end
+    button
   end
 
   def add_label_popup_entry_icon_release(entry, label, term)
@@ -83,22 +251,38 @@ class TopinambourTermChooser < Gtk::ScrolledWindow
     end
   end
 
+  def add_label_popup_entry_activate_signal(entry, popup, label, term)
+    entry.signal_connect "activate" do |widget|
+      label.text = widget.buffer.text
+      term.custom_title = widget.buffer.text
+      popup.destroy
+    end
+  end
+
   def generate_label_popup(label, event, term)
-    entry = Gtk::Entry.new
-    entry.max_width_chars = 50
-    entry.buffer.text = label.text
-    entry.set_icon_from_icon_name(:secondary, "edit-clear")
+    entry = initialize_entry_popup(label)
     pp = Gtk::Popover.new
     add_label_popup_entry_activate_signal(entry, pp, label, term)
     add_label_popup_entry_icon_release(entry, label, term)
-
     pp.add(entry)
+    set_popup_position(pp, label, event)
+  end
+
+  def initialize_entry_popup(label)
+    entry = Gtk::Entry.new
+    entry.max_width_chars = 50
+    entry.buffer.text = label.text
+    entry.set_icon_from_icon_name(:secondary, "edit-clear-symbolic")
+    entry
+  end
+
+  def set_popup_position(popup, label, event)
     x, y = event.window.coords_to_parent(event.x, event.y)
     rect = Gdk::Rectangle.new(x - label.allocation.x, y - label.allocation.y,
                               1, 1)
-    pp.pointing_to = rect
-    pp.relative_to = label
-    pp.show_all
+    popup.pointing_to = rect
+    popup.relative_to = label
+    popup.show_all
   end
 
   def generate_label(term)
@@ -111,69 +295,23 @@ class TopinambourTermChooser < Gtk::ScrolledWindow
     label
   end
 
-  def generate_close_tab_button
-    button = Gtk::EventBox.new
-    button.tooltip_text = "Close Tab"
-    image = Gtk::Image.new(:icon_name => "window-close-symbolic",
-                           :size => :button)
-    button.add(image)
-    button.hexpand = false
-    button.vexpand = false
-    button.valign = :start
-    button.halign = :center
-    button.signal_connect "button_press_event" do
-      n = @grid.child_get_property(button, "top-attach")
-      tab = @window.notebook.get_nth_page(n)
-      if  @window.notebook.n_pages == 1
-        @window.quit_gracefully
-      else
-        remove_tab(tab, n)
-      end
+  def update_tabs_num_labels
+    @listbox.children.each_with_index do |row, i|
+      hbox = row.children[0]
+      label = hbox.children[0]
+      label.text = "tab. #{i + 1}"
     end
-    button
+    update_hidden_tabs_num_labels
   end
 
-  def remove_tab(tab, n)
-    @window.notebook.remove(tab)
-    @grid.remove_row(n)
-    last_tab = @window.notebook.n_pages - 1
-    update_tab_num_label(n..last_tab)
-  end
-
-  def update_tab_num_label(range)
-    range.each do |j|
-      @grid.get_child_at(0, j).text = "tab. #{(j + 1)}"
+  def update_hidden_tabs_num_labels
+    @listbox_hidden.children.each_with_index do |row, i|
+      hbox = row.children[0]
+      label = hbox.children[0]
+      label.text = "tab. #{i + 1}"
     end
   end
 
-  def generate_preview_button(child, i)
-    button = Gtk::Button.new
-    button.image = generate_preview_image(child.preview)
-    button.signal_connect("clicked") { @window.notebook.current_page = i }
-    button
-  end
-
-  def generate_preview_image(pixbuf)
-    scaled_pix = pixbuf.scale(150, 75, :bilinear)
-    img = Gtk::Image.new(:pixbuf => scaled_pix)
-    img.show
-    img
-  end
-
-  def generate_separator
-    Gtk::Separator.new(:horizontal)
-  end
-
-  def generate_quit_button
-    button = Gtk::EventBox.new
-    button.tooltip_text = "Quit Topinambour"
-    image = Gtk::Image.new(:icon_name => "application-exit-symbolic",
-                           :size => :dialog)
-    button.add(image)
-    button.signal_connect("button_press_event") { @window.quit_gracefully }
-    button
-  end
-
   def add_drag_and_drop_functionalities(button)
     add_dnd_source(button)
     add_dnd_destination(button)
@@ -182,7 +320,7 @@ class TopinambourTermChooser < Gtk::ScrolledWindow
   def add_dnd_source(button)
     button.drag_source_set(Gdk::ModifierType::BUTTON1_MASK |
                            Gdk::ModifierType::BUTTON2_MASK,
-                           [["test", Gtk::TargetFlags::SAME_APP, 12_345]],
+                           [["drag_term", Gtk::TargetFlags::SAME_APP, 12_345]],
                            Gdk::DragAction::COPY |
                            Gdk::DragAction::MOVE)
     # Drag source signals
@@ -198,7 +336,7 @@ class TopinambourTermChooser < Gtk::ScrolledWindow
     end
 
     button.signal_connect("drag-data-get") do |widget, _, selection_data, _, _|
-      index = grid_line_of(widget)
+      index = widget.parent.parent.index
       selection_data.set(Gdk::Selection::TYPE_INTEGER, index.to_s)
     end
     # button.signal_connect "drag-data-delete" do
@@ -212,7 +350,7 @@ class TopinambourTermChooser < Gtk::ScrolledWindow
   def add_dnd_destination(button)
     button.drag_dest_set(Gtk::DestDefaults::MOTION |
                          Gtk::DestDefaults::HIGHLIGHT,
-                         [["test", :same_app, 12_345]],
+                         [["drag_term", :same_app, 12_345]],
                          Gdk::DragAction::COPY |
                          Gdk::DragAction::MOVE)
 
@@ -229,10 +367,11 @@ class TopinambourTermChooser < Gtk::ScrolledWindow
     end
 
     button.signal_connect("drag-data-received") do |widget, context, _x, _y, selection_data|
-      index = grid_line_of(widget)
+      index = widget.parent.parent.index
       index_of_dragged_object = index
       context.targets.each do |target|
-        next unless target.name == "test" || selection_data.type == :type_integer
+        next unless target.name == "drag_term" ||
+                    selection_data.type == :type_integer
         data_len = selection_data.data.size
         index_of_dragged_object = selection_data.data.pack("C#{data_len}").to_i
       end
@@ -246,12 +385,10 @@ class TopinambourTermChooser < Gtk::ScrolledWindow
     dragged = @window.notebook.get_nth_page(src_index)
     @window.notebook.reorder_child(dragged, dest_index)
     @window.notebook.children.each_with_index do |child, i|
-      @grid.get_child_at(1, i).image = generate_preview_image(child.term.preview)
-      @grid.get_child_at(2, i).label = child.term.terminal_title
+      list_box_row = @listbox.get_row_at_index(i)
+      row_h_box = list_box_row.children[0]
+      row_h_box.children[1].image = generate_preview_image(child.term.preview)
+      row_h_box.children[2].text = child.term.terminal_title
     end
   end
-
-  def grid_line_of(widget)
-    @grid.child_get_property(widget, "top-attach")
-  end
 end

data/lib/window.rb

@@ -1,4 +1,4 @@
-# Copyright 2015-2016 Cedric LE MOIGNE, cedlemo@gmx.com
+# Copyright 2015-2017 Cedric LE MOIGNE, cedlemo@gmx.com
 # This file is part of Topinambour.
 #
 # Topinambour is free software: you can redistribute it and/or modify
@@ -14,14 +14,13 @@
 # You should have received a copy of the GNU General Public License
 # along with Topinambour.  If not, see <http://www.gnu.org/licenses/>.
 
-class TopinambourWindow
+class TopinambourWindow < Gtk::ApplicationWindow
   attr_reader :notebook, :bar, :overlay, :current_label, :current_tab
-  attr_accessor :shell
   def initialize(application)
-    super(:application => application)
+    super(application)
     set_icon_name("utilities-terminal-symbolic")
     set_name("topinambour-window")
-    load_properties
+    load_settings
     set_position(:center)
     create_header_bar
     create_containers
@@ -29,20 +28,19 @@ 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)
+  def add_terminal(cmd = nil)
+    cmd = cmd || application.settings["default-shell"]
+
     exit_overlay_mode
     working_dir = nil
     working_dir = @notebook.current.term.pid_dir if @notebook.current
-
     terminal = TopinambourTabTerm.new(cmd, working_dir)
     terminal.show_all
 
     @notebook.append_page(terminal)
+    terminal.term.load_settings
     @notebook.set_tab_reorderable(terminal, true)
     @notebook.set_page(@notebook.n_pages - 1)
     @notebook.current.term.grab_focus
@@ -78,10 +76,6 @@ 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
@@ -94,7 +88,7 @@ class TopinambourWindow
                           "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.11",
+                          "version" => "1.0.12",
                           "website" => "https://github.com/cedlemo/topinambour",
                           "website_label" => "Topinambour github repository"
                          )
@@ -126,8 +120,22 @@ class TopinambourWindow
     end
   end
 
+  def show_shortcuts
+    resource_file = "/com/github/cedlemo/topinambour/shortcuts.ui"
+    builder = Gtk::Builder.new(:resource => resource_file)
+    shortcuts_win = builder["shortcuts-window"]
+    shortcuts_win.transient_for = self
+    shortcuts_win.show
+  end
+
   private
 
+  def load_settings
+    height = application.settings["height"]
+    width = application.settings["width"]
+    resize(width, height)
+  end
+
   def add_overlay(widget)
     @overlay.add_overlay(widget)
     @overlay.set_overlay_pass_through(widget, false)
@@ -146,13 +154,17 @@ class TopinambourWindow
     headerbar = builder["headerbar"]
     headerbar.name = "topinambour-headerbar"
     set_titlebar(headerbar)
+    # Text is modified when notebook switch tabs or
+    # Vte::Terminal command change and if it is the current Vte.
     @current_label = builder["current_label"]
     current_label_signals
+    # Value is changed when notebook switch tabs or notebook add tab.
     @current_tab = builder["current_tab"]
+    headerbar.remove(@current_label)
+    headerbar.custom_title = @current_label
     next_prev_new_signals(builder)
-    overview_font_color_signals(builder)
+    overview_signal(builder)
     main_menu_signal(builder)
-    reload_css_conf_signal(builder)
   end
 
   def current_label_signals
@@ -162,9 +174,7 @@ class TopinambourWindow
     end
 
     @current_label.signal_connect "icon-release" do |entry, position|
-      if position == :primary
-        close_current_tab
-      elsif position == :secondary
+      if position == :secondary
         @notebook.current.term.custom_title = nil
         entry.text = @notebook.current.term.window_title
       end
@@ -185,44 +195,35 @@ class TopinambourWindow
     end
   end
 
-  def overview_font_color_signals(builder)
+  def overview_signal(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
+    button = builder["menu_button"]
+    ui_file = "/com/github/cedlemo/topinambour/main-menu-popover.ui"
+    menu_builder = Gtk::Builder.new(:resource => ui_file)
+    main_menu = menu_builder["main_menu_popover"]
+    button.set_popover(main_menu)
+    button.popover.modal = true
+    add_theme_menu_buttons_signals(menu_builder)
   end
 
-  def reload_css_conf_signal(builder)
-    button = builder["css_reload_button"]
-    button.signal_connect "clicked" do
+  def add_theme_menu_buttons_signals(builder)
+    builder["css_reload_button"].signal_connect "clicked" do
       application.reload_css_config
-      notebook.each { |tab| tab.term.load_properties }
-      load_properties
       queue_draw
     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 toggle_overlay(klass)