Germinal 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bd0423fec9e2da552397897ee04ba0b7e2d6580
-  data.tar.gz: eb15c61efc307bceca2dfd145d01f9cd35c09b0e
+  metadata.gz: 25f734b1b9677293d5d77a0b1327269bdb3cbdf5
+  data.tar.gz: 1e77a4b1243af8d88fed13892e96a8ba9f273f7d
 SHA512:
-  metadata.gz: bccbabb81fb1784704982b9472f26253b950e907b17cb0353f8a5b4732ccbc7597872c926a96ab273ba3c25967972fe8a793433b340daacaadc2c9a39560815f
-  data.tar.gz: 79fe962d8d56c874b09f1612b7b1404ad7d81ccbb13f850ae100bdcf4d4b0c5def89ad6c360f045d2e55c2c1d4252ef2117cbe2ed5f558eca6b5a98f3dc7cfcd
+  metadata.gz: d3d7b4102322df36b315624a6e7ef3eb83a29ecbb83edefda65aa6e21b28ccf97fa1737c6faa3e1196202b13ba298b8bafb5e833a7e596e7097595075cda4dd2
+  data.tar.gz: 79237ff4efd4be2ee4c97cb20d5eb6f2c4230cde19fe3ec285a45af07ebb9066974f02b49f7856b238ca2b77f269d3392e20e73d82b1e813047f76081ff9bcd8

data/data/germinal.gresource.xml

@@ -3,6 +3,8 @@
   <gresource prefix="/com/github/cedlemo/germinal">
     <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>
     <file>germinal.css</file>
     <file>application-exit-symbolic.svg</file>
     <file>color-select-symbolic.svg</file>

data/data/terminal-menu.ui

@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <menu id="termmenu">
+    <section>
+      <item>
+        <attribute name="label">Copy</attribute>
+        <attribute name="action">app.term_copy</attribute>
+        <attribute name="verb-icon">edit-copy-symbolic</attribute>
+      </item>
+      <item>
+        <attribute name="label">Paste</attribute>
+        <attribute name="action">app.term_paste</attribute>
+        <attribute name="verb-icon">edit-paste-symbolic</attribute>
+      </item>
+    </section>
+  </menu>
+</interface>

data/data/window-menu.ui

@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <menu id="winmenu">
+    <section>
+      <item >
+        <attribute name="label" translatable="yes" >_Css Configuration Editor</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">_Preferences</attribute>
+        <attribute name="action">app.preferences</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">_About</attribute>
+        <attribute name="action">app.about</attribute>
+      </item>
+    </section>
+
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">_Quit</attribute>
+        <attribute name="action">app.quit</attribute>
+      </item>
+    </section>
+  </menu>
+</interface>

data/lib/application.rb

@@ -43,6 +43,18 @@ class GerminalApplication < Gtk::Application
       end
       application.add_action(action)
 
+      action = Gio::SimpleAction.new("term_copy")
+      action.signal_connect("activate") do |_action, _parameter|
+        application.windows[0].notebook.current.copy_clipboard
+      end
+      application.add_action(action)
+
+      action = Gio::SimpleAction.new("term_paste")
+      action.signal_connect("activate") do |_action, _parameter|
+        application.windows[0].notebook.current.paste_clipboard
+      end
+      application.add_action(action)
+
       builder = Gtk::Builder.new(:resource => "/com/github/cedlemo/germinal/app-menu.ui")
       app_menu = builder.get_object("appmenu")
       application.set_app_menu(app_menu)

data/lib/terminal.rb

@@ -13,23 +13,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Germinal.  If not, see <http://www.gnu.org/licenses/>.
-class GerminalMenu < Gtk::Menu
-  def initialize(vte)
-    super()
-    copyitem = Gtk::MenuItem.new(:label => "Copy")
-    copyitem.signal_connect "activate" do
-      vte.copy_clipboard
-    end
-    append(copyitem)
-
-    pasteitem = Gtk::MenuItem.new(:label => "Paste")
-    pasteitem.signal_connect "activate" do
-      vte.paste_clipboard
-    end
-    append(pasteitem)
-    show_all
-  end
-end
 
 TERMINAL_COLOR_NAMES = [:foreground, :background, :black, :red, :green, :yellow, :blue, :magenta, :cyan, :white,
                         :brightblack, :brightred, :brightgreen, :brightyellow, :brightblue, :brightmagenta, :brightcyan, :brightwhite]
@@ -95,12 +78,21 @@ class GerminalTerminal < Vte::Terminal
       end
     end
 
-    @menu = GerminalMenu.new(self)
+    builder = Gtk::Builder.new(:resource => "/com/github/cedlemo/germinal/terminal-menu.ui")
+    @menu = Gtk::Popover.new(self, builder["termmenu"])
+    
     signal_connect "button-press-event" do |widget, event|
       if event.type == Gdk::EventType::BUTTON_PRESS &&
          event.button == Gdk::BUTTON_SECONDARY
 
-        widget.menu.popup(nil, nil, event.button, event.time)
+        x, y = event.window.coords_to_parent(event.x,
+                                             event.y)
+        rect = Gdk::Rectangle.new(x - allocation.x,
+                                  y - allocation.y,
+                                  1,
+                                  1)
+        widget.menu.set_pointing_to(rect)
+        widget.menu.show
         true
       else
         false

data/lib/window.rb

@@ -13,8 +13,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Germinal.  If not, see <http://www.gnu.org/licenses/>.
-#require "#{CURRENT_PATH}/resize_message.rb"
-#require "#{CURRENT_PATH}/css_editor.rb"
 
 class GerminalWindow < Gtk::ApplicationWindow
   attr_reader :notebook, :bar, :overlay, :current_label, :current_tab, :css_editor_style
@@ -213,19 +211,17 @@ class GerminalWindow < Gtk::ApplicationWindow
   end
 
   def add_buttons_at_begining
-    button = gen_icon_button("pan-start-symbolic")
-    button.tooltip_text = "Prev"
-    button.signal_connect("clicked") { @notebook.cycle_prev_page }
+    button = gen_icon_button("pan-start-symbolic", "prev") { @notebook.cycle_prev_page }
     @bar.pack_start(button)
+    
     @bar.pack_start(@current_tab)
-    button = gen_icon_button("pan-end-symbolic")
-    button.tooltip_text = "Next"
-    button.signal_connect("clicked") { @notebook.cycle_next_page }
+    
+    button = gen_icon_button("pan-end-symbolic", "next") { @notebook.cycle_next_page }
     @bar.pack_start(button)
+    
     @bar.pack_start(@current_label)
-    button = gen_icon_button("tab-new-symbolic")
-    button.tooltip_text = "New terminal"
-    button.signal_connect("clicked") do
+    
+    button = gen_icon_button("tab-new-symbolic", "New terminal") do
       add_terminal
       @notebook.set_page(@notebook.n_pages - 1)
     end
@@ -233,27 +229,49 @@ class GerminalWindow < Gtk::ApplicationWindow
   end
 
   def add_buttons_at_end
-    button = gen_icon_button("font-select-symbolic")
-    button.signal_connect "clicked" do
+    button = gen_icon_button("open-menu-symbolic", "Main Menu") do
+      builder = Gtk::Builder.new(:resource => "/com/github/cedlemo/germinal/window-menu.ui")
+      menu = Gtk::Menu.new(builder["winmenu"])
+      menu.attach_to_widget(button)
+      
+      menu.children[0].signal_connect "activate" do
+        css_editor = GerminalCssEditor.new(self)
+        @notebook.append_page(css_editor, Gtk::Label.new)
+        @notebook.set_page(@notebook.n_pages - 1)
+      end
+      
+      menu.show_all
+      event = Gtk.current_event
+      menu.popup(nil, nil, event.button, event.time)
+    end
+    @bar.pack_end(button)
+
+    button = gen_icon_button("font-select-symbolic", "Set font") do
       toggle_overlay(GerminalFontSelector) if @notebook.current.class == GerminalTerminal
     end
     @bar.pack_end(button)
-    button = gen_icon_button("color-select-symbolic")
-    button.signal_connect "clicked" do
+    
+    button = gen_icon_button("color-select-symbolic", "Set colors") do
       toggle_overlay(GerminalColorSelector) if @notebook.current.class == GerminalTerminal
     end
     @bar.pack_end(button)
-    button = gen_icon_button("emblem-photos-symbolic")
-    button.signal_connect "clicked" do
+    
+    button = gen_icon_button("emblem-photos-symbolic", "Terminals overview") do
       toggle_overlay(GerminalTermChooser)
     end
     @bar.pack_end(button)
   end
 
-  def gen_icon_button(icon_name)
+  def 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
+        yield
+      end
+    end
     button
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: Germinal
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Cédric LE MOIGNE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-13 00:00:00.000000000 Z
+date: 2016-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vte3
@@ -91,7 +91,9 @@ files:
 - data/pan-end-symbolic.svg
 - data/pan-start-symbolic.svg
 - data/tab-new-symbolic.svg
+- data/terminal-menu.ui
 - data/window-close-symbolic.svg
+- data/window-menu.ui
 - data/window.ui
 - lib/application.rb
 - lib/color_selector.rb