gtk3 3.1.0 → 3.1.1

data/sample/gtk-demo/button_box.rb

@@ -11,16 +11,15 @@ class ButtonBoxDemo
     @window = Gtk::Window.new(:toplevel)
     @window.screen = main_window.screen
     @window.title = "Button Boxes"
-    @window.border_width = 10
 
     main_vbox = Gtk::Box.new(:vertical, 0)
     @window.add(main_vbox)
     frame_horz = generate_horizontal_frame
     main_vbox.pack_start(frame_horz,
-                         :expand => true, :fill => true, :padding => 10)
+                         :expand => true, :fill => true, :padding => 0)
     frame_vert = generate_vertical_frame
     main_vbox.pack_start(frame_vert,
-                         :expand => true, :fill => true, :padding => 10)
+                         :expand => true, :fill => true, :padding => 0)
   end
 
   def run
@@ -36,36 +35,35 @@ class ButtonBoxDemo
 
   def generate_horizontal_frame
     frame_horz = Gtk::Frame.new("Horizontal Button Boxes")
-
-    vbox = Gtk::Box.new(:vertical, 0)
-    vbox.border_width = 10
+    frame_horz.margin_top = 10
+    frame_horz.margin_bottom = 10
+    vbox = Gtk::Box.new(:vertical, 10)
     frame_horz.add(vbox)
 
     bbox = create_bbox(true, "Spread", 40, :spread)
     vbox.pack_start(bbox, :expand => true, :fill => true, :padding => 0)
 
     bbox = create_bbox(true, "Edge", 40, :edge)
-    vbox.pack_start(bbox, :expand => true, :fill => true, :padding => 5)
+    vbox.pack_start(bbox, :expand => true, :fill => true, :padding => 0)
 
     bbox = create_bbox(true, "Start", 40, :start)
-    vbox.pack_start(bbox, :expand => true, :fill => true, :padding => 5)
+    vbox.pack_start(bbox, :expand => true, :fill => true, :padding => 0)
 
     bbox = create_bbox(true, "End", 40, :end)
-    vbox.pack_start(bbox, :expand => true, :fill => true, :padding => 5)
+    vbox.pack_start(bbox, :expand => true, :fill => true, :padding => 0)
 
     bbox = create_bbox(true, "Center", 40, :center)
-    vbox.pack_start(bbox, :expand => true, :fill => true, :padding => 5)
+    vbox.pack_start(bbox, :expand => true, :fill => true, :padding => 0)
 
     bbox = create_bbox(true, "Expand", 0, :expand)
-    vbox.pack_start(bbox, :expand => true, :fill => true, :padding => 5)
+    vbox.pack_start(bbox, :expand => true, :fill => true, :padding => 0)
     frame_horz
   end
 
   def generate_vertical_frame
     frame_vert = Gtk::Frame.new("Vertical Button Boxes")
 
-    hbox = Gtk::Box.new(:horizontal, 0)
-    hbox.border_width = 10
+    hbox = Gtk::Box.new(:horizontal, 10)
 
     frame_vert.add(hbox)
 
@@ -73,19 +71,19 @@ class ButtonBoxDemo
     hbox.pack_start(bbox, :expand => true, :fill => true, :padding => 0)
 
     bbox = create_bbox(false, "Edge", 10, :edge)
-    hbox.pack_start(bbox, :expand => true, :fill => true, :padding => 5)
+    hbox.pack_start(bbox, :expand => true, :fill => true, :padding => 0)
 
     bbox = create_bbox(false, "Start", 10, :start)
-    hbox.pack_start(bbox, :expand => true, :fill => true, :padding => 5)
+    hbox.pack_start(bbox, :expand => true, :fill => true, :padding => 0)
 
     bbox = create_bbox(false, "End", 10, :end)
-    hbox.pack_start(bbox, :expand => true, :fill => true, :padding => 5)
+    hbox.pack_start(bbox, :expand => true, :fill => true, :padding => 0)
 
     bbox = create_bbox(false, "Center", 10, :center)
-    hbox.pack_start(bbox, :expand => true, :fill => true, :padding => 5)
+    hbox.pack_start(bbox, :expand => true, :fill => true, :padding => 0)
 
     bbox = create_bbox(false, "Expand", 0, :expand)
-    hbox.pack_start(bbox, :expand => true, :fill => true, :padding => 5)
+    hbox.pack_start(bbox, :expand => true, :fill => true, :padding => 0)
     frame_vert
   end
 
@@ -96,7 +94,6 @@ class ButtonBoxDemo
     orientation = horizontal ? :horizontal : :vertical
     bbox = Gtk::ButtonBox.new(orientation)
 
-    bbox.border_width = 5
     frame.add(bbox)
     bbox.layout = layout
     bbox.spacing = spacing

data/sample/gtk-demo/clipboard.rb

@@ -19,7 +19,7 @@ class ClipboardDemo
     @window.title = "Clipboard"
 
     @vbox = Gtk::Box.new(:vertical, 0)
-    @vbox.border_width = 0
+    @vbox.margin = 8
     @window.add(@vbox)
 
     text = "\"Copy\" will copy the text\nin the entry to the clipboard"
@@ -39,7 +39,6 @@ class ClipboardDemo
     @vbox.pack_start(label, :expand => false, :fill => false, :padding => 0)
 
     @hbox = Gtk::Box.new(:horizontal, 4)
-    @hbox.border_width = 8
     @vbox.pack_start(@hbox, :expand => false, :fill => false, :padding => 0)
 
     # Create the first image
@@ -82,7 +81,7 @@ class ClipboardDemo
     @vbox.pack_start(label, :expand => false, :fill => false, :padding => 0)
 
     hbox = Gtk::Box.new(:horizontal, 4)
-    hbox.border_width = 8
+    hbox.margin = 8
     @vbox.pack_start(hbox, :expand => false, :fill => false, :padding => 0)
 
     # Create the first entry

data/sample/gtk-demo/colorsel.rb

@@ -16,10 +16,9 @@ class ColorselDemo
     @window = Gtk::Window.new(:toplevel)
     @window.screen = main_window.screen
     @window.title = "Color Chooser"
-    @window.border_width = 8
 
     vbox = Gtk::Box.new(:vertical, 8)
-    vbox.border_width = 8
+    vbox.margin = 12
     @window.add(vbox)
     frame = initialize_drawing_area_frame
     vbox.pack_start(frame, :expand => true, :fill => true, :padding => 0)

data/sample/gtk-demo/css_accordion.css

@@ -4,7 +4,7 @@
     transition-property: color, background-color, border-color, background-image, padding, border-width;
     transition-duration: 1s;
 
-    font: Cantarell 20px;
+    font: 20px Cantarell;
 }
 
 window {

data/sample/gtk-demo/css_blendmodes.css

@@ -0,0 +1,77 @@
+/*
+ * First page.
+ */
+image.duck {
+    background-image: url('resource://css_blendmodes/ducky.png');
+    background-size: cover;
+    min-width: 200px;
+    min-height: 200px;
+}
+
+image.gradient {
+    background-image: linear-gradient(to right, red 0%%, green 50%%, blue 100%%);
+    min-width: 200px;
+    min-height: 200px;
+}
+
+/*
+ * Second page.
+ */
+image.red {
+    background: url('resource://css_blendmodes/blends.png') top center;
+    min-width: 200px;
+    min-height: 200px;
+}
+
+image.blue {
+    background: url('resource://css_blendmodes/blends.png') bottom center;
+    min-width: 200px;
+    min-height: 200px;
+}
+
+/*
+ * Third page.
+ */
+image.cyan {
+    background: url('resource://css_blendmodes/cmy.jpg') top center;
+    min-width: 200px;
+    min-height: 200px;
+}
+
+image.magenta {
+    background: url('resource://css_blendmodes/cmy.jpg') center center;
+    min-width: 200px;
+    min-height: 200px;
+}
+
+image.yellow {
+    background: url('resource://css_blendmodes/cmy.jpg') bottom center;
+    min-width: 200px;
+    min-height: 200px;
+}
+
+image.blend0 {
+  background-image: url('resource://css_blendmodes/ducky.png'),
+                    linear-gradient(to right, red 0%%, green 50%%, blue 100%%);
+  background-size: cover;
+  background-blend-mode: %s;
+  min-width: 200px;
+  min-height: 200px;
+}
+
+image.blend1 {
+  background: url('resource://css_blendmodes/blends.png') top center,
+              url('resource://css_blendmodes/blends.png') bottom center;
+  background-blend-mode: %s;
+  min-width: 200px;
+  min-height: 200px;
+}
+
+image.blend2 {
+  background: url('resource://css_blendmodes/cmy.jpg') top center,
+              url('resource://css_blendmodes/cmy.jpg') center center,
+              url('resource://css_blendmodes/cmy.jpg') bottom center;
+  background-blend-mode: %s;
+  min-width: 200px;
+  min-height: 200px;
+}

data/sample/gtk-demo/cssview.css

@@ -1,7 +1,7 @@
 /* Make the text editor has a nice style */
 .view {
   color: #2e3436;
-  font: Monospace;
+  font-family: Monospace;
   background-color: alpha(white, 0.30);
 }
 

data/sample/gtk-demo/demo.gresource.xml

@@ -20,6 +20,13 @@
     <file>css_basics.css</file>
     <file>reset.css</file>
   </gresource>
+  <gresource prefix="/css_blendmodes">
+    <file>css_blendmodes.css</file>
+    <file>blendmodes.ui</file>
+    <file>blends.png</file>
+    <file>ducky.png</file>
+    <file>cmy.jpg</file>
+  </gresource>
   <gresource prefix="/css_multiplebgs">
     <file>css_multiplebgs.css</file>
     <file>brick.png</file>
@@ -54,6 +61,7 @@
     <file>all_scroll_cursor.png</file>
     <file>cell_cursor.png</file>
     <file>col_resize_cursor.png</file>
+    <file>context_menu_cursor.png</file>
     <file>copy_cursor.png</file>
     <file>crosshair_cursor.png</file>
     <file>default_cursor.png</file>
@@ -86,6 +94,9 @@
     <file>zoom_in_cursor.png</file>
     <file>zoom_out_cursor.png</file>
   </gresource>
+  <gresource prefix="/fishbowl">
+    <file>fishbowl.ui</file>
+  </gresource>
   <gresource prefix="/iconview">
     <file preprocess="to-pixdata">gnome-fs-directory.png</file>
     <file preprocess="to-pixdata">gnome-fs-regular.png</file>
@@ -199,8 +210,10 @@
     <file>popover.ui</file>
   </gresource>
   <gresource prefix="/glarea">
-    <file>glarea-fragment.glsl</file>
-    <file>glarea-vertex.glsl</file>
+    <file>glarea-gl.fs.glsl</file>
+    <file>glarea-gl.vs.glsl</file>
+    <file>glarea-gles.fs.glsl</file>
+    <file>glarea-gles.vs.glsl</file>
   </gresource>
   <gresource prefix="/font_features">
     <file>font-features.ui</file>

data/sample/gtk-demo/demo.ui

@@ -35,8 +35,9 @@
     <property name="default_width">440</property>
     <property name="title" translatable="yes">Builder</property>
     <child>
-      <object class="GtkVBox" id="vbox1">
+      <object class="GtkBox" id="vbox1">
         <property name="visible">1</property>
+        <property name="orientation">vertical</property>
         <child>
           <object class="GtkMenuBar" id="menubar1">
             <property name="visible">1</property>

data/sample/gtk-demo/dialog.rb

@@ -11,13 +11,13 @@ class DialogDemo
     @window = Gtk::Window.new(:toplevel)
     @window.screen = main_window.screen
     @window.title = "Dialogs and Message Boxes"
-    @window.border_width = 8
 
     frame = Gtk::Frame.new("Dialogs")
+    frame.margin = 8
     @window.add(frame)
 
     vbox = Gtk::Box.new(:vertical, 8)
-    vbox.border_width = 8
+    vbox.margin = 8
     frame.add(vbox)
 
     # Standard message dialog
@@ -111,7 +111,6 @@ MESSAGE
 
   def initialize_interactive_dialog_interface
     hbox = Gtk::Box.new(:horizontal, 8)
-    hbox.border_width = 8
     image = Gtk::Image.new(:icon_name => "dialog-question", :size => :dialog)
     hbox.pack_start(image)
     table, @dialog_entry1, @dialog_entry2 = initialize_grid_with_entries

data/sample/gtk-demo/drawingarea.rb

@@ -21,7 +21,6 @@ class DrawingareaDemo
     @window = Gtk::Window.new(:toplevel)
     @window.screen = main_window.screen
     @window.title = "Drawing Area"
-    @window.border_width = 8
 
     initialize_vbox
     create_the_checkerboard_area
@@ -41,7 +40,7 @@ class DrawingareaDemo
 
   def initialize_vbox
     @vbox = Gtk::Box.new(:vertical, 8)
-    @vbox.border_width = 8
+    @vbox.margin = 16
     @window.add(@vbox)
   end
 

data/sample/gtk-demo/editable_cells.rb

@@ -22,9 +22,9 @@ class EditableCellsDemo
     @window = Gtk::Window.new(:toplevel)
     @window.screen = main_window.screen
     @window.title = "Editable Cells"
-    @window.border_width = 5
 
     vbox = Gtk::Box.new(:vertical, 5)
+    vbox.margin = 5
     @window.add(vbox)
     label = Gtk::Label.new("Shopping list (you can edit the cells)")
     vbox.pack_start(label, :expand => false, :fill => true, :padding => 0)

data/sample/gtk-demo/entry_buffer.rb

@@ -16,8 +16,8 @@ class EntryBufferDemo
     @window.resizable = false
 
     vbox = Gtk::Box.new(:vertical, 5)
+    vbox.margin = 5
     @window.add(vbox)
-    vbox.set_border_width(5)
 
     label = Gtk::Label.new
     markup = "Entries share a buffer. Typing in one is reflected in the other."

data/sample/gtk-demo/entry_completion.rb

@@ -15,8 +15,8 @@ class EntryCompletionDemo
     @window.resizable = true
 
     vbox = Gtk::Box.new(:vertical, 5)
+    vbox.margin = 5
     @window.add(vbox)
-    vbox.border_width = 5
 
     label = Gtk::Label.new
     markup = "Completion demo, try writing <b>total</b> or <b>gnome</b> for example."

data/sample/gtk-demo/filtermodel.ui

@@ -24,15 +24,18 @@
       </row>
     </data>
   </object>
+  <object class="GtkAdjustment" id="adj">
+    <property name="lower">5</property>
+    <property name="upper">50</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">5</property>
+  </object>
   <object class="GtkWindow" id="window1">
     <property name="title" translatable="yes">Filter Model</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <property name="visible">1</property>
-        <property name="margin_left">10</property>
-        <property name="margin_right">10</property>
-        <property name="margin_top">10</property>
-        <property name="margin_bottom">10</property>
+        <property name="margin">10</property>
         <property name="row_spacing">10</property>
         <property name="column_spacing">10</property>
         <property name="column_homogeneous">1</property>
@@ -63,7 +66,10 @@
               <object class="GtkTreeViewColumn" id="treeviewcolumn1">
                 <property name="title" translatable="yes">Width</property>
                 <child>
-                  <object class="GtkCellRendererText" id="cellrenderertext1"/>
+                  <object class="GtkCellRendererSpin" id="cellrenderertext1">
+                    <property name="editable">1</property>
+                    <property name="adjustment">adj</property>
+                  </object>
                 </child>
               </object>
             </child>
@@ -71,7 +77,10 @@
               <object class="GtkTreeViewColumn" id="treeviewcolumn2">
                 <property name="title" translatable="yes">Height</property>
                 <child>
-                  <object class="GtkCellRendererText" id="cellrenderertext2"/>
+                  <object class="GtkCellRendererSpin" id="cellrenderertext2">
+                    <property name="editable">1</property>
+                    <property name="adjustment">adj</property>
+                  </object>
                 </child>
               </object>
             </child>