iconify 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f88b781da3aee4c1090ee46c7166adf93139675f
-  data.tar.gz: 43760935e2287349a47636af6ddf02570c215b08
+  metadata.gz: 77f5ba6428215e6714068c04ba0ac9f6112522e2
+  data.tar.gz: 86effae2ea2f63f5a2cccb91d6ba13aff88bafb4
 SHA512:
-  metadata.gz: 83e04021817c01873593fab8c234e8ccb4fc17e22778e4a4714f6745634465628209c8b535fbc63486d895b5149c74146fe2676f375675724e1bd086f822cec1
-  data.tar.gz: 995d4728461f71c24570b36f064f98cd2c349da76525bafcbd528bc58c1d7c90c1150b957281c4eb793dd60ea938efef2566255038a761083d240e4b414eb4ce
+  metadata.gz: 4c25bc69efd9b485c792ddedcf6b5ac9ff897b3f903959b3f6e42974b631244ad5da1c6c50465f1d18bb082bc0c20e7313dafcf3051f3715e6ccd8b029be559b
+  data.tar.gz: 838730d2b89ea8b625b57ce2a3c7fd8fc1ac4329f1f2ade8c4c3a6676b691df62429bda6085cfd23a82271cf38a29dd7691056ffe7fb9bfdb0347972eb89207c

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+*~

data/iconify.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "gtk2"
-  spec.add_dependency "vte"
+  spec.add_dependency "gtk3"
+  spec.add_dependency "vte3"
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/iconify.rb

@@ -1,5 +1,5 @@
-require 'gtk2'
-require 'vte'
+require 'gtk3'
+require 'vte3'
 
 require "iconify/version"
 require "iconify/program"
@@ -20,14 +20,17 @@ class TerminalWindow < Gtk::Window
     @argv = argv
 
     @terminal = Vte::Terminal.new
+    @terminal.font = Pango::FontDescription.new("monospace 14")
+    @terminal.set_size_request(@terminal.char_width * 80, @terminal.char_height * 24)
+    @terminal.cursor_blink_mode = Vte::CursorBlinkMode::OFF
 
     self.title = "iconify - #{argv[0]}"
 
     @state = :stopped
 
-    vbox = VBox.new
-    hbox = HButtonBox.new
-    rerun_button = Button.new("Rerun")
+    vbox = Box.new(:vertical)
+    hbox = ButtonBox.new(:horizontal)
+    rerun_button = Button.new(label: "Rerun")
     rerun_button.signal_connect('clicked') do
       self.exec
     end
@@ -35,7 +38,7 @@ class TerminalWindow < Gtk::Window
       rerun_button.sensitive = (@state == :stopped)
     end
 
-    kill_button = Button.new("Kill")
+    kill_button = Button.new(label: "Kill")
     kill_button.signal_connect('clicked') do 
       Process.kill("KILL", @pid) if @pid
     end
@@ -43,15 +46,15 @@ class TerminalWindow < Gtk::Window
       kill_button.sensitive = (@state == :running)
     end
 
-    quit_button = Button.new("Quit")
+    quit_button = Button.new(label: "Quit")
     quit_button.signal_connect('clicked') do
       Gtk.main_quit
     end
     hbox.pack_start(rerun_button)
     hbox.pack_start(kill_button)
     hbox.pack_start(quit_button)
-    vbox.pack_start(hbox, false)
-    vbox.pack_start(@terminal)
+    vbox.pack_start(hbox, expand: false)
+    vbox.pack_start(@terminal, expand: true, fill: true)
 
     add vbox
 
@@ -64,7 +67,7 @@ class TerminalWindow < Gtk::Window
   end
 
   def exec
-    @pid = @terminal.fork_command(argv: @argv)
+    @pid = @terminal.spawn(argv: @argv)
     @state = :running
     signal_emit('changed')
   end
@@ -95,9 +98,11 @@ class CommandStatusIcon < Gtk::StatusIcon
   end
 
   def redraw
-    pixmap = Gdk::Pixmap.new(nil, 64, 64, 24)
+    # pixmap = Gdk::Pixmap.new(nil, 64, 64, 24)
 
-    cr = pixmap.create_cairo_context
+    image_surface = Cairo::ImageSurface.new(Cairo::FORMAT_ARGB32, 64, 64)
+
+    cr = Cairo::Context.new(image_surface)
 
     cr.set_source_rgb(0.8, 0.8, 0.8)
     cr.set_operator(Cairo::OPERATOR_SOURCE)
@@ -114,8 +119,10 @@ class CommandStatusIcon < Gtk::StatusIcon
 
     cr.destroy
 
-    buf = Gdk::Pixbuf.from_drawable(nil, pixmap, 0, 0, 64, 64)
+    buf = image_surface.to_pixbuf(0, 0, 64, 64)
     self.pixbuf = buf
+
+    image_surface.destroy
   end
 
 end

data/lib/iconify/program.rb

@@ -11,7 +11,7 @@ class Program
     @terminal_window = TerminalWindow.new(argv)
     @terminal_window.signal_connect('delete-event') do
       if @status_icon.embedded?
-        hide
+        @terminal_window.hide
       else
         run_dialog("The status icon is not embedded in a notification area. The window cannot be hidden.")
       end
@@ -22,7 +22,7 @@ class Program
       @terminal_window.icon = @status_icon.pixbuf
     end
     @terminal_window.show_all
-    Gtk.timeout_add(500) do
+    GLib::Timeout.add(500) do
       if @status_icon.embedded?
         @terminal_window.hide
       else

data/lib/iconify/version.rb

@@ -1,3 +1,3 @@
 module Iconify
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: iconify
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Yoteichi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-03 00:00:00.000000000 Z
+date: 2016-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: gtk2
+  name: gtk3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: vte
+  name: vte3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="