gtk3 2.0.0 → 2.0.1

data/Rakefile

@@ -17,6 +17,5 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
   package.windows.packages = []
   package.windows.dependencies = []
   package.required_ruby_version = ">= 1.9.2"
-  package.post_install_message = "This library is experimental."
 end
 package_task.define

data/ext/gtk3/rbgtk-image.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2013  Ruby-GNOME2 Project Team
  *  Copyright (C) 2002-2005 Masao Mutoh
  *
  *  This library is free software; you can redistribute it and/or
@@ -83,12 +83,77 @@ rg_clear(VALUE self)
     return self;
 }
 
+static GtkIconSize
+icon_size_from_ruby(GtkImage *image, VALUE rb_size)
+{
+    GtkIconSize size;
+
+    if (NIL_P(rb_size)) {
+        g_object_get(image,
+                     "icon-size", &size,
+                     NULL);
+        if (size == GTK_ICON_SIZE_INVALID) {
+            size = GTK_ICON_SIZE_BUTTON;
+        }
+    } else {
+        size = RVAL2GTKICONSIZE(rb_size);
+    }
+
+    return size;
+}
+
+static VALUE
+rg_set_from_icon_set(int argc, VALUE *argv, VALUE self)
+{
+    GtkImage *image;
+    VALUE rb_icon_set, rb_size;
+
+    image = RVAL2GTKIMAGE(self);
+    rb_scan_args(argc, argv, "11", &rb_icon_set, &rb_size);
+    gtk_image_set_from_icon_set(image,
+                                RVAL2GTKICONSET(rb_icon_set),
+                                icon_size_from_ruby(image, rb_size));
+    return self;
+}
+
+static VALUE
+rg_set_from_stock(int argc, VALUE *argv, VALUE self)
+{
+    GtkImage *image;
+    VALUE rb_stock, rb_size;
+    VALUE rb_buffer;
+
+    image = RVAL2GTKIMAGE(self);
+    rb_scan_args(argc, argv, "11", &rb_stock, &rb_size);
+    gtk_image_set_from_stock(image,
+                             RVAL2GLIBID(rb_stock, rb_buffer),
+                             icon_size_from_ruby(image, rb_size));
+    return self;
+}
+
+static VALUE
+rg_set_from_gicon(int argc, VALUE *argv, VALUE self)
+{
+    GtkImage *image;
+    VALUE rb_gicon, rb_size;
+
+    image = RVAL2GTKIMAGE(self);
+    rb_scan_args(argc, argv, "11", &rb_gicon, &rb_size);
+    gtk_image_set_from_gicon(image,
+                             RVAL2GICON(rb_gicon),
+                             icon_size_from_ruby(image, rb_size));
+    return self;
+}
+
 void
 Init_gtk_image(VALUE mGtk)
 {
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_IMAGE, "Image", mGtk);
     RG_DEF_METHOD(initialize, -1);
     RG_DEF_METHOD(clear, 0);
+    RG_DEF_METHOD(set_from_icon_set, -1);
+    RG_DEF_METHOD(set_from_stock, -1);
+    RG_DEF_METHOD(set_from_gicon, -1);
 
     G_DEF_CLASS(GTK_TYPE_IMAGE_TYPE, "Type", RG_TARGET_NAMESPACE);
 

data/ext/gtk3/rbgtk-tree-view.c

@@ -106,6 +106,7 @@ rg_insert_column(int argc, VALUE *argv, VALUE self)
         int ret;
         VALUE func = rb_block_proc();
 
+        G_RELATIVE(self, argv[2]);
         G_RELATIVE(self, func);
         ret = gtk_tree_view_insert_column_with_data_func(_SELF(self),
                                                          NUM2INT(args[0]),

data/sample/gtk-demo/stock_browser.rb

@@ -14,15 +14,13 @@ require 'common'
 
 module Demo
   class StockBrowser < BasicWindow
-    Item =
-      Struct.new('Item',
-		 :stock_id, :label, :modifier, :keyval, :translation_domain)
-    ItemInfo =
-      Struct.new('ItemInfo', :id, :item, :small_icon, :const, :accel_str)
-    ItemDisplay =
-      Struct.new('ItemDisplay',
-		 :type_label, :const_label, :id_label, :label_accel_label,
-		 :icon_image)
+    Item = Struct.new('Item',
+      :stock_id, :label, :modifier, :keyval, :translation_domain)
+    ItemInfo = Struct.new('ItemInfo',
+      :id, :item, :small_icon, :const, :accel_str)
+    ItemDisplay = Struct.new('ItemDisplay',
+      :type_label, :const_label, :id_label, :label_accel_label,
+      :icon_image)
 
     def initialize
       super('Stock Icons and Items')
@@ -34,7 +32,7 @@ module Demo
       add(hbox)
 
       sw = Gtk::ScrolledWindow.new
-      sw.set_policy(Gtk::POLICY_NEVER, :automatic)
+      sw.set_policy(:never, :automatic)
       hbox.pack_start(sw, :expand => false, :fill => false, :padding => 0)
 
       model = create_model
@@ -52,43 +50,43 @@ module Demo
       cell_renderer = Gtk::CellRendererText.new
       column.pack_start(cell_renderer, :expand => true)
       column.set_cell_data_func(cell_renderer) do |column, cell, model, iter|
-	cell.text = iter[0].const
+        cell.text = iter[0].const
       end
 
       treeview.append_column(column)
 
       cell_renderer = Gtk::CellRendererText.new
       treeview.insert_column(-1, 'Label', cell_renderer) do |col, cell, model, iter|
-	info = iter[0]
-	cell.text = info.item.label if info
+        info = iter[0]
+        cell.text = info.item.label if info
       end
 
       cell_renderer = Gtk::CellRendererText.new
       treeview.insert_column(-1, 'Accel', cell_renderer) do |col, cell, model, iter|
-	info = iter[0]
-	cell.text = info.accel_str if info
+        info = iter[0]
+        cell.text = info.accel_str if info
       end
 
       cell_renderer = Gtk::CellRendererText.new
       treeview.insert_column(-1, 'ID', cell_renderer) do |col, cell, model, iter|
-	info = iter[0]
-	cell.text = info.id if info
+        info = iter[0]
+        cell.text = info.id if info
       end
 
       align = Gtk::Alignment.new(0.5, 0.0, 0.0, 0.0)
-      hbox.pack_end(align, false, false, 0)
+      hbox.pack_end(align, :expand => false, :fill => false, :padding => 0)
 
       frame = Gtk::Frame.new('Selected Item')
       align.add(frame)
 
-      vbox = Gtk::VBox.new(false, 8)
+      vbox = Gtk::Box.new(:vertical, 8)
       vbox.border_width = 4
       frame.add(vbox)
 
       display = ItemDisplay.new
       class << treeview
-	@display = nil
-	attr_accessor :display
+        @display = nil
+        attr_accessor :display
       end
       treeview.display = display
 
@@ -107,10 +105,10 @@ module Demo
       vbox.pack_start(display.id_label, :expand => false, :fill => false, :padding => 0)
 
       selection = treeview.selection
-      selection.mode = Gtk::SELECTION_SINGLE
+      selection.mode = :single
 
       selection.signal_connect('changed') do |s|
-	selection_changed(s)
+        selection_changed(s)
       end
     end
 
@@ -119,54 +117,54 @@ module Demo
 
       list_ids = Gtk::Stock.ids
       list_ids.sort! do |a, b|
-	a.to_s <=> b.to_s
+        a.to_s <=> b.to_s
       end
       list_ids.each do |stock_id|
-	info = ItemInfo.new
+        info = ItemInfo.new
 
-	info.id = stock_id
+        info.id = stock_id
 
-	begin
-	  info.item = Item.new(*Gtk::Stock.lookup(stock_id))
-	rescue ArgumentError
-	  info.item = Item.new
-	end
+        begin
+          info.item = Item.new(*Gtk::Stock.lookup(stock_id))
+        rescue ArgumentError
+          info.item = Item.new
+        end
 
-	# only show icons for stock IDs that have default icons
-	icon_set = Gtk::IconFactory.lookup_default(info.id.to_s)
-	if icon_set
-	  # See what sizes this stock icon really exists at
-	  sizes = icon_set.sizes
+        # only show icons for stock IDs that have default icons
+        icon_set = Gtk::IconFactory.lookup_default(info.id.to_s)
+        if icon_set
+          # See what sizes this stock icon really exists at
+          sizes = icon_set.sizes
 
-	  # Use menu size if it exists, otherwise first size found
-	  size = sizes.find do |s| s == Gtk::IconSize::MENU end || sizes.first
+          # Use menu size if it exists, otherwise first size found
+          size = sizes.find do |s| s == :menu end || sizes.first
 
-	  info.small_icon = render_icon(info.id, size, '')
+          info.small_icon = render_icon_pixbuf(info.id, size)
 
-	  unless size == Gtk::IconSize::MENU
-	    # Make the result the proper size for our thumbnail
-	    w, h = Gtk::IconSize.lookup(size)
+          unless size == :menu
+            # Make the result the proper size for our thumbnail
+            w, h = Gtk::IconSize.lookup(size)
 
-	    scaled = info.small_icon.scale(w, h, Gdk::Pixbuf::INTERP_BILINEAR)
-	    info.small_icon = scaled
-	  end
+            scaled = info.small_icon.scale(w, h, Gdk::Pixbuf::INTERP_BILINEAR)
+            info.small_icon = scaled
+          end
 
-	else
-	  info.small_icon = nil
-	end
+        else
+          info.small_icon = nil
+        end
 
-	if info.item.keyval
-	  info.accel_str = Gtk::Accelerator.to_name(info.item.keyval,
-						    info.item.modifier)
-	else
-	  info.accel_str = ''
-	end
+        if info.item.keyval
+          info.accel_str = Gtk::Accelerator.to_name(info.item.keyval,
+                      info.item.modifier)
+        else
+          info.accel_str = ''
+        end
 
-	info.const = id_to_const(info.id)
+        info.const = id_to_const(info.id)
 
-	iter = store.append
-	iter[0] = info
-	iter[1] = info.id
+        iter = store.append
+        iter[0] = info
+        iter[1] = info.id
       end
 
       return store
@@ -180,40 +178,40 @@ module Demo
       info = iter[0]
 
       display.type_label.label = if info.small_icon and info.item.label
-				   'Icon and Item'
-				 elsif info.small_icon
-				   'Icon Only'
-				 elsif info.item.label
-				   'Item Only'
-				 else
-				   '???????'
-				 end
+                                   'Icon and Item'
+                                 elsif info.small_icon
+                                   'Icon Only'
+                                 elsif info.item.label
+                                   'Item Only'
+                                 else
+                                   '???????'
+                                 end
       display.const_label.label = info.const
       display.id_label.label = info.id
 
       if info.item.label
-	str = "%s %s" % [info.item.label, info.accel_str]
-	display.label_accel_label.set_text(str, true)
+        str = "%s %s" % [info.item.label, info.accel_str]
+        display.label_accel_label.set_text(str, true)
       else
-	display.label_accel_label.set_text('')
+        display.label_accel_label.set_text('')
       end
 
       if info.small_icon
-	display.icon_image.set(info.id, get_largest_size(info.id))
+        display.icon_image.set_from_stock(info.id, get_largest_size(info.id))
       else
-	display.icon_image.pixbuf = nil
+        display.icon_image.pixbuf = nil
       end
     end
 
     def get_largest_size(symbol)
       set = Gtk::IconFactory.lookup_default(symbol.id2name)
-      best_size = Gtk::IconSize::INVALID
+      best_size = :invalid
       best_pixels = 0
 
       sizes = set.sizes
       sizes.collect! do |i|
-	width, height = Gtk::IconSize.lookup(i)
-	[i, width * height]
+        width, height = Gtk::IconSize.lookup(i)
+        [i, width * height]
       end
       return (sizes.max do |a, b| a[1] <=> b[1] end)[0]
     end
@@ -223,8 +221,8 @@ module Demo
 
       s = id.id2name
       if s =~ /^gtk-/
-	const += 'Gtk::Stock::'
-	s[0,4] = ''
+        const += 'Gtk::Stock::'
+        s[0,4] = ''
       end
 
       const += s.upcase.gsub(/-/, '_')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gtk3
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,104 +9,104 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-29 00:00:00.000000000 Z
+date: 2013-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glib2
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: gio2
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: atk
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: pango
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: gdk_pixbuf2
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: gdk3
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.1
 description: Ruby/GTK3 is a Ruby binding of GTK+-3.x.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []
@@ -538,7 +538,7 @@ files:
 - test/test_gtk_widget.rb
 homepage: http://ruby-gnome2.sourceforge.jp/
 licenses: []
-post_install_message: This library is experimental.
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib