topinambour 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c375742bddecb003e389bb6cea4c6490caf71ad
-  data.tar.gz: 1e5d10e6a5013656fef450706c6b2168ff3af3a4
+  metadata.gz: bd58ccf9a13dafa848a0091098256879687c5877
+  data.tar.gz: e6bf6b64542f156627325b9748a94007916d3b2d
 SHA512:
-  metadata.gz: f3476123395d21c5fd0437e3eea3d6999136e312c1f999f1d527ed576926e5cf72e675b12ac38faa3263d73e5e5f119e434e197b8893a9c8912f09f14f5c80d1
-  data.tar.gz: b11c2169ad5adbfe1cdeb5e825a2d545912f50b4c3675093f39d818a69dfec10d9874f0bbbfa6bba2473dcde6d86d73e2e626ffbab5f71b2e98748fd7c3a26b3
+  metadata.gz: 16387db255b4837972943be109094fe88ea1dbe4f4007b3206040115b6b02711be5871ac0d8dc00e443b9d167464ec84a44be1f7b8017d5dd8fcf2daf0c41580
+  data.tar.gz: 9816772c41dfc77d1202f8761e6488cf04592005852d162bdd2da5221a47fef33f8ab723c3bc65e70fb6fc56d2629d78f65fe715eca84b3a02ddbc449ae88510

data/README.md

@@ -26,7 +26,13 @@ Topinambour is Terminal written with the Gtk3 and Vte3 ruby bindings from the pr
 *    Topinambour allows users to modify existing modules. For example if a user copy the css_editor.rb in the directory *~/.config/topinambour/lib/css_editor.rb*, he should be able to modify it in order to fit its needs.
 
 ##  TODO:
-*   Name all the important widget so that they can be easily themed in Css.
+*   Name all the important widgets so that they can be easily themed in Css.
+    *    `#topinambour-overview-box`
+    *    `#topinambour-headerbar`
+    *    `#topinambour-window`
+    *    `#topinambour-scrollbar`
+    *    `#topinambour-notebook`
+
 *   Write a description of the widgets that have a Css name/Id.
 *   Improve the Css editor with a part for the Css parsing error when the user writes. Add a color chooser widget in the related tab.
 *   Make Topinambour 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.
@@ -91,22 +97,32 @@ It can be found in the file `$HOME/.config/topinambour/topinambour.css` (Be care
 }
 
 TopinambourWindow headerbar entry{
-  border-radius: 4px;
+  /*border-radius: 4px;*/
 }
 
-#OverviewBox {
+#topinambour-overview-box {
   background-color: rgba(0,0,0,0.2);
   border: solid 1px rgba(49, 150, 188, 1);
   border-radius: 6px 0px 0px 6px;
 }
 
+#topinambour-headerbar {
+  background-color: #323232;
+  border: none;
+  box-shadow: none;
+}
+#topinambour_headerbar:backdrop {
+  background-color: rgba(50,50,50,0.7);
+  border: none;
+  box-shadow: none;
+}
 grid button {
   margin: 0px;
   padding: 0px;
 
 }
 
- grid button image {
+grid button image {
   border: solid 3px rgba(0, 0, 0, 0.0);
   margin: 0px;
   padding: 0px;

data/data/headerbar.ui

@@ -112,6 +112,25 @@ default label for the current tab
         <property name="position">5</property>
       </packing>
     </child>
+    <child>
+      <object class="GtkButton" id="css_reload_button">
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">True</property>
+        <property name="tooltip_text" translatable="yes">Reload the Css file</property>
+        <child>
+          <object class="GtkImage">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="icon_name">view-refresh-symbolic</property>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="pack_type">end</property>
+        <property name="position">6</property>
+      </packing>
+    </child>
     <child>
       <object class="GtkButton" id="font_sel_button">
         <property name="visible">True</property>

data/data/topinambour.css

@@ -25,24 +25,49 @@
   -TopinambourWindow-width: 1000;*/
 }
 
-TopinambourWindow headerbar entry{
-  /*border-radius: 4px;*/
+#topinambour-overview-box {
+  background-color: rgba(43,45,54,0.95);
+  border-radius: 6px 0px 0px 6px;
 }
 
-#overview-main-box {
-  background-color: rgba(0,0,0,0.2);
-  border: solid 1px rgba(49, 150, 188, 1);
-  border-radius: 6px 0px 0px 6px;
+#topinambour-headerbar {
+  background-color: #323232;
+  border: none;
+  box-shadow: none;
 }
 
-grid button {
-  margin: 0px;
-  padding: 0px;
+#topinambour-headerbar:backdrop {
+  background-color: rgba(50,50,50,0.7);
+  border: none;
+  box-shadow: none;
+}
+
+#topinambour-scrollbar{
+	background-color: rgba(0,0,0,0);
+	border: none;
+}
 
+#topinambour-scrollbar trough{
+	background-color: rgba(0,0,0,0);
+	border: none;
 }
 
- grid button image {
+#topinambour-scrollbar slider{
+	margin-left: 8px;
+	background-color: rgba(49,150,188,0.5);
+}
+
+#topinambour-tab-term {
+	background-color: rgba(0,0,0,0);
+}
+
+grid button image {
   border: solid 3px rgba(0, 0, 0, 0.0);
   margin: 0px;
   padding: 0px;
 }
+
+grid button {
+  margin: 0px;
+  padding: 0px;
+}

data/lib/actions.rb

@@ -47,9 +47,9 @@ module TopinambourActions
   def self.generate_preferences_action(application)
     action = generate_action("preferences") do |_act, _param|
       dialog = TopinambourPreferences.generate_dialog(application.windows.first)
-      
+
       dialog.run
-      application.windows.first.notebook.current.grab_focus
+      application.windows.first.notebook.current.term.grab_focus
     end
     action
   end
@@ -63,9 +63,9 @@ module TopinambourActions
 
   def self.generate_term_copy_action(application)
     action = generate_action("term_copy") do |_act, _param|
-      term = application.windows[0].notebook.current
+      term = application.windows[0].notebook.current.term
       event = Gtk.current_event
-      
+
       _match, regex_type = term.match_check_event(event)
       if term.has_selection? || regex_type == -1
         term.copy_clipboard
@@ -79,7 +79,7 @@ module TopinambourActions
 
   def self.generate_term_paste_action(application)
     action = generate_action("term_paste") do |_act, _param|
-      application.windows[0].notebook.current.paste_clipboard
+      application.windows[0].notebook.current.term.paste_clipboard
     end
     action
   end

data/lib/application.rb

@@ -15,7 +15,7 @@
 # along with Topinambour.  If not, see <http://www.gnu.org/licenses/>.
 
 class TopinambourApplication < Gtk::Application
-  attr_reader :provider, :css_file, :css_content # :css_content really needed ?
+  attr_reader :provider, :css_file, :css_content
   def initialize
     super("com.github.cedlemo.topinambour", :non_unique)
 
@@ -33,7 +33,7 @@ class TopinambourApplication < Gtk::Application
       window = TopinambourWindow.new(application)
       window.present
       window.add_terminal
-      window.notebook.current.grab_focus
+      window.notebook.current.term.grab_focus
     end
   end
 
@@ -65,6 +65,37 @@ class TopinambourApplication < Gtk::Application
     @css_content = new_conf
   end
 
+  def reload_css_config
+    error_popup = nil
+    bad_css = nil
+    if File.exist?(USR_CSS)
+      @provider.signal_connect "parsing-error" do |css_provider, section, error|
+        buf = Gtk::TextBuffer.new
+        buf.text = @css_content
+        start_i = buf.get_iter_at(:line => section.start_line,
+                                  :index => section.start_position)
+        end_i =  buf.get_iter_at(:line => section.start_line + 10,
+                                 :index => section.end_position)
+        bad_css = ""
+        buf.get_text(start_i, end_i, true).lines.each_with_index do |line, i|
+          bad_css += "#{section.start_line  + 1 + i}  #{line}"
+        end
+      end
+      css_backup = @css_content
+
+      begin
+        load_custom_css_config
+      rescue => e
+        error_popup = TopinambourCssErrorPopup.new(self.windows.first)
+        error_popup.message = e.message + "\n\n" + bad_css
+        error_popup.show_all
+
+        @css_content = css_backup
+        @provider.load(:data => @css_content)
+      end
+    end
+  end
+
   private
 
   def load_menu_ui_in(application)
@@ -92,6 +123,9 @@ class TopinambourApplication < Gtk::Application
         load_custom_css_config
       rescue => e
         puts "Bad css file using default css #{e.message}"
+        error_popup = TopinambourCssErrorPopup.new(self.windows.first)
+        error_popup.message = e.message + "\n\nBad css file using default css"
+        error_popup.show_all
         load_default_css_config
       end
     else
@@ -100,7 +134,33 @@ class TopinambourApplication < Gtk::Application
     end
   end
 
+  def write_down_default_css
+    File.open(USR_CSS, "w") { |file| file.write(@css_content) }
+  end
+
   def check_and_create_if_no_config_dir
     Dir.mkdir(CONFIG_DIR) unless Dir.exist?(CONFIG_DIR)
   end
 end
+
+class TopinambourCssErrorPopup < Gtk::MessageDialog
+
+  def initialize(parent)
+    super(:parent => parent, :flags => 0,
+          :type => Gtk::MessageType::ERROR,
+          :buttons_type => Gtk::ButtonsType::CLOSE,
+          :message => "Css Error")
+
+    @message = Gtk::Label.new("")
+    content_area.add(@message)
+    signal_connect("response") { |widget| widget.destroy }
+  end
+
+  def message=(message)
+    @message.text = message
+  end
+
+  def message
+    @message.text
+  end
+end

data/lib/color_selector.rb

@@ -37,7 +37,7 @@ class TopinambourColorSelector < Gtk::Box
   private
 
   def initialize_default_colors
-    @default_colors = @window.notebook.current.css_colors
+    @default_colors = @window.notebook.current.term.css_colors
     @colors = @default_colors.dup
   end
 
@@ -77,7 +77,8 @@ class TopinambourColorSelector < Gtk::Box
   def add_color_selectors
     TERMINAL_COLOR_NAMES.each_with_index do |name, i|
       color_sel = Gtk::ColorButton.new(@default_colors[i])
-      color_sel.set_title(name.to_s)
+      color_sel.title = name.to_s
+      color_sel.tooltip_text = name.to_s
       color_sel.signal_connect "color-set" do
         @colors[i] = color_sel.rgba
         apply_new_colors
@@ -87,7 +88,7 @@ class TopinambourColorSelector < Gtk::Box
   end
 
   def apply_new_colors
-    @window.notebook.current.colors = @colors
-    @window.notebook.current.apply_colors
+    @window.notebook.current.term.colors = @colors
+    @window.notebook.current.term.apply_colors
   end
 end

data/lib/font_selector.rb

@@ -17,13 +17,13 @@ class TopinambourFontSelector < Gtk::Box
   attr_reader :font
   def initialize(window)
     @window = window
-    @font = @window.notebook.current.font
+    @font = @window.notebook.current.term.font
     super(:horizontal, 0)
 
     reset_button = Gtk::Button.new(:label => "Reset")
     reset_button.signal_connect "clicked" do
       font_desc = Pango::FontDescription.new(@font)
-      @window.notebook.current.set_font(font_desc)
+      @window.notebook.current.term.set_font(font_desc)
     end
     pack_start(reset_button, :expand => false, :fill => false, :padding => 0)
 
@@ -35,14 +35,14 @@ class TopinambourFontSelector < Gtk::Box
     font_button.set_use_size(false)
     font_button.signal_connect "font-set" do
       font_desc = Pango::FontDescription.new(font_button.font_name)
-      @window.notebook.current.set_font(font_desc)
+      @window.notebook.current.term.set_font(font_desc)
     end
     pack_start(font_button, :expand => false, :fill => false, :padding => 0)
 
     save_button = Gtk::Button.new(:label => "Save")
     save_button.signal_connect "clicked" do
       new_props = {}
-      font = @window.notebook.current.font
+      font = @window.notebook.current.term.font
       new_props["-TopinambourTerminal-font"] = font.to_s
       toplevel.application.update_css(new_props)
       toplevel.notebook.send_to_all_terminals("set_font", font)

data/lib/notebook.rb

@@ -26,7 +26,7 @@ class TopinambourNotebook < Gtk::Notebook
     end
 
     signal_connect "switch-page" do |_widget, next_page, next_page_num|
-      toplevel.current_label.text = next_page.terminal_title
+      toplevel.current_label.text = next_page.term.terminal_title
       toplevel.current_tab.text = "#{next_page_num + 1}/#{n_pages}"
       generate_tab_preview if page >= 0
     end
@@ -38,7 +38,7 @@ class TopinambourNotebook < Gtk::Notebook
     signal_connect "page-removed" do
       toplevel.current_tab.text = "#{page + 1}/#{n_pages}" if toplevel.class == TopinambourWindow
     end
-
+    set_name("topinambour-notebook")
     set_show_tabs(false)
     set_show_border(false)
   end
@@ -67,7 +67,7 @@ class TopinambourNotebook < Gtk::Notebook
       toplevel.quit_gracefully
     else
       remove(current)
-      current.grab_focus
+      current.term.grab_focus
     end
   end
 
@@ -76,13 +76,13 @@ class TopinambourNotebook < Gtk::Notebook
   end
 
   def generate_tab_preview
-    _x, _y, w, h = current.allocation.to_a
+    _x, _y, w, h = current.term.allocation.to_a
     surface = Cairo::ImageSurface.new(Cairo::FORMAT_ARGB32,
                                       w, h)
     cr = Cairo::Context.new(surface)
-    current.draw(cr)
+    current.term.draw(cr)
     pix = surface.to_pixbuf(0, 0, w, h)
-    current.preview = pix if pix
+    current.term.preview = pix if pix
   end
 
   def send_to_all_terminals(method_name, values)

data/lib/preferences.rb

@@ -67,7 +67,7 @@ module TopinambourPreferences
 
   def self.gen_switch_actions(property_name, builder, parent)
     switch = builder["#{property_name}_switch"]
-    switch.active = parent.notebook.current.send("#{property_name}?")
+    switch.active = parent.notebook.current.term.send("#{property_name}?")
     switch.signal_connect "state-set" do |_widget, state|
       parent.notebook.send_to_all_terminals("#{property_name}=", state)
       false
@@ -89,7 +89,7 @@ module TopinambourPreferences
 
   def self.gen_combobox_actions(property_name, builder, parent)
     combobox = builder["#{property_name}_sel"]
-    id = parent.notebook.current.send("#{property_name}").nick + "_id"
+    id = parent.notebook.current.term.send("#{property_name}").nick + "_id"
     combobox.active_id = id
     combobox.signal_connect "changed" do |widget|
       value = widget.active_id.gsub(/_id/, "").to_sym

data/lib/searchbar.rb

@@ -30,19 +30,16 @@ class TopinambourSearchBar < Gtk::SearchBar
 
   def generate_search_entry(window)
     @entry = Gtk::SearchEntry.new
-    term = window.notebook.current
+    term = window.notebook.current.term
     @entry.signal_connect "next-match" do |entry|
-      puts "next-match"
       term.search_find_next if @regex
     end
 
-    @entry.signal_connect "previous-match" do |entry|
-      puts "prev match"
+    @entry.signal_connect("previous-match") do |entry|
       term.search_find_previous if @regex
     end
 
     @entry.signal_connect "search-changed" do |entry|
-      puts "search changed"
       pattern = entry.buffer.text
       if pattern != ""
         @regex = GLib::Regex.new(pattern)

data/lib/shortcuts.rb

@@ -27,7 +27,7 @@ module TopinambourShortcuts
     when Gdk::Keyval::KEY_Escape # escape from overlay mode
       if window.in_overlay_mode?
         window.exit_overlay_mode
-        window.notebook.current.grab_focus
+        window.notebook.current.term.grab_focus
         true
       end
     end

data/lib/style_properties.rb

@@ -116,6 +116,38 @@ class TopinambourTerminal < Vte::Terminal
     %w(cursor_shape cursor_blink_mode backspace_binding delete_binding).each do |prop|
       send("#{prop}=", style_get_property(prop.gsub(/_/,"-")))
     end
+    @colors = css_colors
+    apply_colors
+    set_font(css_font)
+  end
+
+  def parse_css_color(color_name)
+    color_index = TERMINAL_COLOR_NAMES.index(color_name.to_sym)
+    color_value = DEFAULT_TERMINAL_COLORS[color_index]
+    default_color = Gdk::RGBA.parse(color_value)
+    color_from_css = style_get_property(color_name)
+    color = color_from_css ? color_from_css : default_color
+    color
+  end
+
+  def css_colors
+    colors = []
+    background = parse_css_color(TERMINAL_COLOR_NAMES[0].to_s)
+    foreground = parse_css_color(TERMINAL_COLOR_NAMES[1].to_s)
+    TERMINAL_COLOR_NAMES[2..-1].each do |c|
+      colors << parse_css_color(c.to_s)
+    end
+    [background, foreground] + colors
+  end
+
+  def css_font
+    font = style_get_property("font")
+    font = Pango::FontDescription.new(DEFAULT_TERMINAL_FONT) unless font
+    font
+  end
+
+  def apply_colors
+    set_colors(@colors[0], @colors[1], @colors[2..-1])
   end
 end
 
@@ -125,9 +157,15 @@ class TopinambourWindow < Gtk::ApplicationWindow
   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 load_properties
-
+    _w, _h = self.size
+    w = style_get_property("width")
+    h = style_get_property("height")
+    w = _w if w == -1
+    h = _h if h == -1
+    self.resize(w, h)
+    self.set_default_size(w, h)
+    @shell = style_get_property("shell")
   end
 end

data/lib/terminal.rb

@@ -14,6 +14,21 @@
 # You should have received a copy of the GNU General Public License
 # along with Topinambour.  If not, see <http://www.gnu.org/licenses/>.
 
+## The main full tab Gtk::Box + Vte::Terminal + Gtk::Scrollbar
+#
+
+class TopinambourTabTerm < Gtk::Box
+  attr_reader :term
+  def initialize(command_string, working_dir=nil)
+    super(:horizontal, 0)
+    set_name("topinambour-tab-term")
+    @term = TopinambourTerminal.new(command_string, working_dir)
+    @scrollbar = Gtk::Scrollbar.new(:vertical, @term.vadjustment)
+    @scrollbar.name = "topinambour-scrollbar"
+    pack_start(@term, :expand => true, :fill => true, :padding => 0)
+    pack_start(@scrollbar)
+  end
+end
 ##
 # The default vte terminal customized
 class TopinambourTerminal
@@ -31,14 +46,17 @@ class TopinambourTerminal
                  :spawn_flags => GLib::Spawn::SEARCH_PATH)
 
     signal_connect "child-exited" do |widget|
-      notebook = widget.parent
-      current_page = notebook.page_num(widget)
+      tabterm = widget.parent
+      notebook = tabterm.parent
+      current_page = notebook.page_num(tabterm)
       notebook.remove_page(current_page)
       notebook.toplevel.application.quit unless notebook.n_pages >= 1
     end
 
-    signal_connect "window-title-changed" do
-      when_terminal_title_change if parent && parent.current == self
+    signal_connect "window-title-changed" do |widget|
+      tabterm = widget.parent
+      notebook = tabterm.parent
+      when_terminal_title_change if notebook && notebook.current.term == self
     end
 
     builder = Gtk::Builder.new(:resource =>
@@ -66,41 +84,12 @@ class TopinambourTerminal
     File.readlink("/proc/#{@pid}/cwd")
   end
 
-  def css_colors
-    colors = []
-    background = parse_css_color(TERMINAL_COLOR_NAMES[0].to_s)
-    foreground = parse_css_color(TERMINAL_COLOR_NAMES[1].to_s)
-    TERMINAL_COLOR_NAMES[2..-1].each do |c|
-      colors << parse_css_color(c.to_s)
-    end
-    [background, foreground] + colors
-  end
-
-  def css_font
-    font = style_get_property("font")
-    font = Pango::FontDescription.new(DEFAULT_TERMINAL_FONT) unless font
-    font
-  end
-
-  def apply_colors
-    set_colors(@colors[0], @colors[1], @colors[2..-1])
-  end
-
   def terminal_title
     @custom_title.class == String ? @custom_title : window_title.to_s
   end
 
   private
 
-  def parse_css_color(color_name)
-    color_index = TERMINAL_COLOR_NAMES.index(color_name.to_sym)
-    color_value = DEFAULT_TERMINAL_COLORS[color_index]
-    default_color = Gdk::RGBA.parse(color_value)
-    color_from_css = style_get_property(color_name)
-    color = color_from_css ? color_from_css : default_color
-    color
-  end
-
   def configure
     set_rewrap_on_resize(true)
     set_scrollback_lines(-1)

data/lib/terminal_chooser.rb

@@ -27,10 +27,10 @@ class TopinambourTermChooser < Gtk::ScrolledWindow
     fill_grid
 
     @box = Gtk::Box.new(:vertical, 4)
-    @box.name = "overview-main-box"
+    @box.name = "topinambour-overview-box"
     @box.pack_start(@grid, :expand => true, :fill => true, :padding => 4)
     add(@box)
-    set_size_request(-1, @window.notebook.current.allocation.to_a[3] - 8)
+    set_size_request(-1, @window.notebook.current.term.allocation.to_a[3] - 8)
   end
 
   private
@@ -43,7 +43,7 @@ class TopinambourTermChooser < Gtk::ScrolledWindow
 
   def fill_grid
     @window.notebook.children.each_with_index do |child, i|
-      generate_row_grid(child, i)
+      generate_row_grid(child.term, i)
     end
     @grid.attach(generate_separator, 0, @window.notebook.n_pages, 2, 1)
     button = generate_quit_button
@@ -137,19 +137,18 @@ class TopinambourTermChooser < Gtk::ScrolledWindow
     @window.notebook.remove(tab)
     @grid.remove_row(n)
     last_tab = @window.notebook.n_pages - 1
-    update_preview_button_tooltip(n..last_tab)
+    update_tab_num_label(n..last_tab)
   end
 
-  def update_preview_button_tooltip(range)
+  def update_tab_num_label(range)
     range.each do |j|
-      @grid.get_child_at(0, j).tooltip_text = j.to_s
+      @grid.get_child_at(0, j).text = "tab. #{(j + 1)}"
     end
   end
 
   def generate_preview_button(child, i)
     button = Gtk::Button.new
     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
@@ -247,8 +246,8 @@ 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.preview)
-      @grid.get_child_at(2, i).label = child.terminal_title
+      @grid.get_child_at(1, i).image = generate_preview_image(child.term.preview)
+      @grid.get_child_at(2, i).label = child.term.terminal_title
     end
   end
 

data/lib/window.rb

@@ -20,7 +20,8 @@ class TopinambourWindow
   def initialize(application)
     super(:application => application)
     set_icon_name("utilities-terminal-symbolic")
-    load_css_properties
+    set_name("topinambour-window")
+    load_properties
     set_position(:center)
     create_header_bar
     create_containers
@@ -36,14 +37,15 @@ class TopinambourWindow
   def add_terminal(cmd = @shell)
     exit_overlay_mode
     working_dir = nil
-    working_dir = @notebook.current.pid_dir if @notebook.current
+    working_dir = @notebook.current.term.pid_dir if @notebook.current
+
+    terminal = TopinambourTabTerm.new(cmd, working_dir)
+    terminal.show_all
 
-    terminal = TopinambourTerminal.new(cmd, working_dir)
-    terminal.show
     @notebook.append_page(terminal)
     @notebook.set_tab_reorderable(terminal, true)
     @notebook.set_page(@notebook.n_pages - 1)
-    @notebook.current.grab_focus
+    @notebook.current.term.grab_focus
   end
 
   def quit_gracefully
@@ -59,13 +61,13 @@ class TopinambourWindow
   def show_prev_tab
     exit_overlay_mode
     @notebook.cycle_prev_page
-    @notebook.current.grab_focus
+    @notebook.current.term.grab_focus
   end
 
   def show_next_tab
     exit_overlay_mode
     @notebook.cycle_next_page
-    @notebook.current.grab_focus
+    @notebook.current.term.grab_focus
   end
 
   def show_font_selector
@@ -84,13 +86,6 @@ class TopinambourWindow
     @overlay.children[1].destroy if in_overlay_mode?
   end
 
-  def load_css_properties
-    @default_width = style_get_property("width")
-    @default_height = style_get_property("height")
-    set_default_size(@default_width, @default_height)
-    @shell = style_get_property("shell")
-  end
-
   def display_about
     Gtk::AboutDialog.show(self,
                           "authors" => ["Cedric Le Moigne <cedlemo@gmx.com>"],
@@ -99,7 +94,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.9",
+                          "version" => "1.0.11",
                           "website" => "https://github.com/cedlemo/topinambour",
                           "website_label" => "Topinambour github repository"
                          )
@@ -148,27 +143,30 @@ class TopinambourWindow
   def create_header_bar
     resource_file = "/com/github/cedlemo/topinambour/headerbar.ui"
     builder = Gtk::Builder.new(:resource => resource_file)
-    set_titlebar(builder["headerbar"])
+    headerbar = builder["headerbar"]
+    headerbar.name = "topinambour-headerbar"
+    set_titlebar(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)
+    reload_css_conf_signal(builder)
   end
 
   def current_label_signals
     @current_label.signal_connect "activate" do |entry|
-      @notebook.current.custom_title = entry.text
-      @notebook.current.grab_focus
+      @notebook.current.term.custom_title = entry.text
+      @notebook.current.term.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
+        @notebook.current.term.custom_title = nil
+        entry.text = @notebook.current.term.window_title
       end
     end
   end
@@ -217,10 +215,20 @@ class TopinambourWindow
     end
   end
 
+  def reload_css_conf_signal(builder)
+    button = builder["css_reload_button"]
+    button.signal_connect "clicked" do
+      application.reload_css_config
+      notebook.each { |tab| tab.term.load_properties }
+      load_properties
+      queue_draw
+    end
+  end
+
   def toggle_overlay(klass)
     if in_overlay_mode? && @overlay.children[1].class == klass
       exit_overlay_mode
-      @notebook.current.grab_focus
+      @notebook.current.term.grab_focus
     else
       exit_overlay_mode
       add_overlay(klass.new(self))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: topinambour
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Cedric LE MOIGNE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-04 00:00:00.000000000 Z
+date: 2016-11-25 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.9
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,27 +29,7 @@ dependencies:
         version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.9
-- !ruby/object:Gem::Dependency
-  name: gtksourceview3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.9
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.9
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
@@ -134,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Ruby-gnome2 Terminal emulator