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

data/sample/misc/assistant.rb

@@ -18,7 +18,6 @@ class AssistantRunner
     @generous_assistant = nil
     @selected_branch = "A"
     @nonlinear_assistant = nil
-    @full_featured_assistant = nil
   end
 
   def run_simple_assistant
@@ -36,11 +35,6 @@ class AssistantRunner
                                          :create_nonlinear_assistant)
   end
 
-  def run_full_featured_assistant
-    @full_featured_assistant = run_assistant(@full_featured_assistant,
-                                             :create_full_featured_assistant)
-  end
-
   private
   def run_assistant(assistant, assistant_create_method)
     assistant ||= send(assistant_create_method)
@@ -84,7 +78,7 @@ class AssistantRunner
       GLib::Timeout.add(300) do
         page = assistant.get_nth_page(assistant.current_page)
         progress = page.child
-        value = progress.fraction = progress.fraction + 0.1
+        value = progress.fraction = (progress.fraction + 0.1).round(1)
         continue = value < 1.0
         assistant.set_page_complete(page, true) unless continue
         continue
@@ -256,67 +250,13 @@ class AssistantRunner
     assistant.set_page_type(page, :confirm)
     assistant.set_page_complete(page, true)
   end
-
-  def create_full_featured_assistant
-    assistant = Gtk::Assistant.new
-    assistant.set_default_size(400, 300)
-    assistant.signal_connect("cancel") do
-      puts "cancel"
-      assistant.hide
-    end
-    assistant.signal_connect("close") do
-      puts "close"
-      assistant.hide
-    end
-    assistant.signal_connect("apply") do
-      puts "apply"
-    end
-    assistant.signal_connect("prepare") do |_assistant, page|
-      prepare_cb(_assistant, page)
-    end
-
-    button = Gtk::Button.new(:stock_id => Gtk::Stock::STOP)
-    button.show
-    assistant.add_action_widget(button)
-
-    page = create_test_page("Page 1")
-    page.show
-    assistant.append_page(page)
-    assistant.set_page_title(page, "Page 1")
-    assistant.set_page_complete(page, true)
-
-    #- set a side image
-    pixbuf = page.render_icon(Gtk::Stock::DIALOG_WARNING, :dialog)
-    assistant.set_page_side_image(page, pixbuf)
-
-    #- set a header image
-    pixbuf = page.render_icon(Gtk::Stock::DIALOG_INFO, :dialog)
-    assistant.set_page_header_image(page, pixbuf)
-
-    page = create_test_page("Invisible page")
-    assistant.append_page(page)
-
-    page = create_test_page("Page 3")
-    page.show
-    assistant.append_page(page)
-    assistant.set_page_title(page, "Page 3")
-    assistant.set_page_type(page, :confirm)
-    assistant.set_page_complete(page, true)
-
-    #- set a header image
-    pixbuf = page.render_icon(Gtk::Stock::DIALOG_INFO, :dialog)
-    assistant.set_page_header_image(page, pixbuf)
-
-    assistant
-  end
 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}]
 ]
 
 if ENV["RTL"]
@@ -324,8 +264,8 @@ if ENV["RTL"]
 end
 
 window = Gtk::Window.new(:toplevel)
-window.signal_connect("destroy") { Gtk.main_quit }
-window.signal_connect("delete-event") { false }
+window.signal_connect("destroy") {Gtk.main_quit}
+window.signal_connect("delete-event") {false}
 
 box = Gtk::Box.new(:vertical, 6)
 window.add(box)

data/sample/misc/bindings.rb

@@ -25,18 +25,24 @@ Usage:
     "back_space" : same as pressing <backspace> in text view area.
     "cancel j/k" : disable 'j' and 'k' binding
 =end
-require 'gtk3'
+require "gtk3"
 
 class Pager < Gtk::TextView
   type_register
   
   # widget's key binding can be defined like this
-  binding_set.add_signal(Gdk::Keyval::GDK_space, 0,
+  binding_set.add_signal(Gdk::Keyval::GDK_KEY_space, 0,
                          "move_cursor", 
-                         Gtk::MOVEMENT_PAGES, 1, false)
-  binding_set.add_signal(Gdk::Keyval::GDK_BackSpace, 0,
+                         Gtk::MovementStep::PAGES, 1, false)
+  binding_set.add_signal(Gdk::Keyval::GDK_KEY_BackSpace, 0,
                          "move_cursor", 
-                         Gtk::MOVEMENT_PAGES, -1, false)
+                         Gtk::MovementStep::PAGES, -1, false)
+  binding_set.add_signal(Gdk::Keyval::GDK_KEY_j, 0,
+                         "move_cursor",
+                         Gtk::MovementStep::DISPLAY_LINES, 1, false)
+  binding_set.add_signal(Gdk::Keyval::GDK_KEY_k, 0,
+                         "move_cursor",
+                         Gtk::MovementStep::DISPLAY_LINES, -1, false)
 
   def initialize(path)
     @path = path
@@ -55,42 +61,28 @@ class Pager < Gtk::TextView
   end
 end
 
-path = ARGV[0] || __FILE__ 
+path = ARGV[0] || __FILE__
 
 window = Gtk::Window.new
 window.name = "pager_window"
 sw = Gtk::ScrolledWindow.new
-vbox = Gtk::VBox.new
-hbox = Gtk::HBox.new
+vbox = Gtk::Box.new(:vertical)
+hbox = Gtk::Box.new(:horizontal)
 pager = Pager.new(path)
 
-hbox.add(button1 = Gtk::Button.new("space"))
-hbox.add(button2 = Gtk::Button.new("back_space"))
-hbox.add(button3 = Gtk::Button.new("cancel j/k"))
+hbox.add(button1 = Gtk::Button.new(:label => "space"))
+hbox.add(button2 = Gtk::Button.new(:label => "back_space"))
+hbox.add(button3 = Gtk::Button.new(:label => "cancel j/k"))
 
 button1.signal_connect("clicked") do
-  Pager.binding_set.activate(Gdk::Keyval::GDK_space, 0, pager)
+  Pager.binding_set.activate(Gdk::Keyval::GDK_KEY_space, 0, pager)
 end
 button2.signal_connect("clicked") do
-  pager.bindings_activate(Gdk::Keyval::GDK_BackSpace, 0)
+  pager.bindings_activate(Gdk::Keyval::GDK_KEY_BackSpace, 0)
 end
-
-# Key bindings can be attached to any widget by 
-# Gtk::BindingSet#add_path
-# see RC Files section of GTK+ documentation for more detail.
-bset = Gtk::BindingSet.new("j_and_k")
-bset.add_signal(Gdk::Keyval::GDK_j, 0,
-                "move_cursor",
-                Gtk::MOVEMENT_DISPLAY_LINES, 1, false)
-bset.add_signal(Gdk::Keyval::GDK_k, 0,
-                "move_cursor",
-                Gtk::MOVEMENT_DISPLAY_LINES, -1, false)
-bset.add_path(Gtk::PathType::WIDGET, "pager_window.*.Pager", 
-                 Gtk::PathPriorityType::APPLICATION)
-
 button3.signal_connect("clicked") do
-  bset.entry_clear(Gdk::Keyval::GDK_j, 0)
-  bset.entry_clear(Gdk::Keyval::GDK_k, 0)
+  Pager.binding_set.entry_remove(Gdk::Keyval::GDK_KEY_j, 0)
+  Pager.binding_set.entry_remove(Gdk::Keyval::GDK_KEY_k, 0)
 end
 
 sw.add(pager)
@@ -100,8 +92,6 @@ window.show_all
 
 pager.grab_focus
 
-window.signal_connect("destroy") { Gtk.main_quit }
+window.signal_connect("destroy") {Gtk.main_quit}
 
 Gtk.main
-
-

data/sample/misc/button.rb

@@ -8,10 +8,13 @@
   $Id: button.rb,v 1.10 2006/06/17 13:18:12 mutoh Exp $
 =end
 
-require 'gtk3'
+require "gtk3"
 
 window = Gtk::Window.new("buttons")
 window.border_width = 0
+window.signal_connect("delete_event") do
+  Gtk.main_quit
+end
 
 box1 = Gtk::Box.new(:vertical, 0)
 window.add(box1)
@@ -20,7 +23,7 @@ table = Gtk::Table.new(3, 3, false)
 table.set_row_spacings(5)
 table.set_column_spacings(5)
 table.set_border_width(10)
-box1.pack_start(table, true, true, 0)
+box1.pack_start(table, :expand => true, :fill => true, :padding => 0)
 
 button = []
 0.upto(8) do |i|
@@ -49,18 +52,18 @@ table.attach(button[7], 2, 3, 1, 2, nil, nil, 0, 0)
 table.attach(button[8], 0, 1, 1, 2, nil, nil, 0, 0)
 
 separator = Gtk::Separator.new(:vertical)
-box1.pack_start(separator, false, true, 0)
+box1.pack_start(separator, :expand => false, :fill => true, :padding => 0)
 
 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)
 
 close = Gtk::Button.new(:label => "close")
 close.signal_connect("clicked") do
   Gtk.main_quit
 end
 
-box2.pack_start(close, true, true, 0)
+box2.pack_start(close, :expand => true, :fill => true, :padding => 0)
 close.can_default = true
 close.grab_default
 

data/sample/misc/buttonbox.rb

@@ -8,7 +8,7 @@
   $Id: buttonbox.rb,v 1.9 2006/06/17 13:18:12 mutoh Exp $
 =end
 
-require 'gtk3'
+require "gtk3"
 
 def create_bbox_window(horizontal, title, pos, spacing, layout)
   window = Gtk::Window.new(title)
@@ -32,7 +32,7 @@ def create_bbox_window(horizontal, title, pos, spacing, layout)
   bbox.layout_style = layout
   bbox.spacing = spacing
   box1.border_width = 25
-  box1.pack_start(bbox, true, true, 0)
+  box1.pack_start(bbox, :expand => true, :fill => true, :padding => 0)
 
   button = Gtk::Button.new(:label => "OK")
   bbox.add(button)

data/sample/misc/checkbutton.rb

@@ -8,10 +8,13 @@
   $Id: checkbutton.rb,v 1.10 2006/06/17 13:18:12 mutoh Exp $
 =end
 
-require 'gtk3'
+require "gtk3"
 
 window = Gtk::Window.new("check buttons")
 window.border_width = 0
+window.signal_connect("delete_event") do
+  Gtk.main_quit
+end
 
 box1 = Gtk::Box.new(:vertical)
 window.add(box1)

data/sample/misc/colorselection.rb

@@ -7,19 +7,16 @@
   $Id: colorselection.rb,v 1.3 2006/06/17 13:18:12 mutoh Exp $
 =end
 
-require 'gtk3'
-
-settings = Gtk::Settings.default
-
-# You can save the palette to use right click on the palette.
-Gtk::ColorSelection.set_change_palette_hook{|screen, colors|
-  puts strs = Gtk::ColorSelection.palette_to_string(colors)
-  settings.gtk_color_palette = strs
-}
+require "gtk3"
 
 a = Gtk::ColorSelection.new
 a.has_palette = true
+a.signal_connect("color_changed") do |w|
+  unless w.adjusting?
+    p w.current_rgba.to_s
+  end
+end
 
-Gtk::Window.new.add(a).show_all.signal_connect("destroy"){Gtk.main_quit}
+Gtk::Window.new.add(a).show_all.signal_connect("destroy") {Gtk.main_quit}
 
 Gtk.main

data/sample/misc/combo_check.rb

@@ -8,56 +8,64 @@
   $Id: combo_check.rb,v 1.9 2006/06/17 13:18:12 mutoh Exp $
 =end
 
-require 'gtk3'
+require "gtk3"
 
 window = Gtk::Window.new("entry")
 window.border_width = 0
+window.signal_connect("destroy") do
+  Gtk.main_quit
+end
 
-box1 = Gtk::VBox.new
+box1 = Gtk::Box.new(:vertical)
 window.add(box1)
 
-box2 = Gtk::VBox.new(false, 10)
+box2 = Gtk::Box.new(:vertical, 10)
 box2.border_width = 10
 box1.pack_start(box2)
 
 entry = Gtk::Entry.new
 entry.text = "hello world"
+entry.set_editable(false)
 entry.select_region(0, -1)
 box2.pack_start(entry)
 
-#
-# Gtk::Combo has been deprecated. Use Gtk::ComboBox instead.
-#
-cb = Gtk::Combo.new
-cb.set_popdown_strings(["item0",
-			 "item1 item1",
-			 "item2 item2 item2",
-			 "item3 item3 item3 item3",
-			 "item4 item4 item4 item4 item4",
-			 "item5 item5 item5 item5 item5 item5",
-			 "item6 item6 item6 item6 item6",
-			 "item7 item7 item7 item7",
-			 "item8 item8 item8",
-			 "item9 item9"])
-cb.entry.set_text("hello world")
-cb.entry.select_region(0, -1)
-box2.pack_start(cb, true, true, 0)
+## Gtk::ComboBoxText is simpler than Gtk::ComboBox, but has less functions.
+## Gtk::Combo has been deprecated.
+cb = Gtk::ComboBoxText.new(:entry => true)
+cb.append_text("item0")
+cb.append_text("item1 item1")
+cb.append_text("item2 item2 item2")
+cb.append_text("item3 item3 item3 item3")
+cb.append_text("item4 item4 item4 item4 item4")
+cb.append_text("item5 item5 item5 item5 item5 item5")
+cb.append_text("item6 item6 item6 item6 item6")
+cb.append_text("item7 item7 item7 item7")
+cb.append_text("item8 item8 item8")
+cb.append_text("item9 item9")
+cb.child.text = "hello world"
+cb.child.select_region(0, -1)
+cb.child.set_editable(false)
+box2.pack_start(cb, :expand => true, :fill => true, :padding => 0)
 
 check = Gtk::CheckButton.new("Editable")
-box2.pack_start(check, false, true, 0)
+box2.pack_start(check, :expand => false, :fill => true, :padding => 0)
 check.signal_connect("toggled") do
-  cb.entry.set_editable(check.active?)
+  cb.child.set_editable(check.active?)
   entry.set_editable(check.active?)
 end
-check.state = 0
+check.set_state_flags(Gtk::StateFlags::NORMAL, true)
+## Run this code to see all of GtkStateFlags ##
+#  Gtk::StateFlags.constants.each do |i|
+#    p i
+#  end
 
-box1.pack_start(Gtk::HSeparator.new)
+box1.pack_start(Gtk::Separator.new(:horizontal))
 
-box2 = Gtk::VBox.new(false, 10)
+box2 = Gtk::Box.new(:vertical, 10)
 box2.border_width = 10
 box1.pack_start(box2)
 
-button = Gtk::Button.new("close")
+button = Gtk::Button.new(:label => "close")
 button.signal_connect("clicked") do
   Gtk.main_quit
 end

data/sample/misc/combobox.rb

@@ -8,21 +8,21 @@
   $Id: combobox.rb,v 1.3 2006/06/17 13:18:12 mutoh Exp $
 =end
 
-require 'gtk3'
+require "gtk3"
 
-if str = Gtk.check_version(2, 4, 0)
-  puts "This sample requires GTK+ 2.4.0 or later"
+if str = Gtk.check_version(3, 10, 7)
+  puts "This sample requires GTK+ 3.10.7 or later"
   puts str
   exit
 end
 
 window = Gtk::Window.new("Gtk::ComboBox sample")
-window.signal_connect("destroy"){Gtk.main_quit}
+window.signal_connect("destroy") {Gtk.main_quit}
 
 #
 # Text only
 #
-combo1 = Gtk::ComboBox.new
+combo1 = Gtk::ComboBoxText.new
 ["foo", "bar", "fuga", "hoge"].each do |val|
   combo1.append_text(val)
 end
@@ -40,11 +40,11 @@ model = Gtk::ListStore.new(Gdk::Pixbuf, String)
  [Gtk::Stock::CANCEL, "cancel"],
  [Gtk::Stock::OK, "ok"]].each do |stock, name|
   iter = model.append
-  iter[0] = window.render_icon(stock, Gtk::IconSize::MENU, "icon")
+  iter[0] = window.render_icon_pixbuf(stock, Gtk::IconSize::IconSize::MENU)
   iter[1] = name
 end
 
-combo2 = Gtk::ComboBox.new(model)
+combo2 = Gtk::ComboBox.new(:model => model)
 
 # column 1
 renderer = Gtk::CellRendererPixbuf.new
@@ -65,7 +65,7 @@ end
 #
 # Gtk::ComboBoxEntry
 #
-combo3 = Gtk::ComboBoxEntry.new
+combo3 = Gtk::ComboBoxText.new(:entry => true)
 ["foo", "bar", "fuga", "hoge"].each do |val|
   combo3.append_text(val)
 end
@@ -76,11 +76,10 @@ combo3.signal_connect("changed") do
     p "combo3: #{combo3.active}, #{combo3.active_iter[0]}"
   end
 end
-                                                                     
+
 # Show main window
-vbox = Gtk::VBox.new
+vbox = Gtk::Box.new(:vertical)
 vbox.add(combo1).add(combo2).add(combo3)
 window.add(vbox).show_all
 
 Gtk.main
-