gtk3 2.2.0-x86-mingw32 → 2.2.1-x86-mingw32

data/sample/gtk-demo/item_factory.rb

@@ -14,55 +14,55 @@ module Demo
   class ItemFactory < BasicWindow
     def initialize
       super('Item Factory')
-      
+
       accel_group = Gtk::AccelGroup.new
       item_factory = Gtk::ItemFactory.new(Gtk::ItemFactory::TYPE_MENU_BAR,
-					  '<main>', accel_group)
-      
+                                          '<main>', accel_group)
+
       add_accel_group(accel_group)
       set_border_width(0)
       ifactory_cb = proc do |data, widget|
-	puts "ItemFactory: activated \"#{Gtk::ItemFactory.path_from_widget(widget)}\""
+        puts "ItemFactory: activated \"#{Gtk::ItemFactory.path_from_widget(widget)}\""
       end
       menu_items = [
-	['/_File'],
-	['/File/tearoff1',
-	  '<Tearoff>', nil, nil, ifactory_cb],
-	['/File/_New',
-	  '<Item>', '<control>N', nil, ifactory_cb],
-	['/File/_Open',
-	  '<Item>', '<control>O', nil, ifactory_cb],
-	['/File/_Save',
-	  '<Item>', '<control>S', nil, ifactory_cb],
-	['/File/Save _As...',
-	  '<Item>', nil, nil, ifactory_cb],
-	['/File/sep1', '<Separator>'],
-	['/File/_Quit',
-	  '<Item>', '<control>Q', nil, ifactory_cb],
-	
-	['/_Preferences'],
-	['/_Preferences/_Color'],
-	[ '/_Preferences/Color/_Red',
-	  '<RadioItem>', nil, nil, ifactory_cb],
-	['/_Preferences/Color/_Green',
-	  '/Preferences/Color/Red', nil, nil, ifactory_cb],
-	['/_Preferences/Color/_Blue',
-	  '/Preferences/Color/Red', nil, nil, ifactory_cb],
-	['/_Preferences/_Shape'],
-	['/_Preferences/Shape/_Square',
-	  '<RadioItem>', nil, nil, ifactory_cb],
-	[ '/_Preferences/Shape/_Rectangle',
-	  '/Preferences/Shape/Square', nil, nil, ifactory_cb],
-	[ '/_Preferences/Shape/_Oval',
-	  '/Preferences/Shape/Rectangle', nil, nil, ifactory_cb],
-	
-	[ '/_Help', '<LastBranch>'],
-	[ '/Help/_About', '<Item>', nil, nil, ifactory_cb],
+        ['/_File'],
+        ['/File/tearoff1',
+          '<Tearoff>', nil, nil, ifactory_cb],
+        ['/File/_New',
+          '<Item>', '<control>N', nil, ifactory_cb],
+        ['/File/_Open',
+          '<Item>', '<control>O', nil, ifactory_cb],
+        ['/File/_Save',
+          '<Item>', '<control>S', nil, ifactory_cb],
+        ['/File/Save _As...',
+          '<Item>', nil, nil, ifactory_cb],
+        ['/File/sep1', '<Separator>'],
+        ['/File/_Quit',
+          '<Item>', '<control>Q', nil, ifactory_cb],
+
+        ['/_Preferences'],
+        ['/_Preferences/_Color'],
+        [ '/_Preferences/Color/_Red',
+          '<RadioItem>', nil, nil, ifactory_cb],
+        ['/_Preferences/Color/_Green',
+          '/Preferences/Color/Red', nil, nil, ifactory_cb],
+        ['/_Preferences/Color/_Blue',
+          '/Preferences/Color/Red', nil, nil, ifactory_cb],
+        ['/_Preferences/_Shape'],
+        ['/_Preferences/Shape/_Square',
+          '<RadioItem>', nil, nil, ifactory_cb],
+        [ '/_Preferences/Shape/_Rectangle',
+          '/Preferences/Shape/Square', nil, nil, ifactory_cb],
+        [ '/_Preferences/Shape/_Oval',
+          '/Preferences/Shape/Rectangle', nil, nil, ifactory_cb],
+
+        [ '/_Help', '<LastBranch>'],
+        [ '/Help/_About', '<Item>', nil, nil, ifactory_cb],
       ]
       item_factory.create_items(menu_items)
 
       item_factory.get_item('/Preferences/Shape/Oval').set_active(true)
-      
+
       box1 = Gtk::VBox.new(false, 0)
       add(box1)
 
@@ -76,7 +76,7 @@ module Demo
       separator = Gtk::HSeparator.new
       box1.pack_start(separator)
 
-      
+
       box2 = Gtk::VBox.new(false, 10)
       box2.set_border_width(10)
       box1.pack_start(box2, :expand => false, :fill => true, :padding => 0)
@@ -84,7 +84,7 @@ module Demo
       button = Gtk::Button.new('close')
       # TODO: Need signal_connect_swapped?
       button.signal_connect('clicked') do
-	quit
+        quit
       end
       box2.pack_start(button, :expand => true, :fill => true, :padding => 0)
       button.set_flags(Gtk::Widget::CAN_DEFAULT)

data/sample/gtk-demo/list_store.rb

@@ -72,10 +72,10 @@ module Demo
 
       # add data to the list store
       DATA.each do |bug|
-	iter = store.append
-	bug.each_with_index do |value, index|
-	  iter[index] = value
-	end
+        iter = store.append
+        bug.each_with_index do |value, index|
+          iter[index] = value
+        end
       end
       return store
     end
@@ -84,12 +84,12 @@ module Demo
       # column for fixed toggles
       renderer = Gtk::CellRendererToggle.new
       renderer.signal_connect('toggled') do |cell, path|
-	fixed_toggled(treeview.model, path)
+        fixed_toggled(treeview.model, path)
       end
 
       column = Gtk::TreeViewColumn.new('Fixed?',
-				       renderer,
-				       'active' => COLUMN_FIXED)
+                                       renderer,
+                                       'active' => COLUMN_FIXED)
 
       # set this column to a fixed sizing (of 50 pixels)
       column.sizing = Gtk::TreeViewColumn::FIXED
@@ -99,24 +99,24 @@ module Demo
       # column for bug numbers
       renderer = Gtk::CellRendererText.new
       column = Gtk::TreeViewColumn.new('Bug number',
-				       renderer,
-				       'text' => COLUMN_NUMBER)
+                                       renderer,
+                                       'text' => COLUMN_NUMBER)
       column.set_sort_column_id(COLUMN_NUMBER)
       treeview.append_column(column)
 
       # column for severities
       renderer = Gtk::CellRendererText.new
       column = Gtk::TreeViewColumn.new('Severity',
-				       renderer,
-				       'text' => COLUMN_SEVERITY)
+                                       renderer,
+                                       'text' => COLUMN_SEVERITY)
       column.set_sort_column_id(COLUMN_SEVERITY)
       treeview.append_column(column)
 
       # column for description
       renderer = Gtk::CellRendererText.new
       column = Gtk::TreeViewColumn.new('Description',
-				       renderer,
-				       'text' => COLUMN_DESCRIPTION)
+                                       renderer,
+                                       'text' => COLUMN_DESCRIPTION)
       column.set_sort_column_id(COLUMN_DESCRIPTION)
       treeview.append_column(column)
     end

data/sample/gtk-demo/menus.rb

@@ -83,31 +83,31 @@ module Demo
       menu.append(menuitem)
       menuitem.show
       menuitem.add_accelerator('activate',
-			       accel_group,
-			       Gdk::Keyval::GDK_F1,
-			       0,
-			       Gtk::ACCEL_VISIBLE)
+                               accel_group,
+                               Gdk::Keyval::GDK_F1,
+                               0,
+                               Gtk::ACCEL_VISIBLE)
       menuitem = Gtk::CheckMenuItem.new('Accelerator Locked')
       menu.append(menuitem)
       menuitem.show
       menuitem.add_accelerator('activate',
-			       accel_group,
-			       Gdk::Keyval::GDK_F2,
-			       0,
-			       Gtk::ACCEL_VISIBLE | Gtk::ACCEL_LOCKED)
+                               accel_group,
+                               Gdk::Keyval::GDK_F2,
+                               0,
+                               Gtk::ACCEL_VISIBLE | Gtk::ACCEL_LOCKED)
       menuitem = Gtk::CheckMenuItem.new('Accelerators Frozen')
       menu.append(menuitem)
       menuitem.show
       menuitem.add_accelerator('activate',
-			       accel_group,
-			       Gdk::Keyval::GDK_F2,
-			       0,
-			       Gtk::ACCEL_VISIBLE)
+                               accel_group,
+                               Gdk::Keyval::GDK_F2,
+                               0,
+                               Gtk::ACCEL_VISIBLE)
       menuitem.add_accelerator('activate',
-			       accel_group,
-			       Gdk::Keyval::GDK_F3,
-			       0,
-			       Gtk::ACCEL_VISIBLE)
+                               accel_group,
+                               Gdk::Keyval::GDK_F3,
+                               0,
+                               Gtk::ACCEL_VISIBLE)
 
       optionmenu = Gtk::OptionMenu.new
       optionmenu.menu = menu
@@ -126,7 +126,7 @@ module Demo
 
       button = Gtk::Button.new('close')
       button.signal_connect('clicked') do
-	quit
+        quit
       end
       box2.pack_start(button, :expand => true, :fill => true, :padding => 0)
       button.flags = Gtk::Widget::CAN_DEFAULT
@@ -137,32 +137,32 @@ module Demo
 
     def create_menu (depth, tearoff)
       if depth < 1
-	return nil
+        return nil
       end
 
       menu = Gtk::Menu.new
       group = nil
 
       if tearoff
-	menuitem = Gtk::TearoffMenuItem.new
-	menu.append(menuitem)
-	menuitem.show
+        menuitem = Gtk::TearoffMenuItem.new
+        menu.append(menuitem)
+        menuitem.show
       end
 
       5.times do |i|
-	buf = sprintf('item %2d - %d', depth, i + 1)
-	menuitem = Gtk::RadioMenuItem.new(buf)
-	group = menuitem.group
-
-	menu.append(menuitem)
-	menuitem.show
-	if i == 3
-	  menuitem.sensitive = false
-	end
-
-	if submenu = create_menu(depth - 1, true)
-	  menuitem.submenu = submenu
-	end
+        buf = sprintf('item %2d - %d', depth, i + 1)
+        menuitem = Gtk::RadioMenuItem.new(buf)
+        group = menuitem.group
+
+        menu.append(menuitem)
+        menuitem.show
+        if i == 3
+          menuitem.sensitive = false
+        end
+
+        if submenu = create_menu(depth - 1, true)
+          menuitem.submenu = submenu
+        end
       end
 
       menu.show

data/sample/gtk-demo/panes.rb

@@ -54,12 +54,12 @@ module Demo
       # Now create toggle buttons to control sizing
 
       vbox.pack_start(create_pane_options(hpaned,
-					  'Horizontal', 'Left', 'Right'),
-		      :expand => false, :fill => false, :padding => 0)
+                                          'Horizontal', 'Left', 'Right'),
+                      :expand => false, :fill => false, :padding => 0)
 
       vbox.pack_start(create_pane_options(vpaned,
-					  'Vertical', 'Top', 'Bottom'),
-		      :expand => false, :fill => false, :padding => 0)
+                                          'Vertical', 'Top', 'Bottom'),
+                      :expand => false, :fill => false, :padding => 0)
     end
 
     def create_pane_options(paned, frame_label, label1, label2)
@@ -75,14 +75,14 @@ module Demo
       check_button = Gtk::CheckButton.new('_Resize', true)
       table.attach_defaults(check_button, 0, 1, 1, 2)
       check_button.signal_connect('toggled') do
-	toggle_resize(paned.child1)
+        toggle_resize(paned.child1)
       end
 
       check_button = Gtk::CheckButton.new('_Shrink', true)
       table.attach_defaults(check_button, 0, 1, 2, 3)
       check_button.active = true
       check_button.signal_connect('toggled') do
-	toggle_shrink(paned.child1)
+        toggle_shrink(paned.child1)
       end
 
       label = Gtk::Label.new(label2)
@@ -92,14 +92,14 @@ module Demo
       table.attach_defaults(check_button, 1, 2, 1, 2)
       check_button.active = true
       check_button.signal_connect('toggled') do
-	toggle_resize(paned.child2)
+        toggle_resize(paned.child2)
       end
 
       check_button = Gtk::CheckButton.new('_Shrink')
       table.attach_defaults(check_button, 1, 2, 2, 3)
       check_button.active = true
       check_button.signal_connect('toggled') do
-	toggle_shrink(paned.child2)
+        toggle_shrink(paned.child2)
       end
 
       return frame
@@ -110,22 +110,22 @@ module Demo
       is_child1 = (child == paned.child1)
 
       resize = if is_child1
-		 paned.child1_resize?
-	       else
-		 paned.child2_resize?
-	       end
+                 paned.child1_resize?
+               else
+                 paned.child2_resize?
+               end
 
       shrink = if is_child1
-		 paned.child1_shrink?
-	       else
-		 paned.child2_shrink?
-	       end
+                 paned.child1_shrink?
+               else
+                 paned.child2_shrink?
+               end
 
       child.parent.remove(child)
       if is_child1
-	paned.pack1(child, !resize, shrink)
+        paned.pack1(child, !resize, shrink)
       else
-	paned.pack2(child, !resize, shrink)
+        paned.pack2(child, !resize, shrink)
       end
     end
 
@@ -134,22 +134,22 @@ module Demo
       is_child1 = (child == paned.child1)
 
       resize = if is_child1
-		 paned.child1_resize?
-	       else
-		 paned.child2_resize?
-	       end
+                 paned.child1_resize?
+               else
+                 paned.child2_resize?
+               end
 
       shrink = if is_child1
-		 paned.child1_shrink?
-	       else
-		 paned.child2_shrink?
-	       end
+                 paned.child1_shrink?
+               else
+                 paned.child2_shrink?
+               end
 
       child.parent.remove(child)
       if is_child1
-	paned.pack1(child, resize, !shrink)
+        paned.pack1(child, resize, !shrink)
       else
-	paned.pack2(child, resize, !shrink)
+        paned.pack2(child, resize, !shrink)
       end
     end
   end

data/sample/gtk-demo/rotated_text.rb

@@ -1,17 +1,13 @@
-# Copyright (c) 2005 Ruby-GNOME2 Project Team
+# Copyright (c) 2005-2014  Ruby-GNOME2 Project Team
 # This program is licenced under the same licence as Ruby-GNOME2.
 #
 # $Id: rotated_text.rb,v 1.2 2005/03/05 15:01:16 mutoh Exp $
 =begin
 = Rotated Text
 
-This demo shows how to use GDK and Pango to draw rotated and transformed text. 
-The use of Gdk::PangoRenderer in this example is a somewhat advanced technique; most applications can simply use Gdk::Drawable#draw_layout. 
-We use it here mostly because that allows us to work in user coordinates - that is, coordinates prior to the application of the transformation matrix, rather than device coordinates.
-As of GTK+-2.6, the ability to draw transformed and anti-aliased graphics as shown in this example is only present for text. 
-With GTK+-2.8, a new graphics system called "Cairo" will be introduced that provides these capabilities and many more for all types of graphics.
+This demo shows how to use Cairo and Pango to draw rotated and transformed text.
 =end
-require 'common'
+require "common"
 
 module Demo
   class RotatedText < BasicWindow
@@ -20,64 +16,56 @@ module Demo
     FONT = "Sans Bold 27"
 
     def initialize
-      super('Rotated Text')
-
-      unless Gtk.check_version?(2, 6, 0)
-         add(Gtk::Label.new("This sample requires GTK+ 2.6.0 or later"))
-         return
-      end
+      super("Rotated Text")
 
       drawing_area = Gtk::DrawingArea.new
       add(drawing_area)
-      drawing_area.modify_bg(Gtk::STATE_NORMAL, Gdk::Color.new(65535, 65535, 65535))
+      drawing_area.override_background_color(:normal, Gdk::RGBA.new(1.0,
+                                                                    1.0,
+                                                                    1.0,
+                                                                    0.0))
 
-      drawing_area.signal_connect("expose_event") do
-	matrix = Pango::Matrix.new
+      drawing_area.signal_connect("draw") do |_drawing_area, cairo_context|
+        cairo_context.set_source_rgb(1.0, 1.0, 1.0)
+        cairo_context.paint
+        cairo_context.save do
+          width, height = size
+          cairo_context.scale(width.to_f / (RADIUS * 2),
+                              height.to_f / (RADIUS * 2))
+          draw_text(cairo_context)
+        end
+      end
+    end
 
-	# Get the default renderer for the screen, and set it up for drawing
-	renderer = Gdk::PangoRenderer.get_default(drawing_area.screen)
-	renderer.drawable = drawing_area.window
-	renderer.gc = style.black_gc
-	width = drawing_area.allocation.width
-	height = drawing_area.allocation.height
+    private
+    def draw_text(cairo_context)
+      # Center coordinates on the middle of the region we are drawing
+      cairo_context.translate(RADIUS, RADIUS)
 
-	# Set up a transformation matrix so that the user space coordinates for
-	# the centered square where we draw are [-RADIUS, RADIUS], [-RADIUS, RADIUS]
-	# We first center, then change the scale
-	device_radius = [width, height].min / 2.0
+      # Create a PangoLayout, set the font and text
+      layout = cairo_context.create_pango_layout
 
-	matrix.translate!(device_radius + (width - 2 * device_radius) / 2.0,
-			  device_radius + (height - 2 * device_radius) / 2.0)
-	matrix.scale!(device_radius / RADIUS, device_radius / RADIUS)
+      layout.text = "Text"
+      layout.font_description = Pango::FontDescription.new(FONT)
 
-	# Create a PangoLayout, set the font and text
-	context = Gdk::Pango.context
-	layout = Pango::Layout.new(context)
-	layout.text = "Text"
-	layout.font_description = Pango::FontDescription.new(FONT)
+      # Draw the layout N_WORDS times in a circle
+      N_WORDS.times do |i|
+        angle = (360.0 * i) / N_WORDS
 
-	# Draw the layout N_WORDS times in a circle
-	(0...N_WORDS).each do |i|
-	  rotated_matrix = matrix.dup
-	  angle = 360 * i / N_WORDS.to_f
+        cairo_context.save do
+          # Gradient from red at angle == 60 to blue at angle == 240
+          red = (1 + Math.cos((angle - 60) * Math::PI / 180.0)) / 2
+          cairo_context.set_source_rgb(red, 0.0, 1.0 - red)
 
-	  # Gradient from red at angle == 60 to blue at angle == 300
-	  red = 65535 * (1 + Math.cos((angle - 60) * Math::PI / 180.0)) / 2
-	  color = Gdk::Color.new(red, 0, 65535 - red) 
-	  renderer.set_override_color(Pango::Renderer::PART_FOREGROUND, color)
+          cairo_context.rotate(angle * Math::PI / 180.0)
 
-	  rotated_matrix.rotate!(angle)
-	  context.matrix = rotated_matrix
+          # Inform Pango to re-layout the text with the new transformation
+          cairo_context.update_pango_layout(layout)
 
-	  # Inform Pango to re-layout the text with the new transformation matrix
-	  layout.context_changed
-	  width, height = layout.size
-	  renderer.draw_layout(layout, - width / 2, - RADIUS * Pango::SCALE)
-	end
-	# Clean up default renderer, since it is shared
-	renderer.set_override_color(Gdk::PangoRenderer::PART_FOREGROUND, nil)
-	renderer.drawable = nil
-	renderer.gc = nil
+          width, height = layout.size
+          cairo_context.move_to(-(width / Pango::SCALE) / 2, -RADIUS)
+          cairo_context.show_pango_layout(layout)
+        end
       end
     end
   end