gtk3 2.1.0-x86-mingw32 → 2.2.0-x86-mingw32

data/sample/gtk-demo/pixbufs.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2003-2005 Ruby-GNOME2 Project Team
+# Copyright (c) 2003-2014 Ruby-GNOME2 Project Team
 # This program is licenced under the same licence as Ruby-GNOME2.
 #
 # $Id: pixbufs.rb,v 1.5 2005/02/12 23:02:43 kzys Exp $
@@ -16,29 +16,29 @@ off how to use Gtk::DrawingArea to do a simple animation.
 Look at the Image demo for additional pixbuf usage examples.
 =end
 
-require 'common'
+require "common"
 
 module Demo
   class Pixbufs < BasicWindow
     FRAME_DELAY = 50
 
-    BACKGROUND_NAME = 'background.jpg'
+    BACKGROUND_NAME = "background.jpg"
 
     IMAGE_NAMES = [
-      'apple-red.png',
-      'gnome-applets.png',
-      'gnome-calendar.png',
-      'gnome-foot.png',
-      'gnome-gmush.png',
-      'gnome-gimp.png',
-      'gnome-gsame.png',
-      'gnu-keys.png',
-      'ruby-gnome2-logo.png'
+      "apple-red.png",
+      "gnome-applets.png",
+      "gnome-calendar.png",
+      "gnome-foot.png",
+      "gnome-gmush.png",
+      "gnome-gimp.png",
+      "gnome-gsame.png",
+      "gnu-keys.png",
+      "ruby-gnome2-logo.png",
     ]
 
     CYCLE_LEN = 60
     def initialize
-      super('Pixbufs')
+      super("Pixbufs")
       set_resizable(false)
 
       @background = nil
@@ -47,40 +47,41 @@ module Demo
       @images = []
 
       begin
-	load_pixbufs
+        load_pixbufs
 
-	set_size_request(@background.width, @background.height)
+        set_size_request(@background.width, @background.height)
 
-	@frame = Gdk::Pixbuf.new(Gdk::Pixbuf::COLORSPACE_RGB,
-				 false, 8,
-				 @background.width, @background.height)
+        @frame = Gdk::Pixbuf.new(Gdk::Pixbuf::COLORSPACE_RGB,
+                                 false, 8,
+                                 @background.width, @background.height)
 
-	@da = Gtk::DrawingArea.new
+        @da = Gtk::DrawingArea.new
 
-	@da.signal_connect('expose_event') do |w, e|
-	  expose_cb(w, e)
-	end
+        @da.signal_connect("draw") do |w, e|
+          draw_cb(w, e)
+        end
 
-	add(@da)
+        add(@da)
 
-	timeout_id = Gtk.timeout_add(FRAME_DELAY) do
+        timeout_id = GLib::Timeout.add(FRAME_DELAY) do
           timeout
-	end
-        signal_connect('destroy') do
-          Gtk.timeout_remove(timeout_id)
+        end
+        signal_connect("destroy") do
+          GLib::Source.remove(timeout_id)
         end
       rescue
-	dialog = Gtk::MessageDialog.new(self,
-					Gtk::Dialog::DESTROY_WITH_PARENT,
-					Gtk::MessageDialog::ERROR,
-					Gtk::MessageDialog::BUTTONS_CLOSE,
-					"Failed to load an image: #{$!.message}")
-
-	dialog.signal_connect('response') do
-	  dialog.destroy
-	end
+        message = "Failed to load an image: #{$!.message}"
+        dialog = Gtk::MessageDialog.new(:parent       => self,
+                                        :flags        => :destroy_with_parent,
+                                        :type         => :error,
+                                        :buttons_type => :close,
+                                        :message      => message)
+
+        dialog.signal_connect("response") do
+          dialog.destroy
+        end
 
-	dialog.show
+        dialog.show
       end
     end
 
@@ -88,7 +89,7 @@ module Demo
       # Loads the images for the demo
 
       if @background
-	return # already loaded earlier
+        return # already loaded earlier
       end
 
       # demo_find_file() looks in the the current directory first,
@@ -99,25 +100,15 @@ module Demo
       @background = Gdk::Pixbuf.new(filename)
 
       IMAGE_NAMES.each_with_index do |basename, i|
-	filename = Demo.find_file(basename)
+        filename = Demo.find_file(basename)
 
-	@images[i] = Gdk::Pixbuf.new(filename)
+        @images[i] = Gdk::Pixbuf.new(filename)
       end
     end
 
-    def expose_cb(widget, event)
-      rowstride = @frame.rowstride
-
-      pixels = @frame.pixels
-      pixels[0, rowstride * event.area.y + event.area.x * 3] = ''
-
-      Gdk::RGB.draw_rgb_image(widget.window,
-                              widget.style.black_gc,
-                              event.area.x, event.area.y,
-                              event.area.width, event.area.height,
-                              Gdk::RGB::Dither::NORMAL,
-                              pixels, rowstride,
-                              event.area.x, event.area.y)
+    def draw_cb(widget, cairo_context)
+      cairo_context.set_source_pixbuf(@frame)
+      cairo_context.paint
       true
     end
 
@@ -128,7 +119,7 @@ module Demo
 
       f = Float(@frame_num % CYCLE_LEN) / CYCLE_LEN;
 
-      xmid = @background.width / 2.0
+      xmid = @background.width  / 2.0
       ymid = @background.height / 2.0
 
       radius = [xmid, ymid].min / 2.0
@@ -138,7 +129,7 @@ module Demo
 
         r = radius + (radius / 3.0) * Math.sin(f * 2.0 * Math::PI)
 
-        xpos = (xmid + r * Math.cos(ang) - image.width / 2.0 + 0.5).floor
+        xpos = (xmid + r * Math.cos(ang) - image.width  / 2.0 + 0.5).floor
         ypos = (ymid + r * Math.sin(ang) - image.height / 2.0 + 0.5).floor
 
         k = if (i & 1) == 1
@@ -158,12 +149,12 @@ module Demo
                             if (i & 1) == 1
                               [
                                 127,
-                                (255 * Math.sin(f * 2.0 * Math::PI)).abs
+                                (255 * Math.sin(f * 2.0 * Math::PI)).abs,
                               ].max
                             else
                               [
                                 127,
-                                (255 * Math.cos(f * 2.0 * Math::PI)).abs
+                                (255 * Math.cos(f * 2.0 * Math::PI)).abs,
                               ].max
                             end)
         end

data/sample/misc/alpha-demo.rb

@@ -31,7 +31,7 @@ class AlphaDemo < Gtk::Window
     end
     set_double_buffered(false)
 
-    signal_connect('expose-event') do |widget, event|
+    signal_connect('draw') do |widget, event|
       cr = widget.window.create_cairo_context
 
       rgba = [1.0, 1.0, 1.0]

data/sample/misc/assistant.rb

@@ -10,13 +10,7 @@
   $Id: assistant.rb,v 1.1 2006/11/23 08:39:12 mutoh Exp $
 =end
 
-require 'gtk3'
-
-if str = Gtk.check_version(2, 10, 0)
-  puts "This sample requires GTK+ 2.10.0 or later"
-  puts str
-  exit
-end
+require "gtk3"
 
 class AssistantRunner
   def initialize
@@ -60,12 +54,12 @@ class AssistantRunner
   end
 
   def add_completion_test_page(assistant, text, visible, complete)
-    page = Gtk::VBox.new(0, 0)
+    page = Gtk::Box.new(:vertical, 0)
     check = Gtk::CheckButton.new("Complete")
     page.add(Gtk::Label.new(text))
     page.add(check)
     check.active = complete
-    check.signal_connect('toggled') do
+    check.signal_connect("toggled") do
       complete = check.active?
       assistant.set_page_complete(page, complete)
     end
@@ -83,11 +77,11 @@ class AssistantRunner
   def prepare_cb(assistant, page)
     if page.is_a?(Gtk::Label)
       puts "prepare: #{page.text}"
-    elsif assistant.get_page_type(page) == Gtk::Assistant::PAGE_PROGRESS
+    elsif assistant.get_page_type(page) == :progress
       progress = page.child
       assistant.set_page_complete(page, false)
       progress.fraction = 0.0
-      Gtk.timeout_add(300) do
+      GLib::Timeout.add(300) do
         page = assistant.get_nth_page(assistant.current_page)
         progress = page.child
         value = progress.fraction = progress.fraction + 0.1
@@ -103,18 +97,18 @@ class AssistantRunner
   def create_simple_assistant
     assistant = Gtk::Assistant.new
     assistant.set_default_size(400, 300)
-    assistant.signal_connect('cancel') do
+    assistant.signal_connect("cancel") do
       puts "cancel"
       assistant.hide
     end
-    assistant.signal_connect('close') do
+    assistant.signal_connect("close") do
       puts "close"
       assistant.hide
     end
-    assistant.signal_connect('apply') do
+    assistant.signal_connect("apply") do
       puts "apply"
     end
-    assistant.signal_connect('prepare') do |_assistant, page|
+    assistant.signal_connect("prepare") do |_assistant, page|
       prepare_cb(_assistant, page)
     end
 
@@ -135,18 +129,18 @@ class AssistantRunner
   def create_generous_assistant
     assistant = Gtk::Assistant.new
     assistant.set_default_size(400, 300)
-    assistant.signal_connect('cancel') do
+    assistant.signal_connect("cancel") do
       puts "cancel"
       assistant.hide
     end
-    assistant.signal_connect('close') do
+    assistant.signal_connect("close") do
       puts "close"
       assistant.hide
     end
-    assistant.signal_connect('apply') do
+    assistant.signal_connect("apply") do
       puts "apply"
     end
-    assistant.signal_connect('prepare') do|_assistant, page|
+    assistant.signal_connect("prepare") do|_assistant, page|
       prepare_cb(_assistant, page)
     end
 
@@ -162,7 +156,7 @@ class AssistantRunner
 
     check = Gtk::CheckButton.new("Next page visible");
     check.active = true
-    check.signal_connect('toggled') do
+    check.signal_connect("toggled") do
       puts "beuh"
       next_page.visible = check.active?
     end
@@ -197,25 +191,25 @@ class AssistantRunner
   def create_nonlinear_assistant
     assistant = Gtk::Assistant.new
     assistant.set_default_size(400, 300)
-    assistant.signal_connect('cancel') do
+    assistant.signal_connect("cancel") do
       puts "cancel"
       assistant.hide
     end
-    assistant.signal_connect('close') do
+    assistant.signal_connect("close") do
       puts "close"
       assistant.hide
     end
-    assistant.signal_connect('apply') do
+    assistant.signal_connect("apply") do
       puts "apply"
     end
-    assistant.signal_connect('prepare') do |_assistant, page|
+    assistant.signal_connect("prepare") do |_assistant, page|
       prepare_cb(_assistant, page)
     end
 
     assistant.set_forward_page_func do |current_page|
       retval = -1
       if current_page == 0
-        if @selected_branch == 'A'
+        if @selected_branch == "A"
           retval = 1
         else
           retval = 2
@@ -226,17 +220,17 @@ class AssistantRunner
       retval
     end
 
-    page = Gtk::VBox.new(false, 6)
-    button = Gtk::RadioButton.new('branch A')
-    page.pack_start(button, false, false, 0)
-    button.signal_connect('toggled') do
-      @selected_branch = 'A'
+    page = Gtk::Box.new(:vertical, 6)
+    button = Gtk::RadioButton.new("branch A")
+    page.pack_start(button, :expand => false, :fill => false, :padding => 0)
+    button.signal_connect("toggled") do
+      @selected_branch = "A"
     end
     button.active = true
-    button = Gtk::RadioButton.new(button, 'branch B')
-    page.pack_start(button, false, false, 0)
-    button.signal_connect('toggled') do
-      @selected_branch = 'B'
+    button = Gtk::RadioButton.new(button, "branch B")
+    page.pack_start(button, :expand => false, :fill => false, :padding => 0)
+    button.signal_connect("toggled") do
+      @selected_branch = "B"
     end
     page.show_all
     assistant.append_page(page)
@@ -266,22 +260,22 @@ class AssistantRunner
   def create_full_featured_assistant
     assistant = Gtk::Assistant.new
     assistant.set_default_size(400, 300)
-    assistant.signal_connect('cancel') do
+    assistant.signal_connect("cancel") do
       puts "cancel"
       assistant.hide
     end
-    assistant.signal_connect('close') do
+    assistant.signal_connect("close") do
       puts "close"
       assistant.hide
     end
-    assistant.signal_connect('apply') do
+    assistant.signal_connect("apply") do
       puts "apply"
     end
-    assistant.signal_connect('prepare') do |_assistant, page|
+    assistant.signal_connect("prepare") do |_assistant, page|
       prepare_cb(_assistant, page)
     end
 
-    button = Gtk::Button.new(Gtk::Stock::STOP)
+    button = Gtk::Button.new(:stock_id => Gtk::Stock::STOP)
     button.show
     assistant.add_action_widget(button)
 
@@ -319,29 +313,29 @@ end
 
 runner = AssistantRunner.new
 buttons = [
-    [ 'simple assistant', proc { runner.run_simple_assistant } ],
-    [ 'generous assistant', proc { runner.run_generous_assistant } ],
-    [ 'nonlinear assistant', proc { runner.run_nonlinear_assistant } ],
-    [ 'full featured assistant', proc { runner.run_full_featured_assistant } ],
+    [ "simple assistant", proc { runner.run_simple_assistant } ],
+    [ "generous assistant", proc { runner.run_generous_assistant } ],
+    [ "nonlinear assistant", proc { runner.run_nonlinear_assistant } ],
+    [ "full featured assistant", proc { runner.run_full_featured_assistant } ],
 ]
 
-if ENV['RTL']
+if ENV["RTL"]
   Gtk::Widget.default_direction = Gtk::Widget::TEXT_DIR_RTL
 end
 
-window = Gtk::Window.new(Gtk::Window::TOPLEVEL)
-window.signal_connect('destroy') { Gtk.main_quit }
-window.signal_connect('delete-event') { false }
+window = Gtk::Window.new(:toplevel)
+window.signal_connect("destroy") { Gtk.main_quit }
+window.signal_connect("delete-event") { false }
 
-box = Gtk::VBox.new(false, 6)
+box = Gtk::Box.new(:vertical, 6)
 window.add(box)
 
 buttons.each do |label, callback|
-  button = Gtk::Button.new(label)
-  button.signal_connect('clicked') do
+  button = Gtk::Button.new(:label => label)
+  button.signal_connect("clicked") do
     callback.call
   end
-  box.pack_start(button, true, true, 0)
+  box.pack_start(button, :expand => true, :fill => true, :padding => 0)
 end
 window.show_all
 Gtk.main

data/sample/misc/cairo-pong.rb

@@ -4,7 +4,7 @@
 
   Original: gtkcairo sample by Evan Martins.
 
-  Copyright (c) 2005,2006  Ruby-GNOME2 Project Team 
+  Copyright (c) 2005,2006  Ruby-GNOME2 Project Team
   This program is licenced under the same licence as Ruby-GNOME2.
 
   $Id: cairo-pong.rb,v 1.3 2006/06/17 13:18:12 mutoh Exp $
@@ -20,7 +20,7 @@ module Pong
   class CenteredItem
     attr_accessor :x, :y
     attr_reader :width, :height
-    
+
     def initialize(x, y, width, height)
       @x = x
       @y = y
@@ -31,15 +31,15 @@ module Pong
     def min_x
       @x - @width / 2
     end
-  
+
     def max_x
       @x + @width / 2
     end
-  
+
     def min_y
       @y - @height / 2
     end
-  
+
     def max_y
       @y + @height / 2
     end
@@ -53,7 +53,7 @@ module Pong
       cr.fill
     end
   end
-  
+
   class CenteredRect < CenteredItem
     def draw(cr)
       cr.translate(min_x, min_y)
@@ -62,7 +62,7 @@ module Pong
       cr.fill
     end
   end
-  
+
   class Ball < CenteredCircle
     attr_accessor :dx, :dy
     def initialize(dx=0.02, dy=0.02)
@@ -70,7 +70,7 @@ module Pong
       @dx = dx
       @dy = dy
     end
-    
+
     def update
       @x += @dx
       @y += @dy
@@ -83,7 +83,7 @@ module Pong
         @y -= min_y
         @dy *= -1
       end
-      
+
       if max_x > 1
         @x = 1 - (max_x - 1)
         @dx *= -1
@@ -93,13 +93,13 @@ module Pong
       end
     end
   end
-  
+
   class Paddle < CenteredRect
     def initialize(field, x, y)
       super(x, y, 0.05, 0.3)
       @field = field
     end
-    
+
     def update(ball)
       # is the ball coming towards us?
       if (ball.x < @x and ball.dx > 0) or
@@ -112,7 +112,7 @@ module Pong
     def ball_hit?(ball)
       ball.y > min_y and ball.y < max_y
     end
-    
+
     def update_ball(ball)
       if ball_hit?(ball)
         if ball.min_x < @x and ball.max_x > min_x # hit our left side
@@ -128,16 +128,16 @@ module Pong
 
   class Field
     attr_accessor :width, :height
-    
+
     def initialize(margin=0.05)
       @margin = margin
-      
+
       @left_paddle = Paddle.new(self, @margin, 0.5)
       @right_paddle = Paddle.new(self, 1 - @margin, 0.7)
       @paddles = [@left_paddle, @right_paddle]
       @ball = Ball.new
     end
-    
+
     def update
       @paddles.each do |paddle|
         paddle.update(@ball)
@@ -147,7 +147,7 @@ module Pong
         paddle.update_ball(@ball)
       end
     end
-    
+
     def draw(cr)
       cr.set_source_rgba(1, 1, 1)
       cr.rectangle(0, 0, 1, 1)
@@ -160,7 +160,7 @@ module Pong
           cr.save {paddle.draw(cr)}
         end
       end
-      
+
       cr.set_source_rgba(0, 0, 0)
       cr.save {@ball.draw(cr)}
     end
@@ -170,9 +170,9 @@ module Pong
     def initialize(speed=30)
       super()
       @speed = speed
-      
-      self.title = 'Pong Demonstration'
-      signal_connect('destroy') { Gtk.main_quit }
+
+      self.title = "Pong Demonstration"
+      signal_connect("destroy") { Gtk.main_quit }
       signal_connect("key_press_event") do |widget, event|
         if event.state.control_mask? and event.keyval == Gdk::Keyval::GDK_q
           destroy
@@ -189,20 +189,22 @@ module Pong
       @drawing_area = Gtk::DrawingArea.new
       set_draw
 
-      vb = Gtk::VBox.new(false, 5)
+      vb = Gtk::Box.new(:vertical, 5)
       vb.border_width = 10
-      vb.pack_start(@drawing_area, true, true, 0)
+      vb.pack_start(@drawing_area, :expand  => true,
+                                   :fill    => true,
+                                   :padding => 0)
       vb.show_all
       add(vb)
 
-      Gtk.timeout_add(@speed) do
+      GLib::Timeout.add(@speed) do
         @field.update
         @drawing_area.queue_draw unless @drawing_area.destroyed?
       end
     end
 
     def set_draw
-      @drawing_area.signal_connect('draw') do |widget, cr|
+      @drawing_area.signal_connect("draw") do |widget, cr|
         window = widget.window
         cr.scale(window.width, window.height)
         @field.draw(cr)