gtk3 2.2.5 → 3.0.1

data/sample/gtk-demo/menus.rb

@@ -84,7 +84,7 @@ module Demo
       menuitem.show
       menuitem.add_accelerator('activate',
                                accel_group,
-                               Gdk::Keyval::GDK_F1,
+                               Gdk::Keyval::KEY_F1,
                                0,
                                Gtk::ACCEL_VISIBLE)
       menuitem = Gtk::CheckMenuItem.new('Accelerator Locked')
@@ -92,7 +92,7 @@ module Demo
       menuitem.show
       menuitem.add_accelerator('activate',
                                accel_group,
-                               Gdk::Keyval::GDK_F2,
+                               Gdk::Keyval::KEY_F2,
                                0,
                                Gtk::ACCEL_VISIBLE | Gtk::ACCEL_LOCKED)
       menuitem = Gtk::CheckMenuItem.new('Accelerators Frozen')
@@ -100,12 +100,12 @@ module Demo
       menuitem.show
       menuitem.add_accelerator('activate',
                                accel_group,
-                               Gdk::Keyval::GDK_F2,
+                               Gdk::Keyval::KEY_F2,
                                0,
                                Gtk::ACCEL_VISIBLE)
       menuitem.add_accelerator('activate',
                                accel_group,
-                               Gdk::Keyval::GDK_F3,
+                               Gdk::Keyval::KEY_F3,
                                0,
                                Gtk::ACCEL_VISIBLE)
 

data/sample/gtk-demo/menus.ui

@@ -0,0 +1,107 @@
+<?xml version="1.0"?>
+<interface>
+  <menu id="appmenu">
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">_New</attribute>
+        <attribute name="action">app.new</attribute>
+        <attribute name="accel">&lt;Primary&gt;n</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">_Open</attribute>
+        <attribute name="action">app.open</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">_Save</attribute>
+        <attribute name="action">app.save</attribute>
+        <attribute name="accel">&lt;Primary&gt;s</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Save _As...</attribute>
+        <attribute name="action">app.save-as</attribute>
+        <attribute name="accel">&lt;Primary&gt;s</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">_Quit</attribute>
+        <attribute name="action">app.quit</attribute>
+        <attribute name="accel">&lt;Primary&gt;q</attribute>
+      </item>
+    </section>
+  </menu>
+  <menu id="menubar">
+    <submenu>
+      <attribute name="label" translatable="yes">_Preferences</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Prefer Dark Theme</attribute>
+          <attribute name="action">app.dark</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Hide Titlebar when maximized</attribute>
+          <attribute name="action">win.titlebar</attribute>
+        </item>
+        <submenu>
+          <attribute name="label" translatable="yes">_Color</attribute>
+          <section>
+            <item>
+              <attribute name="label" translatable="yes">_Red</attribute>
+              <attribute name="action">app.color</attribute>
+              <attribute name="target">red</attribute>
+              <attribute name="accel">&lt;Primary&gt;r</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">_Green</attribute>
+              <attribute name="action">app.color</attribute>
+              <attribute name="target">green</attribute>
+              <attribute name="accel">&lt;Primary&gt;g</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">_Blue</attribute>
+              <attribute name="action">app.color</attribute>
+              <attribute name="target">blue</attribute>
+              <attribute name="accel">&lt;Primary&gt;b</attribute>
+            </item>
+          </section>
+        </submenu>
+        <submenu>
+          <attribute name="label" translatable="yes">_Shape</attribute>
+          <section>
+            <item>
+              <attribute name="label" translatable="yes">_Square</attribute>
+              <attribute name="action">win.shape</attribute>
+              <attribute name="target">square</attribute>
+              <attribute name="accel">&lt;Primary&gt;s</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">_Rectangle</attribute>
+              <attribute name="action">win.shape</attribute>
+              <attribute name="target">rectangle</attribute>
+              <attribute name="accel">&lt;Primary&gt;r</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">_Oval</attribute>
+              <attribute name="action">win.shape</attribute>
+              <attribute name="target">oval</attribute>
+              <attribute name="accel">&lt;Primary&gt;o</attribute>
+            </item>
+          </section>
+        </submenu>
+        <item>
+          <attribute name="label" translatable="yes">_Bold</attribute>
+          <attribute name="action">win.bold</attribute>
+          <attribute name="accel">&lt;Primary&gt;b</attribute>
+        </item>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_Help</attribute>
+      <item>
+        <attribute name="label" translatable="yes">_About</attribute>
+        <attribute name="action">win.about</attribute>
+        <attribute name="accel">&lt;Primary&gt;a</attribute>
+      </item>
+    </submenu>
+  </menu>
+</interface>

data/sample/gtk-demo/sizegroup.rb

@@ -23,7 +23,7 @@ module Demo
   class SizeGroup < Gtk::Dialog
     def initialize
       super('GtkSizeGroup', nil, 0,
-            [Gtk::Stock::CLOSE, Gtk::Dialog::RESPONSE_NONE])
+            [Gtk::Stock::CLOSE, Gtk::ResponseType::NONE])
 
       color_options = %w(Red Green Blue)
       dash_options = %w(Solid Dashed Dotted)

data/sample/misc/aboutdialog.rb

@@ -2,28 +2,16 @@
 =begin
   aboutdialog.rb - Ruby/GTK sample script.
 
-  Copyright (c) 2005,2006 Ruby-GNOME2 Project Team 
+  Copyright (c) 2005-2015 Ruby-GNOME2 Project Team
   This program is licenced under the same licence as Ruby-GNOME2.
-
-  $Id: aboutdialog.rb,v 1.2 2006/06/17 13:18:12 mutoh Exp $
 =end
-require 'gtk3'
+require "gtk3"
 
-if str = Gtk.check_version(2, 6, 0)
-  puts "This sample requires GTK+ 2.6.0 or later"
-  puts str
+unless Gtk::Version.or_later?(3, 4, 2)
+  puts "This sample requires GTK+ 3.4.2 or later: #{Gtk::Version::STRING}"
   exit
 end
 
-Gtk::AboutDialog.set_email_hook {|about, link|
-  p "email_hook"
-  p link
-}
-Gtk::AboutDialog.set_url_hook {|about, link|
-  p "url_hook"
-  p link
-}
-
 a = Gtk::AboutDialog.new
 a.artists   = ["Artist 1 <no1@foo.bar.com>", "Artist 2 <no2@foo.bar.com>"]
 a.authors = ["Author 1 <no1@foo.bar.com>", "Author 2 <no2@foo.bar.com>"]
@@ -31,12 +19,16 @@ a.comments  = "This is a sample script for Gtk::AboutDialog"
 a.copyright = "Copyright (C) 2005 Ruby-GNOME2 Project"
 a.documenters = ["Documenter 1 <no1@foo.bar.com>", "Documenter 2 <no2@foo.bar.com>"]
 a.license   = "This program is licenced under the same licence as Ruby-GNOME2."
-a.logo      = Gdk::Pixbuf.new("gnome-logo-icon.png")
+a.logo      = Gdk::Pixbuf.new(File.join(__dir__, "gnome-logo-icon.png"))
 a.program_name = "Gtk::AboutDialog sample"
 a.translator_credits = "Translator 1\nTranslator 2\n"
 a.version   = "1.0.0"
 a.website   = "http://ruby-gnome2.sourceforge.jp"
 a.website_label = "Ruby-GNOME2 Project Website"
 
-p a.run
+a.signal_connect("activate-link") do |about_dialog, uri|
+  p widget.class
+  p uri
+end
 
+p a.run

data/sample/misc/aboutdialog2.rb

@@ -2,28 +2,16 @@
 =begin
   aboutdialog2.rb - Ruby/GTK sample script.
 
-  Copyright (c) 2005,2006 Ruby-GNOME2 Project Team 
+  Copyright (c) 2005-2015 Ruby-GNOME2 Project Team
   This program is licenced under the same licence as Ruby-GNOME2.
-
-  $Id: aboutdialog2.rb,v 1.2 2006/06/17 13:18:12 mutoh Exp $
 =end
-require 'gtk3'
+require "gtk3"
 
-if str = Gtk.check_version(2, 6, 0)
-  puts "This sample requires GTK+ 2.6.0 or later"
-  puts str
+unless Gtk::Version.or_later?(3, 4, 2)
+  puts "This sample requires GTK+ 3.4.2 or later: #{Gtk::Version::STRING}"
   exit
 end
 
-Gtk::AboutDialog.set_email_hook {|about, link|
-  p "email_hook"
-  p link
-}
-Gtk::AboutDialog.set_url_hook {|about, link|
-  p "url_hook"
-  p link
-}
-
 Gtk::AboutDialog.show(nil,
 		      "artists" => ["Artist 1 <no1@foo.bar.com>", "Artist 2 <no2@foo.bar.com>"],
 		      "authors" => ["Author 1 <no1@foo.bar.com>", "Author 2 <no2@foo.bar.com>"],

data/sample/misc/alpha-demo.rb

@@ -8,18 +8,15 @@
 
   Translated to Ruby by Juergen Mangler <juergen.mangler@univie.ac.at>
 
-  Copyright (c) 2006  Ruby-GNOME2 Project Team
+  Copyright (c) 2006-2015 Ruby-GNOME2 Project Team
   This program is licenced under the same licence as Ruby-GNOME2.
-
-  $Id: alpha-demo.rb,v 1.1 2007/01/06 03:55:44 ktou Exp $
 =end
 
-require 'gtk3'
-require 'cairo'
+require "gtk3"
+require "cairo"
 
 class AlphaDemo < Gtk::Window
-
-  def initialize()
+  def initialize
     super()
 
     set_app_paintable(true)
@@ -31,7 +28,7 @@ class AlphaDemo < Gtk::Window
     end
     set_double_buffered(false)
 
-    signal_connect('draw') do |widget, event|
+    signal_connect("draw") do |widget, _event|
       cr = widget.window.create_cairo_context
 
       rgba = [1.0, 1.0, 1.0]
@@ -49,22 +46,26 @@ class AlphaDemo < Gtk::Window
       cr.fill_preserve
       cr.stroke
     end
-    signal_connect('screen-changed') do |widget, old_screen|
-      screen_changed(widget, old_screen)
+    signal_connect("screen-changed") do |widget, _old_screen|
+      screen_changed(widget)
     end
 
     screen_changed(self)
   end
 
-  def screen_changed(widget,old_screen=nil)
-    tcolormap = widget.screen.rgba_colormap
-    @supports_alpha = !tcolormap.nil?
-    tcolormap ||= widget.screen.rgb_colormap
-    widget.set_colormap(tcolormap)
+  def screen_changed(widget)
+    visual = widget.screen.rgba_visual
+    if visual && widget.screen.composited?
+      set_visual(visual)
+      @supports_alpha = true
+    else
+      set_visual(widget.screen.system_visual)
+      @supports_alpha = false
+    end
   end
 end
 
 alpha = AlphaDemo.new
 alpha.show
 
-Gtk.main()
+Gtk.main

data/sample/misc/application.rb

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+=begin
+  application.rb - Ruby/GTK version of the example-1.c at
+  https://developer.gnome.org/gtk3/stable/gtk-getting-started.html
+  Copyright (c) 2015  Ruby-GNOME2 Project Team
+  This program is licenced under the same licence as Ruby-GNOME2.
+=end
+
+require "gtk3"
+myapp = Gtk::Application.new("org.gtk.example", :flags_none)
+
+myapp.signal_connect "activate" do |app|
+  win = Gtk::ApplicationWindow.new(app)
+  win.set_title("window")
+  win.set_default_size 200, 200
+
+  button_box = Gtk::ButtonBox.new(:horizontal)
+  win.add(button_box)
+
+  button = Gtk::Button.new(:label => "Hello World")
+  button.signal_connect "clicked" do
+    puts "Hello World"
+    win.destroy
+  end
+
+  button_box.add(button)
+
+  win.show_all
+end
+
+myapp.run

data/sample/misc/assistant.rb

@@ -4,10 +4,8 @@
 
   Guillaume Cottenceau for the ruby-gnome2 project.
 
-  Copyright (c) 2005,2006  Ruby-GNOME2 Project Team
+  Copyright (c) 2005-2015  Ruby-GNOME2 Project Team
   This program is licenced under the same licence as Ruby-GNOME2.
-
-  $Id: assistant.rb,v 1.1 2006/11/23 08:39:12 mutoh Exp $
 =end
 
 require "gtk3"
@@ -215,13 +213,13 @@ class AssistantRunner
     end
 
     page = Gtk::Box.new(:vertical, 6)
-    button = Gtk::RadioButton.new("branch A")
+    button = Gtk::RadioButton.new(:label => "branch A")
     page.pack_start(button, :expand => false, :fill => false, :padding => 0)
     button.signal_connect("toggled") do
       @selected_branch = "A"
     end
     button.active = true
-    button = Gtk::RadioButton.new(button, "branch B")
+    button = Gtk::RadioButton.new(:label => "branch B")
     page.pack_start(button, :expand => false, :fill => false, :padding => 0)
     button.signal_connect("toggled") do
       @selected_branch = "B"

data/sample/misc/bindings.rb

@@ -2,10 +2,8 @@
 =begin
   bindings.rb - Ruby/GTK sample script.
 
-  Copyright (c) 2002-2006 Ruby-GNOME2 Project Team 
+  Copyright (c) 2002-2015 Ruby-GNOME2 Project Team
   This program is licenced under the same licence as Ruby-GNOME2.
-
-  $Id: bindings.rb,v 1.7 2006/06/17 13:18:12 mutoh Exp $
 =end
 
 =begin
@@ -13,85 +11,101 @@ Usage:
   bindings.rb <filename>
 
   Following key bindings are effective in the TextView area.
-  
-    <space>      : scroll down by one page
-    <backspace>  : scroll up by one page
-    j            : move cursor donw by one line
-    k            : move cursor up by one line
+
+    <Control> + l     : scroll down by one page
+    <Control> + m     : scroll up by one page
+    <Control> + j     : move cursor donw by one line
+    <Control> + k     : move cursor up by one line
 
   clicking buttons cause following effect
 
-    "space"      : same as pressing <space> in text view area.
-    "back_space" : same as pressing <backspace> in text view area.
-    "cancel j/k" : disable 'j' and 'k' binding
+    "Ctrl + l"          : same as pressing <Control> + l in text view area.
+    "Ctrl + m"          : same as pressing <Control> + m in text view area.
+    "cancel Ctrl +j/k"  : disable <Control> + j and <Control> + k bindings.
 =end
+
 require "gtk3"
 
 class Pager < Gtk::TextView
-  type_register
-  
-  # widget's key binding can be defined like this
-  binding_set.add_signal(Gdk::Keyval::GDK_KEY_space, 0,
-                         "move_cursor", 
-                         Gtk::MovementStep::PAGES, 1, false)
-  binding_set.add_signal(Gdk::Keyval::GDK_KEY_BackSpace, 0,
-                         "move_cursor", 
-                         Gtk::MovementStep::PAGES, -1, false)
-  binding_set.add_signal(Gdk::Keyval::GDK_KEY_j, 0,
-                         "move_cursor",
-                         Gtk::MovementStep::DISPLAY_LINES, 1, false)
-  binding_set.add_signal(Gdk::Keyval::GDK_KEY_k, 0,
-                         "move_cursor",
-                         Gtk::MovementStep::DISPLAY_LINES, -1, false)
-
   def initialize(path)
     @path = path
     super()
-    @buffer = self.buffer
     load
     set_editable(false)
     set_size_request(400, 400)
   end
 
+  private
   def load
     open(@path).read.each_line do |line|
-      @buffer.insert_at_cursor(line)
+      buffer.insert_at_cursor(line)
     end
-    @buffer.place_cursor(@buffer.start_iter)
+    buffer.place_cursor(buffer.start_iter)
   end
 end
 
-path = ARGV[0] || __FILE__
+file_path = ARGV[0] || __FILE__
 
 window = Gtk::Window.new
 window.name = "pager_window"
-sw = Gtk::ScrolledWindow.new
-vbox = Gtk::Box.new(:vertical)
+
+css_provider = Gtk::CssProvider.new
+css_provider.load(:data => <<CSS) 
+@binding-set MoveCursor {
+  bind "<Control>j" { "move-cursor" (display-lines, 1, 0) };
+  bind "<Control>k" { "move-cursor" (display-lines, -1, 0) };
+  bind "<Control>l" { "move-cursor" (buffer-ends, 1, 0) };
+  bind "<Control>m" { "move-cursor" (buffer-ends, -1, 0) };
+}
+GtkTextView {
+  -GtkWidget-cursor-color: green;
+  -GtkWidget-aspect-ratio: 1.0;
+  font: 20 Sans;
+  color: #aaa;
+  background-color: #333 ;
+  gtk-key-bindings: MoveCursor;
+}
+CSS
 hbox = Gtk::Box.new(:horizontal)
-pager = Pager.new(path)
 
-hbox.add(button1 = Gtk::Button.new(:label => "space"))
-hbox.add(button2 = Gtk::Button.new(:label => "back_space"))
-hbox.add(button3 = Gtk::Button.new(:label => "cancel j/k"))
+hbox.add(button1 = Gtk::Button.new(:label => "Ctrl + l"))
+hbox.add(button2 = Gtk::Button.new(:label => "Ctrl + m"))
+hbox.add(button3 = Gtk::Button.new(:label => "Cancel Ctrl + j/k"))
 
-button1.signal_connect("clicked") do
-  Pager.binding_set.activate(Gdk::Keyval::GDK_KEY_space, 0, pager)
-end
-button2.signal_connect("clicked") do
-  pager.bindings_activate(Gdk::Keyval::GDK_KEY_BackSpace, 0)
-end
-button3.signal_connect("clicked") do
-  Pager.binding_set.entry_remove(Gdk::Keyval::GDK_KEY_j, 0)
-  Pager.binding_set.entry_remove(Gdk::Keyval::GDK_KEY_k, 0)
-end
+vbox = Gtk::Box.new(:vertical)
+sw = Gtk::ScrolledWindow.new
+sw.set_size_request(500, 500)
 
+pager = Pager.new(file_path)
+pager.style_context.add_provider(css_provider, Gtk::StyleProvider::PRIORITY_USER)
 sw.add(pager)
-vbox.add(hbox).add(sw)
+
+vbox.add(hbox)
+vbox.add(sw)
+
 window.add(vbox)
 window.show_all
 
-pager.grab_focus
+window.signal_connect("destroy") { Gtk.main_quit }
+
+binding_set = Gtk::BindingSet.find("MoveCursor")
+
+button1.signal_connect "clicked" do
+  binding_set.activate(Gdk::Keyval::KEY_l, Gdk::ModifierType::CONTROL_MASK, pager)
+  pager.grab_focus
+end
 
-window.signal_connect("destroy") {Gtk.main_quit}
+button2.signal_connect "clicked" do
+  binding_set.activate(Gdk::Keyval::KEY_m, Gdk::ModifierType::CONTROL_MASK, pager)
+  pager.grab_focus
+end
+
+button3.signal_connect "clicked" do
+  binding_set.remove(Gdk::Keyval::KEY_j, Gdk::ModifierType::CONTROL_MASK)
+  binding_set.remove(Gdk::Keyval::KEY_k, Gdk::ModifierType::CONTROL_MASK)
+  pager.grab_focus
+end
+
+pager.grab_focus
 
 Gtk.main