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

data/sample/gtk-demo/main.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (C) 2006-2015  Ruby-GNOME2 Project Team
+# Copyright (C) 2006-2016  Ruby-GNOME2 Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -128,10 +128,10 @@ def get_demo_name_from_filename(filename)
   File.basename(filename, ".rb").tr("-", "_")
 end
 
-def get_module_name_from_filename(filename)
+def get_class_name_from_filename(filename)
   pattern = get_demo_name_from_filename(filename)
-  module_name = pattern.split("_").map(&:capitalize).join
-  module_name << "Demo"
+  class_name = pattern.split("_").map(&:capitalize).join
+  class_name << "Demo"
 end
 
 def list_demos(source, is_child = false)
@@ -173,20 +173,30 @@ def get_demo_filename_from_name(name)
 end
 
 def run_demo_from_file(filename, window)
-  module_name = get_module_name_from_filename(filename)
+  class_name = get_class_name_from_filename(filename)
 
-  unless Module.const_defined?(module_name) == true
-    require filename
-  end
+  require filename unless Object.const_defined?(class_name)
+
+  klass = Object.const_get(class_name)
+  demo = klass.new(window)
+  demo_window = demo.run
 
-  module_object = Module.const_get(module_name)
-  demo = module_object.send(:run_demo, window)
+  if demo_window && demo_window.is_a?(Gtk::Window)
+    demo_window.set_transient_for(window)
+    demo_window.modal = true
+  end
+  demo_window
+end
 
-  if demo && demo.class == Gtk::Window
-    demo.set_transient_for(window)
-    demo.modal = true
+def select_treeview_item(treeview, filename)
+  to_select = nil
+  treeview.model.each do |model, path, iter|
+    if iter[FILENAME_COLUMN] == filename
+      to_select = path
+      break
+    end
   end
-  demo
+  treeview.set_cursor(to_select, treeview.columns[FILENAME_COLUMN])
 end
 
 class Demo < Gtk::Application
@@ -210,8 +220,7 @@ class Demo < Gtk::Application
                             "comments" => "Program to demonstrate GTK+ widgets",
                             "authors" => ["The GTK+ Team"],
                             "logo_icon_name" => "gtk3-demo",
-                            "title" => "About GTK+ Demo"
-                           )
+                            "title" => "About GTK+ Demo")
     end
 
     add_action(action)
@@ -235,8 +244,7 @@ class Demo < Gtk::Application
                                 "foreground" => "ForestGreen")
       @source_buffer.create_tag("string",
                                 "foreground" => "RosyBrown",
-                                "weight" => Pango::FontDescription::WEIGHT_BOLD
-                               )
+                                "weight" => Pango::FontDescription::WEIGHT_BOLD)
       @source_buffer.create_tag("reserved",
                                 "foreground" => "purple")
     end
@@ -338,7 +346,7 @@ class Demo < Gtk::Application
 
     @menu.show_all
 
-    scrollbar.signal_connect "popup-menu" do |widget, button, activate_time|
+    scrollbar.signal_connect "popup-menu" do |_widget, _button, _activate_time|
       @menu.popup(nil, nil, 0, Gtk.current_event_time)
     end
 
@@ -365,7 +373,10 @@ class Demo < Gtk::Application
 
     if @options[:name]
       filename = get_demo_filename_from_name(@options[:name])
-      run_demo_from_file(filename, windows.first)
+      if filename
+        select_treeview_item(@treeview, filename)
+        run_demo_from_file(filename, windows.first)
+      end
     end
 
     if @options[:autoquit]
@@ -436,7 +447,7 @@ class Demo < Gtk::Application
   end
 
   def fontify(start_iter = @source_buffer.start_iter,
-                end_iter = @source_buffer.end_iter)
+              end_iter = @source_buffer.end_iter)
     str = @source_buffer.get_text(start_iter, end_iter, true)
     tokenizer = RubyTokenizer.new
     tokenizer.tokenize(str, start_iter.offset) do |tag, start, last|

data/sample/gtk-demo/markup.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
@@ -10,28 +10,73 @@ that Gtk::TextBuffer can load Pango markup and automatically generate
 suitable tags.
 
 =end
-module MarkupDemo
+class MarkupDemo
+  def initialize(main_window)
+    @window = Gtk::Window.new(:toplevel)
+    @window.screen = main_window.screen
+    @window.title = "Markup"
+    @window.set_default_size(450, 450)
+
+    initialize_stack
+    initialize_show_source
+    initialize_headerbar
+
+    sw = generate_sourceview
+    @view = sw.child
+    @stack.add_named(sw, "formatted")
+
+    sw = generate_sourceview
+    @view2 = sw.child
+    @stack.add_named(sw, "source")
+
+    populate_sourceviews
+  end
 
-  def self.run_demo(main_window)
-    window = Gtk::Window.new(:toplevel)
-    window.screen = main_window.screen
-    window.set_default_size(450, 450)
+  def run
+    if !@window.visible?
+      @window.show_all
+    else
+      @window.destroy
+    end
+  end
 
-    stack = Gtk::Stack.new
-    stack.show
-    window.add(stack)
+  private
 
-    show_source = Gtk::CheckButton.new("Source")
-    show_source.valign = :center
+  def initialize_stack
+    @stack = Gtk::Stack.new
+    @stack.show
+    @window.add(@stack)
+  end
 
+  def initialize_headerbar
     header = Gtk::HeaderBar.new
-    header.pack_start(show_source)
+    header.pack_start(@show_source)
     header.show_close_button = true
     header.show_all
-    window.titlebar = header
+    @window.titlebar = header
+  end
+
+  def show_source_toggled_signal
+    @show_source.signal_connect "toggled" do |button|
+      if button.active?
+        @stack.visible_child_name = "source"
+      else
+        buffer = @view2.buffer
+        markup = buffer.get_text(buffer.start_iter, buffer.end_iter, false)
+        buffer = @view.buffer
+        buffer.insert_markup(buffer.start_iter, markup, -1)
+        @stack.visible_child_name = "formatted"
+      end
+    end
+  end
 
-    window.title = "Markup"
+  def initialize_show_source
+    @show_source = Gtk::CheckButton.new("Source")
+    @show_source.valign = :center
+    show_source_toggled_signal
+  end
 
+  def generate_sourceview
     view = Gtk::TextView.new
     view.wrap_mode = :word
     view.left_margin = 10
@@ -42,50 +87,18 @@ module MarkupDemo
 
     sw.add(view)
     sw.show_all
+    sw
+  end
 
-    stack.add_named(sw, "formatted")
-
-    view2 = Gtk::TextView.new
-    view2.wrap_mode = :word
-    view2.left_margin = 10
-    view2.right_margin = 10
-
-    sw = Gtk::ScrolledWindow.new(nil, nil)
-    sw.set_policy(:automatic, :automatic)
-
-    sw.add(view2)
-    sw.show_all
-
-    stack.add_named(sw, "source")
-
+  def populate_sourceviews
     markup = Gio::Resources.lookup_data("/markup/markup.txt", 0)
 
-    show_source.signal_connect "toggled" do |button|
-      if button.active?
-        stack.visible_child_name = "source"
-      else
-        buffer = view2.buffer
-        markup = buffer.get_text(buffer.start_iter,
-                                 buffer.end_iter,
-                                 false)
-        buffer = view.buffer
-        buffer.insert_markup(buffer.start_iter, markup, -1)
-        stack.visible_child_name = "formatted"
-      end
-    end
-
-    buffer = view.buffer
+    buffer = @view.buffer
     buffer.insert_markup(buffer.start_iter, markup, -1)
 
-    buffer = view2.buffer
+    buffer = @view2.buffer
     buffer.insert(buffer.start_iter, markup)
 
-    stack.show
-
-    if !window.visible?
-      window.show_all
-    else
-      window.destroy
-    end
+    @stack.show
   end
 end

data/sample/gtk-demo/menus.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
@@ -23,83 +23,52 @@
  up when the menu item is selected. Typically, all menu items in a menu bar
  have submenus.
 =end
-module MenusDemo
-  def self.run_demo(main_window)
-    window = Gtk::Window.new(:toplevel)
-    window.screen = main_window.screen
-    window.title = "Menus"
+class MenusDemo
+  def initialize(main_window)
+    @window = Gtk::Window.new(:toplevel)
+    @window.screen = main_window.screen
+    @window.title = "Menus"
+    @window.border_width = 0
 
     accel_group = Gtk::AccelGroup.new
-    window.add_accel_group(accel_group)
-    window.border_width = 0
+    @window.add_accel_group(accel_group)
 
     box = Gtk::Box.new(:horizontal, 0)
-    window.add(box)
-    box.show
+    @window.add(box)
 
     box1 = Gtk::Box.new(:horizontal, 0)
     box.add(box1)
-    box1.show
 
-    menubar = Gtk::MenuBar.new
-    menubar.expand = true
-    box1.pack_start(menubar, :expand => false, :fill => true, :padding => 0)
-    menubar.show
+    @menubar = Gtk::MenuBar.new
+    @menubar.expand = true
+    box1.pack_start(@menubar, :expand => false, :fill => true, :padding => 0)
 
-    menu = create_menu(2)
-
-    menuitem = Gtk::MenuItem.new(:label => "test\nline2")
-    menuitem.submenu = menu
-    menubar.append(menuitem)
-    menuitem.show
-
-    menuitem = Gtk::MenuItem.new(:label => "foo")
-    menuitem.submenu = create_menu(3)
-    menubar.append(menuitem)
-    menuitem.show
-
-    menuitem = Gtk::MenuItem.new(:label => "bar")
-    menuitem.submenu = create_menu(4)
-    menubar.append(menuitem)
-    menuitem.show
+    { "test\nline2" => 2, "foo" => 3, "bar" => 4 }.each do |k, v|
+      create_menu_item(k, v)
+    end
 
     box2 = Gtk::Box.new(:vertical, 10)
     box2.border_width = 10
     box1.pack_start(box2, :expand => false, :fill => true, :padding => 0)
-    box2.show
-
-    button = Gtk::Button.new(:label => "Flip")
-    button.signal_connect("clicked") do |_widget|
-      parent = menubar.parent
-      orientation = parent.orientation.to_i
-      parent.orientation = 1 - orientation
 
-      if orientation == Gtk::Orientation::VERTICAL
-        menubar.set_property("pack-direction", Gtk::PackDirection::TTB)
-      else
-        menubar.set_property("pack-direction", Gtk::PackDirection::LTR)
-      end
-    end
+    button = generate_flip_button
     box2.pack_start(button, :expand => true, :fill => true, :padding => 0)
-    button.show
-    button = Gtk::Button.new(:label => "Close")
-    button.signal_connect("clicked") do |_widget|
-      window.destroy
-    end
+    button = generate_close_button
     box2.pack_start(button, :expand => true, :fill => true, :padding => 0)
-    button.can_default = true
-    button.grab_default
-    button.show
+  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_menu(depth)
+  private
+
+  def create_menu(depth)
     return nil if depth < 1
 
     menu = Gtk::Menu.new
@@ -111,11 +80,41 @@ module MenusDemo
       menu_item.join_group(last_item) if last_item
       last_item = menu_item
       menu.append(menu_item)
-      menu_item.show
       menu_item.sensitive = false if i == 3
       menu_item.submenu = create_menu(depth - 1)
     end
 
     menu
   end
+
+  def create_menu_item(label, depth)
+    menuitem = Gtk::MenuItem.new(:label => label)
+    menuitem.submenu = create_menu(depth)
+    @menubar.append(menuitem)
+  end
+
+  def generate_flip_button
+    button = Gtk::Button.new(:label => "Flip")
+    button.signal_connect("clicked") do |_widget|
+      parent = @menubar.parent
+      orientation = parent.orientation.to_i
+      parent.orientation = 1 - orientation
+
+      if orientation == Gtk::Orientation::VERTICAL
+        @menubar.set_property("pack-direction", Gtk::PackDirection::TTB)
+      else
+        @menubar.set_property("pack-direction", Gtk::PackDirection::LTR)
+      end
+    end
+
+    button
+  end
+
+  def generate_close_button
+    button = Gtk::Button.new(:label => "Close")
+    button.signal_connect("clicked") { @window.destroy }
+    button.can_default = true
+    button.grab_default
+    button
+  end
 end

data/sample/gtk-demo/modelbutton.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
@@ -15,8 +15,8 @@ case, you should set the "role" attribute yourself, and connect to the
 A common use of GtkModelButton is to implement menu-like content
 in popovers.
 =end
-module ModelbuttonDemo
-  def self.run_demo(main_window)
+class ModelbuttonDemo
+  def initialize(main_window)
     builder = Gtk::Builder.new(:resource => "/modelbutton/modelbutton.ui")
 
     builder.connect_signals do |name|
@@ -26,8 +26,8 @@ module ModelbuttonDemo
         end
       end
     end
-    window = builder["window1"]
-    window.screen = main_window.screen
+    @window = builder["window1"]
+    @window.screen = main_window.screen
     actions = Gio::SimpleActionGroup.new
     actions.add_actions([
       { :name => "color", :parameter_type => "s", :state => "'red'" },
@@ -36,12 +36,14 @@ module ModelbuttonDemo
       { :name => "sprinkles" }
     ])
 
-    window.insert_action_group("win", actions)
+    @window.insert_action_group("win", actions)
+  end
 
-    if !window.visible?
-      window.show_all
+  def run
+    if !@window.visible?
+      @window.show_all
     else
-      window.destroy
+      @window.destroy
     end
   end
 end