topinambour 2.0.4 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0691d6722ae037b1a62082537bbab8c33ff8cd37ab8539a8e8bc4b79476bab5e'
-  data.tar.gz: 64940e7dcddc3316cb25d0e61d56631b068daff15b41485736ed3d5e873833ec
+  metadata.gz: c051e0f90536143f79f773b54aaf57a26f7e547273a7df6c47969d46f20f7c95
+  data.tar.gz: ae1f7425d773901cfbc676e74a62f65e3a24073f3e944391fc9b07e0383b956c
 SHA512:
-  metadata.gz: 0bb15b54d2064783f90b90103373340bc4ad4116ed6dc79ef59c75e5a0655ba0ecce9946f0e18b6718f41376a42f8a002b9c9db81ad3b8557280f4c921b69a2e
-  data.tar.gz: 1eb0653f29eebe9f6e80cda523d38596572c94b0e83239889c5ae19513fde6fa1c403dfcc0dd2beeaea2df28f445b642e7c4275055c0c15cd02862c95aedc5e9
+  metadata.gz: 8487cfb2100b779913d4cc1e735c1adb88b120a2f98040f22996ba22762c932a956bc1aa013a53365faf5edd0f7931d7c316ce1415f9e621d50cc3beacb6fc03
+  data.tar.gz: b6f1ccc359cf0ae366f44ad4460a9052fc8efe86810b518ee8a5fc35a5695a0f9a6a6ab96bd31b31b869c609e0b0c8539f867d9a91137700b2e22dcf2a277166

data/bin/topinambour

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# Copyright 2015-2017 Cedric LE MOIGNE, cedlemo@gmx.com
+# Copyright 2015-2018 Cedric LE MOIGNE, cedlemo@gmx.com
 # This file is part of Topinambour.
 #
 # Topinambour is free software: you can redistribute it and/or modify
@@ -19,39 +19,37 @@
 # vte 3 bindings.
 # Author:: Cedlemo (mailto:cedlemo@gmx.com)
 
-require "vte3"
-require "fileutils"
+require 'vte3'
+require 'fileutils'
 
-Signal.trap("INT") {
-  STDERR.puts "\tTopinambour processus pid = #{Process.pid} has been interrupted with Ctrl-C"
+err_msg = "\tTopinambour processus pid = #{Process.pid} has been "
+
+Signal.trap('INT') do
+  STDERR.puts err_msg + 'interrupted with Ctrl-C'
   exit
-}
+end
 
-Signal.trap("TERM") {
-  STDERR.puts "\tTopinambour processus pid = #{Process.pid} has been killed"
+Signal.trap('TERM') do
+  STDERR.puts err_msg + 'has been killed'
   exit
-}
+end
 
-CURRENT_PATH = File.expand_path(File.dirname(__FILE__))
-LIB_PATH = "#{CURRENT_PATH}/../lib"
-DATA_PATH = "#{CURRENT_PATH}/../data"
+CURRENT_PATH = __dir__
+LIB_PATH = "#{CURRENT_PATH}/../lib".freeze
+DATA_PATH = "#{CURRENT_PATH}/../data".freeze
 CONFIG_DIR = File.expand_path("#{ENV['HOME']}/.config/topinambour")
-USR_CSS = "#{CONFIG_DIR}/topinambour.css"
-USR_LIB_PATH  = "#{CONFIG_DIR}/lib"
+DATA_HOME_DIR = File.expand_path("#{ENV['HOME']}/.local/share/topinambour")
+USR_CSS = "#{CONFIG_DIR}/topinambour.css".freeze
+USR_LIB_PATH  = "#{CONFIG_DIR}/lib".freeze
 gresource_bin = "#{DATA_PATH}/topinambour.gresource"
-
 resource = Gio::Resource.load(gresource_bin)
 Gio::Resources.register(resource)
-# Load default libraries !!WARNING!! loading order matters
 
-%w(actions application rgb_names_regexes
-terminal_regex terminal color_selector font_selector
-shortcuts window preferences).each do |l|
-  if File.exist?("#{USR_LIB_PATH}/#{l}.rb")
-    require "#{USR_LIB_PATH}/#{l}.rb"
-  else
-    require "#{LIB_PATH}/#{l}.rb"
-  end
+# Load default libraries !!WARNING!! loading order matters
+%w[version about actions application rgb_names_regexes
+   terminal_regex terminal color_selector font_selector
+   shortcuts window preferences].each do |l|
+  require "#{LIB_PATH}/#{l}.rb"
 end
 
 topinambour = TopinambourApplication.new

data/data/prefs-dialog.ui

@@ -3,14 +3,14 @@
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkAdjustment" id="width_adjustment">
-    <property name="upper">2000</property>
-    <property name="step_increment">5</property>
-    <property name="page_increment">10</property>
+    <property name="upper">500</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">1</property>
   </object>
   <object class="GtkAdjustment" id="height_adjustment">
-    <property name="upper">2000</property>
-    <property name="step_increment">5</property>
-    <property name="page_increment">10</property>
+    <property name="upper">500</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">1</property>
   </object>
   <template class="TopinambourPreferences" parent="GtkWindow">
     <property name="can_focus">False</property>

data/data/topinambour.css

@@ -1,73 +1,34 @@
 *{
-/* Default css properties
-  -TopinambourTerminal-foreground: #aeafad;
-  -TopinambourTerminal-background: #323232;
-  -TopinambourTerminal-black: #000000;
-  -TopinambourTerminal-red: #b9214f;
-  -TopinambourTerminal-green: #A6E22E;
-  -TopinambourTerminal-yellow: #ff9800;
-  -TopinambourTerminal-blue: #3399ff;
-  -TopinambourTerminal-magenta: #8e33ff;
-  -TopinambourTerminal-cyan: #06a2dc;
-  -TopinambourTerminal-white: #B0B0B0;
-  -TopinambourTerminal-brightblack: #5D5D5D;
-  -TopinambourTerminal-brightred: #ff5c8d;
-  -TopinambourTerminal-brightgreen: #CDEE69;
-  -TopinambourTerminal-brightyellow: #ffff00;
-  -TopinambourTerminal-brightblue: #9CD9F0;
-  -TopinambourTerminal-brightmagenta: #FBB1F9;
-  -TopinambourTerminal-brightcyan: #77DFD8;
-  -TopinambourTerminal-brightwhite: #F7F7F7;
-  -TopinambourTerminal-font: Monospace 11;
-  -TopinambourWindow-shell: "/usr/bin/fish";
-  -TopinambourWindow-css-editor-style: "monokai-extended";
-  -TopinambourWindow-height: 500;
-  -TopinambourWindow-width: 1000;*/
 }
 
-#topinambour-overview-box {
-  background-color: rgba(43,45,54,0.95);
-  border-radius: 6px 0px 0px 6px;
+#topinambour-window {
+  background-color: rgba(0,0,0,0);
 }
 
 #topinambour-headerbar {
-  background-color: #323232;
+  background-color: #282828;
   border: none;
   box-shadow: none;
 }
-
 #topinambour-headerbar:backdrop {
   background-color: rgba(50,50,50,0.7);
   border: none;
   box-shadow: none;
 }
 
-#topinambour-scrollbar{
+#topinambour-scrollbar {
 	background-color: rgba(0,0,0,0);
 	border: none;
 }
-
 #topinambour-scrollbar trough{
 	background-color: rgba(0,0,0,0);
 	border: none;
 }
-
 #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;
+	background-color: rgba(255,255,255,0.1);
 }
 
-grid button {
-  margin: 0px;
-  padding: 0px;
+#topinambour-term-box {
+	background-color: #282828;
 }

data/data/topinambour.gresource.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/com/github/cedlemo/topinambour">
-    <file preprocess="xml-stripblanks">window.ui</file>
     <file preprocess="xml-stripblanks">app-menu.ui</file>
     <file preprocess="xml-stripblanks">window-menu.ui</file>
     <file preprocess="xml-stripblanks">terminal-menu.ui</file>

data/data/topinambour.gschema.xml

@@ -25,12 +25,12 @@
 	<summary>Font of the terminal.</summary>
     </key>
      <key name="width" type="i">
-      <range min="1" max="2000"/>
-      <default>800</default>
+      <range min="1" max="500"/>
+      <default>80</default>
     </key>
      <key name="height" type="i">
-      <range min="1" max="2000"/>
-      <default>500</default>
+      <range min="1" max="500"/>
+      <default>20</default>
     </key>
     <key name="custom-css" type="b">
       <default>false</default>

data/lib/about.rb

@@ -0,0 +1,46 @@
+# Copyright 2018 Cedric 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/>.
+
+require "#{__dir__}/version"
+## About stores metainformation about Topinambour.
+module About
+  AUTHORS = ["Cedric Le Moigne <cedlemo@gmx.com>"].freeze
+  SUMMARY = "Vte3 Terminal emulator in ruby.".freeze
+  COMMENTS =
+    "Terminal Emulator based on the ruby bindings of Gtk3 and Vte3".freeze
+  COPYRIGHT = "Copyright (C) 2015-2018 Cedric Le Moigne".freeze
+  LICENSE = "GPL-3.0".freeze
+  LICENSE_COMMENTS =
+    "This program is licenced under the licence GPL-3.0 and later.".freeze
+  LOGO_ICON_NAME = "utilities-terminal-symbolic".freeze
+  PROGRAM_NAME = "topinambour".freeze
+  VERSION = Version::STRING
+  WEBSITE = "https://github.com/cedlemo/topinambour".freeze
+  WEBSITE_LABEL = "Topinambour github repository".freeze
+
+  def self.dialog(parent)
+    Gtk::AboutDialog.show(parent,
+                          "authors" => AUTHORS,
+                          "comments" => COMMENTS,
+                          "copyright" => COPYRIGHT,
+                          "license" => LICENSE,
+                          "logo_icon_name" => LOGO_ICON_NAME,
+                          "program_name" => PROGRAM_NAME,
+                          "version" => VERSION,
+                          "website" => WEBSITE,
+                          "website_label" => WEBSITE_LABEL)
+  end
+end

data/lib/actions.rb

@@ -14,6 +14,8 @@
 # You should have received a copy of the GNU General Public License
 # along with Topinambour.  If not, see <http://www.gnu.org/licenses/>.
 
+# Those are all the actions that can be called via the interface with
+# the label 'app.my_action' for a method my_action.
 module TopinambourActions
   def self.generate_action(name)
     action = Gio::SimpleAction.new(name)

data/lib/application.rb

@@ -14,41 +14,51 @@
 # You should have received a copy of the GNU General Public License
 # along with Topinambour.  If not, see <http://www.gnu.org/licenses/>.
 
-require "optparse"
+require 'optparse'
+require 'fileutils'
 
+## Gtk::Application class for topinambour
+#
 class TopinambourApplication < Gtk::Application
   attr_accessor :settings
   def initialize
     @options = {}
     @exit_status = 0
+    @app_id = 'com.github.cedlemo.topinambour'
+    @app_path = '/com/github/cedlemo/topinambour'
 
-    super("com.github.cedlemo.topinambour", [:non_unique,:handles_command_line])
+    super(@app_id, %i[non_unique handles_command_line])
 
-    signal_connect "startup" do |application|
-      ENV["GSETTINGS_SCHEMA_DIR"] = DATA_PATH
-      @settings  = Gio::Settings.new("com.github.cedlemo.topinambour")
-      initialize_css_provider
-      load_css_config
+    signal_connect 'startup' do |application|
+      GLib.set_application_name('topinambout')
+      GLib.set_prgname('topinambour')
+      parent_schema = Gio::SettingsSchemaSource.default
+      schema_source =
+        Gio::SettingsSchemaSource.new(DATA_PATH, parent_schema, true)
+      schema = schema_source.lookup(@app_id, true)
+      @settings = Gio::Settings.new(schema: schema,
+                                    path: @app_path + '/preferences/')
 
       TopinambourActions.add_actions_to(application)
-      load_menu_ui_in(application)
+      initialize_css_provider
+      create_xdg_dirs
+      load_css_config
+      load_menu_ui(application)
     end
 
-    signal_connect "activate" do |application|
-
+    signal_connect 'activate' do |application|
       window = TopinambourWindow.new(application)
-      window.present
 
       if @options[:execute]
         window.add_terminal(@options[:execute])
       else
         window.add_terminal
       end
-      window.terminal.grab_focus
+      window.show_all
+      window.present
     end
 
-
-    signal_connect "command-line" do |_application, command_line|
+    signal_connect 'command-line' do |_application, command_line|
       begin
         parse_command_line(command_line.arguments)
       rescue SystemExit => error
@@ -68,42 +78,41 @@ class TopinambourApplication < Gtk::Application
   end
 
   def reload_css_config
-    error_popup = nil
     bad_css = nil
     css_file = check_css_file_path
-    if css_file
-      @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
+    return unless css_file
+
+    @provider.signal_connect 'parsing-error' do |_css_prov, 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
 
-      begin
-        load_custom_css(css_file)
-      rescue => e
-        self.windows.first.exit_overlay_mode
-        # TODO : deal with the preferences window which is a transient one
-        # that keeps the focus even when the popup shows up.
-        error_popup = TopinambourCssErrorPopup.new(self.windows.first)
-        error_popup.transient_for = self.windows.first
-        error_popup.message = e.message + "\n\n" + bad_css
-        error_popup.show_all
-      end
+    begin
+      load_custom_css(css_file)
+    rescue => e
+      windows.first.exit_overlay_mode
+      # TODO : deal with the preferences window which is a transient one
+      # that keeps the focus even when the popup shows up.
+      error_popup = TopinambourCssErrorPopup.new(windows.first)
+      error_popup.transient_for = windows.first
+      error_popup.message = e.message + "\n\n" + bad_css
+      error_popup.show_all
     end
   end
 
   def check_css_file_path
-    css_file = if File.exist?(@settings["css-file"])
-                 @settings["css-file"]
+    css_file = if File.exist?(@settings['css-file'])
+                 @settings['css-file']
                else
-                 "#{CONFIG_DIR}/#{@settings["css-file"]}"
+                 "#{CONFIG_DIR}/#{@settings['css-file']}"
                end
     File.exist?(css_file) ? css_file : nil
   end
@@ -112,12 +121,22 @@ class TopinambourApplication < Gtk::Application
 
   def parse_command_line(arguments)
     parser = OptionParser.new
-    parser.on("-e", "--execute COMMAND", String, "Run a command") do |cmd|
+    parser.on('-e', '--execute COMMAND', String, 'Run a command') do |cmd|
       @options[:execute] = cmd
     end
     parser.parse(arguments)
   end
 
+  def load_menu_ui(application)
+    builder = Gtk::Builder.new(resource: @app_path + '/app-menu.ui')
+    app_menu = builder['appmenu']
+    application.app_menu = app_menu
+  end
+
+  #########################
+  # CSS related functions #
+  #########################
+
   def initialize_css_provider
     screen = Gdk::Display.default.default_screen
     @provider = Gtk::CssProvider.new
@@ -126,61 +145,39 @@ class TopinambourApplication < Gtk::Application
                                               Gtk::StyleProvider::PRIORITY_USER)
   end
 
-  def load_menu_ui_in(application)
-    builder = Gtk::Builder.new(:resource => "/com/github/cedlemo/topinambour/app-menu.ui")
-    app_menu = builder["appmenu"]
-    application.app_menu = app_menu
-  end
-
-  def load_custom_css(file)
-    if @settings["custom-css"]
-      @css_content = File.open(file, "r").read
-      @provider.load(:data => @css_content)
-    else
-      @provider.load(:data => "")
-    end
-  end
-
   def load_css_config
-    return unless @settings["custom-css"]
-    css_file = check_css_file_path
-    if css_file
+    return unless @settings['custom-css']
+    if (css_file = check_css_file_path)
       begin
         load_custom_css(css_file)
       rescue => e
-        puts "Bad css file using default css #{e.message}"
-        error_popup = TopinambourCssErrorPopup.new(self.windows.first)
+        error_popup = TopinambourCssErrorPopup.new(windows.first)
         error_popup.message = e.message + "\n\nBad css file using default css"
         error_popup.show_all
       end
     else
-      puts "No custom CSS, using default theme"
+      puts 'No custom CSS, using default theme'
     end
   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 }
+  def load_custom_css(file)
+    if @settings['custom-css']
+      @css_content = File.open(file, 'r').read
+      @provider.load(data: @css_content)
+    else
+      @provider.load(data: '')
+    end
   end
 
-  def message=(message)
-    @message.text = message
+  #########################
+  # Misc                  #
+  #########################
+  def create_xdg_dirs
+    create_dir_if_absent(CONFIG_DIR)
+    create_dir_if_absent(DATA_HOME_DIR)
   end
 
-  def message
-    @message.text
+  def create_dir_if_absent(path)
+    FileUtils.mkdir_p path unless File.exist?(path)
   end
 end