gtk3 3.0.9-x64-mingw32 → 3.1.0-x64-mingw32

data/sample/gtk-demo/modelbutton.ui

@@ -66,6 +66,7 @@
           <object class="GtkModelButton">
             <property name="visible">1</property>
             <property name="action-name">win.color</property>
+            <property name="action-target">'red'</property>
             <property name="text">Red</property>
             <property name="inverted">1</property>
           </object>
@@ -74,6 +75,7 @@
           <object class="GtkModelButton">
             <property name="visible">1</property>
             <property name="action-name">win.color</property>
+            <property name="action-target">'green'</property>
             <property name="text">Green</property>
             <property name="inverted">1</property>
           </object>
@@ -82,6 +84,7 @@
           <object class="GtkModelButton">
             <property name="visible">1</property>
             <property name="action-name">win.color</property>
+            <property name="action-target">'blue'</property>
             <property name="text">Blue</property>
             <property name="inverted">1</property>
           </object>

data/sample/gtk-demo/overlay.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2015 Ruby-GNOME2 Project Team
+# Copyright (c) 2015-2016 Ruby-GNOME2 Project Team
 # This program is licenced under the same licence as Ruby-GNOME2.
 #
 =begin
@@ -10,52 +10,59 @@ The overlayed widgets can be interactive controls such
 as the entry in this example, or just decorative, like
 the big blue label.
 =end
-module OverlayDemo
-  def self.run_demo(main_window)
-    window = Gtk::Window.new(:toplevel)
-    window.set_default_size(500, 510)
-    window.set_title("Interactive Overlay")
-    window.screen = main_window.screen
+class OverlayDemo
+  def initialize(main_window)
+    @window = Gtk::Window.new(:toplevel)
+    @window.set_default_size(500, 510)
+    @window.title = "Interactive Overlay"
+    @window.screen = main_window.screen
 
     overlay = Gtk::Overlay.new
-    grid = Gtk::Grid.new
-    overlay.add(grid)
+    initialize_grid
+    overlay.add(@grid)
 
-    entry = Gtk::Entry.new
-
-    (0..4).each do |i|
-      (0..4).each do |j|
-        text = "#{5 * j + i}"
-        button = Gtk::Button.new(:label => text)
-        button.set_hexpand(true)
-        button.set_vexpand(true)
-        button.signal_connect "clicked" do |widget|
-          entry.text = widget.label
-        end
-        grid.attach(button, i, j, 1, 1)
-      end
-    end
+    @entry = Gtk::Entry.new
+    @entry.placeholder_text = "Your Lucky Number"
 
     vbox = Gtk::Box.new(:vertical, 10)
     overlay.add_overlay(vbox)
     overlay.set_overlay_pass_through(vbox, true)
-    vbox.set_halign(:center)
-    vbox.set_valign(:center)
+    vbox.halign = :center
+    vbox.valign = :center
 
     label = Gtk::Label.new("<span foreground='blue' weight='ultrabold' font='40'>Numbers</span>")
-    label.set_use_markup(true)
+    label.use_markup = true
     vbox.pack_start(label, :expand => false, :fill => false, :padding => 8)
 
-    entry.set_placeholder_text("Your Lucky Number")
-    vbox.pack_start(entry, :expand => false, :fill => false, :padding => 8)
+    vbox.pack_start(@entry, :expand => false, :fill => false, :padding => 8)
 
-    window.add(overlay)
+    @window.add(overlay)
     overlay.show_all
+  end
 
-    if !window.visible?
-      window.show_all
+  def run
+    if !@window.visible?
+      @window.show_all
     else
-      window.destroy
+      @window.destroy
+    end
+  end
+
+  private
+
+  def initialize_grid
+    @grid = Gtk::Grid.new
+    (0..4).each do |i|
+      (0..4).each do |j|
+        text = (5 * j + i).to_s
+        button = Gtk::Button.new(:label => text)
+        button.hexpand = true
+        button.vexpand = true
+        button.signal_connect "clicked" do |widget|
+          @entry.text = widget.label
+        end
+        @grid.attach(button, i, j, 1, 1)
+      end
     end
   end
 end

data/sample/gtk-demo/overlay2.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2015 Ruby-GNOME2 Project Team
+# Copyright (c) 2015-2016 Ruby-GNOME2 Project Team
 # This program is licenced under the same licence as Ruby-GNOME2.
 #
 =begin
@@ -7,69 +7,83 @@
 Another example of an overlay with some decorative
 and some interactive controls.
 =end
-module Overlay2Demo
-  def self.run_demo(_main_window)
-    window = Gtk::Window.new(:toplevel)
-    window.set_default_size(500, 510)
-    window.set_title("Decorative Overlay")
+class Overlay2Demo
+  def initialize(_main_window)
+    @window = Gtk::Window.new(:toplevel)
+    @window.set_default_size(500, 510)
+    @window.title = "Decorative Overlay"
 
-    overlay = Gtk::Overlay.new
+    @overlay = Gtk::Overlay.new
 
     sw = Gtk::ScrolledWindow.new
     sw.set_policy(:automatic, :automatic)
 
-    text = Gtk::TextView.new
-    buffer = text.buffer
-    buffer.text = "Dear Diary..."
+    initialize_textview
 
-    tag = buffer.create_tag("top-margin", "pixels-above-lines" => 0)
+    @window.add(@overlay)
+    @overlay.add(sw)
+    sw.add(@text)
 
-    word_end = buffer.start_iter
-    word_end.forward_word_end
-    buffer.apply_tag(tag, buffer.start_iter, word_end)
-
-    window.add(overlay)
-    overlay.add(sw)
-    sw.add(text)
-
-    image = Gtk::Image.new(:resource => "/overlay2/decor1.png")
-    overlay.add_overlay(image)
-    overlay.set_overlay_pass_through(image, true)
-    image.set_halign(:start)
-    image.set_valign(:start)
-
-    image = Gtk::Image.new(:resource => "/overlay2/decor2.png")
-    overlay.add_overlay(image)
-    overlay.set_overlay_pass_through(image, true)
-    image.set_halign(:end)
-    image.set_valign(:end)
-
-    adjustment = Gtk::Adjustment.new(0, 0, 100, 1, 1, 0)
-    adjustment.signal_connect "value-changed" do |widget|
+    generate_image_in_overlay("/overlay2/decor1.png", :start)
+    generate_image_in_overlay("/overlay2/decor2.png", :end)
+
+    generate_adjustment
+    generate_scale_in_overlay
+
+    @overlay.show_all
+  end
+
+  def run
+    if !@window.visible?
+      @window.show_all
+    else
+      @window.destroy
+    end
+    @window
+  end
+
+  private
+
+  def generate_image_in_overlay(resource, position)
+    image = Gtk::Image.new(:resource => resource)
+    @overlay.add_overlay(image)
+    @overlay.set_overlay_pass_through(image, true)
+    image.halign = position
+    image.valign = position
+  end
+
+  def generate_adjustment
+    @adjustment = Gtk::Adjustment.new(0, 0, 100, 1, 1, 0)
+    @adjustment.signal_connect "value-changed" do |widget|
       value = widget.value
-      text.set_left_margin(value)
-      tag.set_property("pixels-above-lines", value)
+      @text.set_left_margin(value)
+      @tag.set_property("pixels-above-lines", value)
     end
+    @adjustment.value = 100
+  end
 
-    scale = Gtk::Scale.new(:horizontal, adjustment)
-    scale.set_draw_value(false)
+  def generate_scale_in_overlay
+    scale = Gtk::Scale.new(:horizontal, @adjustment)
+    scale.draw_value = false
     scale.set_size_request(120, -1)
-    scale.set_margin_start(20)
-    scale.set_margin_end(20)
-    scale.set_margin_bottom(20)
-    overlay.add_overlay(scale)
-    scale.set_halign(:start)
-    scale.set_valign(:end)
-    scale.set_tooltip_text("Margin")
-
-    adjustment.value = 100
-    overlay.show_all
-
-    if !window.visible?
-      window.show_all
-    else
-      window.destroy
-    end
-    window
+    scale.margin_start = 20
+    scale.margin_end = 20
+    scale.margin_bottom = 20
+    @overlay.add_overlay(scale)
+    scale.halign = :start
+    scale.valign = :end
+    scale.tooltip_text = "Margin"
+  end
+
+  def initialize_textview
+    @text = Gtk::TextView.new
+    buffer = @text.buffer
+    buffer.text = "Dear Diary..."
+
+    @tag = buffer.create_tag("top-margin", "pixels-above-lines" => 0)
+
+    word_end = buffer.start_iter
+    word_end.forward_word_end
+    buffer.apply_tag(@tag, buffer.start_iter, word_end)
   end
 end

data/sample/gtk-demo/panes.rb

@@ -14,27 +14,27 @@
  widget, and allows you to adjust the options for each side of
  each widget.
 =end
-module PanesDemo
-  def self.run_demo(main_window)
-    window = Gtk::Window.new(:toplevel)
-    window.screen = main_window.screen
-    window.title = "Paned Widgets"
-    window.border_width = 0
+class PanesDemo
+  def initialize(main_window)
+    @window = Gtk::Window.new(:toplevel)
+    @window.screen = main_window.screen
+    @window.title = "Paned Widgets"
+    @window.border_width = 0
 
     vbox = Gtk::Box.new(:vertical, 0)
-    window.add(vbox)
+    @window.add(vbox)
 
     vpaned = Gtk::Paned.new(:vertical)
     vbox.pack_start(vpaned, :expand => true, :fill => true, :padding => 0)
     vpaned.border_width = 5
 
-    hpaned = Gtk::Paned.new(:horizontal)
-    vpaned.add1(hpaned)
+    @hpaned = Gtk::Paned.new(:horizontal)
+    vpaned.add1(@hpaned)
 
     frame = Gtk::Frame.new
     frame.shadow_type = :in
     frame.set_size_request(60, 60)
-    hpaned.add1(frame)
+    @hpaned.add1(frame)
 
     button = Gtk::Button.new(:label => "_Hi there", :use_underline => true)
     frame.add(button)
@@ -42,7 +42,7 @@ module PanesDemo
     frame = Gtk::Frame.new
     frame.shadow_type = :in
     frame.set_size_request(80, 60)
-    hpaned.add2(frame)
+    @hpaned.add2(frame)
 
     frame = Gtk::Frame.new
     frame.shadow_type = :in
@@ -50,88 +50,76 @@ module PanesDemo
     vpaned.add2(frame)
 
     # Now create toggle buttons to control sizing
-    buttons = create_pane_options(hpaned,
-                                  "Horizontal",
+    buttons = create_pane_options("Horizontal",
                                   "Left",
                                   "Right")
     vbox.pack_start(buttons, :expand => false, :fill => false, :padding => 0)
-    buttons = create_pane_options(hpaned,
-                                  "Vertical",
+    buttons = create_pane_options("Vertical",
                                   "Top",
                                   "Bottom")
     vbox.pack_start(buttons, :expand => false, :fill => false, :padding => 0)
     vbox.show_all
+  end
 
-    if !window.visible?
-      window.show_all
+  def run
+    if !@window.visible?
+      @window.show_all
     else
-      window.destroy
+      @window.destroy
     end
-    window
+    @window
   end
 
-  def self.create_pane_options(paned, frame_label, label1, label2)
-    child1 = paned.child1
-    child2 = paned.child2
+  private
 
+  def create_pane_options(frame_label, label1, label2)
+    child1 = @hpaned.child1
+    child2 = @hpaned.child2
     frame = Gtk::Frame.new(frame_label)
     frame.border_width = 4
 
-    table = Gtk::Grid.new
-    frame.add(table)
+    @table = Gtk::Grid.new
+    frame.add(@table)
 
     label = Gtk::Label.new(label1)
-    table.attach(label, 0, 0, 1, 1)
-
-    check_button = Gtk::CheckButton.new("_Resize")
-    check_button.use_underline = true
-    table.attach(check_button, 0, 1, 1, 1)
-    check_button.signal_connect "toggled" do
-      resize = paned.child_get_property(child1, "resize")
-      shrink = paned.child_get_property(child1, "shrink")
-
-      paned.remove(child1)
-      paned.pack1(child1, :resize => !resize, :shrink => shrink)
-    end
-
-    check_button = Gtk::CheckButton.new("_Shrink")
-    check_button.use_underline = true
-    table.attach(check_button, 0, 2, 1, 1)
-    check_button.active = true
-    check_button.signal_connect "toggled" do
-      resize = paned.child_get_property(child1, "resize")
-      shrink = paned.child_get_property(child1, "shrink")
+    @table.attach(label, 0, 0, 1, 1)
 
-      paned.remove(child1)
-      paned.pack1(child1, :resize => resize, :shrink => !shrink)
-    end
+    check_button(:resize, false, child1, 0, 1)
+    check_button(:shrink, true, child1, 0, 2)
 
     label = Gtk::Label.new(label2)
-    table.attach(label, 1, 0, 1, 1)
+    @table.attach(label, 1, 0, 1, 1)
 
-    check_button = Gtk::CheckButton.new("_Resize")
-    check_button.use_underline = true
-    table.attach(check_button, 1, 1, 1, 1)
-    check_button.active = true
-    check_button.signal_connect "toggled" do
-      resize = paned.child_get_property(child2, "resize")
-      shrink = paned.child_get_property(child2, "shrink")
-
-      paned.remove(child2)
-      paned.pack2(child2, :resize => !resize, :shrink => shrink)
-    end
+    check_button(:resize, true, child2, 1, 1)
+    check_button(:shrink, true, child2, 1, 2)
+    frame
+  end
 
-    check_button = Gtk::CheckButton.new("_Shrink")
+  def check_button(type, active, child, xposition, yposition)
+    is_resize = (type == :resize)
+    label = is_resize ? "_Resize" : "_Shrink"
+    check_button = Gtk::CheckButton.new(label)
     check_button.use_underline = true
-    table.attach(check_button, 1, 2, 1, 1)
-    check_button.active = true
+    check_button.active = active
+    @table.attach(check_button, xposition, yposition, 1, 1)
     check_button.signal_connect "toggled" do
-      resize = paned.child_get_property(child2, "resize")
-      shrink = paned.child_get_property(child2, "shrink")
-
-      paned.remove(child2)
-      paned.pack2(child2, :resize => resize, :shrink => !shrink)
+      is_child1 = (@hpaned.child1 == child)
+
+      resize = @hpaned.child_get_property(child, "resize")
+      shrink = @hpaned.child_get_property(child, "shrink")
+
+      if is_resize
+        resize = !resize
+      else
+        shrink = !shrink
+      end
+
+      @hpaned.remove(child)
+      if is_child1
+        @hpaned.pack1(child, :resize => resize, :shrink => shrink)
+      else
+        @hpaned.pack2(child, :resize => resize, :shrink => shrink)
+      end
     end
-    frame
   end
 end

data/sample/gtk-demo/pickers.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2015 Ruby-GNOME2 Project Team
+# Copyright (c) 2015-2016 Ruby-GNOME2 Project Team
 # This program is licenced under the same licence as Ruby-GNOME2.
 #
 =begin
@@ -7,64 +7,65 @@
 These widgets are mainly intended for use in preference dialogs.
 They allow to select colors, fonts, files, directories and applications.
 =end
-module PickersDemo
-  def self.run_demo(main_window)
-    window = Gtk::Window.new(:toplevel)
-    window.screen = main_window.screen
-    window.set_title("Pickers")
-    window.set_border_width(10)
+class PickersDemo
+  def initialize(main_window)
+    @window = Gtk::Window.new(:toplevel)
+    @window.screen = main_window.screen
+    @window.title = "Pickers"
+    @window.border_width = 10
 
-    table = Gtk::Grid.new
-    table.set_row_spacing(3)
-    table.set_column_spacing(10)
-    window.add(table)
+    initialize_grid
 
-    label = Gtk::Label.new("Color:")
-    label.set_halign(:start)
-    label.set_valign(:center)
-    label.set_hexpand(true)
+    label = generate_label("Color:")
     picker = Gtk::ColorButton.new
-    table.attach(label, 0, 0, 1, 1)
-    table.attach(picker, 1, 0, 1, 1)
+    @table.attach(label, 0, 0, 1, 1)
+    @table.attach(picker, 1, 0, 1, 1)
 
-    label = Gtk::Label.new("Font:")
-    label.set_halign(:start)
-    label.set_valign(:center)
-    label.set_hexpand(true)
+    label = generate_label("Font:")
     picker = Gtk::FontButton.new
-    table.attach(label, 0, 1, 1, 1)
-    table.attach(picker, 1, 1, 1, 1)
+    @table.attach(label, 0, 1, 1, 1)
+    @table.attach(picker, 1, 1, 1, 1)
 
-    label = Gtk::Label.new("File:")
-    label.set_halign(:start)
-    label.set_valign(:center)
-    label.set_hexpand(true)
+    label = generate_label("File:")
     picker = Gtk::FileChooserButton.new("Pick a file", :open)
-    table.attach(label, 0, 2, 1, 1)
-    table.attach(picker, 1, 2, 1, 1)
+    @table.attach(label, 0, 2, 1, 1)
+    @table.attach(picker, 1, 2, 1, 1)
 
-    label = Gtk::Label.new("Folder:")
-    label.set_halign(:start)
-    label.set_valign(:center)
-    label.set_hexpand(true)
+    label = generate_label("Folder:")
     picker = Gtk::FileChooserButton.new("Pick a folder", :select_folder)
-    table.attach(label, 0, 3, 1, 1)
-    table.attach(picker, 1, 3, 1, 1)
+    @table.attach(label, 0, 3, 1, 1)
+    @table.attach(picker, 1, 3, 1, 1)
 
-    label = Gtk::Label.new("Mail:")
-    label.set_halign(:start)
-    label.set_valign(:center)
-    label.set_hexpand(true)
+    label = generate_label("Mail:")
     picker = Gtk::AppChooserButton.new("x-scheme-handler/mailto")
     picker.set_show_dialog_item(true)
-    table.attach(label, 0, 4, 1, 1)
-    table.attach(picker, 1, 4, 1, 1)
+    @table.attach(label, 0, 4, 1, 1)
+    @table.attach(picker, 1, 4, 1, 1)
+  end
 
-    if !window.visible?
-      window.show_all
+  def run
+    if !@window.visible?
+      @window.show_all
     else
-      window.destroy
+      @window.destroy
     end
-    window
+    @window
+  end
+
+  private
+
+  def initialize_grid
+    @table = Gtk::Grid.new
+    @table.row_spacing = 3
+    @table.column_spacing = 10
+    @window.add(@table)
+  end
+
+  def generate_label(label)
+    label = Gtk::Label.new(label)
+    label.set_halign(:start)
+    label.set_valign(:center)
+    label.set_hexpand(true)
+    label
   end
 end