topinambour 1.0.16 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f5c93eafb8c228baa405d2d3d3ef937a3c4cfb82
-  data.tar.gz: 8a2f504b545bc51830cb07216df766e40a50459b
+SHA256:
+  metadata.gz: 8f2671582f944b01b92f69e7e4bca371fdce5521443345a1ee35192b7a010bf4
+  data.tar.gz: 5fdd3ff4575fc9b5d687072a74429c6572947099c671ef5859ff8d198517e50e
 SHA512:
-  metadata.gz: 0a86353ef799af18b34f4f3b4ab43538f3e6a2e685b670d08d88d7b514def855a64c43a7c3f594e0c97dae5142305762aa9ffc0a87a1332efa0664e49cd76884
-  data.tar.gz: d4dde72409c9e839451f48fe9388f1f5c249d6416b8cad12f0ec703cbf19cb97eaa85de719d1b88cb22687761a65e4b6f00aab10db468c7c3ef76cfdfb243dc8
+  metadata.gz: 2a5fda92705259ddef1768140534f521af67dba6f062e3c4b5166e30539dd89b9bbd5b750a998d13aacd29f80e2dd99bec74b987377199726a22cad05ad2de83
+  data.tar.gz: 8710cfd3701824f4a27a5176ec4da70f015519d1b58ac99f92e9d74e7bc3c0b71312e55e9f9d51ad783f732ba7d4470e0929549303ae43884211bf7636a004fe

data/README.md

@@ -3,12 +3,11 @@
 [![Gem Version](https://badge.fury.io/rb/topinambour.svg)](https://badge.fury.io/rb/topinambour)
 [![Code Climate](https://codeclimate.com/github/cedlemo/topinambour/badges/gpa.svg)](https://codeclimate.com/github/cedlemo/topinambour)
 
-<a href="https://raw.github.com/cedlemo/topinambour/master/screenshot_terminal_chooser.png"><img src="https://raw.github.com/cedlemo/topinambour/master/screenshot_terminal_chooser.png" alt="Topinambour Preview"></a>
-
 ## Introduction
-Topinambour is a Terminal written with the **Gtk3** and **Vte3** ruby bindings from the project [Ruby-GNOME2](https://github.com/ruby-gnome2/ruby-gnome2).
+Topinambour is a simple Terminal written with the **Gtk3** and **Vte3** ruby bindings from the project [Ruby-GNOME2](https://github.com/ruby-gnome2/ruby-gnome2). It just provides one windows with one Vte terminal. If you need tab management, windows splitting, session management,
+uses [tmux](https://github.com/tmux/tmux/wiki) with it.
 
- ### Install
+### Install
 
     gem install topinambour
 
@@ -19,40 +18,20 @@ Topinambour is a Terminal written with the **Gtk3** and **Vte3** ruby bindings f
 
 ## Features
 
-<a href="https://raw.github.com/cedlemo/topinambour/master/screenshot_color_scheme.png"><img src="https://raw.github.com/cedlemo/topinambour/master/screenshot_color_scheme.png" alt="Topinambour Preview"></a>
-
-*    supports tabs
-*    tabs can be reordered or selected through the preview mode ( `Shift + Ctrl + o` ).
-*    each tab can be named.
-*    the theme can be done via a Css file, there is a load button that allow to reload the Css file when needed.
+*    the Gtk theme can be modified via a Css file (~/.config/topinambour/topinambour.css).
 *    terminal colors can be changed on the fly and saved.
 *    terminal font can be changed on the fly and saved.
-*    in the terminals, some patterns can be clicked (urls, emails, color names ...) in order to launch the appropriate application or a related dialog window.
+*    in the terminal, some patterns can be clicked (urls, emails, color names ...)
+in order to launch the appropriate application or a related dialog window.
 
 ## Shortcuts
 
-<a href="https://raw.github.com/cedlemo/topinambour/master/screenshot_shortcuts.png"><img src="https://raw.github.com/cedlemo/topinambour/master/screenshot_shortcuts.png" alt="Topinambour Shortcuts"></a>
-
-*    `Shift + Ctrl + t`  new tab
-
 *    `Shift + Ctrl + q` quit Topinambour
 
-*    `Shift + Ctrl + w` close current tab
-
-*    `Shift + Ctrl + left` previous tab
-
-*    `Shift + Ctrl + right` next tab
-
 *    `Shift + Ctrl + c` display color selectors for the vte in overlay mod (Esc to leave)
 
 *    `Shift + Ctrl + f` display font selector for the vte in overlay mod (Esc to leave)
 
-*    `Shift + Ctrl + o` display previews of all tabs (Esc to leave)
-
-*    `Shift + Ctrl + e` open the Css configuration editor in a new notebook tab.
-
-*    `Shift + Ctrl + /` open for the current terminal a search entry.
-
 *    `Shift + Ctrl + Up` diminue topinambour window size to its minimum or resize to its previous height.
 
 *    `Shift + Ctrl + PageUp` increase the opacity.
@@ -64,6 +43,14 @@ Topinambour is a Terminal written with the **Gtk3** and **Vte3** ruby bindings f
 By default, topinambour will look for the file `~/.config/topinambour/topinambour.css`. You can select another file in the preferences dialog.
 Various widget can be themed via the Css like the headerbar for example. Here is the Css used in the first screenshot (the Gtk theme is the Arc theme).
 
+topinambour-window
+topinambour-headerbar
+topinambour-term-box
+topinambour-scrollbar
+topinambour-terminal
+topinambour-color-selector
+topinambour-font-selector
+
 ```css
 *{
 }
@@ -72,13 +59,6 @@ Various widget can be themed via the Css like the headerbar for example. Here is
   background-color: rgba(0,0,0,0);
 }
 
-#topinambour-overview-box {
-  margin-right: 24px;
-  background-color: rgba(87,91,108,0.95);
-  border-radius: 6px;
-  color: #b0b0b0;
-}
-
 #topinambour-headerbar {
   background-color: #282828;
   border: none;
@@ -104,176 +84,11 @@ Various widget can be themed via the Css like the headerbar for example. Here is
   margin-left: 8px;
   background-color: #076678;
 }
-
-#topinambour-tab-term {
-  background-color: rgb(40,40,40);
-}
-
-grid button {
-  margin: 0px;
-  padding: 0px;
-}
-
-grid button image {
-  border: solid 3px rgba(0, 0, 0, 0.0);
-  margin: 0px;
-  padding: 0px;
-}
-```
-
-## Build and Install git version.
-
-    git clone git@github.com:cedlemo/topinambour.git
-    cd topinambour
-    gem build topinambour.gemspec
-    gem install topinambour-x.x.x.gem
-    ~> topinambour
-
-*Tips:*
-> Don't forget, if you install it localy, you need that your system know the path of
-the ruby gem binaries (for example).
-
-    export PATH="${PATH}:/home/${USER}/bin:${HOME}/gem/ruby/2.3.0/bin"
-
-## TODOs
-  * find out why there is the warning message related to the Vte::Regex.
-    * http://www.pcre.org/current/doc/html/pcre2.html
-    * https://www.regexbuddy.com/pcre.html
-## Old version (before 1.0.11)
-
-<a href="https://raw.github.com/cedlemo/topinambour/master/terminal_selector_screen.gif"><img src="https://raw.github.com/cedlemo/topinambour/master/terminal_selector_screen.gif" style="width:576px;height:324px;" alt="Color selection gif"></a>
-
-<a href="https://raw.github.com/cedlemo/topinambour/master/color_selection_screen.gif"><img src="https://raw.github.com/cedlemo/topinambour/master/color_selection_screen.gif" style="width:576px;height:324px;" alt="Color selection gif"></a>
-
-<a href="https://raw.github.com/cedlemo/topinambour/master/terminal_regex_color.gif"><img src="https://raw.github.com/cedlemo/topinambour/master/terminal_regex_color.gif" style="width:576px;height:324px;" alt="Regex color gif"></a>
-
-
-
-###  TODO:
-*   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.
-
-
-### User configuration
-
-It can be found in the file `$HOME/.config/topinambour/topinambour.css` (Be carefull by default Topinambour use fish as a default shell, if you want to use another one specify it in the topinambour.css file)
-
-```css
-*{
-/* 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;*/
-}
-
-TopinambourWindow headerbar entry{
-  /*border-radius: 4px;*/
-}
-
-#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 {
-  border: solid 3px rgba(0, 0, 0, 0.0);
-  margin: 0px;
-  padding: 0px;
-}
 ```
 
-Each time you modify this configuration via the interface of Topinambour (terminal colors selector, terminal font selector, css editor) and that you save your modifications, Topinambour create a copy of your previous Css file under a new name with :
-
-    FileUtils.mv(USR_CSS, "#{USR_CSS}_#{Time.new.strftime('%Y-%m-%d-%H-%M-%S')}.backup")
-
-Which means that the old file can be something like that : *topinambour.css_2016-12-5-13-20.backup*.
-
-## Installation
-
-### Dependencies
-
-*   gtk3 vte3 sass
-
-### Create the gem if needed:
-
-    gem build topinambour.gemspec
-
-### Install the gem :
-
-    gem install topinambour-x.x.x.gem
-
-### Launch the terminal
-
-    ~> topinambour
-
-#### Tips:
-
-Don't forget, if you install it localy, you need that your system know the path of
-the ruby gem binaries (for example).
-
-    export PATH="${PATH}:/home/${USER}/bin:${HOME}/gem/ruby/2.3.0/bin"
-
-#### Modifying or testing Topinambour is easy:
-
-##### Get the sources
-
-    git clone https://github.com/cedlemo/topinambour.git
-    cd topinambour/bin
-
-##### Edit the files Topinambour and test
-  The filenames correspond to their functionnalities.
-  Simply run `./topinambour` when you have done your modifications.
-
-You will need fish shell if you want to test it.
-
 ### Copying:
 
-Copyright 2015-2016 Cedric Le Moigne
+Copyright 2015-2018 Cedric Le Moigne
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

data/bin/topinambour

@@ -19,7 +19,6 @@
 # vte 3 bindings.
 # Author:: Cedlemo (mailto:cedlemo@gmx.com)
 
-require "gtk3"
 require "vte3"
 require "fileutils"
 
@@ -46,8 +45,8 @@ Gio::Resources.register(resource)
 # Load default libraries !!WARNING!! loading order matters
 
 %w(actions application rgb_names_regexes
-terminal_regex terminal notebook color_selector font_selector
-terminal_chooser shortcuts searchbar window preferences).each do |l|
+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

data/data/topinambour.gschema.xml

@@ -4,10 +4,10 @@
 
     <schema path="/com/github/cedlemo/topinambour/preferences/" id="com.github.cedlemo.topinambour">
     <key name='colorscheme' type='as'>
-	    <default>['#aeafad', '#323232', '#000000', '#b9214f', '#A6E22E',
-		    '#ff9800', '#3399ff', '#8e33ff', '#06a2dc', '#B0B0B0',
-		    '#5D5D5D', '#ff5c8d', '#CDEE69', '#ffff00', '#9CD9F0',
-		    '#FBB1F9', '#77DFD8', '#F7F7F7']</default>
+	    <default>['#ebdbb2', '#282828', '#282828', '#cc241d', '#98971a',
+		    '#d79921', '#458588', '#b16286', '#689d6a', '#a89984',
+		    '#928374', '#fb4934', '#b8bb26', '#fabd2f', '#83a598',
+		    '#d3869b', '#8ec07c', '#ebdbb2']</default>
 	    <summary>Default colorscheme</summary>
 	    <description>:foreground, :background, :black, :red, :green, :yellow,
                         :blue, :magenta, :cyan, :white, :brightblack,

data/lib/actions.rb

@@ -1,4 +1,4 @@
-# Copyright 2016-2017 Cedric LE MOIGNE, cedlemo@gmx.com
+# Copyright 2016-2018 Cedric LE MOIGNE, cedlemo@gmx.com
 # This file is part of Topinambour.
 #
 # Topinambour is free software: you can redistribute it and/or modify
@@ -30,20 +30,20 @@ module TopinambourActions
     application.add_action(action)
   end
 
-  def self.generate_about_action(application)
-    action = generate_action("about") do |_act, _param|
-      application.windows[0].display_about
-    end
-    action
-  end
-
-  def self.generate_preferences_action(application)
-    action = generate_action("preferences") do |_act, _param|
-      dialog = TopinambourPreferences.new(application.windows.first)
-      dialog.show_all
-    end
-    action
-  end
+#  def self.generate_about_action(application)
+#    action = generate_action("about") do |_act, _param|
+#      application.windows[0].display_about
+#    end
+#    action
+#  end
+#
+#  def self.generate_preferences_action(application)
+#    action = generate_action("preferences") do |_act, _param|
+#      dialog = TopinambourPreferences.new(application.windows.first)
+#      dialog.show_all
+#    end
+#    action
+#  end
 
   def self.generate_quit_action(application)
     action = generate_action("quit") do |_act, _param|
@@ -54,7 +54,7 @@ module TopinambourActions
 
   def self.generate_term_copy_action(application)
     action = generate_action("term_copy") do |_act, _param|
-      term = application.windows[0].notebook.current.term
+      term = application.windows[0].terminal
       event = Gtk.current_event
 
       _match, regex_type = term.match_check_event(event)
@@ -70,21 +70,22 @@ module TopinambourActions
 
   def self.generate_term_paste_action(application)
     action = generate_action("term_paste") do |_act, _param|
-      application.windows[0].notebook.current.term.paste_clipboard
+      application.windows[0].terminal.paste_clipboard
     end
     action
   end
 
-  def self.generate_shortcuts_action(application)
-    action = generate_action("shortcuts") do |_act, _param|
-      application.windows[0].show_shortcuts
-    end
-    action
-  end
+#  def self.generate_shortcuts_action(application)
+#    action = generate_action("shortcuts") do |_act, _param|
+#      application.windows[0].show_shortcuts
+#    end
+#    action
+#  end
 
   def self.add_actions_to(application)
     # preferences
-    %w(about quit term_copy term_paste preferences shortcuts).each do |name|
+    # %w(about quit term_copy term_paste preferences shortcuts).each do |name|
+    %w(quit term_copy term_paste).each do |name|
       add_action_to(name, application)
     end
   end

data/lib/application.rb

@@ -1,4 +1,4 @@
-# Copyright 2016-2017 Cedric LE MOIGNE, cedlemo@gmx.com
+# Copyright 2016-2018 Cedric LE MOIGNE, cedlemo@gmx.com
 # This file is part of Topinambour.
 #
 # Topinambour is free software: you can redistribute it and/or modify
@@ -22,7 +22,7 @@ class TopinambourApplication < Gtk::Application
     @options = {}
     @exit_status = 0
 
-    super("com.github.cedlemo.topinambour", [:non_unique, :handles_command_line])
+    super("com.github.cedlemo.topinambour", [:non_unique,:handles_command_line])
 
     signal_connect "startup" do |application|
       ENV["GSETTINGS_SCHEMA_DIR"] = DATA_PATH
@@ -31,21 +31,20 @@ class TopinambourApplication < Gtk::Application
       load_css_config
 
       TopinambourActions.add_actions_to(application)
-      load_menu_ui_in(application)
+#      load_menu_ui_in(application)
     end
 
     signal_connect "activate" do |application|
+
       window = TopinambourWindow.new(application)
       window.present
+
       if @options[:execute]
-        @options[:execute].each do |cmd|
-          window.add_terminal(cmd)
-          window.notebook.current.term.custom_title = cmd
-          window.current_label.text = cmd
-        end
+        window.add_terminal(@options[:execute])
       else
         window.add_terminal
       end
+      window.terminal.grab_focus
     end
 
 
@@ -113,8 +112,8 @@ class TopinambourApplication < Gtk::Application
 
   def parse_command_line(arguments)
     parser = OptionParser.new
-    parser.on("-e", "--execute COMMAND1,COMMAND2,COMMAND3", Array, "Run a command") do |cmds|
-      @options[:execute] = cmds
+    parser.on("-e", "--execute COMMAND", String, "Run a command") do |cmd|
+      @options[:execute] = cmd
     end
     parser.parse(arguments)
   end
@@ -127,11 +126,11 @@ 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_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"]