gtk3 2.2.5 → 3.0.1

data/sample/gtk-demo/common.rb

@@ -29,7 +29,7 @@ module Demo
       end
 
       signal_connect("key_press_event") do |widget, event|
-        if event.state.control_mask? and event.keyval == Gdk::Keyval::GDK_q
+        if event.state.control_mask? and event.keyval == Gdk::Keyval::KEY_q
           destroy
           true
         else

data/sample/gtk-demo/css_accordion.rb

@@ -1,11 +1,9 @@
-#!/usr/bin/env ruby
-#
 # This sample code is a port of gtk3/demos/gtk-demo/css_accordion.c. The
 # CSS files used in this sample code are copied from gtk3/demos/gtk-demo.
 # They are licensed under the terms of the GNU Lesser General Public
 # License, version 2.1 or (at your option) later.
 #
-# Copyright (C) 2013  Ruby-GNOME2 Project Team
+# Copyright (C) 2013-2015  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
@@ -58,7 +56,9 @@ module Demo
       container.add(child)
 
       provider = Gtk::CssProvider.new
-      provider.load(:data => File.read("css_accordion.css"))
+      Dir.chdir(__dir__) do
+        provider.load(:data => File.read("css_accordion.css"))
+      end
 
       apply_css(self, provider)
     end
@@ -66,7 +66,7 @@ module Demo
     def apply_css(widget, provider)
       widget.style_context.add_provider(provider, GLib::MAXUINT)
       if widget.is_a?(Gtk::Container)
-        widget.each_forall do |child|
+        widget.each_all do |child|
           apply_css(child, provider)
         end
       end

data/sample/gtk-demo/css_basics.css

@@ -0,0 +1,22 @@
+/* You can edit the text in this window to change the
+ * appearance of this Window.
+ * Be careful, if you screw it up, nothing might be visible
+ * anymore. :)
+ */
+
+/* This CSS resets all properties to their defaults values
+ *    and overrides all user settings and the theme in use */
+@import url("reset.css");
+
+/* Set a very futuristic style by default */
+* {
+  color: green;
+  font-family: Monospace;
+  border: 1px solid;
+}
+
+/* Make sure selections are visible */
+:selected {
+  background-color: darkGreen;
+  color: black;
+}

data/sample/gtk-demo/css_basics.rb

@@ -0,0 +1,103 @@
+#
+# This sample code is a port of gtk3/demos/gtk-demo/css_basic.c. The
+# CSS file used in this sample code is copied from gtk3/demos/gtk-demo.
+# They are licensed under the terms of the GNU Lesser General Public
+# License, version 2.1 or (at your option) later.
+#
+# Copyright (C) 2013  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
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+=begin
+= CSS Theming/CSS Basics
+
+Gtk themes are written using CSS. Every widget is build of multiple items
+that you can style very similarly to a regular website.
+=end
+
+require "common"
+
+module Demo
+  class CssBasics < BasicWindow
+    def initialize
+      super("CSS Basics")
+      set_default_size(400, 300)
+
+      text = Gtk::TextBuffer.new
+      text.create_tag("warning", "underline" => Pango::AttrUnderline::SINGLE)
+      text.create_tag("error", "underline" => Pango::AttrUnderline::ERROR)
+
+      provider = Gtk::CssProvider.new
+
+      container = Gtk::ScrolledWindow.new(nil, nil)
+      add(container)
+      child = Gtk::TextView.new(text)
+      container.add(child)
+      text.signal_connect("changed") do |_text|
+        css_text_changed(_text, provider)
+      end
+
+      text.text = File.read(File.join(__dir__, "css_basics.css"))
+
+      provider.signal_connect("parsing-error") do |_provider, section, error|
+        p section
+        p error
+        show_parsing_error(section, error, child.buffer)
+      end
+
+      apply_css(self, provider)
+    end
+
+    private
+    def show_parsing_error(section, error, buffer)
+      p buffer.methods.grep /iter/
+      start = buffer.get_iter_at_line_index(section.start_line,
+                                            section.start_position)
+
+      end_ = buffer.get_iter_at_line_index(section.end_line,
+                                           section.end_position)
+
+      if error == Gtk::CssProvider::ERROR ||
+          error ==  Gtk::CssProvider::ERROR_DEPRECATED
+        tag_name = "warning"
+      else
+        tag_name = "error"
+      end
+
+      buffer.apply_tag_by_name(buffer, tag_name, start, end_)
+    end
+
+    def css_text_changed(buffer, provider)
+      start = buffer.start_iter
+      end_ = buffer.end_iter
+      buffer.remove_all_tags(start, end_)
+
+      text = buffer.get_text(start, end_, false)
+      Dir.chdir(__dir__) do
+        provider.load(:data => text)
+      end
+
+      Gtk::StyleContext.reset_widgets
+    end
+
+    def apply_css(widget, provider)
+      widget.style_context.add_provider(provider, GLib::MAXUINT)
+      if widget.is_a?(Gtk::Container)
+        widget.each_all do |child|
+          apply_css(child, provider)
+        end
+      end
+    end
+  end
+end

data/sample/gtk-demo/dialog.rb

@@ -91,8 +91,8 @@ EOS
                                self,
                                Gtk::Dialog::MODAL |
                                Gtk::Dialog::DESTROY_WITH_PARENT,
-                               [Gtk::Stock::OK, Gtk::Dialog::RESPONSE_OK],
-                               ["_Non-stock Button", Gtk::Dialog::RESPONSE_CANCEL]
+                               [Gtk::Stock::OK, Gtk::ResponseType::OK],
+                               ["_Non-stock Button", Gtk::ResponseType::CANCEL]
                                )
 
       hbox = Gtk::Box.new(:horizontal, 0)
@@ -126,7 +126,7 @@ EOS
       hbox.show_all
       response = dialog.run
 
-      if response == Gtk::Dialog::RESPONSE_OK
+      if response == Gtk::ResponseType::OK
         @entry1.text = local_entry1.text
         @entry2.text = local_entry2.text
       end

data/sample/gtk-demo/entry_completion.rb

@@ -16,7 +16,7 @@ module Demo
       super('GtkEntryCompletion',
             nil, # parent
             0,
-            [Gtk::Stock::CLOSE, Gtk::Dialog::RESPONSE_NONE])
+            [Gtk::Stock::CLOSE, Gtk::ResponseType::NONE])
 
       self.resizable = false
 

data/sample/gtk-demo/hypertext.rb

@@ -120,7 +120,7 @@ module Demo
     # Links can be activated by pressing Enter.
     def key_press_event(text_view, event)
       case event.keyval
-      when Gdk::Keyval::GDK_Return, Gdk::Keyval::GDK_KP_Enter
+      when Gdk::Keyval::KEY_Return, Gdk::Keyval::KEY_KP_Enter
         buffer = text_view.buffer
         iter = buffer.get_iter_at_mark(buffer.get_mark("insert"))
         follow_if_link(text_view, iter)

data/sample/gtk-demo/main.rb

@@ -2,18 +2,15 @@
 =begin
   main.rb - Main class of gtk-demo.
 
-  Copyright (c) 2003-2013 Ruby-GNOME2 Project Team
+  Copyright (c) 2003-2015 Ruby-GNOME2 Project Team
   This program is licenced under the same licence as Ruby-GNOME2.
-
-  $Id: main.rb,v 1.20 2007/07/09 13:21:54 ggc Exp $
 =end
 
-require 'gtk3'
+require "gtk3"
 
-$:.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
 
 module Demo
-
   class Main < Gtk::Window
     TITLE_COLUMN, FILENAME_COLUMN, CLASS_COLUMN, ITALIC_COLUMN = 0, 1, 2, 3
 
@@ -25,13 +22,11 @@ module Demo
       @info_buffer = Gtk::TextBuffer.new
       @source_buffer = Gtk::TextBuffer.new
 
-      set_title('Ruby/GTK+ Code Demos')
-      signal_connect('destroy') do
-        Gtk.main_quit
-      end
+      set_title("Ruby/GTK+ Code Demos")
+      signal_connect("destroy") { Gtk.main_quit }
 
-      signal_connect("key_press_event") do |widget, event|
-        if event.state.control_mask? and event.keyval == Gdk::Keyval::GDK_KEY_q
+      signal_connect("key_press_event") do |_widget, event|
+        if event.state.control_mask? && event.keyval == Gdk::Keyval::KEY_q
           destroy
           true
         else
@@ -52,25 +47,24 @@ module Demo
       hbox.pack_start(notebook, :expand => true, :fill => true, :padding => 0)
 
       notebook.append_page(create_text(@info_buffer, false),
-                           Gtk::Label.new('_Info', true))
+                           Gtk::Label.new("_Info", :use_underline => true))
 
       notebook.append_page(create_text(@source_buffer, true),
-                           Gtk::Label.new('_Source', true))
-
-      @info_buffer.create_tag('title',
-                             {'font' => 'Sans 18'})
-
-      @source_buffer.create_tag('comment',
-                               {'foreground' => 'red'})
-      @source_buffer.create_tag('const',
-                               {'foreground' => 'ForestGreen'})
-      @source_buffer.create_tag('string',
-                               {
-                                  'foreground' => 'RosyBrown',
-                                  'weight' => Pango::FontDescription::WEIGHT_BOLD
-                                })
-      @source_buffer.create_tag('reserved',
-                               {'foreground' => 'purple'})
+                           Gtk::Label.new("_Source", :use_underline => true))
+
+      @info_buffer.create_tag("title",
+                              "font" => "Sans 18")
+
+      @source_buffer.create_tag("comment",
+                                "foreground" => "red")
+      @source_buffer.create_tag("const",
+                                "foreground" => "ForestGreen")
+      @source_buffer.create_tag("string",
+                                "foreground" => "RosyBrown",
+                                "weight" => Pango::FontDescription::WEIGHT_BOLD
+                                )
+      @source_buffer.create_tag("reserved",
+                                "foreground" => "purple")
     end
 
     def script_info(path)
@@ -80,31 +74,27 @@ module Demo
 
       file = File.open(path)
       file.each do |ln|
-        if not title and ln =~ /^=\s+(.*)$/
-          title = $1
+        if !title && ln =~ /^=\s+(.*)$/
+          title = Regexp.last_match(1)
           if title =~ /^(.*)\((.+?)\)$/
-            title = $1
-            depend = $2
+            title = Regexp.last_match(1)
+            depend = Regexp.last_match(2)
           end
-        elsif not klass and ln =~ /\s*class\s+([A-Z][A-Za-z0-9_]*)/
-          klass = $1
+        elsif !klass && ln =~ /\s*class\s+([A-Z][A-Za-z0-9_]*)/
+          klass = Regexp.last_match(1)
         end
 
-        if title and klass
-          break
-        end
+        break if title && klass
       end
 
-      if not klass
-        raise "File not found: #{path}."
-      end
+      raise "File not found: #{path}." unless klass
 
       return title, klass.intern, depend
     end
 
     def generate_index
       # Target scripts
-      scripts = Dir.glob(File.join(File.dirname(__FILE__), '*.rb'))
+      scripts = Dir.glob(File.join(File.dirname(__FILE__), "*.rb"))
 
       # Generate index tree
       children = {}
@@ -114,13 +104,11 @@ module Demo
         next if ["common.rb", "main.rb"].include?(File.basename(script))
         title, klass, depend = script_info(script)
 
-        if depend and not Gtk.const_defined?(depend)
-          next
-        end
+        next if depend && !Gtk.const_defined?(depend)
 
         if title =~ %r{^(.+?)/(.+)$}
-          parent = $1
-          child = $2
+          parent = Regexp.last_match(1)
+          child = Regexp.last_match(2)
 
           unless children[parent]
             children[parent] = []
@@ -142,10 +130,7 @@ module Demo
 
       # Expand children
       index.collect! do |row|
-        if row[3]
-          row[3] = children[row[0]]
-        end
-
+        row[3] = children[row[0]] if row[3]
         row
       end
 
@@ -171,23 +156,22 @@ module Demo
       cell = Gtk::CellRendererText.new
       cell.style = Pango::FontDescription::STYLE_ITALIC
       column = Gtk::TreeViewColumn.new("Widget (double click for demo)", cell,
-                                       {
-                                         'text' => TITLE_COLUMN,
-                                         'style_set' => ITALIC_COLUMN,
-                                       })
+                                       "text" => TITLE_COLUMN,
+                                       "style_set" => ITALIC_COLUMN
+                                       )
 
       tree_view.append_column(column)
 
-      selection.signal_connect('changed') do |selection|
-        iter = selection.selected
+      selection.signal_connect("changed") do |changed_selection|
+        iter = changed_selection.selected
         load_file(iter.get_value(FILENAME_COLUMN)) if iter
       end
-      tree_view.signal_connect('row_activated') do |tree_view, path, column|
-        row_activated_cb(tree_view.model, path)
+      tree_view.signal_connect("row_activated") do |_tree_view, path, _column|
+        row_activated_cb(_tree_view.model, path)
       end
 
       tree_view.expand_all
-      return tree_view
+      tree_view
     end
 
     def append_children(model, source, parent = nil)
@@ -195,15 +179,11 @@ module Demo
         iter = model.append(parent)
 
         [title, filename, klass].each_with_index do |value, i|
-          if value
-            iter.set_value(i, value)
-          end
+          iter.set_value(i, value) if value
         end
         iter.set_value(ITALIC_COLUMN, false)
 
-        if children
-          append_children(model, children, iter)
-        end
+        append_children(model, children, iter) if children
       end
     end
 
@@ -213,11 +193,11 @@ module Demo
 
       lib = iter.get_value(FILENAME_COLUMN)
       if lib
-        require(lib)
+        require_relative(File.basename(lib))
 
         klass = Demo.const_get(iter.get_value(CLASS_COLUMN))
         window = klass.new
-        window.signal_connect('destroy') do
+        window.signal_connect("destroy") do
           iter.set_value(ITALIC_COLUMN, false)
         end
         window.show_all
@@ -240,7 +220,7 @@ module Demo
       scrolled_window.add(text_view)
 
       if is_source
-        font_desc = Pango::FontDescription.new('Monospace 12')
+        font_desc = Pango::FontDescription.new("Monospace 12")
         text_view.override_font(font_desc)
 
         text_view.set_wrap_mode(:none)
@@ -250,7 +230,7 @@ module Demo
         text_view.set_pixels_below_lines(2)
       end
 
-      return scrolled_window
+      scrolled_window
     end
 
     def fontify(start_iter = @source_buffer.start_iter,
@@ -265,11 +245,8 @@ module Demo
       end
     end
 
-
     def load_file(filename)
-      if filename == @current_file
-        return
-      end
+      return if filename == @current_file
 
       @info_buffer.delete(*@info_buffer.bounds)
 
@@ -278,7 +255,7 @@ module Demo
       file = begin
                File.open(filename)
              rescue
-               $stderr.puts "Cannot open: #{$!}" if $DEBUG
+               $stderr.puts "Cannot open: #{$ERROR_INFO}" if $DEBUG
                return
              end
       start = @info_buffer.get_iter_at(:offset => 0)
@@ -287,16 +264,14 @@ module Demo
       file.each do |line|
         case state
         when :before_header
-          if line =~ /^=begin$/
-            state = :in_header
-          end
+          state = :in_header if line =~ /^=begin$/
         when :in_header
           if line =~ /^=end$/
             state = :body
             start = @source_buffer.get_iter_at(:offset => 0)
           elsif line =~ /^=\s+(.*)$/
-            title = $1
-            title.gsub!(/\s*\(.*\)$/, '') # Delete depend field
+            title = Regexp.last_match(1)
+            title.gsub!(/\s*\(.*\)$/, "") # Delete depend field
 
             last = start
 
@@ -304,7 +279,7 @@ module Demo
             start = last.clone
 
             start.backward_chars(title.length)
-            @info_buffer.apply_tag('title', start, last)
+            @info_buffer.apply_tag("title", start, last)
 
             start = last
           else
@@ -323,14 +298,14 @@ module Demo
 
   class RubyTokonizer
     RESERVED_WORDS = %w(begin end module class def if then else while unless do case when require yield)
-    RESERVED_WORDS_PATTERN = Regexp.compile(/(^|\s+)(#{RESERVED_WORDS.collect do |pat| Regexp.quote(pat) end.join('|')})(\s+|$)/)
+    RESERVED_WORDS_PATTERN = Regexp.compile(/(^|\s+)(#{RESERVED_WORDS.collect { |pat| Regexp.quote(pat) }.join("|")})(\s+|$)/)
 
     def tokenize(str, index = 0)
       until str.empty?
         tag = nil
 
         case str
-        when /".+?"/, /'.+?'/
+        when /".+?"/, /".+?"/
           tag = :string
         when /#.*$/
           tag = :comment
@@ -341,26 +316,25 @@ module Demo
         end
 
         if tag
-          tokenize($~.pre_match, index) do |*args|
+          tokenize($LAST_MATCH_INFO.pre_match, index) do |*args|
             yield(*args)
           end
-          yield(tag, index + $~.begin(0), index + $~.end(0))
-          index += (str.length - $~.post_match.length)
-          str = $~.post_match
+          yield(tag, index + $LAST_MATCH_INFO.begin(0), index + $LAST_MATCH_INFO.end(0))
+          index += (str.length - $LAST_MATCH_INFO.post_match.length)
+          str = $LAST_MATCH_INFO.post_match
         else
           index += str.length
-          str = ''
+          str = ""
         end
       end
     end
   end
 end
 
-
 target = ARGV.shift
 if target
-  Demo::INDEX.each do |title, filename, klass_symbol, children|
-    if target == filename or target == klass_symbol.id2name
+  Demo::INDEX.each do |_title, filename, klass_symbol, _children|
+    if target == filename || target == klass_symbol.id2name
       require filename
 
       window = Demo.const_get(klass_symbol).new