gtk3 3.0.8-x64-mingw32 → 3.0.9-x64-mingw32

data/sample/gtk-demo/theming.ui

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkGrid" id="grid">
-    <property name="row-spacing">6</property>
+    <property name="row-spacing">10</property>
     <property name="orientation">vertical</property>
     <child>
-      <object class="GtkToolbar" id="toolbar1">
+      <object class="GtkToolbar">
         <property name="visible">1</property>
         <property name="hexpand">1</property>
         <property name="show-arrow">0</property>
@@ -12,7 +12,7 @@
           <class name="primary-toolbar"/>
         </style>
         <child>
-          <object class="GtkToggleToolButton" id="toolbutton1">
+          <object class="GtkToggleToolButton">
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="use_action_appearance">0</property>
@@ -26,7 +26,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkToggleToolButton" id="toolbutton2">
+          <object class="GtkToggleToolButton">
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="use_action_appearance">0</property>
@@ -41,7 +41,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkToggleToolButton" id="toolbutton3">
+          <object class="GtkToggleToolButton">
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="sensitive">0</property>
@@ -55,7 +55,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkToggleToolButton" id="toolbutton5">
+          <object class="GtkToggleToolButton">
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="label" translatable="yes">Raised</property>
@@ -71,7 +71,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkToggleToolButton" id="toolbutton6">
+          <object class="GtkToggleToolButton">
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="label" translatable="yes">Raised Active</property>
@@ -88,7 +88,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkToggleToolButton" id="toolbutton4">
+          <object class="GtkToggleToolButton">
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="sensitive">0</property>
@@ -103,7 +103,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkToolItem" id="toolitementry">
+          <object class="GtkToolItem">
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <child>
@@ -118,7 +118,7 @@
           </object>
         </child>
         <child>
-          <object class="GtkToolItem" id="toolitemswitch">
+          <object class="GtkToolItem">
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <child>
@@ -132,7 +132,7 @@
       </object>
     </child>
     <child>
-      <object class="GtkBox" id="box1">
+      <object class="GtkBox">
         <property name="visible">1</property>
         <property name="valign">center</property>
         <property name="halign">center</property>
@@ -140,7 +140,7 @@
           <class name="linked"/>
         </style>
         <child>
-          <object class="GtkButton" id="button1">
+          <object class="GtkButton">
             <property name="label" translatable="yes">Hi, I am a button</property>
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
@@ -150,8 +150,8 @@
           </object>
         </child>
         <child>
-          <object class="GtkButton" id="button2">
-            <property name="label" translatable="yes">And I&apos;m another button</property>
+          <object class="GtkButton">
+            <property name="label" translatable="yes">And I'm another button</property>
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="can_focus">1</property>
@@ -163,7 +163,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkButton" id="button3">
+          <object class="GtkButton">
             <property name="label" translatable="yes">This is a button party!</property>
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
@@ -178,15 +178,16 @@
       </object>
     </child>
     <child>
-      <object class="GtkToolbar" id="itoolbar1">
+      <object class="GtkToolbar">
         <property name="visible">1</property>
         <property name="hexpand">1</property>
         <property name="icon_size">1</property>
+        <property name="toolbar-style">icons</property>
         <style>
           <class name="inline-toolbar"/>
         </style>
         <child>
-          <object class="GtkToggleToolButton" id="itoolbutton1">
+          <object class="GtkToggleToolButton">
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="use_action_appearance">0</property>
@@ -199,7 +200,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkToggleToolButton" id="itoolbutton2">
+          <object class="GtkToggleToolButton">
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="use_action_appearance">0</property>
@@ -212,7 +213,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkToggleToolButton" id="itoolbutton3">
+          <object class="GtkToggleToolButton">
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="use_action_appearance">0</property>
@@ -226,7 +227,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkToggleToolButton" id="itoolbutton4">
+          <object class="GtkToggleToolButton">
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="use_action_appearance">0</property>
@@ -240,7 +241,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkToggleToolButton" id="itoolbutton5">
+          <object class="GtkToggleToolButton">
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="sensitive">0</property>
@@ -254,7 +255,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkToggleToolButton" id="itoolbutton6">
+          <object class="GtkToggleToolButton">
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="sensitive">0</property>
@@ -270,5 +271,40 @@
         </child>
       </object>
     </child>
+    <child>
+      <object class="GtkBox">
+        <property name="visible">1</property>
+        <property name="spacing">10</property>
+        <property name="orientation">horizontal</property>
+        <child>
+          <object class="GtkButton">
+            <property name="visible">1</property>
+            <property name="label">Plain</property>
+            <property name="halign">end</property>
+          </object>
+          <packing>
+            <property name="expand">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton">
+            <property name="visible">1</property>
+            <property name="label">Destructive</property>
+            <style>
+              <class name="destructive-action"/>
+            </style>
+          </object>
+        </child>
+        <child>
+          <object class="GtkButton">
+            <property name="visible">1</property>
+            <property name="label">Suggested</property>
+            <style>
+              <class name="suggested-action"/>
+            </style>
+          </object>
+        </child>
+      </object>
+    </child>
   </object>
 </interface>

data/sample/gtk-demo/theming_style_classes.rb

@@ -4,7 +4,7 @@
 # This is licensed under the terms of the GNU Lesser General Public
 # License, version 2.1 or (at your option) later.
 #
-# Copyright (C) 2014-2015  Ruby-GNOME2 Project Team
+# Copyright (C) 2014-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
@@ -20,7 +20,7 @@
 # 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/Style Classes
+= Theming/Style Classes
 
 GTK+ uses CSS for theming. Style classes can be associated
 with widgets to inform the theme about intended rendering.
@@ -34,8 +34,9 @@ module ThemingStyleClassesDemo
   def self.run_demo(main_window)
     window = Gtk::Window.new(:toplevel)
     window.screen = main_window.screen
-    window.set_title("Style Classes")
-    window.set_border_width(12)
+    window.title = "Style Classes"
+    window.resizable = false
+    window.border_width = 12
 
     builder = Gtk::Builder.new(:resource => "/theming_style_classes/theming.ui")
     grid = builder["grid"]

data/sample/gtk-demo/transparent.rb

@@ -0,0 +1,143 @@
+# Copyright (c) 2016 Ruby-GNOME2 Project Team
+# This program is licenced under the same licence as Ruby-GNOME2.
+#
+=begin
+=  Overlay/Transparency
+
+ Use transparent background on GdkWindows to create a shadow effect on a GtkOverlay widget.
+=end
+module TransparentDemo
+  SHADOW_OFFSET_X = 7
+  SHADOW_OFFSET_Y = 7
+  SHADOW_RADIUS = 5
+
+  def self.run_demo(main_window)
+    window = Gtk::Window.new(:toplevel)
+    window.screen = main_window.screen
+    window.set_default_size(450, 450)
+    window.title = "Transparency"
+    window.border_width = 0
+
+    view = Gtk::TextView.new
+    sw = Gtk::ScrolledWindow.new
+    sw.set_policy(:automatic, :automatic)
+    sw.add(view)
+
+    overlay = Gtk::Overlay.new
+    overlay.add(sw)
+    window.add(overlay)
+
+    entry = Gtk::Entry.new
+    css = <<-CSS
+    * { border-width: 0px #{SHADOW_OFFSET_X}px #{SHADOW_OFFSET_Y}px 0px; }
+    CSS
+    provider = Gtk::CssProvider.new
+    provider.load_from_data(css)
+    style_context = entry.style_context
+    style_context.add_provider(provider,
+                               Gtk::StyleProvider::PRIORITY_APPLICATION)
+    entry.signal_connect "draw" do |widget, cr|
+      allocation = widget.allocation
+      rect = [allocation.x + SHADOW_OFFSET_X,
+              allocation.y + SHADOW_OFFSET_Y,
+              allocation.width - SHADOW_OFFSET_X,
+              allocation.height - SHADOW_OFFSET_Y
+             ]
+      draw_shadow_box(cr, rect, SHADOW_RADIUS, 0.4)
+      false
+    end
+
+    overlay.add_overlay(entry)
+    entry.valign = :center
+    entry.halign = :start
+    overlay.show_all
+
+    if !window.visible?
+      window.show_all
+    else
+      window.destroy
+    end
+    window
+  end
+
+  def self.draw_shadow_box(cr, rect, radius, transparency)
+    x0 = rect[0]
+    x1 = rect[0] + radius
+    x2 = rect[0] + rect[2] - radius
+    x3 = rect[0] + rect[2]
+
+    y0 = rect[1]
+    y1 = rect[1] + radius
+    y2 = rect[1] + rect[3] - radius
+    y3 = rect[1] + rect[3]
+
+    # Fill non-border part
+    cr.set_source_rgba(0, 0, 0, transparency)
+    cr.rectangle(x1, y1, x2 - x1, y2 - y1)
+
+    # Upper border
+    pattern = Cairo::LinearPattern.new(0, y0, 0, y1)
+    pattern.add_color_stop_rgba(0.0, 0.0, 0.0, 0.0)
+    pattern.add_color_stop_rgba(1.0, 0.0, 0.0, transparency)
+
+    cr.set_source(pattern)
+    cr.rectangle(x1, y0, x2 - x1, y1 - y0)
+    cr.fill
+
+    # Bottom border
+    pattern = Cairo::LinearPattern.new(0, y2, 0, y3)
+    pattern.add_color_stop_rgba(0.0, 0.0, 0.0, transparency)
+    pattern.add_color_stop_rgba(1.0, 0.0, 0.0, 0.0)
+    cr.set_source(pattern)
+    cr.rectangle(x1, y2, x2 - x1, y3 - y2)
+    cr.fill
+
+    # Left border
+    pattern = Cairo::LinearPattern.new(x0, 0, x1, 0)
+    pattern.add_color_stop_rgba(0.0, 0.0, 0.0, 0.0)
+    pattern.add_color_stop_rgba(1.0, 0.0, 0.0, transparency)
+    cr.set_source(pattern)
+    cr.rectangle(x0, y1, x1 - x0, y2 - y1)
+    cr.fill
+
+    # Right border
+    pattern = Cairo::LinearPattern.new(x2, 0, x3, 0)
+    pattern.add_color_stop_rgba(0.0, 0.0, 0.0, transparency)
+    pattern.add_color_stop_rgba(1.0, 0.0, 0.0, 0.0)
+    cr.set_source(pattern)
+    cr.rectangle(x2, y1, x3 - x2, y2 - y1)
+    cr.fill
+
+    # NW corner
+    pattern = Cairo::RadialPattern.new(x1, y1, 0, x1, y1, radius)
+    pattern.add_color_stop_rgba(0.0, 0.0, 0.0, transparency)
+    pattern.add_color_stop_rgba(1.0, 0.0, 0.0, 0.0)
+    cr.set_source(pattern)
+    cr.rectangle(x0, y0, x1 - x0, y1 - y0)
+    cr.fill
+
+    # NE corner
+    pattern = Cairo::RadialPattern.new(x2, y1, 0, x2, y1, radius)
+    pattern.add_color_stop_rgba(0.0, 0.0, 0.0, transparency)
+    pattern.add_color_stop_rgba(1.0, 0.0, 0.0, 0.0)
+    cr.set_source(pattern)
+    cr.rectangle(x2, y0, x3 - x2, y1 - y0)
+    cr.fill
+
+    # SW corner
+    pattern = Cairo::RadialPattern.new(x1, y2, 0, x1, y2, radius)
+    pattern.add_color_stop_rgba(0.0, 0.0, 0.0, transparency)
+    pattern.add_color_stop_rgba(1.0, 0.0, 0.0, 0.0)
+    cr.set_source(pattern)
+    cr.rectangle(x0, y2, x1 - x0, y3 - y2)
+    cr.fill
+
+    # SE corner
+    pattern = Cairo::RadialPattern.new(x2, y2, 0, x2, y2, radius)
+    pattern.add_color_stop_rgba(0.0, 0.0, 0.0, transparency)
+    pattern.add_color_stop_rgba(1.0, 0.0, 0.0, 0.0)
+    cr.set_source(pattern)
+    cr.rectangle(x2, y2, x3 - x2, y3 - y2)
+    cr.fill
+  end
+end

data/sample/misc/aboutdialog.rb

@@ -19,7 +19,7 @@ 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(File.join(__dir__, "gnome-logo-icon.png"))
+a.logo = GdkPixbuf::Pixbuf.new(:file => 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"

data/sample/misc/bindings.rb

@@ -50,22 +50,43 @@ window = Gtk::Window.new
 window.name = "pager_window"
 
 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;
-}
+
+if Gtk::Version.or_later?(3, 20, 0)
+  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) };
+  }
+  textview {
+    caret-color: green;
+    -GtkWidget-aspect-ratio: 1.0;
+    font: 20 Sans;
+    color: #aaa;
+    background-color: #333 ;
+    -gtk-key-bindings: MoveCursor;
+  }
+CSS
+else
+  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
+end
+
 hbox = Gtk::Box.new(:horizontal)
 
 hbox.add(button1 = Gtk::Button.new(:label => "Ctrl + l"))