gtk3 3.0.9-x86-mingw32 → 3.1.0-x86-mingw32

data/sample/gtk-demo/pixbufs.rb

@@ -14,7 +14,7 @@
 
  Look at the Image demo for additional pixbuf usage examples.
 =end
-module PixbufsDemo
+class PixbufsDemo
   IMAGES_NAMES = %w(/pixbufs/apple-red.png /pixbufs/gnome-applets.png
                     /pixbufs/gnome-calendar.png /pixbufs/gnome-foot.png
                     /pixbufs/gnome-gmush.png /pixbufs/gnome-gimp.png
@@ -23,20 +23,20 @@ module PixbufsDemo
   BACKGROUND_NAME = "/pixbufs/background.jpg"
   CYCLE_TIME = 3_000_000
 
-  def self.run_demo(main_window)
-    window = Gtk::Window.new(:toplevel)
-    window.screen = main_window.screen
-    window.resizable = false
+  def initialize(main_window)
+    @window = Gtk::Window.new(:toplevel)
+    @window.screen = main_window.screen
+    @window.resizable = false
 
-    background_pixbuf = load_pixbuf(window, BACKGROUND_NAME)
+    background_pixbuf = load_pixbuf(BACKGROUND_NAME)
     other_pixbufs = []
     IMAGES_NAMES.each do |img|
-      other_pixbufs << load_pixbuf(window, img)
+      other_pixbufs << load_pixbuf(img)
     end
 
     width = background_pixbuf.width
     height = background_pixbuf.height
-    window.set_size_request(width, height)
+    @window.set_size_request(width, height)
 
     frame = GdkPixbuf::Pixbuf.new(:colorspace => :rgb,
                                  :has_alpha => false,
@@ -49,7 +49,7 @@ module PixbufsDemo
       cr.paint
       true
     end
-    window.add(da)
+    @window.add(da)
     start_time = 0
     da.add_tick_callback do |_widget, frame_clock|
       background_pixbuf.copy_area(0, 0, width, height, frame, 0, 0)
@@ -77,10 +77,11 @@ module PixbufsDemo
 
         dest = r1.intersect(r2)
         next unless dest
-        frame.composite!(other_pixbufs[i], dest.x, dest.y, dest.width,
-                         dest.height, xpos, ypos, k, k,
-                         :nearest,
-                         if (i & 1) == 1
+        frame.composite!(other_pixbufs[i], :dest_x => dest.x, :dest_y => dest.y,
+                         :dest_width => dest.width, :dest_height => dest.height,
+                         :offset_x => xpos, :offset_y => ypos, :scale_x => k,
+                         :scale_y => k, :interpolation_type => :nearest,
+                         :overall_alpha => if (i & 1) == 1
                            [
                              127, (255 * Math.sin(f * 2.0 * Math::PI)).abs
                            ].max
@@ -89,23 +90,26 @@ module PixbufsDemo
                              127, (255 * Math.cos(f * 2.0 * Math::PI)).abs
                            ].max
                          end)
-
       end
       da.queue_draw
       GLib::Source::CONTINUE
     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
 
-  def self.show_message_dialog_on(window, error)
+  private
+
+  def show_message_dialog_on(error)
     message = "Failed to load an image: #{error.message}"
-    dialog = Gtk::MessageDialog.new(:parent => window,
+    dialog = Gtk::MessageDialog.new(:parent => @window,
                                     :flags => :destroy_with_parent,
                                     :type => :error,
                                     :buttons => :close,
@@ -114,14 +118,12 @@ module PixbufsDemo
     dialog.show
   end
 
-  def self.load_pixbuf(window, image_name)
+  def load_pixbuf(image_name)
     begin
-      # Is it OK? should we implement gdk_pixbuf_new_from_resource instead?
-      #Gtk::Image.new(:resource => image_name).pixbuf
       GdkPixbuf::Pixbuf.new(:resource => image_name)
     rescue StandardError => e
-      show_message_dialog_on(window, e)
-      window.destroy
+      show_message_dialog_on(e)
+      @window.destroy
     end
   end
 end

data/sample/gtk-demo/popover.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
@@ -8,76 +8,34 @@
  GtkPopovers can be attached to any widget, and will be displayed
  within the same window, but on top of all its content.
 =end
-module PopoverDemo
-  def self.run_demo(main_window)
-    window = Gtk::Window.new(:toplevel)
-    window.screen = main_window.screen
+class PopoverDemo
+  def initialize(main_window)
+    @window = Gtk::Window.new(:toplevel)
+    @window.screen = main_window.screen
     box = Gtk::Box.new(:vertical, 24)
     box.border_width = 24
-    window.add(box)
-
-    widget = Gtk::ToggleButton.new(:label => "Button")
-    toggle_popover = create_popover(widget,
-                                    Gtk::Label.new(
-                                      "This popover does not grab input"
-                                    ),
-                                    :top)
-    toggle_popover.modal = false
-    widget.signal_connect "toggled" do |button|
-      toggle_popover.visible = button.active?
-    end
+    @window.add(box)
 
+    widget = add_toggle_button_with_popover
     box.add(widget)
 
-    widget = CustomEntry.new
-    entry_popover = create_complex_popover(widget, :top)
-    widget.set_icon_from_icon_name(:primary, "edit-find")
-    widget.set_icon_from_icon_name(:secondary, "edit-clear")
-    widget.signal_connect "icon-press" do  |entry, icon_pos, _event|
-      rect = entry.get_icon_area(icon_pos)
-      entry_popover.set_pointing_to(rect)
-      entry_popover.show
-      entry.popover_icon_pos = icon_pos
-    end
-
-    widget.signal_connect "size-allocate" do |entry, _allocation|
-      if entry_popover.visible?
-        popover_pos = entry.popover_icon_pos
-        rect = entry.get_icon_area(popover_pos)
-        entry_popover.set_pointing_to(rect)
-      end
-    end
-
+    widget = add_custom_entry_with_complex_popover
     box.add(widget)
 
-    widget = Gtk::Calendar.new
-    widget.signal_connect "day-selected" do |calendar|
-      event = Gtk.current_event
-      if event.type == :button_press
-        x, y = event.window.coords_to_parent(event.x,
-                                             event.y)
-        allocation = calendar.allocation
-        rect = Gdk::Rectangle.new(x - allocation.x,
-                                  y - allocation.y,
-                                  1,
-                                  1)
-        cal_popover = create_popover(calendar, CustomEntry.new, :bottom)
-        cal_popover.set_pointing_to(rect)
-        cal_popover.show
-      end
-    end
-
+    widget = add_calendar_with_popover
     box.add(widget)
+  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_popover(parent, child, pos)
+  def create_popover(parent, child, pos)
     popover = Gtk::Popover.new(parent)
     popover.position = pos
     popover.add(child)
@@ -86,7 +44,7 @@ module PopoverDemo
     popover
   end
 
-  def self.create_complex_popover(parent, pos)
+  def create_complex_popover(parent, pos)
     builder = Gtk::Builder.new(:resource => "/popover/popover.ui")
     window = builder["window"]
     content = window.child
@@ -101,10 +59,59 @@ module PopoverDemo
     popover
   end
 
-  class CustomEntry < Gtk::Entry
-    attr_accessor :popover_icon_pos
-    def initialize
-      super
+  def add_toggle_button_with_popover
+    widget = Gtk::ToggleButton.new(:label => "Button")
+    label = Gtk::Label.new("This popover does not grab input")
+    toggle_popover = create_popover(widget, label, :top)
+    toggle_popover.modal = false
+    widget.signal_connect "toggled" do |button|
+      toggle_popover.visible = button.active?
+    end
+    widget
+  end
+
+  def add_custom_entry_with_complex_popover
+    widget = CustomEntry.new
+    entry_popover = create_complex_popover(widget, :top)
+    widget.set_icon_from_icon_name(:primary, "edit-find")
+    widget.set_icon_from_icon_name(:secondary, "edit-clear")
+    widget.signal_connect "icon-press" do |entry, icon_pos, _event|
+      rect = entry.get_icon_area(icon_pos)
+      entry_popover.pointing_to = rect
+      entry_popover.show
+      entry.popover_icon_pos = icon_pos
+    end
+
+    widget.signal_connect "size-allocate" do |entry, _allocation|
+      if entry_popover.visible?
+        popover_pos = entry.popover_icon_pos
+        rect = entry.get_icon_area(popover_pos)
+        entry_popover.pointing_to = rect
+      end
+    end
+    widget
+  end
+
+  def add_calendar_with_popover
+    widget = Gtk::Calendar.new
+    widget.signal_connect "day-selected" do |calendar|
+      event = Gtk.current_event
+      if event.type == :button_press
+        x, y = event.window.coords_to_parent(event.x, event.y)
+        allocation = calendar.allocation
+        rect = Gdk::Rectangle.new(x - allocation.x, y - allocation.y, 1, 1)
+        cal_popover = create_popover(calendar, CustomEntry.new, :bottom)
+        cal_popover.pointing_to = rect
+        cal_popover.show
+      end
     end
+    widget
+  end
+end
+
+class CustomEntry < Gtk::Entry
+  attr_accessor :popover_icon_pos
+  def initialize
+    super
   end
 end

data/sample/gtk-demo/printing.rb

@@ -8,96 +8,56 @@
  in a cross-platform way.
 
 =end
-module PrintingDemo
+class PrintingDemo
   HEADER_HEIGHT = 10 * 72 / 25.4
   HEADER_GAP = 3 * 72 / 25.4
 
-  def self.run_demo(main_window)
-    print_operation = Gtk::PrintOperation.new
-
-    resource_name = File.expand_path(__FILE__)
-    font_size = 12.0
-    num_pages = 0
-    lines_per_page = 0
-    lines = []
-
-    print_operation.signal_connect "begin-print" do |operation, context|
-      height = context.height - HEADER_HEIGHT - HEADER_GAP
-      lines_per_page = (height / font_size).floor
-      File.open(resource_name, "r") do |file|
-        file.each_line do |line|
-          lines << line
-        end
-      end
-      num_pages = lines.size / (lines_per_page + 1)
-      operation.n_pages = num_pages
+  def initialize(main_window)
+    @print_operation = Gtk::PrintOperation.new
+    @main_window = main_window
+    @resource_name = File.expand_path(__FILE__)
+    @font_size = 12.0
+    @num_pages = 0
+    @lines_per_page = 0
+    @lines = []
+
+    @print_operation.signal_connect "begin-print" do |operation, context|
+      configure_pagination(operation, context)
     end
 
-    print_operation.signal_connect "draw-page" do |_operation, context, page_nr|
-      cr = context.cairo_context
-      width = context.width
-      cr.rectangle(0, 0, width, HEADER_HEIGHT)
-      cr.set_source_rgb(0.8, 0.8, 0.8)
-      cr.fill_preserve
-
-      cr.set_source_rgb(0, 0, 0)
-      cr.line_width = 1
-      cr.stroke
-
-      layout = context.create_pango_layout
-      desc = Pango::FontDescription.new("sans 14")
-      layout.font_description = desc
-
-      layout.text = resource_name
-      text_width, text_height = layout.pixel_size
+    @print_operation.signal_connect "draw-page" do |_oper, context, page_nr|
+      cr = initialize_cairo_context(context)
 
-      if text_width > width
-        layout.width = width
-        layout.ellipsize = :start
-        text_width, text_height = layout.pixel_size
-      end
-      cr.move_to((width - text_width) / 2,
-                 (HEADER_HEIGHT - text_height) / 2)
+      layout = initialize_pango_layout_title(context)
+      cr.move_to((@width - @text_width) / 2,
+                 (HEADER_HEIGHT - @text_height) / 2)
       cr.show_pango_layout(layout)
 
-      layout.text = "#{page_nr + 1}/#{num_pages}"
-      layout.width = -1
-      text_width, text_height = layout.pixel_size
-
-      cr.move_to(width - text_width - 4,
-                 (HEADER_HEIGHT - text_height) / 2)
+      initialize_pango_layout_page_nb(layout, page_nr)
+      cr.move_to(@width - @text_width - 4,
+                 (HEADER_HEIGHT - @text_height) / 2)
       cr.show_pango_layout(layout)
 
-      layout = context.create_pango_layout
-      desc = Pango::FontDescription.new("monospace")
-      desc.size = font_size * Pango::SCALE
-      layout.font_description = desc
-
-      cr.move_to(0, HEADER_HEIGHT + HEADER_GAP)
-      start_line = page_nr * lines_per_page
-
-      lines[start_line, lines_per_page].each do |line|
-        layout.text = line
-        cr.show_pango_layout(layout)
-        cr.rel_move_to(0, font_size)
-      end
+      initialize_pango_layout_page_content(context, cr, page_nr)
     end
 
-    print_operation.signal_connect "end-print" do
+    @print_operation.signal_connect "end-print" do
       puts "End of print"
     end
 
-    print_operation.use_full_page = false
-    print_operation.unit = :points
-    print_operation.embed_page_setup = true
+    @print_operation.use_full_page = false
+    @print_operation.unit = :points
+    @print_operation.embed_page_setup = true
 
     settings = Gtk::PrintSettings.new
     settings.set(:ouput_basename, "gtk-demo")
 
-    print_operation.print_settings = settings
+    @print_operation.print_settings = settings
+  end
 
+  def run
     begin
-      print_operation.run(:print_dialog, main_window)
+      @print_operation.run(:print_dialog, @main_window)
     rescue => error
       dialog = Gtk::MessageDialog.new(:parent => main_window,
                                       :flags => :destroy_with_parent,
@@ -110,4 +70,69 @@ module PrintingDemo
       dialog.show
     end
   end
+
+  private
+
+  def configure_pagination(operation, context)
+    height = context.height - HEADER_HEIGHT - HEADER_GAP
+    @lines_per_page = (height / @font_size).floor
+    File.open(@resource_name, "r") do |file|
+      file.each_line do |line|
+        @lines << line
+      end
+    end
+    @num_pages = @lines.size / (@lines_per_page + 1)
+    operation.n_pages = @num_pages
+  end
+
+  def initialize_cairo_context(context)
+    cr = context.cairo_context
+    @width = context.width
+    cr.rectangle(0, 0, @width, HEADER_HEIGHT)
+    cr.set_source_rgb(0.8, 0.8, 0.8)
+    cr.fill_preserve
+
+    cr.set_source_rgb(0, 0, 0)
+    cr.line_width = 1
+    cr.stroke
+    cr
+  end
+
+  def initialize_pango_layout_title(context)
+    layout = context.create_pango_layout
+    desc = Pango::FontDescription.new("sans 14")
+    layout.font_description = desc
+
+    layout.text = @resource_name
+    @text_width, @text_height = layout.pixel_size
+
+    if @text_width > @width
+      layout.width = @width
+      layout.ellipsize = :start
+      @text_width, @text_height = layout.pixel_size
+    end
+    layout
+  end
+
+  def initialize_pango_layout_page_nb(layout, page_nr)
+    layout.text = "#{page_nr + 1}/#{@num_pages}"
+    layout.width = -1
+    @text_width, @text_height = layout.pixel_size
+  end
+
+  def initialize_pango_layout_page_content(context, cr, page_nr)
+    layout = context.create_pango_layout
+    desc = Pango::FontDescription.new("monospace")
+    desc.size = @font_size * Pango::SCALE
+    layout.font_description = desc
+
+    cr.move_to(0, HEADER_HEIGHT + HEADER_GAP)
+    start_line = page_nr * @lines_per_page
+
+    @lines[start_line, @lines_per_page].each do |line|
+      layout.text = line
+      cr.show_pango_layout(layout)
+      cr.rel_move_to(0, @font_size)
+    end
+  end
 end