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

data/sample/gtk-demo/search_entry2.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
@@ -9,67 +9,98 @@
  when the searched operation is slow such as loads of entries
  to search, or online searches.
 =end
-module SearchEntry2Demo
-  def self.run_demo(main_window)
-    window = Gtk::Window.new(:toplevel)
-    window.title = "Delayed Search Entry"
-    window.transient_for = main_window
-    window.resizable = true
-    window.set_size_request(200, -1)
-
-    vbox = Gtk::Box.new(:vertical, 0)
-    window.add(vbox)
-    vbox.border_width = 0
-
-    entry = Gtk::SearchEntry.new
-    container = Gtk::Box.new(:horizontal, 10)
-    container.halign = :center
-    container.pack_start(entry, :expand => false, :fill => false, :padding => 0)
+class SearchEntry2Demo
+  def initialize(main_window)
+    @window = Gtk::Window.new(:toplevel)
+    @window.title = "Delayed Search Entry"
+    @window.transient_for = main_window
+    @window.resizable = true
+    @window.set_size_request(200, -1)
+
+    initialize_vbox
 
-    searchbar = Gtk::SearchBar.new
-    searchbar.connect_entry(entry)
-    searchbar.show_close_button = false
-    searchbar.add(container)
-    vbox.pack_start(searchbar, :expand => false, :fill => false, :padding => 0)
+    @entry = Gtk::SearchEntry.new
+    initialize_search_bar
+    @vbox.pack_start(@searchbar,
+                     :expand => false, :fill => false, :padding => 0)
 
     # Hook the search bar to key presses
-    window.signal_connect("key-press-event") do |_widget, event|
-      searchbar.handle_event(event)
+    @window.signal_connect("key-press-event") do |_widget, event|
+      @searchbar.handle_event(event)
+    end
+
+    initialize_help_label
+    initialize_toggle_button
+    initialize_result_hbox
+    initialize_signal_hbox
+  end
+
+  def run
+    if !@window.visible?
+      @window.show_all
+    else
+      @window.destroy
     end
+    @window
+  end
+
+  private
 
+  def initialize_search_bar
+    container = Gtk::Box.new(:horizontal, 10)
+    container.halign = :center
+    container.pack_start(@entry,
+                         :expand => false, :fill => false, :padding => 0)
+
+    @searchbar = Gtk::SearchBar.new
+    @searchbar.connect_entry(@entry)
+    @searchbar.show_close_button = false
+    @searchbar.add(container)
+  end
+
+  def initialize_vbox
+    @vbox = Gtk::Box.new(:vertical, 0)
+    @window.add(@vbox)
+    @vbox.border_width = 0
+  end
+
+  def initialize_help_label
     # Help
     label = Gtk::Label.new("Start Typing to search")
-    vbox.pack_start(label, :expand => true, :fill => true, :padding => 0)
+    @vbox.pack_start(label, :expand => true, :fill => true, :padding => 0)
+  end
 
+  def initialize_toggle_button
     # Toggle button
     button = Gtk::ToggleButton.new(:label => "Search")
-    button.bind_property("active", searchbar, "search-mode-enabled", :bidirectional)
-    vbox.pack_start(button, :expand => true, :fill => true, :padding => 0)
+    button.bind_property("active", @searchbar, "search-mode-enabled",
+                         :bidirectional)
+    @vbox.pack_start(button, :expand => true, :fill => true, :padding => 0)
+  end
 
-    # Result
+  def initialize_result_hbox
     hbox = Gtk::Box.new(:horizontal, 10)
-    vbox.pack_start(hbox, :expand => true, :fill => true, :padding => 0)
+    @vbox.pack_start(hbox, :expand => true, :fill => true, :padding => 0)
     hbox.border_width = 0
 
+    # Result
     label = Gtk::Label.new("Result:")
     label.xalign = 0.0
     label.margin_start = 6
     hbox.pack_start(label, :expand => true, :fill => true, :padding => 0)
-
     label = Gtk::Label.new("")
     hbox.pack_start(label, :expand => true, :fill => true, :padding => 0)
 
-    entry.signal_connect("search-changed") do |widget|
+    @entry.signal_connect("search-changed") do |widget|
       puts "search changed: #{widget.text || ''}"
       label.text = widget.text || ""
     end
+    @entry.signal_connect("changed") { puts "changed: #{label.text || ''}" }
+  end
 
-    entry.signal_connect("changed") do |_widget|
-      puts "changed: #{label.text || ''}"
-    end
-
+  def initialize_signal_hbox
     hbox = Gtk::Box.new(:horizontal, 10)
-    vbox.pack_start(hbox, :expand => true, :fill => true, :padding => 0)
+    @vbox.pack_start(hbox, :expand => true, :fill => true, :padding => 0)
     hbox.border_width = 0
 
     label = Gtk::Label.new("Signal:")
@@ -80,28 +111,9 @@ module SearchEntry2Demo
     label = Gtk::Label.new("")
     hbox.pack_start(label, :expand => true, :fill => true, :padding => 0)
 
-    entry.signal_connect("search-changed") do |widget|
-      puts "search changed: #{widget.text || ''}"
-      label.text = widget.text || ""
-    end
-
-    entry.signal_connect("next-match") do |_widget|
-      label.text = "next-match"
-    end
-
-    entry.signal_connect("previous-match") do |_widget|
-      label.text = "previous-match"
-    end
-
-    entry.signal_connect("stop-search") do |_widget|
-      label.text = "stop-search"
-    end
-
-    if !window.visible?
-      window.show_all
-    else
-      window.destroy
-    end
-    window
+    @entry.signal_connect("search-changed") { label.text = "search-changed" }
+    @entry.signal_connect("next-match") { label.text = "next-match" }
+    @entry.signal_connect("previous-match") { label.text = "previous-match" }
+    @entry.signal_connect("stop-search") { label.text = "stop-search" }
   end
 end

data/sample/gtk-demo/sidebar.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
@@ -9,24 +9,24 @@ navigation of a GtkStack object. This widget automatically updates it
 content based on what is presently available in the GtkStack object,
 and using the "title" child property to set the display labels.
 =end
-module SidebarDemo
-  def self.run_demo(_main_window)
-    window = Gtk::Window.new(:toplevel)
-    window.set_resizable(true)
-    window.set_size_request(500, 350)
+class SidebarDemo
+  def initialize(_main_window)
+    @window = Gtk::Window.new(:toplevel)
+    @window.resizable = true
+    @window.set_size_request(500, 350)
 
     header = Gtk::HeaderBar.new
-    header.set_show_close_button(true)
-    window.set_titlebar(header)
-    window.set_title("Stack Sidebar")
+    header.show_close_button = true
+    @window.titlebar = header
+    @window.title = "Stack Sidebar"
 
     box = Gtk::Box.new(:horizontal, 0)
     sidebar = Gtk::StackSidebar.new
     box.pack_start(sidebar, :expand => false, :fill => false, :padding => 0)
 
     stack = Gtk::Stack.new
-    stack.set_transition_type(:slide_up_down)
-    sidebar.set_stack(stack)
+    stack.transition_type = :slide_up_down
+    sidebar.stack = stack
 
     widget = Gtk::Separator.new(:vertical)
     box.pack_start(widget, :expand => false, :fill => false, :padding => 0)
@@ -41,14 +41,13 @@ module SidebarDemo
              "Page 6",
              "Page 7",
              "Page 8",
-             "Page 9"
-            ]
+             "Page 9"]
 
     pages.each_with_index do |page_string, i|
       child = nil
-      if i == 0
+      if i.zero?
         child = Gtk::Image.new(:icon_name => "help-about", :size => :menu)
-        child.set_pixel_size(256)
+        child.pixel_size = 256
       else
         child = Gtk::Label.new(page_string)
       end
@@ -57,12 +56,14 @@ module SidebarDemo
       stack.child_set_property(child, "title", page_string)
     end
 
-    window.add(box)
+    @window.add(box)
+  end
 
-    if !window.visible?
-      window.show_all
+  def run
+    if !@window.visible?
+      @window.show_all
     else
-      window.destroy
+      @window.destroy
     end
   end
 end

data/sample/gtk-demo/sizegroup.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
@@ -16,53 +16,38 @@
  and not more. For example, if you are packing your widgets
  into a table, you would not include the GTK_FILL flag.
 =end
-module SizegroupDemo
-  def self.run_demo(main_window)
+class SizegroupDemo
+  def initialize(main_window)
     color_options = %w(Red Green Blue)
     dash_options = %w(Solid Dashed Dotted)
     end_options = %w(Square Round Double Arrow)
 
-    window = Gtk::Window.new(:toplevel)
-    window.screen = main_window.screen
-    window.set_title("Size Groups")
-    window.set_resizable(false)
+    @window = Gtk::Window.new(:toplevel)
+    @window.screen = main_window.screen
+    @window.title = "Size Groups"
+    @window.resizable = false
 
-    vbox = Gtk::Box.new(:vertical, 5)
-    window.add(vbox)
-    vbox.set_border_width(5)
+    @vbox = Gtk::Box.new(:vertical, 5)
+    @window.add(@vbox)
+    @vbox.border_width = 5
 
     size_group = Gtk::SizeGroup.new(:horizontal)
 
     # Create one frame holding color options
-    frame = Gtk::Frame.new("Color Options")
-    vbox.pack_start(frame, :expand => true, :fill => true, :padding => 0)
-
-    table = Gtk::Grid.new
-    table.set_border_width(5)
-    table.set_row_spacing(5)
-    table.set_column_spacing(10)
-    frame.add(table)
-
+    table = initialize_frame("Color Options")
     add_row(table, 0, size_group, "_Foreground", color_options)
     add_row(table, 1, size_group, "_Background", color_options)
 
     # And another frame holding line style options
-    frame = Gtk::Frame.new("Line options")
-    vbox.pack_start(frame, :expand => false, :fill => false, :padding => 0)
-
-    table = Gtk::Grid.new
-    table.set_border_width(5)
-    table.set_row_spacing(5)
-    table.set_column_spacing(10)
-    frame.add(table)
-
+    table = initialize_frame("Line Options")
     add_row(table, 0, size_group, "_Dashing", dash_options)
     add_row(table, 1, size_group, "_Line ends", end_options)
 
     # And a check button to turn grouping on and off
     check_button = Gtk::CheckButton.new("_Enable grouping")
     check_button.set_use_underline(true)
-    vbox.pack_start(check_button, :expand => false, :fill => false, :padding => 0)
+    @vbox.pack_start(check_button,
+                     :expand => false, :fill => false, :padding => 0)
 
     check_button.signal_connect("toggled") do |widget|
       if widget.active?
@@ -71,16 +56,32 @@ module SizegroupDemo
         size_group.set_mode(:none)
       end
     end
+  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_frame(title)
+    frame = Gtk::Frame.new(title)
+    @vbox.pack_start(frame, :expand => false, :fill => false, :padding => 0)
+
+    table = Gtk::Grid.new
+    table.set_border_width(5)
+    table.set_row_spacing(5)
+    table.set_column_spacing(10)
+    frame.add(table)
+    table
   end
 
-  def self.add_row(table, row, size_group, label_text, options)
+  def add_row(table, row, size_group, label_text, options)
     label = Gtk::Label.new(label_text, :use_underline => true)
     label.set_halign(:start)
     label.set_valign(:baseline)
@@ -95,7 +96,7 @@ module SizegroupDemo
     table.attach(combo_box, 1, row, 1, 1)
   end
 
-  def self.create_combo_box(options)
+  def create_combo_box(options)
     combo_box = Gtk::ComboBoxText.new
     options.each do |o|
       combo_box.append_text(o)

data/sample/gtk-demo/spinbutton.rb

@@ -0,0 +1,128 @@
+# Copyright (c) 2016 Ruby-GNOME2 Project Team
+# This program is licenced under the same licence as Ruby-GNOME2.
+#
+=begin
+=  Spin Button
+
+ GtkSpinButton provides convenient ways to input data
+ that can be seen as a value in a range. The examples
+ here show that this does not necessarily mean numeric
+ values, and it can include custom formatting.
+=end
+require "date"
+
+class SpinbuttonDemo
+  def initialize(main_window)
+    builder = Gtk::Builder.new(:resource => "/spinbutton/spinbutton.ui")
+    builder.connect_signals do |name|
+      case name
+      when "hex_spin_input"
+        proc do |button|
+          hex_spin_input(button)
+        end
+      when "hex_spin_output"
+        proc do |button|
+          hex_spin_output(button)
+        end
+      when "time_spin_input"
+        proc do |button|
+          time_spin_input(button)
+        end
+      when "time_spin_output"
+        proc do |button|
+          time_spin_output(button)
+        end
+      when "month_spin_input"
+        proc do |button|
+          month_spin_input(button)
+        end
+      when "month_spin_output"
+        proc do |button|
+          month_spin_output(button)
+        end
+      else
+      end
+    end
+    @window = builder["window"]
+    @window.screen = main_window.screen
+    @window.title = "Spin Buttons"
+    @window.resizable = false
+
+    value_to_label = proc do |value|
+      value.to_s
+    end
+
+    adj = builder["basic_adjustment"]
+    basic_label = builder["basic_label"]
+    adj.bind_property("value", basic_label, "label", :sync_create,
+                      :transform_to => value_to_label)
+
+    hex_adj = builder["hex_adjustment"]
+    hex_label = builder["hex_label"]
+    hex_adj.bind_property("value", hex_label, "label", :sync_create,
+                      :transform_to => value_to_label)
+
+    adj = builder["time_adjustment"]
+    time_label = builder["time_label"]
+    adj.bind_property("value", time_label, "label", :sync_create,
+                      :transform_to => value_to_label)
+
+    adj = builder["month_adjustment"]
+    month_label = builder["month_label"]
+    adj.bind_property("value", month_label, "label", :sync_create,
+                      :transform_to => value_to_label)
+
+  end
+
+  def run
+    if !@window.visible?
+      @window.show_all
+    else
+      @window.destroy
+    end
+    @window
+  end
+
+  private
+
+  def hex_spin_input(button)
+    value = button.text.to_i(16)
+    value = 0 if value < 1e-5
+    value
+  end
+
+  def hex_spin_output(button)
+    value = button.value
+    button.text = sprintf("0x%.2X", value)
+    button.text = "0x00" if value.abs < 1e-5
+    true
+  end
+
+  def time_spin_input(button)
+    str = button.text.split(":")
+    hours = str[0].to_i
+    minutes = str[1].to_i
+    value = 0
+    if (0..24).include?(hours) && (0..60).include?(minutes)
+      value = hours * 60 + minutes
+    end
+    value
+  end
+
+  def time_spin_output(button)
+    hours = button.value / 60.0
+    minutes = (hours - hours.floor) * 60.0
+    button.text = sprintf("%02.0f:%02.0f", hours.floor, (minutes + 0.5).floor)
+    true
+  end
+
+  def month_spin_input(button)
+    Date::MONTHNAMES.index(button.text) || 1
+  end
+
+  def month_spin_output(button)
+    value = button.adjustment.value || 1
+    button.text = Date::MONTHNAMES[value]
+    true
+  end
+end