gtk3 2.2.5-x64-mingw32 → 3.0.0-x64-mingw32

data/sample/misc/listview.rb

@@ -2,13 +2,11 @@
 =begin
   listview.rb - Ruby/GTK sample script.
 
-  Copyright (c) 2002-2006 Ruby-GNOME2 Project Team
+  Copyright (c) 2002-2015 Ruby-GNOME2 Project Team
   This program is licenced under the same licence as Ruby-GNOME2.
-
-  $Id: listview.rb,v 1.11 2006/06/17 13:18:12 mutoh Exp $
 =end
 
-require 'gtk3'
+require "gtk3"
 
 window = Gtk::Window.new("Gtk::ListStore sample")
 window.border_width = 0
@@ -18,11 +16,11 @@ window.add(box1)
 
 box2 = Gtk::Box.new(:vertical, 10)
 box2.border_width = 10
-box1.pack_start(box2, true, true, 0)
+box1.pack_start(box2, :expand => true, :fill => true, :padding => 0)
 
 scrolled_win = Gtk::ScrolledWindow.new
 scrolled_win.set_policy(:automatic,:automatic)
-box2.pack_start(scrolled_win, true, true, 0)
+box2.pack_start(scrolled_win, :expand => true, :fill => true, :padding => 0)
 
 data = [
     "hello",
@@ -60,7 +58,7 @@ button.signal_connect("clicked") do
   i += 1
 end
 
-box2.pack_start(button, false, true, 0)
+box2.pack_start(button, :expand => false, :fill => true, :padding => 0)
 
 button = Gtk::Button.new(:label => "remove")
 button.can_focus=true
@@ -68,21 +66,21 @@ button.signal_connect("clicked") do
   iter = treeview.selection.selected
   model.remove(iter) if iter
 end
-box2.pack_start(button, false, true, 0)
+box2.pack_start(button, :expand => false, :fill => true, :padding => 0)
 
 separator = Gtk::Separator.new(:horizontal)
-box1.pack_start(separator, false, true, 0)
+box1.pack_start(separator, :expand => false, :fill => true, :padding => 0)
 separator.show
 
 box2 = Gtk::Box.new(:vertical, 10)
 box2.border_width = 10
-box1.pack_start(box2, false, true, 0)
+box1.pack_start(box2, :expand => false, :fill => true, :padding => 0)
 
 button = Gtk::Button.new(:label => "close")
 button.signal_connect("clicked") do
   Gtk.main_quit
 end
-box2.pack_start(button, true, true, 0)
+box2.pack_start(button, :expand => true, :fill => true, :padding => 0)
 button.can_default=true
 button.grab_default
 

data/sample/misc/menu.rb

@@ -2,44 +2,66 @@
 =begin
   menu.rb - Ruby/GTK2 sample script.
 
-  Copyright (c) 2002-2006 Ruby-GNOME2 Project Team
+  Copyright (c) 2002-2015 Ruby-GNOME2 Project Team
   This program is licenced under the same licence as Ruby-GNOME2.
-
-  $Id: menu.rb,v 1.8 2006/06/17 13:18:12 mutoh Exp $
 =end
 
-require 'gtk3'
+require "gtk3"
 
 def create_menu(depth)
   return nil if depth < 1
-  
+
   menu = Gtk::Menu.new
   group = nil
-  submenu = nil
 
-  for i in 0..4
-    buf = sprintf("item %2d - %d", depth, i + 1)
+  (0..4).each do |i|
+    buf = format("item %2d - %d", depth, i + 1)
     menuitem = Gtk::RadioMenuItem.new(group, buf)
     group = menuitem.group
     menu.append(menuitem)
-    if depth > 1
-      menuitem.set_submenu create_menu(depth - 1)
-    end
+
+    menuitem.set_submenu create_menu(depth - 1) if depth > 1
   end
   menu
 end
 
+def create_option_menu
+  lstore = Gtk::ListStore.new(TrueClass, String)
+  (1..5).each do |i|
+    lstore.append.set_values([false, "item #{i}"])
+  end
+
+  combobox = Gtk::ComboBox.new(:model => lstore, :entry => true)
+
+  toggle = Gtk::CellRendererToggle.new
+
+  combobox.pack_start(toggle, true)
+  combobox.add_attribute(toggle, "active", 0)
+  combobox.set_entry_text_column(1)
+
+  combobox.signal_connect("changed") do |widget|
+    list = widget.model
+    list.each do |model, _path, iter|
+      model.set_value(iter, 0, false)
+    end
+    iter = widget.active_iter
+    list.set_value(iter, 0, true)
+  end
+
+  combobox
+end
+
 window = Gtk::Window.new("menus")
 window.signal_connect("destroy") do
   Gtk.main_quit
 end
 window.border_width = 0
 
-box1 = Gtk::VBox.new(false, 0)
+box1 = Gtk::Box.new(:vertical, 0)
 window.add(box1)
 
 menubar = Gtk::MenuBar.new
-box1.pack_start(menubar, false, true, 0)
+box1.pack_start(menubar, :expand => false, :fill => true, :padding => 0)
 
 menu = create_menu(2)
 menuitem = Gtk::MenuItem.new("test\nline2")
@@ -54,27 +76,25 @@ menuitem = Gtk::MenuItem.new("bar")
 menuitem.set_submenu(create_menu(4))
 menubar.append(menuitem)
 
-box2 = Gtk::VBox.new(false, 10)
+box2 = Gtk::Box.new(:vertical, 10)
 box2.border_width = 10
-box1.pack_start(box2, true, true, 0)
+box1.pack_start(box2, :expand => true, :fill => true, :padding => 0)
 
-optionmenu = Gtk::OptionMenu.new
-optionmenu.set_menu(create_menu(1))
-optionmenu.set_history(4)
-box2.pack_start(optionmenu, true, true, 0)
+optionmenu = create_option_menu
+box2.pack_start(optionmenu, :expand => true, :fill => true, :padding => 0)
 
-separator = Gtk::HSeparator.new
-box1.pack_start(separator, false, true, 0)
+separator = Gtk::Separator.new(:horizontal)
+box1.pack_start(separator, :expand => false, :fill => true, :padding => 0)
 
-box2 = Gtk::HBox.new(false, 10)
+box2 = Gtk::Box.new(:horizontal, 10)
 box2.border_width = 10
-box1.pack_start(box2, false, true, 0)
+box1.pack_start(box2, :expand => false, :fill => true, :padding => 0)
 
-button = Gtk::Button.new("close")
+button = Gtk::Button.new(:label => "close")
 button.signal_connect("clicked") do
   window.destroy
 end
-box2.pack_start(button, true, true, 0)
+box2.pack_start(button, :expand => true, :fill => true, :padding => 0)
 
 window.show_all
 

data/sample/misc/{misc_button.rb → misc-button.rb}

@@ -1,35 +1,32 @@
 #!/usr/bin/env ruby
 =begin
   misc_button.rb - Ruby/GTK sample script.
-                                                                                
-  Copyright (c) 2004-2006 Ruby-GNOME2 Project Team
+
+  Copyright (c) 2004-2015 Ruby-GNOME2 Project Team
   This program is licenced under the same licence as Ruby-GNOME2.
-                                                                                
-  $Id: misc_button.rb,v 1.2 2006/06/17 13:18:12 mutoh Exp $
 =end
 
-require 'gtk3'
+require "gtk3"
 
 box = Gtk::Box.new(:vertical)
 
-#Gtk::ColorButton
+# Gtk::ColorButton
 colorbutton = Gtk::ColorButton.new
 colorbutton.signal_connect("color-set") do
-  p colorbutton.color.to_a
+  p colorbutton.color.to_s
 end
 box.add(colorbutton)
 
-
-#Gtk::FontButton
+# Gtk::FontButton
 fontbutton = Gtk::FontButton.new
 fontbutton.signal_connect("font-set") do
   p fontbutton.font_name
 end
 box.add(fontbutton)
 
-#Gtk::FileChooserButton
-filebutton = Gtk::FileChooserButton.new("Gtk::FileChooserButton", 
-                                    Gtk::FileChooser::Action::OPEN)
+# Gtk::FileChooserButton
+filebutton = Gtk::FileChooserButton.new("Gtk::FileChooserButton",
+                                    Gtk::FileChooserAction::OPEN)
 filebutton.filename = GLib.home_dir
 filebutton.signal_connect("current-folder-changed") do |w, e|
   p filebutton.filename
@@ -37,13 +34,17 @@ end
 
 box.add(filebutton)
 
-#Quit
+# Quit
 quitbutton = Gtk::Button.new(:label => "Quit")
 quitbutton.signal_connect("clicked") do
   Gtk.main_quit
 end
 box.add(quitbutton)
 
-Gtk::Window.new.add(box).set_default_size(200, 100).show_all
+win = Gtk::Window.new
+win.add(box)
+win.set_default_size(200, 100)
+win.show_all
+win.signal_connect("delete-event") { Gtk.main_quit }
 
 Gtk.main

data/sample/misc/mouse-gesture.rb

@@ -1,28 +1,21 @@
 =begin
   mouse-gesture.rb - mouse gesture sample script.
 
-  Copyright (C) 2005,2006 Kouhei Sutou 
+  Copyright (C) 2005,2006 Kouhei Sutou
+  Copyright (c) 2005-2015 Ruby-GNOME2 Project Team
   This program is licenced under the same licence as Ruby-GNOME2.
-
-  $Date: 2006/06/17 13:18:12 $
-  $Id: mouse-gesture.rb,v 1.2 2006/06/17 13:18:12 mutoh Exp $
 =end
 
-require 'gtk3'
-
-unless Gdk.cairo_available?
-  STDERR.puts("need cairo and rcairo support for this sample")
-  exit 1
-end
+require "gtk3"
 
 class GestureProcessor
   DEFAULT_THRESHOLD = 16
   DEFAULT_SKEW_THRESHOLD_ANGLE = 30
-    
+
   attr_accessor :threshold, :skew_threshold_angle
   attr_reader :motions
 
-  def initialize(threshold=nil, skew_threshold_angle=nil)
+  def initialize(threshold = nil, skew_threshold_angle = nil)
     @threshold = threshold || DEFAULT_THRESHOLD
     @skew_threshold_angle = skew_threshold_angle
     @skew_threshold_angle ||= DEFAULT_SKEW_THRESHOLD_ANGLE
@@ -34,22 +27,22 @@ class GestureProcessor
   end
 
   MOTIONS = %w(L R U D UL UR LL LR)
-  
+
   def available_motion?(motion)
     MOTIONS.include?(motion)
   end
-  
+
   def start(x, y)
     @prev_x = @x = x
     @prev_y = @y = y
     @started = true
     @motions = []
   end
-    
+
   def update_position(x, y)
     mx = x - @prev_x
     my = y - @prev_y
-    
+
     motion = judge_motion(mx, my)
     if motion
       @prev_x = @x = x
@@ -64,7 +57,7 @@ class GestureProcessor
       false
     end
   end
-    
+
   def reset
     @started = false
     @x = @y = -1
@@ -135,7 +128,7 @@ class Gesture < Gtk::EventBox
   DEFAULT_LINE_RGBA = [1, 0, 0, 1]
   DEFAULT_NEXT_RGBA = [0, 1, 0, 0.8]
   DEFAULT_CURRENT_RGBA = [1, 0, 1, 0.8]
-  
+
   def initialize(conf={})
     super()
     set_visible_window(false)
@@ -152,7 +145,7 @@ class Gesture < Gtk::EventBox
     set_button_release_event
   end
 
-  def add_action(sequence, action=Proc.new)
+  def add_action(sequence, action = proc)
     invalid_motion = sequence.find do |motion|
       not @processor.available_motion?(motion)
     end
@@ -161,7 +154,7 @@ class Gesture < Gtk::EventBox
   end
 
   def start(widget, button, x, y, base_x, base_y)
-    Gtk.grab_add(self)
+    self.grab_add
     @widget = widget
     @button = button
     @processor.start(x, y)
@@ -197,7 +190,7 @@ class Gesture < Gtk::EventBox
       end
     end.compact.uniq
   end
-    
+
   def next_available_motions
     motions = @processor.motions
     @actions.collect do |sequence, act|
@@ -208,11 +201,11 @@ class Gesture < Gtk::EventBox
       end
     end.compact.uniq
   end
-    
+
   def match?
     not action.nil?
   end
-    
+
   def set_expose_event
     signal_connect("draw") do |widget, event|
       if @processor.started?
@@ -231,7 +224,7 @@ class Gesture < Gtk::EventBox
         end
 
         @cr.stroke_preserve
-        
+
         true
       else
         false
@@ -239,7 +232,7 @@ class Gesture < Gtk::EventBox
     end
   end
 
-  def draw_mark(cr, x=nil, y=nil, radius=nil)
+  def draw_mark(cr, x = nil, y = nil, radius = nil)
     x ||= @processor.position[0]
     y ||= @processor.position[1]
     radius ||= @processor.threshold
@@ -250,7 +243,7 @@ class Gesture < Gtk::EventBox
       cr.fill
     end
   end
-  
+
   def draw_available_marks(cr, motions)
     motions.each do |motion|
       adjust_x = calc_position_ratio(motion, %w(R), %w(L), %w(UR LR), %w(UL LL))
@@ -278,7 +271,7 @@ class Gesture < Gtk::EventBox
       0
     end
   end
-  
+
   def set_motion_notify_event
     signal_connect("motion_notify_event") do |widget, event|
       if @processor.started?
@@ -301,7 +294,7 @@ class Gesture < Gtk::EventBox
   def set_button_release_event
     signal_connect("button_release_event") do |widget, event|
       if event.button == @button and @processor.started?
-        Gtk.grab_remove(self)
+        self.grab_remove
         perform_action
         hide
         true
@@ -314,8 +307,8 @@ end
 
 class GesturedWidget < Gtk::EventBox
   DEFAULT_GESTURE_BUTTON = 3
-  
-  def initialize(gesture_button=nil)
+
+  def initialize(gesture_button = nil)
     super()
     set_visible_window(false)
     @gesture_button = gesture_button || DEFAULT_GESTURE_BUTTON
@@ -346,9 +339,9 @@ class GesturedWidget < Gtk::EventBox
 end
 
 class Layout < Gtk::Layout
-  def initialize()
+  def initialize
     super()
-    @gesture = Gesture.new()
+    @gesture = Gesture.new
     put(@gesture, 0, 0)
   end
 
@@ -361,7 +354,7 @@ class Layout < Gtk::Layout
     @gesture.start(widget, button, x, y, base_x, base_y)
   end
 
-  def add_gesture_action(sequence, action=Proc.new)
+  def add_gesture_action(sequence, action = proc)
     @gesture.add_action(sequence, action)
   end
 end
@@ -405,38 +398,38 @@ layout.put(gestured_widget2, 0, 25)
 # gesture handlers
 expand_size = 20
 
-expand_left = Proc.new do |widget|
+expand_left = proc do |widget|
   x = layout.child_get_property(widget, :x)
   y = layout.child_get_property(widget, :y)
   w, h = widget.size_request
   layout.move(widget, x - expand_size, y)
   widget.set_size_request(w + expand_size, h)
 end
-  
-expand_right = Proc.new do |widget|
+
+expand_right = proc do |widget|
   x = layout.child_get_property(widget, :x)
   y = layout.child_get_property(widget, :y)
   w, h = widget.size_request
   layout.move(widget, x, y)
   widget.set_size_request(w + expand_size, h)
 end
-  
-expand_top = Proc.new do |widget|
+
+expand_top = proc do |widget|
   x = layout.child_get_property(widget, :x)
   y = layout.child_get_property(widget, :y)
   w, h = widget.size_request
   layout.move(widget, x, y - expand_size)
   widget.set_size_request(w, h + expand_size)
 end
-  
-expand_bottom = Proc.new do |widget|
+
+expand_bottom = proc do |widget|
   x = layout.child_get_property(widget, :x)
   y = layout.child_get_property(widget, :y)
   w, h = widget.size_request
   layout.move(widget, x, y)
   widget.set_size_request(w, h + expand_size)
 end
-  
+
 layout.add_gesture_action(["L"]) do |widget|
   expand_left.call(widget)
 end
@@ -458,7 +451,7 @@ end
 
 
 window.add(layout)
-window.signal_connect("destroy"){Gtk.main_quit}
+window.signal_connect("destroy") { Gtk.main_quit }
 
 window.show_all