gtk3 3.0.9 → 3.1.0

data/sample/gtk-demo/css_shadows.rb

@@ -6,72 +6,44 @@
 
  This demo shows how to use CSS shadows.
 =end
-module CssShadowsDemo
-  def self.run_demo(main_window)
-    window = Gtk::Window.new(:toplevel)
-    window.set_title("Shadows")
-    window.set_transient_for(main_window)
-    window.set_default_size(400, 300)
+class CssShadowsDemo
+  def initialize(main_window)
+    @window = Gtk::Window.new(:toplevel)
+    @window.title = "Shadows"
+    @window.transient_for = main_window
+    @window.set_default_size(400, 300)
 
     paned = Gtk::Paned.new(:vertical)
-    window.add(paned)
+    @window.add(paned)
 
     child = create_toolbar
     paned.add(child)
 
-    text = Gtk::TextBuffer.new
-    text.create_tag("warning", "underline" => :single)
-    text.create_tag("error", "underline" => :error)
-    default_css = Gio::Resources.lookup_data("/css_shadows/gtk.css")
-    text.text = default_css
-
-    provider = Gtk::CssProvider.new
-    provider.load_from_data(default_css)
+    @default_css = Gio::Resources.lookup_data("/css_shadows/gtk.css")
+    initialize_text_buffer
+    initialize_provider
 
     container = Gtk::ScrolledWindow.new
     paned.add(container)
 
-    child = Gtk::TextView.new(text)
+    child = Gtk::TextView.new(@text)
     container.add(child)
 
-    text.signal_connect "changed" do |buffer|
-      buffer.remove_all_tags(buffer.start_iter, buffer.end_iter)
-      modified_text = buffer.get_text(buffer.start_iter,
-                                      buffer.end_iter,
-                                      false)
-      begin
-        provider.load_from_data(modified_text)
-      rescue
-        provider.load_from_data(default_css)
-      end
-
-      Gtk::StyleContext.reset_widgets
-    end
-
-    provider.signal_connect "parsing-error" do |_css_provider, section, error|
-      start_i = text.get_iter_at(:line => section.start_line,
-                                 :index => section.start_position)
-      end_i =  text.get_iter_at(:line => section.end_line,
-                                :index => section.end_position)
-      tag_name = nil
-      if error == Gtk::CssProviderError::DEPRECATED
-        tag_name = "warning"
-      else
-        tag_name = "error"
-      end
-      text.apply_tag_by_name(tag_name, start_i, end_i)
-    end
-    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.create_toolbar
+  private
+
+  def create_toolbar
     toolbar = Gtk::Toolbar.new
     toolbar.set_valign(:center)
 
@@ -90,7 +62,7 @@ module CssShadowsDemo
     toolbar
   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)
@@ -98,4 +70,45 @@ module CssShadowsDemo
       apply_style(child, provider)
     end
   end
+
+  def initialize_text_buffer
+    @text = Gtk::TextBuffer.new
+    @text.create_tag("warning", "underline" => Pango::UNDERLINE_SINGLE)
+    @text.create_tag("error", "underline" => Pango::UNDERLINE_ERROR)
+    @text.text = @default_css
+    text_buffer_signal_connect_changed
+  end
+
+  def text_buffer_signal_connect_changed
+    @text.signal_connect "changed" do |buffer|
+      buffer.remove_all_tags(buffer.start_iter, buffer.end_iter)
+      modified_text = buffer.get_text(buffer.start_iter,
+                                      buffer.end_iter,
+                                      false)
+      begin
+        @provider.load_from_data(modified_text)
+      rescue
+        @provider.load_from_data(@default_css)
+      end
+
+      Gtk::StyleContext.reset_widgets
+    end
+  end
+
+  def initialize_provider
+    @provider = Gtk::CssProvider.new
+    @provider.load_from_data(@default_css)
+    provider_signal_connect_parsing_error
+  end
+
+  def provider_signal_connect_parsing_error
+    @provider.signal_connect "parsing-error" do |_css_provider, section, error|
+      start_i = @text.get_iter_at(:line => section.start_line,
+                                  :index => section.start_position)
+      end_i = @text.get_iter_at(:line => section.end_line,
+                                :index => section.end_position)
+      tag = error == Gtk::CssProviderError::DEPRECATED ? "warning" : "error"
+      @text.apply_tag_by_name(tag, start_i, end_i)
+    end
+  end
 end

data/sample/gtk-demo/cursors.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,109 +6,140 @@
 
  Demonstrates a useful set of available cursors.
 =end
-module CursorsDemo
-  def self.run_demo(main_window)
-    window = Gtk::Window.new(:toplevel)
-    window.screen = main_window.screen
-    window.set_title("Cursors")
-    window.set_default_size(500, 500)
+class CursorsDemo
+  def initialize(main_window)
+    @window = Gtk::Window.new(:toplevel)
+    @window.screen = main_window.screen
+    @window.title = "Cursors"
+    @window.set_default_size(500, 500)
 
     sw = Gtk::ScrolledWindow.new(nil, nil)
     sw.set_policy(:never, :automatic)
-    window.add(sw)
+    @window.add(sw)
 
-    box = Gtk::Box.new(:vertical, 0)
-    box.set_property("margin-start", 20)
-    box.set_property("margin-end", 20)
-    box.set_property("margin-bottom", 20)
-    sw.add(box)
+    initialize_box
+    sw.add(@box)
 
-    section = Section.new(box, "General")
+    add_general_section
+    add_link_and_status_section
+    add_selection_section
+    add_drag_and_drop_section
+    add_resize_and_scrolling_section
+    add_zoom_section
+  end
+
+  def run
+    if !@window.visible?
+      @window.show_all
+    else
+      @window.destroy
+    end
+    @window
+  end
+
+  private
+
+  def initialize_box
+    @box = Gtk::Box.new(:vertical, 0)
+    @box.margin_start = 20
+    @box.margin_end = 20
+    @box.margin_bottom = 20
+  end
+
+  def add_general_section
+    section = Section.new(@box, "General")
     %w(default none).each do |cursor_name|
       section.add_button(cursor_name)
     end
+  end
 
-    section = Section.new(box, "Link & Status")
+  def add_link_and_status_section
+    section = Section.new(@box, "Link & Status")
     %w(context-menu help
        pointer progress wait).each do |cursor_name|
       section.add_button(cursor_name)
     end
+  end
 
-    section = Section.new(box, "Selection")
+  def add_selection_section
+    section = Section.new(@box, "Selection")
     %w(cell crosshair text vertical-text).each do |cursor_name|
       section.add_button(cursor_name)
     end
+  end
 
-    section = Section.new(box, "Drag & Drop")
+  def add_drag_and_drop_section
+    section = Section.new(@box, "Drag & Drop")
     %w(alias copy move no-drop
        not-allowed grab grabbing).each do |cursor_name|
       section.add_button(cursor_name)
     end
+  end
 
-    section = Section.new(box, "Resize & Scrolling")
+  def add_resize_and_scrolling_section
+    section = Section.new(@box, "Resize & Scrolling")
     %w(all-scroll col-resize row-resize n-resize
        e-resize s-resize w-resize ne-resize nw-resize
        se-resize sw-resize ew-resize ns-resize nesw-resize
        nwse-resize).each do |cursor_name|
       section.add_button(cursor_name)
     end
+  end
 
-    section = Section.new(box, "Zoom")
+  def add_zoom_section
+    section = Section.new(@box, "Zoom")
     %w(zoom-in zoom-out).each do |cursor_name|
       section.add_button(cursor_name)
     end
+  end
+end
 
-    if !window.visible?
-      window.show_all
-    else
-      window.destroy
-    end
-    window
+class Section
+  def initialize(container, title)
+    label = Gtk::Label.new(title)
+    label.xalign = 0
+    label.margin_top = 10
+    label.margin_bottom = 10
+    container.pack_start(label, :expand => false, :fill => true, :padding => 0)
+    initialize_section
+    container.pack_start(@section,
+                         :expand => false, :fill => true, :padding => 0)
   end
 
-  class Section
-    def initialize(container, title)
-      label = Gtk::Label.new(title)
-      label.set_xalign(0.0)
-      label.set_margin_top(10)
-      label.set_margin_bottom(10)
-      container.pack_start(label, :expand => false, :fill => true, :padding => 0)
-
-      @section = Gtk::FlowBox.new
-      @section.set_halign(:start)
-      @section.set_selection_mode(:none)
-      @section.set_min_children_per_line(2)
-      @section.set_min_children_per_line(20)
-      container.pack_start(@section, :expand => false, :fill => true, :padding => 0)
+  def add_button(css_name)
+    cursor = Gdk::Cursor.new(css_name)
+    image = nil
+    if !cursor
+      image = Gtk::Image.new(:icon_name => "image-missing", :size => :menu)
+    else
+      path = "/cursors/#{css_name.tr('-', '_')}_cursor.png"
+      image = Gtk::Image.new(:resource => path)
     end
+    image.set_size_request(32, 32)
 
-    def add_button(css_name)
-      cursor = Gdk::Cursor.new(css_name)
-      image = nil
-      if !cursor
-        image = Gtk::Image.new(:icon_name => "image-missing", :size => :menu)
-      else
-        path = "/cursors/#{css_name.tr('-', '_')}_cursor.png"
-        image = Gtk::Image.new(:resource => path)
-      end
-      image.set_size_request(32, 32)
-
-      button = Gtk::Button.new
-      button.add(image)
-      button.style_context.add_class("image-button")
-      button.signal_connect("clicked") do |_widget|
-        apply_cursor(cursor)
-      end
-      button.set_tooltip_text(css_name)
-      @section.add(button)
+    button = Gtk::Button.new
+    button.add(image)
+    button.style_context.add_class("image-button")
+    button.signal_connect("clicked") do |_widget|
+      apply_cursor(cursor)
     end
+    button.set_tooltip_text(css_name)
+    @section.add(button)
+  end
 
-    private
+  private
 
-    def apply_cursor(cursor)
-      toplevel = @section.toplevel
-      window = toplevel.window
-      window.set_cursor(cursor)
-    end
+  def initialize_section
+    @section = Gtk::FlowBox.new
+    @section.set_halign(:start)
+    @section.set_selection_mode(:none)
+    @section.set_min_children_per_line(2)
+    @section.set_min_children_per_line(20)
+  end
+
+  def apply_cursor(cursor)
+    toplevel = @section.toplevel
+    window = toplevel.window
+    window.set_cursor(cursor)
   end
 end

data/sample/gtk-demo/dialog.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,15 +6,15 @@
 
  Dialog widgets are used to pop up a transient window for user feedback.
 =end
-module DialogDemo
-  def self.run_demo(main_window)
-    window = Gtk::Window.new(:toplevel)
-    window.screen = main_window.screen
-    window.title = "Dialogs and Message Boxes"
-    window.border_width = 8
+class DialogDemo
+  def initialize(main_window)
+    @window = Gtk::Window.new(:toplevel)
+    @window.screen = main_window.screen
+    @window.title = "Dialogs and Message Boxes"
+    @window.border_width = 8
 
     frame = Gtk::Frame.new("Dialogs")
-    window.add(frame)
+    @window.add(frame)
 
     vbox = Gtk::Box.new(:vertical, 8)
     vbox.border_width = 8
@@ -23,25 +23,8 @@ module DialogDemo
     # Standard message dialog
     hbox = Gtk::Box.new(:horizontal, 8)
     vbox.pack_start(hbox, :expand => false, :fill => false, :padding => 0)
-    button = Gtk::Button.new(:label => "_Message Dialog",
-                             :use_underline => true)
-    i = 0
-
-    button.signal_connect "clicked" do
-      dialog = Gtk::MessageDialog.new(:parent => window,
-                                      :flags => [:modal, :destroy_with_parent],
-                                      :type => :info,
-                                      :buttons => :ok_cancel,
-                                      :message => <<-MESSAGE)
-This message has been popped up the following
-number of times:
-MESSAGE
-      dialog.secondary_text = "#{i}"
-      dialog.run
-      dialog.destroy
-      i += 1
-    end
 
+    button = initialize_standard_message_button
     hbox.pack_start(button, :expand => false, :fill => false, :padding => 0)
     vbox.pack_start(Gtk::Separator.new(:horizontal),
                     :expand => false,
@@ -53,16 +36,94 @@ MESSAGE
     vbox.pack_start(hbox, :expand => false, :fill => false, :padding => 0)
     vbox2 = Gtk::Box.new(:vertical, 0)
 
+    hbox.pack_start(vbox2, :expand => false, :fill => false, :padding => 0)
+    button = initialize_interactive_message_button
+    vbox2.pack_start(button, :expand => false, :fill => false, :padding => 0)
+
+    table, @entry1, @entry2 = initialize_grid_with_entries
+    hbox.pack_start(table, :expand => false, :fill => false, :padding => 0)
+  end
+
+  def run
+    if !@window.visible?
+      @window.show_all
+    else
+      @window.destroy
+    end
+    @window
+  end
+
+  private
+
+  def initialize_standard_message_button
+    button = Gtk::Button.new(:label => "_Message Dialog",
+                             :use_underline => true)
+    @counter = 0
+    button.signal_connect "clicked" do
+      show_standard_message_dialog
+    end
+    button
+  end
+
+  def initialize_interactive_message_button
     button = Gtk::Button.new(:label => "_Interactive Dialog",
                              :use_underline => true)
+    button.signal_connect "clicked" do
+      show_interactive_message_dialog
+    end
+    button
+  end
 
-    hbox.pack_start(vbox2, :expand => false, :fill => false, :padding => 0)
-    vbox2.pack_start(button, :expand => false, :fill => false, :padding => 0)
+  def show_standard_message_dialog
+    dialog = Gtk::MessageDialog.new(:parent => @window,
+                                    :flags => [:modal, :destroy_with_parent],
+                                    :type => :info,
+                                    :buttons => :ok_cancel,
+                                    :message => <<-MESSAGE)
+This message has been popped up the following
+number of times:
+MESSAGE
+    dialog.secondary_text = @counter.to_s
+    dialog.run
+    dialog.destroy
+    @counter += 1
+  end
+
+  def show_interactive_message_dialog
+    dialog = Gtk::Dialog.new(:parent => @window,
+                             :title => "Interactive Dialog",
+                             :flags => [:modal, :destroy_with_parent],
+                             :buttons => [["_OK", :ok],
+                                          ["_Cancel", :cancel]])
+    content_area = dialog.content_area
+    hbox = initialize_interactive_dialog_interface
+    content_area.pack_start(hbox)
+
+    response = dialog.run
+
+    if response == :ok
+      @entry1.text = @dialog_entry1.text
+      @entry2.text = @dialog_entry2.text
+    end
 
+    dialog.destroy
+  end
+
+  def initialize_interactive_dialog_interface
+    hbox = Gtk::Box.new(:horizontal, 8)
+    hbox.border_width = 8
+    image = Gtk::Image.new(:icon_name => "dialog-question", :size => :dialog)
+    hbox.pack_start(image)
+    table, @dialog_entry1, @dialog_entry2 = initialize_grid_with_entries
+    hbox.pack_start(table, :expand => false, :fill => false, :padding => 0)
+    hbox.show_all
+    hbox
+  end
+
+  def initialize_grid_with_entries
     table = Gtk::Grid.new
     table.row_spacing = 4
     table.column_spacing = 4
-    hbox.pack_start(table, :expand => false, :fill => false, :padding => 0)
 
     label = Gtk::Label.new("_Entry 1", :use_underline => true)
     table.attach(label, 0, 0, 1, 1)
@@ -71,57 +132,13 @@ MESSAGE
     table.attach(entry1, 1, 0, 1, 1)
     label.set_mnemonic_widget(entry1)
 
-    entry2 = Gtk::Entry.new
     label = Gtk::Label.new("E_ntry 2", :use_underline => true)
-    table.attach(entry2, 1, 1, 1, 1)
+    table.attach(label, 0, 1, 1, 1)
 
-    button.signal_connect "clicked" do
-      dialog = Gtk::Dialog.new(:parent => window,
-                               :title => "Interactive Dialog",
-                               :flags => [:modal, :destroy_with_parent],
-                               :buttons => [["_OK", :ok],
-                                            ["_Cancel", :cancel]]
-                              )
-      content_area = dialog.content_area
-      local_hbox = Gtk::Box.new(:horizontal, 8)
-      local_hbox.border_width = 8
-      content_area.pack_start(local_hbox)
-
-      image = Gtk::Image.new(:icon_name => "dialog-question", :size => :dialog)
-      local_hbox.pack_start(image)
-
-      local_table = Gtk::Grid.new
-      local_table.row_spacing = 4
-      local_table.column_spacing = 4
-      local_hbox.pack_start(local_table, :expand => false, :fill => false, :padding => 0)
-
-      label = Gtk::Label.new("_Entry 1", :use_underline => true)
-      local_table.attach(label, 0, 0, 1, 1)
-
-      local_entry1 = Gtk::Entry.new
-      local_table.attach(local_entry1, 1, 0, 1, 1)
-      label.set_mnemonic_widget(local_entry1)
-
-      local_entry2 = Gtk::Entry.new
-      label = Gtk::Label.new("E_ntry 2", :use_underline => true)
-      local_table.attach(local_entry2, 1, 1, 1, 1)
-
-      local_hbox.show_all
-      response = dialog.run
-
-      if response == :ok
-        entry1.text = local_entry1.text
-        entry2.text = local_entry2.text
-      end
-
-      dialog.destroy
-    end
+    entry2 = Gtk::Entry.new
+    table.attach(entry2, 1, 1, 1, 1)
+    label.set_mnemonic_widget(entry2)
 
-    if !window.visible?
-      window.show_all
-    else
-      window.destroy
-    end
-    window
+    [table, entry1, entry2]
   end
 end