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

data/sample/gtk-demo/iconview.rb

@@ -1,110 +1,151 @@
-# Copyright (c) 2005 Ruby-GNOME2 Project Team
+# Copyright (c) 2016 Ruby-GNOME2 Project Team
 # This program is licenced under the same licence as Ruby-GNOME2.
 #
-# $Id: iconview.rb,v 1.7 2007/08/05 15:41:31 mutoh Exp $
 =begin
-= Icon View (IconView)
+=  Icon View/Icon View Basics
 
-The Gtk::IconView widget is used to display and manipulate icons.
-It uses a Gtk::TreeModel for data storage, so the list store example
-might be helpful.
+ The GtkIconView widget is used to display and manipulate icons.
+ It uses a GtkTreeModel for data storage, so the list store
+ example might be helpful.
 =end
+class IconviewDemo
+  COL_PATH, COL_DISPLAY_NAME, COL_PIXBUF, COL_IS_DIRECTORY = (0..3).to_a
+  FOLDER_NAME = "/iconview/gnome-fs-directory.png".freeze
+  FILE_NAME = "/iconview/gnome-fs-regular.png".freeze
+
+  def initialize(main_window)
+    @window = Gtk::Window.new(:toplevel)
+    @window.screen = main_window.screen
+    @window.title = "Icon View Basics"
+    @window.set_default_size(650, 400)
+    load_pixbufs
+
+    vbox = Gtk::Box.new(:vertical, 0)
+    @window.add(vbox)
+
+    tool_bar = Gtk::Toolbar.new
+    vbox.pack_start(tool_bar, :expand => false, :fill => false, :padding => 0)
+
+    up_button = Gtk::ToolButton.new
+    up_button.label = "_Up"
+    up_button.use_underline = true
+    up_button.icon_name = "go-up"
+    up_button.is_important = true
+    up_button.sensitive = false
+    tool_bar.insert(up_button, -1)
+
+    home_button = Gtk::ToolButton.new
+    home_button.label = "_Home"
+    home_button.use_underline = true
+    home_button.icon_name = "go-home"
+    home_button.is_important = true
+    tool_bar.insert(home_button, -1)
+
+    sw = Gtk::ScrolledWindow.new
+    sw.shadow_type = :etched_in
+    sw.set_policy(:automatic, :automatic)
+    vbox.pack_start(sw, :expand => true, :fill => true, :padding => 0)
+
+    # Create the store and fill it with the contents of '/'
+    @parent = "/"
+    create_store
+    fill_store
+
+    icon_view = Gtk::IconView.new(:model => @store)
+    icon_view.selection_mode = :multiple
+
+    # Connect to the "clicked" signal of the "Up" tool button
+    up_button.signal_connect "clicked" do
+      @parent = File.dirname(@parent)
+      fill_store
 
+      # Maybe de-sensitive the up button
+      up_button.sensitive = @parent == "/"
+    end
 
-require 'common'
-
-module Demo
-  class IconView < Demo::BasicWindow
-    COL_PATH, COL_DISPLAY_NAME, COL_IS_DIR, COL_PIXBUF = (0..3).to_a
-
-    def fill_store
-      @store.clear
-      Dir.glob(File.join(@parent, "*")).each do |path|
-        is_dir = FileTest.directory?(path)
-        iter = @store.append
-        # set COL_DISPLAY_NAME first because changing an iter will trigger the
-        # sort function; if we set something else first, the value of
-        # COL_DISPLAY_NAME for this row will be "nil" and the sort function will fail
-#puts path
-#puts GLib.convert(GLib.filename_to_utf8(path), "Shift_JIS", "UTF-8")
-#puts File.basename(GLib.convert(GLib.filename_to_utf8(path), "Shift_JIS", "UTF-8"))
-#        iter[COL_DISPLAY_NAME] = File.basename(GLib.filename_to_utf8(path))
-        iter[COL_DISPLAY_NAME] = GLib.filename_to_utf8(path)
-        iter[COL_PATH] = path
-        iter[COL_IS_DIR] = is_dir
-        iter[COL_PIXBUF] = is_dir ? @folder_pixbuf : @file_pixbuf
-      end
+    # Connect to the "clicked" signal of the "Home" too button
+    home_button.signal_connect "clicked" do
+      @parent = ENV["HOME"]
+      fill_store
+      up_button.sensitive = true
     end
 
-    def initialize
-      super('Gtk::IconView demo')
-      @file_pixbuf = Gdk::Pixbuf.new(Demo.find_file("gnome-fs-regular.png"))
-      @folder_pixbuf = Gdk::Pixbuf.new(Demo.find_file("gnome-fs-directory.png"))
-
-      @store = Gtk::ListStore.new(String, String, TrueClass, Gdk::Pixbuf)
-      @parent = "/"
-
-      @store.set_default_sort_func do |a, b|
-        if !a[COL_IS_DIR] and b[COL_IS_DIR]
-          1
-        elsif a[COL_IS_DIR] and !b[COL_IS_DIR]
-          -1
-        else
-          a[COL_DISPLAY_NAME] <=> b[COL_DISPLAY_NAME]
-        end
+    # We now set which model columns that correspond to the text
+    # and pixbbuf of each of item
+    icon_view.text_column = COL_DISPLAY_NAME
+    icon_view.pixbuf_column = COL_PIXBUF
+
+    # Connec the "item-activated" signal
+    icon_view.signal_connect "item-activated" do |_widget, tree_path|
+      iter = @store.get_iter(tree_path)
+      path = iter[COL_PATH]
+      directory = iter[COL_IS_DIRECTORY]
+      if directory
+        @parent = path
+        fill_store
+        up_button.sensitive = true
       end
-      @store.set_sort_column_id(Gtk::TreeSortable::DEFAULT_SORT_COLUMN_ID,
-                                Gtk::SortType::ASCENDING)
+    end
+    sw.add(icon_view)
+    icon_view.grab_focus
+  end
 
-      fill_store
-      set_default_size(650, 400)
-      set_border_width(8)
+  def run
+    if !@window.visible?
+      @window.show_all
+    else
+      @window.destroy
+    end
+    @window
+  end
 
-      vbox = Gtk::Box.new(:vertical)
-      add(vbox)
+  private
 
-      toolbar = Gtk::Toolbar.new
-      vbox.pack_start(toolbar, :expand => false, :fill => false, :padding => 0)
+  def load_pixbufs
+    # Loads the images for the demo and returns whether the operation succeeded
+    return if @file_pixbuf
 
-      up_button = Gtk::ToolButton.new(:stock_id => :go_up)
-      up_button.important = true
-      up_button.sensitive = false
-      toolbar.insert(up_button, -1)
-      up_button.signal_connect("clicked") do
-        @parent = File.dirname(@parent)
-        fill_store
-        up_button.sensitive = @parent != "/"
-      end
+    @file_pixbuf = GdkPixbuf::Pixbuf.new(:resource => FILE_NAME)
+    return false unless @file_pixbuf
 
-      home_button = Gtk::ToolButton.new(:stock_id => :home)
-      home_button.important = true
-      toolbar.insert(home_button, -1)
-      home_button.signal_connect("clicked") do
-        @parent = GLib.home_dir
-        fill_store
-        up_button.sensitive = true
-      end
+    @folder_pixbuf = GdkPixbuf::Pixbuf.new(:resource => FOLDER_NAME)
+    return false unless @folder_pixbuf
+  end
 
-      sw = Gtk::ScrolledWindow.new
-      sw.shadow_type = :etched_in
-      sw.set_policy(:automatic, :automatic)
-      vbox.pack_start(sw, :expand => true, :fill => true, :padding => 0)
-
-      iconview = Gtk::IconView.new(@store)
-      iconview.selection_mode = :multiple
-      iconview.text_column = COL_DISPLAY_NAME
-      iconview.pixbuf_column = COL_PIXBUF
-      iconview.signal_connect("item_activated") do |iview, path|
-        iter = @store.get_iter(path)
-        if iter[COL_DISPLAY_NAME]
-          @parent = iter[COL_PATH]
-          fill_store
-          up_button.sensitive = true
-        end
-      end
-      sw.add(iconview)
-      iconview.grab_focus
+  def create_store
+    @store = Gtk::ListStore.new(String, String, GdkPixbuf::Pixbuf, TrueClass)
+
+    # Set sort column and function
+    @store.set_default_sort_func do |_model, a, b|
+      sort_function(a, b)
     end
+    @store.set_sort_column_id(Gtk::TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID,
+                              :ascending)
   end
-end
 
+  def fill_store
+    @store.clear
+    Dir.glob(File.join(@parent, "*")).each do |path|
+      is_dir = FileTest.directory?(path)
+      iter = @store.append
+      iter[COL_DISPLAY_NAME] = File.basename(path) || "-"
+      iter[COL_PATH] = path
+      iter[COL_PIXBUF] = is_dir ? @folder_pixbuf : @file_pixbuf
+      iter[COL_IS_DIRECTORY] = is_dir
+    end
+  end
+
+  def sort_function(a, b)
+    if !a[COL_IS_DIRECTORY] and b[COL_IS_DIRECTORY]
+      1
+    elsif a[COL_IS_DIRECTORY] and !b[COL_IS_DIRECTORY]
+      -1
+    elsif !a[COL_DISPLAY_NAME] and b[COL_DISPLAY_NAME]
+      1
+    elsif a[COL_DISPLAY_NAME] and !b[COL_DISPLAY_NAME]
+      -1
+    else
+      a[COL_DISPLAY_NAME] <=> b[COL_DISPLAY_NAME]
+    end
+  end
+end

data/sample/gtk-demo/iconview_edit.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,27 +8,53 @@
  This example also demonstrates using the generic GtkCellLayout
  interface to set up cell renderers in an icon view.
 =end
-module IconviewEditDemo
+class IconviewEditDemo
   COL_TEXT = 0
   NUM_COLS = 1
-  def self.run_demo(main_window)
-    window = Gtk::Window.new(:toplevel)
-    window.screen = main_window.screen
-    window.set_title("Editing and Drag-and-drop")
+  def initialize(main_window)
+    @window = Gtk::Window.new(:toplevel)
+    @window.screen = main_window.screen
+    @window.title = "Editing and Drag-and-drop"
 
-    store = create_store
-    fill_store(store)
+    initialize_store
+    initialize_icon_view
 
-    icon_view = Gtk::IconView.new(:model => store)
-    icon_view.set_selection_mode(:single)
-    icon_view.set_item_orientation(:horizontal)
-    icon_view.set_columns(2)
-    icon_view.set_reorderable(true)
+    icon_view_add_renderer_pixbuf
+    icon_view_add_renderer_text
 
+    @window.add(@icon_view)
+  end
+
+  def run
+    if !@window.visible?
+      @window.show_all
+    else
+      @window.destroy
+    end
+    @window
+  end
+
+  def initialize_store
+    @store = Gtk::ListStore.new(String)
+
+    %w(Red Green Blue Yellow).each do |color|
+      @store.append.set_values([color])
+    end
+  end
+
+  def initialize_icon_view
+    @icon_view = Gtk::IconView.new(:model => @store)
+    @icon_view.selection_mode = :single
+    @icon_view.item_orientation = :horizontal
+    @icon_view.columns = 2
+    @icon_view.reorderable = true
+  end
+
+  def icon_view_add_renderer_pixbuf
     renderer = Gtk::CellRendererPixbuf.new
-    icon_view.pack_start(renderer, true)
+    @icon_view.pack_start(renderer, true)
 
-    icon_view.set_cell_data_func(renderer) do |_layout, cell_renderer, model, iter|
+    @icon_view.set_cell_data_func(renderer) do |_layout, cell_renderer, model, iter|
       text = model.get_value(iter, COL_TEXT)
       if text
         color = Gdk::RGBA.parse(text)
@@ -39,41 +65,26 @@ module IconviewEditDemo
                   (color.blue * 255).to_i << 8 |
                   (color.alpha * 255).to_i
         end
-        pixbuf = Gdk::Pixbuf.new(Gdk::Pixbuf::COLORSPACE_RGB, true, 8, 24, 24)
+        pixbuf = GdkPixbuf::Pixbuf.new(:colorspace => :rgb, :has_alpha => true,
+                                       :bits_per_sample => 8,
+                                       :width => 24, :height => 24)
         pixbuf.fill!(pixel) if pixel
         cell_renderer.set_property("pixbuf", pixbuf)
       end
     end
+  end
 
+  def icon_view_add_renderer_text
     renderer = Gtk::CellRendererText.new
-    icon_view.pack_start(renderer, true)
+    @icon_view.pack_start(renderer, true)
     renderer.set_property("editable", true)
     renderer.signal_connect("edited") do |_cell, path_string, text|
-      model = icon_view.model
+      model = @icon_view.model
       path = Gtk::TreePath.new(path_string)
       iter = model.get_iter(path)
       iter[COL_TEXT] = text
     end
 
-    icon_view.set_attributes(renderer, "text" => COL_TEXT)
-    window.add(icon_view)
-
-    if !window.visible?
-      window.show_all
-    else
-      window.destroy
-    end
-    window
-  end
-
-  def self.create_store
-    store = Gtk::ListStore.new(String)
-    store
-  end
-
-  def self.fill_store(store)
-    %w(Red Green Blue Yellow).each do |color|
-      store.append.set_values([color])
-    end
+    @icon_view.set_attributes(renderer, "text" => COL_TEXT)
   end
 end

data/sample/gtk-demo/infobar.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,89 +6,108 @@
 
  Info bar widgets are used to report important messages to the user.
 =end
-module InfobarDemo
-  def self.run_demo(main_window)
-    actions = Gtk::Box.new(:horizontal, 0)
+class InfobarDemo
+  def initialize(main_window)
+    @actions = Gtk::Box.new(:horizontal, 0)
 
-    window = Gtk::Window.new(:toplevel)
-    window.screen = main_window.screen
-    window.set_title("Info Bars")
-    window.set_border_width(8)
+    @window = Gtk::Window.new(:toplevel)
+    @window.screen = main_window.screen
+    @window.set_title("Info Bars")
+    @window.set_border_width(8)
 
-    vbox = Gtk::Box.new(:vertical, 0)
-    window.add(vbox)
+    @vbox = Gtk::Box.new(:vertical, 0)
+    @window.add(@vbox)
 
-    generate_simple_infobar_and_button("info", vbox, actions)
-    generate_simple_infobar_and_button("warning", vbox, actions)
+    generate_simple_infobar("info")
+    generate_simple_infobar("warning")
 
-    bar = Gtk::InfoBar.new
-    bar.add_button("_OK", Gtk::ResponseType::OK)
-    bar.set_show_close_button(true)
-    bar.signal_connect "response" do |info_bar, response_id|
-      info_bar.hide if response_id == Gtk::ResponseType::CLOSE
-      dialog = Gtk::MessageDialog.new(:parent => info_bar.toplevel,
-                                      :flags => [:modal, :destroy_with_parent],
-                                      :type => :info,
-                                      :buttons => :ok,
-                                      :message => "You clicked a button on an info bar")
-      dialog.secondary_text = "Your response has id #{response_id}"
-      dialog.signal_connect("response") { |widget| widget.destroy }
-      dialog.show_all
-    end
+    generate_infobar_with_dialog
 
-    vbox.pack_start(bar,
-                    :expand => false,
-                    :fill => false,
-                    :padding => 0)
-
-    bar.set_message_type(:question)
-    label = Gtk::Label.new("This is an info bar with message type Gtk::MessageType::QUESTION")
-    label.set_line_wrap(true)
-    label.set_xalign(0)
-
-    bar.content_area.pack_start(label, :expand => false, :fill => false, :padding => 0)
-
-    button = Gtk::ToggleButton.new(:label => "Question")
-    button.bind_property("active", bar, "visible", :bidirectional)
-    actions.add(button)
-    button.set_active(false)
-
-    generate_simple_infobar_and_button("error", vbox, actions)
-    generate_simple_infobar_and_button("other", vbox, actions)
+    generate_simple_infobar("error")
+    generate_simple_infobar("other")
 
     frame = Gtk::Frame.new("Info bars")
-    vbox.pack_start(frame, :expand => false, :fill => false, :padding => 8)
+    @vbox.pack_start(frame, :expand => false, :fill => false, :padding => 8)
 
     vbox2 = Gtk::Box.new(:vertical, 8)
-    vbox2.set_border_width(8)
+    vbox2.border_width = 8
     frame.add(vbox2)
 
     label = Gtk::Label.new("An example of different info bars")
     vbox2.pack_start(label, :expand => false, :fill => false, :padding => 0)
-    actions.show_all
-    vbox2.pack_start(actions, :expand => false, :fill => false, :padding => 0)
+    @actions.show_all
+    vbox2.pack_start(@actions, :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
-    window
+    @window
   end
 
-  def self.generate_simple_infobar_and_button(message_type, bar_parent, button_parent)
-    bar = Gtk::InfoBar.new
-    bar_parent.pack_start(bar, :expand => false, :fill => false, :padding => 0)
-    bar.set_message_type(message_type.to_sym)
+  private
 
-    label = Gtk::Label.new("This is an info bar with message type Gtk::MessageType::#{message_type.upcase}")
-    label.set_line_wrap(true)
-    label.set_xalign(0)
+  def generate_infobar_label(message)
+    label = Gtk::Label.new(message)
+    label.line_wrap = true
+    label.xalign = 0
+    label
+  end
 
+  def add_a_label_message_in_an_infobar(bar, message)
+    label = generate_infobar_label(message)
     bar.content_area.pack_start(label, :expand => false, :fill => false, :padding => 0)
+  end
+
+  def generate_simple_infobar(message_type)
+    bar = Gtk::InfoBar.new
+    @vbox.pack_start(bar, :expand => false, :fill => false, :padding => 0)
+    bar.message_type = message_type.to_sym
 
-    button = Gtk::ToggleButton.new(:label => "Message")
+    message = "This is an info bar with message type Gtk::MessageType::#{message_type.upcase}"
+    add_a_label_message_in_an_infobar(bar, message)
+
+    link_bar_to_a_toggle_button(bar, message_type.capitalize)
+  end
+
+  def link_bar_to_a_toggle_button(bar, message)
+    button = Gtk::ToggleButton.new(:label => message)
     button.bind_property("active", bar, "visible", :bidirectional)
-    button_parent.add(button)
+    @actions.add(button)
+    button
+  end
+
+  def generate_infobar_with_dialog
+    bar = Gtk::InfoBar.new
+    bar.add_button("_OK", Gtk::ResponseType::OK)
+    bar.show_close_button = true
+
+    manage_response_event_of_infobar(bar)
+
+    @vbox.pack_start(bar, :expand => false, :fill => false, :padding => 0)
+
+    bar.message_type = :question
+    message = "This is an info bar with message type Gtk::MessageType::QUESTION"
+    add_a_label_message_in_an_infobar(bar, message)
+
+    button = link_bar_to_a_toggle_button(bar, "Question")
+    button.active = false
+  end
+
+  def manage_response_event_of_infobar(bar)
+    bar.signal_connect "response" do |info_bar, response_id|
+      info_bar.hide if response_id == Gtk::ResponseType::CLOSE
+      dialog = Gtk::MessageDialog.new(:parent => info_bar.toplevel,
+                                      :flags => [:modal, :destroy_with_parent],
+                                      :type => :info,
+                                      :buttons => :ok,
+                                      :message => "You clicked a button on an info bar")
+      dialog.secondary_text = "Your response has id #{response_id}"
+      dialog.signal_connect("response", &:destroy)
+      dialog.show_all
+    end
   end
 end