goocanvas 2.0.2 → 2.0.3

data/sample/demo-events.rb

@@ -0,0 +1,187 @@
+#!/usr/bin/env ruby
+#
+# This sample code is a port of
+# goocanvas/demo/demo-events.c. It is licensed
+# under the terms of the GNU Library General Public License, version
+# 2 or (at your option) later.
+#
+# Copyright (C) 2013  Ruby-GNOME2 Project Team
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+class CanvasSampleEvents < Gtk::Box
+  def initialize
+    super(:vertical, 4)
+    border_width = 4
+    show
+    create_events_page(self)
+  end
+
+  private
+  def create_events_page(vbox)
+    # Instructions
+
+    label = Gtk::Label.new(<<-EOT)
+Move the mouse over the items to check they receive the right motion events.
+The first 2 items in each group are 1) invisible and 2) visible but unpainted.
+    EOT
+    vbox.pack_start(label, :expand  => false,
+                           :fill    => false,
+                           :padding => 0)
+    label.show
+
+    # Frame and canvas
+
+    alignment = Gtk::Alignment.new(0.5, 0.5, 0.0, 0.0)
+    vbox.pack_start(alignment, :expand  => false,
+                               :fill    => false,
+                               :padding => 0)
+    alignment.show
+
+    frame = Gtk::Frame.new
+    frame.shadow_type = :in
+    alignment.add(frame)
+    frame.show
+
+    canvas = Goo::Canvas.new
+
+    canvas.set_size_request(600, 450)
+    canvas.set_bounds(0, 0, 600, 450)
+    frame.add(canvas)
+    canvas.show
+
+    create_events_area(canvas, 0, :none, "none")
+    create_events_area(canvas, 1, :visible_painted, "visible-painted")
+    create_events_area(canvas, 2, :visible_fill, "visible-fill")
+    create_events_area(canvas, 3, :visible_stroke, "visible-stroke")
+    create_events_area(canvas, 4, :visible, "visible")
+    create_events_area(canvas, 5, :painted, "painted")
+    create_events_area(canvas, 6, :fill, "fill")
+    create_events_area(canvas, 7, :stroke, "stroke")
+    create_events_area(canvas, 8, :all, "all")
+  end
+
+  def create_events_area(canvas, area_num, pointer_events, label)
+    row = area_num / 3
+    col = area_num % 3
+    x = col * 200
+    y = row * 150
+
+    root = canvas.root_item
+
+    dash = Goo::CanvasLineDash.new(5.0, 5.0)
+
+    # Create invisible item.
+    rect = Goo::CanvasRect.new(:parent         => root,
+                               :x              => x + 45,
+                               :y              => y + 35,
+                               :width          => 30,
+                               :height         => 30,
+                               :fill_color     => "red",
+                               :visibility     => :invisible,
+                               :line_width     => 5.0,
+                               :pointer_events => pointer_events)
+    view_id = sprintf("%s invisible", label)
+    setup_item_signals(rect, view_id)
+
+    # Display a thin rect around it to indicate it is there.
+    rect = Goo::CanvasRect.new(:parent       => root,
+                               :x            => x + 42.5,
+                               :y            => y + 32.5,
+                               :width        => 36,
+                               :height       => 36,
+                               # TODO: [BUG] Segmentation fault
+                               #:line_dash    => dash,
+                               :line_width   => 1.0,
+                               :stroke_color => "gray")
+
+    # Create unpainted item.
+    rect = Goo::CanvasRect.new(:parent         => root,
+                               :x              => x + 85,
+                               :y              => y + 35,
+                               :width          => 30,
+                               :height         => 30,
+                               :stroke_pattern => nil,
+                               :line_width     => 5.0,
+                               :pointer_events => pointer_events)
+    view_id = sprintf("%s unpainted", label)
+    setup_item_signals(rect, view_id)
+
+    # Display a thin rect around it to indicate it is there.
+    rect = Goo::CanvasRect.new(:parent       => root,
+                               :x            => x + 82.5,
+                               :y            => y + 32.5,
+                               :width        => 36,
+                               :height       => 36,
+                               # TODO: [BUG] Segmentation fault
+                               #:line_dash    => dash,
+                               :line_width   => 1.0,
+                               :stroke_color => "gray")
+
+    # Create stroked item.
+    rect = Goo::CanvasRect.new(:parent         => root,
+                               :x              => x + 125,
+                               :y              => y + 35,
+                               :width          => 30,
+                               :height         => 30,
+                               :line_width     => 5.0,
+                               :pointer_events => pointer_events)
+    view_id = sprintf("%s stroked", label)
+    setup_item_signals(rect, view_id)
+
+    # Create filled item.
+    rect = Goo::CanvasRect.new(:parent         => root,
+                               :x              => x + 60,
+                               :y              => y + 75,
+                               :width          => 30,
+                               :height         => 30,
+                               :fill_color     => "red",
+                               :stroke_pattern => nil,
+                               :line_width     => 5.0,
+                               :pointer_events => pointer_events)
+    view_id = sprintf("%s filled", label)
+    setup_item_signals(rect, view_id)
+
+    # Create stroked & filled item.
+    rect = Goo::CanvasRect.new(:parent         => root,
+                               :x              => x + 100,
+                               :y              => y + 75,
+                               :width          => 30,
+                               :height         => 30,
+                               :fill_color     => "red",
+                               :line_width     => 5.0,
+                               :pointer_events => pointer_events)
+    view_id = sprintf("%s stroked & filled", label)
+    setup_item_signals(rect, view_id)
+
+    Goo::CanvasText.new(:parent     => root,
+                        :text       => label,
+                        :x          => x + 100,
+                        :y          => y + 130,
+                        :width      => -1,
+                        :anchor     => :center,
+                        :font       => "Sans 12",
+                        :fill_color => "blue")
+  end
+
+  def setup_item_signals(item, item_id)
+    item.signal_connect("motion_notify_event") do |widget, event|
+      if item_id
+        printf("%s item received 'motion-notify' signal\n", item_id)
+      end
+      false
+    end
+  end
+end

data/sample/demo-features.rb

@@ -0,0 +1,148 @@
+#!/usr/bin/env ruby
+#
+# This sample code is a port of
+# goocanvas/demo/demo-features.c. It is licensed
+# under the terms of the GNU Library General Public License, version
+# 2 or (at your option) later.
+#
+# Copyright (C) 2013  Ruby-GNOME2 Project Team
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+class CanvasSampleFeatures < Gtk::Box
+  def initialize
+    super(:vertical, 4)
+    set_border_width(4)
+    show
+    create_canvas_features(self)
+  end
+
+  private
+  def create_canvas_features(box)
+    instructions(box)
+    root = frame_and_canvas(box)
+    parent1 = first_parent_and_box(root)
+    parent2 = second_parent_and_box(root)
+    big_circle_to_be_reparented(parent1, parent2)
+    a_group_to_be_reparented(parent1, parent2)
+  end
+
+  def instructions(box)
+    label = Gtk::Label.new(<<-EOT)
+Reparent test:  click on the items to switch them between parents
+    EOT
+    box.pack_start(label, :expand  => false,
+                          :fill    => false,
+                          :padding => 0)
+    label.show
+  end
+
+  def frame_and_canvas(box)
+    alignment = Gtk::Alignment.new(0.5, 0.5, 0.0, 0.0)
+    box.pack_start(alignment, :expand  => false,
+                              :fill    => false,
+                              :padding => 0)
+    alignment.show
+
+    frame = Gtk::Frame.new
+    frame.shadow_type = :in
+    alignment.add(frame)
+    frame.show
+
+    canvas = Goo::Canvas.new
+    root = canvas.root_item
+
+    canvas.set_size_request(400, 200)
+    canvas.set_bounds(0, 0, 400, 200)
+    frame.add(canvas)
+    canvas.show
+
+    root
+  end
+
+  def first_parent_and_box(root)
+    parent1 = Goo::CanvasGroup.new(:parent => root)
+    Goo::CanvasRect.new(:parent     => parent1,
+                        :x          => 0,
+                        :y          => 0,
+                        :width      => 200,
+                        :height     => 200,
+                        :fill_color => "tan")
+    parent1
+  end
+
+  def second_parent_and_box(root)
+    parent2 = Goo::CanvasGroup.new(:parent => root)
+    parent2.translate(200, 0)
+    Goo::CanvasRect.new(:parent     => parent2,
+                        :x          => 0,
+                        :y          => 0,
+                        :width      => 200,
+                        :height     => 200,
+                        :fill_color => "#204060")
+    parent2
+  end
+
+  def big_circle_to_be_reparented(parent1, parent2)
+    item = Goo::CanvasEllipse.new(:parent       => parent1,
+                                  :center_x     => 100,
+                                  :center_y     => 100,
+                                  :radius_x     => 90,
+                                  :radius_y     => 90,
+                                  :stroke_color => "black",
+                                  :fill_color   => "mediumseagreen",
+                                  :line_width   => 3.0)
+
+    item.signal_connect("button-press-event") do |widget, event|
+      on_button_press(widget, event, parent1, parent2)
+    end
+  end
+
+  def a_group_to_be_reparented(parent1, parent2)
+    group = Goo::CanvasGroup.new(:parent => parent2)
+    group.translate(100, 100)
+
+    Goo::CanvasEllipse.new(:parent       => group,
+                           :center_x     => 0,
+                           :center_y     => 0,
+                           :radius_x     => 50,
+                           :radius_y     => 50,
+                           :stroke_color => "black",
+                           :fill_color   => "wheat",
+                           :line_width   => 3.0)
+
+    Goo::CanvasEllipse.new(:parent     => group,
+                           :center_x   => 0,
+                           :center_y   => 0,
+                           :radius_x   => 25,
+                           :radius_y   => 25,
+                           :fill_color => "steelblue")
+
+    group.signal_connect("button-press-event") do |widget, event|
+      on_button_press(widget, event, parent1, parent2)
+    end
+  end
+
+  def on_button_press(item, event, parent1, parent2)
+    puts "In on_button_press"
+    parent = item.parent
+    item.remove
+    if parent == parent1
+      parent2.add_child(item, -1)
+    else
+      parent1.add_child(item, -1)
+    end
+  end
+end

data/sample/demo-fifteen.rb

@@ -21,28 +21,27 @@ Original Copyright:
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
 
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-  02111-1307, USA.
+  You should have received a copy of the GNU General Public License along
+  with this program; if not, write to the Free Software Foundation, Inc.,
+  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 =end
 
-class CanvasSampleFifteen < Gtk::VBox
+class CanvasSampleFifteen < Gtk::Box
 	PIECE_SIZE = 50
 	SCRAMBLE_MOVES = 32
 
 	def initialize
-		super(false, 4)
+		super(:vertical, 4)
 		border_width = 4
 		show()
 
 		alignment = Gtk::Alignment.new(0.5, 0.5, 0.0, 0.0)
-		pack_start(alignment, true, true, 0)
+		pack_start(alignment, :expand => true, :fill => true, :padding => 0)
 		alignment.show()
 
 		frame = Gtk::Frame.new
-		frame.set_shadow_type(Gtk::SHADOW_IN);
+		frame.set_shadow_type(:in);
 		alignment.add(frame)
 		frame.show()
 
@@ -57,14 +56,14 @@ class CanvasSampleFifteen < Gtk::VBox
 		@board = Array.new(16)
 		
 		0.upto(14) do |i|
-			@board[i] = Piece.new(@canvas.root_item)
+			@board[i] = Piece.new(:parent => @canvas.root_item)
 			@board[i].setup(self, i)
 		end
 		@board[15] = nil;
 
 		# Scramble button
-		button = Gtk::Button.new("Scramble")
-		pack_start(button, false, false, 0)
+		button = Gtk::Button.new(:label => "Scramble")
+		pack_start(button, :expand => false, :fill => false, :padding => 0)
 		button.signal_connect("clicked") do |button|
 	  	scramble()
 		end
@@ -77,13 +76,14 @@ class CanvasSampleFifteen < Gtk::VBox
 	  		return
 			end
 		end
-	  dialog = Gtk::MessageDialog.new(parent_window,
-                         Gtk::Dialog::DESTROY_WITH_PARENT,
-                         Gtk::MessageDialog::INFO,
-                         Gtk::MessageDialog::BUTTONS_OK,
-                         "You stud, you win!")
+	  dialog = Gtk::MessageDialog.new(:parent => parent.parent,
+                         :flags => :destroy_with_parent,
+                         :type => :info,
+                         :buttons_type => :ok,
+                         :message => "You stud, you win!")
 		dialog.set_modal(true)
-		dialog.run_and_close()
+		dialog.run
+		dialog.hide
 	end
 
 	def piece_enter_notify(item)
@@ -156,7 +156,7 @@ class CanvasSampleFifteen < Gtk::VBox
 			elsif (dir == 3) && ((pos % 4) != 3) # right
 				x = 1
 			else
-				retry
+				redo
 			end
 	
 			oldpos = pos + y * 4 + x;
@@ -165,7 +165,7 @@ class CanvasSampleFifteen < Gtk::VBox
 			@board[pos].pos = pos
 			@board[pos].translate(-x * PIECE_SIZE, -y * PIECE_SIZE)
 			pos = oldpos
-		end
+    end
 	end
 
  	class Piece < Goo::CanvasGroup
@@ -181,14 +181,22 @@ class CanvasSampleFifteen < Gtk::VBox
 			x = i % 4
 			translate( x * PIECE_SIZE,y * PIECE_SIZE)
 
-			Goo::CanvasRect.new(self, 0, 0, PIECE_SIZE, PIECE_SIZE,
+			Goo::CanvasRect.new(:parent => self,
+													:x => 0,
+													:y => 0,
+													:width => PIECE_SIZE,
+													:height => PIECE_SIZE,
 													:line_width => 1.0,
 													:fill_color => get_piece_color(x, y),
 													:stroke_color => "black")
 
   
-			@text = Goo::CanvasText.new(self,i.to_s, PIECE_SIZE / 2.0, 
-																	PIECE_SIZE / 2.0, -1, Gtk::ANCHOR_CENTER,
+			@text = Goo::CanvasText.new(:parent => self,
+																	:text => i.to_s,
+																	:x => PIECE_SIZE / 2.0,
+																	:y => PIECE_SIZE / 2.0,
+																	:width => -1,
+																	:anchor => :center,
 																	:font=>"Sans bold 24",
 																	:fill_color => "black")
 			@num = i