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

data/sample/gtk-demo/button_box.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
@@ -6,21 +6,39 @@
 
  The Button Box widgets are used to arrange buttons with padding.
 =end
-module ButtonBoxDemo
-  def self.run_demo(main_window)
-    window = Gtk::Window.new(:toplevel)
-    window.screen = main_window.screen
-    window.set_title("Button Boxes")
-    window.set_border_width(10)
+class ButtonBoxDemo
+  def initialize(main_window)
+    @window = Gtk::Window.new(:toplevel)
+    @window.screen = main_window.screen
+    @window.title = "Button Boxes"
+    @window.border_width = 10
 
     main_vbox = Gtk::Box.new(:vertical, 0)
-    window.add(main_vbox)
+    @window.add(main_vbox)
+    frame_horz = generate_horizontal_frame
+    main_vbox.pack_start(frame_horz,
+                         :expand => true, :fill => true, :padding => 10)
+    frame_vert = generate_vertical_frame
+    main_vbox.pack_start(frame_vert,
+                         :expand => true, :fill => true, :padding => 10)
+  end
+
+  def run
+    if !@window.visible?
+      @window.show_all
+    else
+      @window.destroy
+    end
+    @window
+  end
+
+  private
 
+  def generate_horizontal_frame
     frame_horz = Gtk::Frame.new("Horizontal Button Boxes")
-    main_vbox.pack_start(frame_horz, :expand => true, :fill => true, :padding => 10)
 
     vbox = Gtk::Box.new(:vertical, 0)
-    vbox.set_border_width(10)
+    vbox.border_width = 10
     frame_horz.add(vbox)
 
     bbox = create_bbox(true, "Spread", 40, :spread)
@@ -40,12 +58,14 @@ module ButtonBoxDemo
 
     bbox = create_bbox(true, "Expand", 0, :expand)
     vbox.pack_start(bbox, :expand => true, :fill => true, :padding => 5)
+    frame_horz
+  end
 
+  def generate_vertical_frame
     frame_vert = Gtk::Frame.new("Vertical Button Boxes")
-    main_vbox.pack_start(frame_vert, :expand => true, :fill => true, :padding => 10)
 
     hbox = Gtk::Box.new(:horizontal, 0)
-    hbox.set_border_width(10)
+    hbox.border_width = 10
 
     frame_vert.add(hbox)
 
@@ -66,29 +86,20 @@ module ButtonBoxDemo
 
     bbox = create_bbox(false, "Expand", 0, :expand)
     hbox.pack_start(bbox, :expand => true, :fill => true, :padding => 5)
-
-    if !window.visible?
-      window.show_all
-    else
-      window.destroy
-    end
-    window
+    frame_vert
   end
 
-  def self.create_bbox(horizontal, title, spacing, layout)
+  def create_bbox(horizontal, title, spacing, layout)
     frame = Gtk::Frame.new(title)
     bbox = nil
 
-    if horizontal
-      bbox = Gtk::ButtonBox.new(:horizontal)
-    else
-      bbox = Gtk::ButtonBox.new(:vertical)
-    end
+    orientation = horizontal ? :horizontal : :vertical
+    bbox = Gtk::ButtonBox.new(orientation)
 
-    bbox.set_border_width(5)
+    bbox.border_width = 5
     frame.add(bbox)
-    bbox.set_layout(layout)
-    bbox.set_spacing(spacing)
+    bbox.layout = layout
+    bbox.spacing = spacing
 
     %w(OK(_O) Cancel(_C) Help(_H)).each do |name|
       button = Gtk::Button.new(:label => name, :use_underline => true)

data/sample/gtk-demo/clipboard.rb

@@ -1,67 +1,160 @@
-# Copyright (c) 2003-2005 Ruby-GNOME2 Project Team
+# Copyright (c) 2016 Ruby-GNOME2 Project Team
 # This program is licenced under the same licence as Ruby-GNOME2.
-# $Id: clipboard.rb,v 1.3 2005/07/28 14:30:38 mutoh Exp $
+#
 =begin
-= Clipboard
+=  Clipboard
 
-GtkClipboard is used for clipboard handling. This demo shows how to
-copy and paste text to and from the clipboard.
+ GtkClipboard is used for clipboard handling. This demo shows how to
+ copy and paste text to and from the clipboard.
+
+ It also shows how to transfer images via the clipboard or via
+ drag-and-drop, and how to make clipboard contents persist after
+ the application exits. Clipboard persistence requires a clipboard
+ manager to run.
 =end
+class ClipboardDemo
+  def initialize(main_window)
+    @window = Gtk::Window.new(:toplevel)
+    @window.screen = main_window.screen
+    @window.title = "Clipboard"
+
+    @vbox = Gtk::Box.new(:vertical, 0)
+    @vbox.border_width = 0
+    @window.add(@vbox)
+
+    text = "\"Copy\" will copy the text\nin the entry to the clipboard"
+    generate_entry(text, "_Copy") do |entry|
+      clipboard = entry.get_clipboard(Gdk::Selection::CLIPBOARD)
+      clipboard.text = entry.text
+    end
 
-require 'common'
+    text = "\"Paste\" will paste the text from the clipboard to the entry"
+    generate_entry(text, "_Paste") do |entry|
+      clipboard = entry.get_clipboard(Gdk::Selection::CLIPBOARD)
+      clipboard.request_text { |_clip, entry_text| entry.text = entry_text }
+    end
 
-module Demo
-  class Clipboard < Demo::BasicWindow
-    def initialize
-      super('Clipboard')
+    text = "Images can be transferred via the clipboard, too"
+    label = Gtk::Label.new(text)
+    @vbox.pack_start(label, :expand => false, :fill => false, :padding => 0)
 
-      vbox = Gtk::Box.new(:vertical)
-      vbox.border_width = 8
+    @hbox = Gtk::Box.new(:horizontal, 4)
+    @hbox.border_width = 8
+    @vbox.pack_start(@hbox, :expand => false, :fill => false, :padding => 0)
 
-      add(vbox)
+    # Create the first image
+    generate_image("dialog-warning")
 
-      label = Gtk::Label.new(%Q["Copy" will copy the text\nin the entry to the clipboard])
+    # Create the second image
+    generate_image("process-stop")
 
-      vbox.pack_start(label, :expand => false, :fill => false, :padding => 0)
+    # Tell the clipboard manager to make the data persistent
+    clipboard = Gtk::Clipboard.get(Gdk::Selection::CLIPBOARD)
+    clipboard.set_can_store([])
+  end
 
-      hbox = Gtk::Box.new(:horizontal, 0)
-      hbox.border_width = 8
-      vbox.pack_start(hbox, :expand => false, :fill => false, :padding => 0)
+  def run
+    if !@window.visible?
+      @window.show_all
+    else
+      @window.destroy
+    end
+    @window
+  end
 
-      # Create the first entry
-      entry = Gtk::Entry.new
-      hbox.pack_start(entry, :expand => true, :fill => true, :padding => 0)
+  private
 
-      # Create the button
-      button = Gtk::Button.new(:stock_id => :copy)
-      hbox.pack_start(button, :expand => false, :fill => false, :padding => 0)
-      button.signal_connect('clicked', entry) do |w, e|
-        clipboard = e.get_clipboard(Gdk::Selection::CLIPBOARD)
-        clipboard.text = e.text
-      end
+  def get_image_pixbuf(image)
+    return image.pixbuf if image.storage_type == :pixbuf
 
-      label = Gtk::Label.new(%Q["Paste" will paste the text from the clipboard to the entry])
-      vbox.pack_start(label, :expand => false, :fill => false, :padding => 0)
+    if image.storage_type == :icon_name
+      icon_name, size = image.icon_name
+      icon_theme = Gtk::IconTheme.get_for_screen(image.screen)
+      width, _height = Gtk::IconSize.lookup(size)
+      return icon_theme.load_icon(icon_name, width, :generic_fallback)
+    else
+      puts "Image storage type #{image.storage_type.to_i} not handled"
+    end
+  end
 
-      hbox = Gtk::Box.new(:horizontal, 4)
-      hbox.border_width = 8
-      vbox.pack_start(hbox, :expand => false, :fill => false, :padding => 0)
+  def generate_entry(text, action_name)
+    label = Gtk::Label.new(text)
+    @vbox.pack_start(label, :expand => false, :fill => false, :padding => 0)
 
-      # Create the second entry
-      entry = Gtk::Entry.new
-      hbox.pack_start(entry, :expand => true, :fill => true, :padding => 0)
+    hbox = Gtk::Box.new(:horizontal, 4)
+    hbox.border_width = 8
+    @vbox.pack_start(hbox, :expand => false, :fill => false, :padding => 0)
 
-      # Create the button
-      button = Gtk::Button.new(:stock_id => :paste)
-      hbox.pack_start(button, :expand => false, :fill => false, :padding => 0)
-      button.signal_connect('clicked', entry) do |w, e|
-        clipboard = e.get_clipboard(Gdk::Selection::CLIPBOARD)
-        clipboard.request_text do |board, text, data|
-          e.text = text
-        end
-      end
+    # Create the first entry
+    entry = Gtk::Entry.new
+    hbox.pack_start(entry, :expand => true, :fill => true, :padding => 0)
 
+    # Create the button
+    button = Gtk::Button.new(:label => action_name, :use_underline => true)
+    hbox.pack_start(button, :expand => false, :fill => false, :padding => 0)
+    button.signal_connect "clicked" do
+      yield(entry) if block_given?
     end
   end
-end
 
+  def generate_image(icon_name)
+    # Create the first image
+    image = Gtk::Image.new(:icon_name => icon_name, :size => :button)
+    ebox = Gtk::EventBox.new
+    ebox.add(image)
+    @hbox.add(ebox)
+
+    # Make ebox a drag source
+    ebox.drag_source_set(Gdk::ModifierType::BUTTON1_MASK, [], :copy)
+    ebox.drag_source_add_image_targets
+    ebox.signal_connect "drag-begin" do |_widget, context|
+      pixbuf = get_image_pixbuf(image1)
+      context.set_icon_pixbuf(pixbuf, -2, -2)
+    end
+
+    ebox.signal_connect "drag-data-get" do |_widget, _context, selection_data|
+      pixbuf = get_image_pixbuf(image)
+      selection_data.pixbuf = pixbuf
+    end
+
+    # Accept drops on ebox
+    ebox.drag_dest_set(Gtk::DestDefaults::ALL, [], Gdk::DragAction::COPY)
+    ebox.drag_dest_add_image_targets
+    ebox.signal_connect "drag-data-received" do |_w, _c, _x, _y, selection_data|
+      pixbuf = selection_data.pixbuf
+      image.from_pixbuf = pixbuf
+    end
+
+    # Context menu on ebox
+    ebox.signal_connect "button-press-event" do |_widget, button|
+      manage_button_press_event(image, button)
+      true
+    end
+  end
+
+  def manage_button_press_event(image, button)
+    return false unless button.button == Gdk::BUTTON_SECONDARY
+    menu = Gtk::Menu.new
+    generate_menu_item(menu, "_Copy") do
+      clipboard = Gtk::Clipboard.get(Gdk::Selection::CLIPBOARD)
+      pixbuf = get_image_pixbuf(image)
+      clipboard.image = pixbuf
+    end
+
+    generate_menu_item(menu, "_Paste") do
+      clipboard = Gtk::Clipboard.get(Gdk::Selection::CLIPBOARD)
+      pixbuf = clipboard.wait_for_image
+      image.from_pixbuf = pixbuf if pixbuf
+    end
+    menu.popup(nil, nil, 3, button.time)
+  end
+
+  def generate_menu_item(menu, label)
+    item = Gtk::MenuItem.new(:label => label, :use_underline => true)
+    item.signal_connect "activate" do
+      yield if block_given?
+    end
+    item.show
+    menu.append(item)
+  end
+end

data/sample/gtk-demo/colorsel.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,58 +9,72 @@ implementations of the GtkColorChooser interface in GTK+. The
 GtkColorChooserDialog is a prebuilt dialog containing a
 GtkColorChooserWidget.
 =end
-module ColorselDemo
-  def self.run_demo(main_window)
-    color = Gdk::RGBA.new(0, 0, 1, 1)
+class ColorselDemo
+  def initialize(main_window)
+    @color = Gdk::RGBA.new(0, 0, 1, 1)
 
-    window = Gtk::Window.new(:toplevel)
-    window.screen = main_window.screen
-    window.set_title("Color Chooser")
-    window.set_border_width(8)
+    @window = Gtk::Window.new(:toplevel)
+    @window.screen = main_window.screen
+    @window.title = "Color Chooser"
+    @window.border_width = 8
 
     vbox = Gtk::Box.new(:vertical, 8)
-    vbox.set_border_width(8)
-    window.add(vbox)
-
-    frame = Gtk::Frame.new
-    frame.set_shadow_type(:in)
+    vbox.border_width = 8
+    @window.add(vbox)
+    frame = initialize_drawing_area_frame
     vbox.pack_start(frame, :expand => true, :fill => true, :padding => 0)
 
-    da = Gtk::DrawingArea.new
-    da.signal_connect "draw" do |_widget, cr|
-      cr.set_source(color.to_a)
-      cr.paint
+    button = initialize_color_chooser_button
+    vbox.pack_start(button, :expand => false, :fill => false, :padding => 0)
+  end
+
+  def run
+    if !@window.visible?
+      @window.show_all
+    else
+      @window.destroy
     end
+    @window
+  end
 
-    da.set_size_request(200, 200)
+  private
 
-    frame.add(da)
+  def initialize_drawing_area_frame
+    frame = Gtk::Frame.new
+    frame.shadow_type = :in
+    @da = Gtk::DrawingArea.new
+    @da.signal_connect "draw" do |_widget, cr|
+      cr.set_source(@color.to_a)
+      cr.paint
+    end
+    @da.set_size_request(200, 200)
+    frame.add(@da)
+    frame
+  end
 
+  def initialize_color_chooser_button
     button = Gtk::Button.new(:mnemonic => "_Change the above color")
     button.set_halign(:end)
     button.set_valign(:center)
 
-    vbox.pack_start(button, :expand => false, :fill => false, :padding => 0)
     button.signal_connect "clicked" do |_widget|
-      dialog = Gtk::ColorChooserDialog.new(:title => "Changing Color",
-                                           :parent => window)
-      dialog.set_modal(true)
-      dialog.set_rgba(color)
+      generate_color_chooser_dialog
+    end
+    button
+  end
 
-      dialog.signal_connect "response" do |widget, response_id|
-        color = widget.rgba if response_id == Gtk::ResponseType::OK
-        da.queue_draw # force da to use the new color now
-        widget.destroy
-      end
+  def generate_color_chooser_dialog
+    dialog = Gtk::ColorChooserDialog.new(:title => "Changing Color",
+                                           :parent => @window)
+    dialog.modal = true
+    dialog.rgba = @color
 
-      dialog.show_all
+    dialog.signal_connect "response" do |widget, response_id|
+      @color = widget.rgba if response_id == Gtk::ResponseType::OK
+      @da.queue_draw # force da to use the new color now
+      widget.destroy
     end
 
-    if !window.visible?
-      window.show_all
-    else
-      window.destroy
-    end
-    window
+    dialog.show_all
   end
 end

data/sample/gtk-demo/css_accordion.rb

@@ -6,19 +6,18 @@
 
 A simple accordion demo written using CSS transitions and multiple backgrounds
 =end
-module CssAccordionDemo
-  def self.run_demo(main_window)
-    window = Gtk::Window.new(:toplevel)
-    window.screen = main_window.screen
-
-    window.set_title("CSS Accordion")
-    window.set_default_size(600, 300)
+class CssAccordionDemo
+  def initialize(main_window)
+    @window = Gtk::Window.new(:toplevel)
+    @window.screen = main_window.screen
+    @window.title = "CSS Accordion"
+    @window.set_default_size(600, 300)
 
     container = Gtk::Box.new(:horizontal, 0)
-    container.set_halign(:center)
-    container.set_valign(:center)
+    container.halign = :center
+    container.valign = :center
 
-    window.add(container)
+    @window.add(container)
 
     %w(This Is A CSS Accordion :-).each do |label|
       child = Gtk::Button.new(:label => label)
@@ -28,21 +27,23 @@ module CssAccordionDemo
     provider = Gtk::CssProvider.new
     provider.load_from_resource("/css_accordion/css_accordion.css")
 
-    style_context = window.style_context
+    style_context = @window.style_context
     style_context.add_provider(provider, Gtk::StyleProvider::PRIORITY_USER)
 
-    apply_style(window, provider)
+    apply_style(@window, provider)
+  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.apply_style(widget, provider)
+  def apply_style(widget, provider)
     style_context = widget.style_context
     style_context.add_provider(provider, Gtk::StyleProvider::PRIORITY_USER)
     return unless widget.respond_to?(:children)