gtk3 3.0.9 → 3.1.0

data/sample/gtk-demo/entry_buffer.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2008-2015 Ruby-GNOME2 Project Team
+# Copyright (c) 2008-2016 Ruby-GNOME2 Project Team
 # This program is licenced under the same licence as Ruby-GNOME2.
 #
 =begin
@@ -8,20 +8,20 @@ Gtk::EntryBuffer provides the text content in a Gtk::Entry.
 Applications can provide their own buffer implementation,
 e.g. to provide secure handling for passwords in memory.
 =end
-module EntryBufferDemo
-
-  def self.run_demo(main_window)
-    window = Gtk::Window.new(:toplevel)
-    window.screen = main_window.screen
-    window.set_title("Entry Buffer")
-    window.set_resizable(false)
+class EntryBufferDemo
+  def initialize(main_window)
+    @window = Gtk::Window.new(:toplevel)
+    @window.screen = main_window.screen
+    @window.title = "Entry Buffer"
+    @window.resizable = false
 
     vbox = Gtk::Box.new(:vertical, 5)
-    window.add(vbox)
+    @window.add(vbox)
     vbox.set_border_width(5)
 
     label = Gtk::Label.new
-    label.set_markup("Entries share a buffer. Typing in one is reflected in the other.")
+    markup = "Entries share a buffer. Typing in one is reflected in the other."
+    label.markup = markup
     vbox.pack_start(label, :expand => false, :fill => false, :padding => 0)
 
     # Create the buffer that will be shared
@@ -34,11 +34,13 @@ module EntryBufferDemo
     # second entry
     entry = Gtk::Entry.new(buffer)
     vbox.pack_start(entry, :expand => false, :fill => false, :padding => 0)
+  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/entry_completion.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,19 +7,20 @@
 GtkEntryCompletion provides a mechanism for adding support for
 completion in GtkEntry.
 =end
-module EntryCompletionDemo
-  def self.run_demo(main_window)
-    window = Gtk::Window.new(:toplevel)
-    window.screen = main_window.screen
-    window.set_title("Entry Completion")
-    window.set_resizable(true)
+class EntryCompletionDemo
+  def initialize(main_window)
+    @window = Gtk::Window.new(:toplevel)
+    @window.screen = main_window.screen
+    @window.title = "Entry Completion"
+    @window.resizable = true
 
     vbox = Gtk::Box.new(:vertical, 5)
-    window.add(vbox)
-    vbox.set_border_width(5)
+    @window.add(vbox)
+    vbox.border_width = 5
 
     label = Gtk::Label.new
-    label.set_markup("Completion demo, try writing <b>total</b> or <b>gnome</b> for example.")
+    markup = "Completion demo, try writing <b>total</b> or <b>gnome</b> for example."
+    label.markup = markup
     vbox.pack_start(label, :expand => false, :fill => false, :padding => 0)
 
     entry = Gtk::Entry.new
@@ -28,18 +29,22 @@ module EntryCompletionDemo
     completion = Gtk::EntryCompletion.new
     entry.completion = completion
 
-    completion.set_model(create_completion_model)
-    completion.set_text_column(0)
+    completion.model = create_completion_model
+    completion.text_column = 0
+  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_completion_model
+  private
+
+  def create_completion_model
     store = Gtk::ListStore.new(String)
     %w(GNOME total totally).each do |word|
       iter = store.append

data/sample/gtk-demo/expander.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,22 +9,22 @@ This is also known as "disclosure triangle".
 
 This example also shows how to make the window resizable only if the expander is expanded.
 =end
-module ExpanderDemo
-  def self.run_demo(main_window)
+class ExpanderDemo
+  def initialize(main_window)
     toplevel = main_window.toplevel
     message = "<big><b>Something went wrong</b></big>"
-    window = Gtk::MessageDialog.new(:parent => toplevel,
-                                    :flags  => :destroy_with_parent,
-                                    :type   => :error,
-                                    :buttons_type => :close,
-                                    :message      => message)
+    @window = Gtk::MessageDialog.new(:parent => toplevel,
+                                     :flags  => :destroy_with_parent,
+                                     :type   => :error,
+                                     :buttons_type => :close,
+                                     :message      => message)
 
-    window.set_use_markup(true)
+    @window.use_markup = true
 
     message = "Here are some more details but not the full story."
-    window.set_secondary_text(message)
+    @window.secondary_text = message
 
-    area = window.message_area
+    area = @window.message_area
     box = area.parent
     box.parent.child_set_property(box, "expand", true)
     box.parent.child_set_property(box, "fill", true)
@@ -39,38 +39,46 @@ module ExpanderDemo
     sw.set_shadow_type(:in)
     sw.set_policy(:never, :automatic)
 
-    tv = Gtk::TextView.new
-    tv.set_editable(false)
-    tv.set_wrap_mode(:word)
-    tv.buffer.text = <<TEXT
-Finally, the full story with all details.
-And all the inside information, including
-error codes, etc etc. Pages of information,
-you might have to scroll down to read it all,
-or even resize the window - it works !
-
-A second paragraph will contain even more
-innuendo, just to make you scroll down or
-resize the window. Do it already !"
-TEXT
-
+    tv = initialize_text_view
     sw.add(tv)
     expander.add(sw)
     area.pack_end(expander, :expand => true, :fill => true, :padding => 0)
     expander.show_all
 
     expander.signal_connect "notify::expanded" do
-      window.set_resizable(expander.expanded?)
+      @window.resizable = expander.expanded?
     end
 
-    window.signal_connect "response" do |dialog, _response_id|
+    @window.signal_connect "response" do |dialog, _response_id|
       dialog.destroy
     end
+  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_text_view
+    tv = Gtk::TextView.new
+    tv.editable  = false
+    tv.wrap_mode = :word
+    tv.buffer.text = <<TEXT
+Finally, the full story with all details.
+And all the inside information, including
+error codes, etc etc. Pages of information,
+you might have to scroll down to read it all,
+or even resize the window - it works !
+
+A second paragraph will contain even more
+innuendo, just to make you scroll down or
+resize the window. Do it already !"
+TEXT
+    tv
+  end
 end

data/sample/gtk-demo/filtermodel.rb

@@ -8,64 +8,87 @@
  just to show a subset of the rows, but also to compute columns
  that are not actually present in the underlying model.
 =end
-module FiltermodelDemo
+class FiltermodelDemo
   WIDTH_COLUMN = 0
   HEIGHT_COLUMN = 1
   AREA_COLUMN = 2
   SQUARE_COLUMN = 3
 
-  def self.run_demo(main_window)
-    builder = Gtk::Builder.new(:resource => "/filtermodel/filtermodel.ui")
-    builder.connect_signals {}
+  def initialize(main_window)
+    initialize_builder
 
-    window = builder["window1"]
-    window.screen = main_window.screen
+    @window = @builder["window1"]
+    @window.screen = main_window.screen
 
-    column = builder["treeviewcolumn1"]
-    cell = builder["cellrenderertext1"]
-    column.set_cell_data_func(cell) do |_column, current_cell, _current_model, current_iter|
-      num = current_iter[WIDTH_COLUMN]
-      current_cell.text = num.to_s
-    end
+    set_treeview_column_data_from_int_to_string("treeviewcolumn1",
+                                                "cellrenderertext1",
+                                                WIDTH_COLUMN)
+    set_treeview_column_data_from_int_to_string("treeviewcolumn2",
+                                                "cellrenderertext2",
+                                                HEIGHT_COLUMN)
 
-    column = builder["treeviewcolumn2"]
-    cell = builder["cellrenderertext2"]
-    column.set_cell_data_func(cell) do |_column, current_cell, _current_model, current_iter|
-      num = current_iter[HEIGHT_COLUMN]
-      current_cell.text = num.to_s
-    end
+    set_treeview_column_data_from_int_to_string("treeviewcolumn3",
+                                                "cellrenderertext3",
+                                                WIDTH_COLUMN)
 
-    column = builder["treeviewcolumn3"]
-    cell = builder["cellrenderertext3"]
-    column.set_cell_data_func(cell) do |_column, current_cell, _current_model, current_iter|
-      num = current_iter[WIDTH_COLUMN]
-      current_cell.text = num.to_s
-    end
+    set_treeview_column_data_from_int_to_string("treeviewcolumn4",
+                                                "cellrenderertext4",
+                                                HEIGHT_COLUMN)
 
-    column = builder["treeviewcolumn4"]
-    cell = builder["cellrenderertext4"]
-    column.set_cell_data_func(cell) do |_column, current_cell, _current_model, current_iter|
-      num = current_iter[HEIGHT_COLUMN]
-      current_cell.text = num.to_s
+    set_treeview_column_data_from_int_to_string("treeviewcolumn5",
+                                                "cellrenderertext5",
+                                                AREA_COLUMN)
+
+    column = @builder["treeviewcolumn6"]
+    cell = @builder["cellrendererpixbuf1"]
+    column.add_attribute(cell, "visible", SQUARE_COLUMN)
+
+    @store = @builder["liststore1"]
+
+    initialize_tree_model_filter_computed
+
+    set_treeview_column_data_from_int_to_string("treeviewcolumn7",
+                                                "cellrenderertext6",
+                                                WIDTH_COLUMN)
+
+    set_treeview_column_data_from_int_to_string("treeviewcolumn8",
+                                                "cellrenderertext7",
+                                                HEIGHT_COLUMN)
+
+    initialize_tree_model_filter_selected
+  end
+
+  def run
+    if !@window.visible?
+      @window.show_all
+    else
+      @window.destroy
     end
+    @window
+  end
+
+  private
 
-    column = builder["treeviewcolumn5"]
-    cell = builder["cellrenderertext5"]
-    column.set_cell_data_func(cell) do |_column, current_cell, _current_model, current_iter|
-      num = current_iter[AREA_COLUMN]
+  def initialize_builder
+    @builder = Gtk::Builder.new(:resource => "/filtermodel/filtermodel.ui")
+    @builder.connect_signals {}
+  end
+
+  def set_treeview_column_data_from_int_to_string(column_name, cell_name, col_index)
+    column = @builder[column_name]
+    cell = @builder[cell_name]
+    column.set_cell_data_func(cell) do |_col, current_cell, _current_model, current_iter|
+      num = current_iter[col_index]
       current_cell.text = num.to_s
     end
+  end
 
-    column = builder["treeviewcolumn6"]
-    cell = builder["cellrendererpixbuf1"]
-    column.add_attribute(cell, "visible", SQUARE_COLUMN)
-
-    store = builder["liststore1"]
-    tree = builder["treeview2"]
+  def initialize_tree_model_filter_computed
+    tree = @builder["treeview2"]
 
     types = [Integer, Integer, Integer, TrueClass]
 
-    model = Gtk::TreeModelFilter.new(store)
+    model = @store.create_filter
     model.set_modify_func(*types) do |filter_model, filter_iter, filter_column|
       value = nil
       child_iter = filter_model.convert_iter_to_child_iter(filter_iter)
@@ -85,35 +108,16 @@ module FiltermodelDemo
     end
 
     tree.model = model
+  end
 
-    column = builder["treeviewcolumn7"]
-    cell = builder["cellrenderertext6"]
-    column.set_cell_data_func(cell) do |_column, current_cell, _current_model, current_iter|
-      num = current_iter[WIDTH_COLUMN]
-      current_cell.text = num.to_s
-    end
-
-    column = builder["treeviewcolumn8"]
-    cell = builder["cellrenderertext7"]
-    column.set_cell_data_func(cell) do |_column, current_cell, _current_model, current_iter|
-      num = current_iter[HEIGHT_COLUMN]
-      current_cell.text = num.to_s
-    end
-
-    tree = builder["treeview3"]
+  def initialize_tree_model_filter_selected
+    tree = @builder["treeview3"]
 
-    model = Gtk::TreeModelFilter.new(store)
+    model = @store.create_filter
     model.set_visible_func do |_current_model, current_iter|
       current_iter[WIDTH_COLUMN] < 10
     end
 
     tree.model = model
-
-    if !window.visible?
-      window.show_all
-    else
-      window.destroy
-    end
-    window
   end
 end

data/sample/gtk-demo/font_features.rb

@@ -8,80 +8,115 @@
  Pango attributes. The attributes can be used manually or
  via Pango markup.
 =end
-module FontFeaturesDemo
-  def self.run_demo(main_window)
-    builder = Gtk::Builder.new(:resource => "/font_features/font-features.ui")
-    window = builder["window"]
-    label = builder["label"]
-    settings = builder["settings"]
-    resetbutton = builder["reset"]
-    font = builder["font"]
-    numcasedefault = builder["numcasedefault"]
-    numspacedefault = builder["numspacedefault"]
-    fractiondefault = builder["fractiondefault"]
-    stack = builder["stack"]
-    entry = builder["entry"]
-    toggle = []
+class FontFeaturesDemo
+  def initialize(_main_window)
+    initialize_builder
+    initialize_widgets
+    builder_add_callback_symbols
+
+    update(@toggle, @entry, @font, @settings, @label)
+  end
+
+  def run
+    if !@window.visible?
+      @window.show_all
+    else
+      @window.destroy
+    end
+    @window
+  end
+
+  private
+
+  def initialize_builder
+    @builder = Gtk::Builder.new(:resource => "/font_features/font-features.ui")
+  end
+
+  def initialize_widgets
+    @window = @builder["window"]
+    @label = @builder["label"]
+    @settings = @builder["settings"]
+    @resetbutton = @builder["reset"]
+    @font = @builder["font"]
+    @numcasedefault = @builder["numcasedefault"]
+    @numspacedefault = @builder["numspacedefault"]
+    @fractiondefault = @builder["fractiondefault"]
+    @stack = @builder["stack"]
+    @entry = @builder["entry"]
+    @toggle = []
 
     %w(kern liga dlig hlig clig smcp c2sc lnum onum pnum tnum frac afrc zero
        nalt swsh calt hist salt ss01 ss02 ss03 ss04 ss05).each do |name|
-      toggle << builder[name]
+      @toggle << @builder[name]
     end
-    text = nil
+    @text = nil
+  end
 
-    builder.connect_signals do |name|
+  def builder_add_callback_symbols
+    @builder.connect_signals do |name|
       case name
       when "reset"
-        proc do |button|
-          numcasedefault.active = true
-          numspacedefault.active = true
-          fractiondefault.active = true
-          toggle.each do |widget|
-            if widget.class != Gtk::RadioButton
-              widget.active = false
-              widget.sensitive = false
-            end
-          end
-        end
+        reset_callback
       when "update"
-        proc do
-          update(toggle, entry, font, settings, label)
-        end
+        update_callback
       when "switch_to_entry"
-        proc do
-          text = entry.text
-          stack.visible_child_name = "entry"
-        end
+        switch_to_entry_callback
       when "switch_to_label"
-        proc do
-          text = nil
-          stack.set_visible_child_name("label")
-          update(toggle, entry, font, settings, label)
-        end
+        switch_to_label_callback
       when "entry_key_press"
-        proc do |entry, event|
-          if event.keyval == Gdk::Keyval::KEY_Escape
-            entry.text = text
-            text = nil
-            stack.set_visible_child_name("label")
-            update(toggle, entry, font, settings, label)
-          end
-          Gdk::Event::PROPAGATE
+        entry_key_press_callback
+      end
+    end
+  end
+
+  def reset_callback
+    proc do
+      @numcasedefault.active = true
+      @numspacedefault.active = true
+      @fractiondefault.active = true
+      @toggle.each do |widget|
+        if widget.class != Gtk::RadioButton
+          widget.active = false
+          widget.sensitive = false
         end
       end
     end
+  end
 
-    update(toggle, entry, font, settings, label)
+  def update_callback
+    proc do
+      update(@toggle, @entry, @font, @settings, @label)
+    end
+  end
 
-    if !window.visible?
-      window.show_all
-    else
-      window.destroy
+  def switch_to_entry_callback
+    proc do
+      @text = @entry.text
+      @stack.visible_child_name = "entry"
+    end
+  end
+
+  def switch_to_label_callback
+    proc do
+      @text = nil
+      @stack.set_visible_child_name("label")
+      update(@toggle, @entry, @font, @settings, @label)
+    end
+  end
+
+  def entry_key_press_callback
+    proc do |_entry, event|
+      if event.keyval == Gdk::Keyval::KEY_Escape
+        @entry.text = @text
+        @text = nil
+        @stack.set_visible_child_name("label")
+        update(@toggle, @entry, @font, @settings, @label)
+      end
+      Gdk::Event::PROPAGATE
     end
-    window
   end
 
-  def self.update(toggle, entry, font, settings, label)
+  def update(toggle, entry, font, settings, label)
     text = entry.text
     font_desc = font.font
     s = ""
@@ -100,11 +135,7 @@ module FontFeaturesDemo
       else
         s += ", " if has_feature
         s += widget.builder_name
-        if widget.active?
-          s += " 1"
-        else
-          s += " 0"
-        end
+        s += widget.active? ? " 1" : " 0"
         has_feature = true
       end
     end