gtk3 2.2.0 → 2.2.1

data/sample/gtk-demo/cairo-text.rb

@@ -21,10 +21,10 @@ module Demo
                           Cairo::FONT_SLANT_NORMAL,
                           Cairo::FONT_WEIGHT_BOLD)
       cr.set_font_size(0.35)
-      
+
       cr.move_to(0.04, 0.53)
       cr.show_text("Hello")
-      
+
       cr.move_to(0.27, 0.65)
       cr.text_path("void")
       cr.set_source_rgba(0.5, 0.5, 1)
@@ -32,7 +32,7 @@ module Demo
       cr.set_source_rgba(0, 0, 0)
       cr.set_line_width(0.01)
       cr.stroke
-      
+
       # draw helping lines
       cr.set_source_rgba(1,0.2,0.2, 0.6)
       cr.arc(0.04, 0.53, 0.02, 0, 2 * Math::PI)

data/sample/gtk-demo/common.rb

@@ -49,7 +49,6 @@ module Demo
   end
 
   class CairoWindow < BasicWindow
-
     def initialize(title=nil)
       super
 

data/sample/gtk-demo/dialog.rb

@@ -14,23 +14,23 @@ module Demo
   class Dialog < Demo::BasicWindow
     def initialize
       @count = 1
-      
+
       super('Dialogs')
       set_border_width(8)
-      
+
       frame = Gtk::Frame.new('Dialogs')
       add(frame)
-      
+
       vbox = Gtk::VBox.new(false, 8)
       vbox.set_border_width(8)
       frame.add(vbox)
-      
+
       # Standard message dialog
       hbox = Gtk::Box.new(:horizontal, 0)
       vbox.pack_start(hbox, :expand => false, :fill => false, :padding => 0)
       button = Gtk::Button.new('_Message Dialog', true)
       button.signal_connect('clicked') do
-	message_dialog_clicked
+        message_dialog_clicked
       end
       hbox.pack_start(button, :expand => false, :fill => false, :padding => 0)
 
@@ -43,7 +43,7 @@ module Demo
 
       button = Gtk::Button.new('_Interactive Dialog')
       button.signal_connect('clicked') do
-	interactive_dialog_clicked
+        interactive_dialog_clicked
       end
       hbox.pack_start(vbox2, :expand => false, :fill => false, :padding => 0)
       vbox2.pack_start(button, :expand => false, :fill => false, :padding => 0)
@@ -71,11 +71,11 @@ module Demo
 
     def message_dialog_clicked
       dialog = Gtk::MessageDialog.new(self,
-				      Gtk::Dialog::MODAL |
-				      Gtk::Dialog::DESTROY_WITH_PARENT,
-				      Gtk::MessageDialog::INFO,
-				      Gtk::MessageDialog::BUTTONS_OK,
-				      <<EOS)
+                                      Gtk::Dialog::MODAL |
+                                      Gtk::Dialog::DESTROY_WITH_PARENT,
+                                      Gtk::MessageDialog::INFO,
+                                      Gtk::MessageDialog::BUTTONS_OK,
+                                      <<EOS)
 This message box has been popped up the following
 number of times:
 
@@ -88,12 +88,12 @@ EOS
 
     def interactive_dialog_clicked
       dialog = Gtk::Dialog.new('Interactive Dialog',
-			       self,
-			       Gtk::Dialog::MODAL |
-			       Gtk::Dialog::DESTROY_WITH_PARENT,
-			       [Gtk::Stock::OK, Gtk::Dialog::RESPONSE_OK],
-			       ["_Non-stock Button", Gtk::Dialog::RESPONSE_CANCEL]
-			       )
+                               self,
+                               Gtk::Dialog::MODAL |
+                               Gtk::Dialog::DESTROY_WITH_PARENT,
+                               [Gtk::Stock::OK, Gtk::Dialog::RESPONSE_OK],
+                               ["_Non-stock Button", Gtk::Dialog::RESPONSE_CANCEL]
+                               )
 
       hbox = Gtk::Box.new(:horizontal, 0)
       hbox.set_border_width(8)
@@ -108,7 +108,7 @@ EOS
       hbox.pack_start(table, :expand => true, :fill => true, :padding => 0)
       label = Gtk::Label.new('_Entry 1', true)
       table.attach_defaults(label,
-			    0, 1, 0, 1)
+                            0, 1, 0, 1)
       local_entry1 = Gtk::Entry.new
       local_entry1.text = @entry1.text
       table.attach_defaults(local_entry1, 1, 2, 0, 1)
@@ -116,7 +116,7 @@ EOS
 
       label = Gtk::Label.new('E_ntry 2', true)
       table.attach_defaults(label,
-			    0, 1, 1, 2)
+                            0, 1, 1, 2)
 
       local_entry2 = Gtk::Entry.new
       local_entry2.text = @entry2.text
@@ -125,10 +125,10 @@ EOS
 
       hbox.show_all
       response = dialog.run
-      
-      if response == Gtk::Dialog::RESPONSE_OK 
-	@entry1.text = local_entry1.text
-	@entry2.text = local_entry2.text
+
+      if response == Gtk::Dialog::RESPONSE_OK
+        @entry1.text = local_entry1.text
+        @entry2.text = local_entry2.text
       end
       dialog.destroy
     end

data/sample/gtk-demo/drawingarea.rb

@@ -93,7 +93,11 @@ module Demo
 
     # Create a new surface of the appropriate size to store our scribbles
     def scribble_configure_event(widget)
-      @cairo_context = widget.window.create_cairo_context
+      allocation = widget.allocation
+      surface = widget.window.create_similar_surface(:color,
+                                                     allocation.width,
+                                                     allocation.height)
+      @cairo_context = Cairo::Context.new(surface)
       @cairo_context.set_source_rgb(1, 1, 1)
       @cairo_context.paint
 

data/sample/gtk-demo/editable_cells.rb

@@ -24,7 +24,7 @@ module Demo
       add(vbox)
 
       vbox.pack_start(Gtk::Label.new('Shopping list (you can edit the cells!)'),
-		      :expand => false, :fill => false, :padding => 0)
+                      :expand => false, :fill => false, :padding => 0)
 
       sw = Gtk::ScrolledWindow.new
       sw.shadow_type = Gtk::SHADOW_ETCHED_IN
@@ -50,13 +50,13 @@ module Demo
 
       button = Gtk::Button.new('Add item')
       button.signal_connect('clicked') do
-	add_item(model)
+        add_item(model)
       end
       hbox.pack_start(button, :expand => true, :fill => true, :padding => 0)
 
       button = Gtk::Button.new('Remove item')
       button.signal_connect('clicked') do
-	remove_item(treeview)
+        remove_item(treeview)
       end
       hbox.pack_start(button, :expand => true, :fill => true, :padding => 0)
 
@@ -74,11 +74,11 @@ module Demo
 
       # add items
       @articles.each do |article|
-	iter = model.append
+        iter = model.append
 
-	article.each_with_index do |value, index|
-	  iter.set_value(index, value)
-	end
+        article.each_with_index do |value, index|
+          iter.set_value(index, value)
+        end
       end
       return model
     end
@@ -106,30 +106,30 @@ module Demo
       # number column
       renderer = Gtk::CellRendererText.new
       renderer.signal_connect('edited') do |*args|
-	cell_edited(*args.push(model))
+        cell_edited(*args.push(model))
       end
       treeview.insert_column(-1, 'Number', renderer,
-			     {
-			       :text => COLUMN_NUMBER,
-			       :editable => COLUMN_EDITABLE,
-			     })
+                             {
+                               :text => COLUMN_NUMBER,
+                               :editable => COLUMN_EDITABLE,
+                             })
       def renderer.column
-	COLUMN_NUMBER
+        COLUMN_NUMBER
       end
 
       # product column
       renderer = Gtk::CellRendererText.new
       renderer.signal_connect('edited') do |*args|
-	cell_edited(*args.push(model))
+        cell_edited(*args.push(model))
       end
       def renderer.column
-	COLUMN_PRODUCT
+        COLUMN_PRODUCT
       end
       treeview.insert_column(-1, 'Product', renderer,
-			     {
-			       :text => COLUMN_PRODUCT,
-			       :editable => COLUMN_EDITABLE,
-			     })
+                             {
+                               :text => COLUMN_PRODUCT,
+                               :editable => COLUMN_EDITABLE,
+                             })
     end
 
     def cell_edited(cell, path_string, new_text, model)
@@ -140,13 +140,13 @@ module Demo
       iter = model.get_iter(path)
       case column
       when COLUMN_NUMBER
-	i = iter.path.indices[0]
-	@articles[i].number = new_text.to_i
-	iter.set_value(column, @articles[i].number)
+        i = iter.path.indices[0]
+        @articles[i].number = new_text.to_i
+        iter.set_value(column, @articles[i].number)
       when COLUMN_PRODUCT
-	i = iter.path.indices[0]
-	@articles[i].product = new_text
-	iter.set_value(column, @articles[i].product)
+        i = iter.path.indices[0]
+        @articles[i].product = new_text
+        iter.set_value(column, @articles[i].product)
       end
     end
 
@@ -156,7 +156,7 @@ module Demo
 
       iter = model.append
       foo.each_with_index do |value, index|
-	iter.set_value(index, value)
+        iter.set_value(index, value)
       end
     end
 
@@ -165,8 +165,8 @@ module Demo
       selection = treeview.selection
 
       if iter = selection.selected
-	@articles.delete_at(iter.path.indices[0])
-	model.remove(iter)
+        @articles.delete_at(iter.path.indices[0])
+        model.remove(iter)
       end
     end
   end

data/sample/gtk-demo/entry_completion.rb

@@ -14,9 +14,9 @@ module Demo
   class EntryCompletion < Gtk::Dialog
     def initialize
       super('GtkEntryCompletion',
-	    nil, # parent
-	    0,
-	    [Gtk::Stock::CLOSE, Gtk::Dialog::RESPONSE_NONE])
+            nil, # parent
+            0,
+            [Gtk::Stock::CLOSE, Gtk::Dialog::RESPONSE_NONE])
 
       self.resizable = false
 

data/sample/gtk-demo/images.rb

@@ -27,9 +27,9 @@ module Demo
 
       super('Images')
       signal_connect('destroy') do
-	cleanup_callback
+        cleanup_callback
       end
-      
+
       self.border_width = 8
 
       vbox = Gtk::VBox.new(false, 8)
@@ -39,10 +39,10 @@ module Demo
       label = Gtk::Label.new
       label.set_markup('<u>Image loaded from a file</u>')
       vbox.pack_start(label, :expand => false, :fill => false, :padding => 0)
-      
+
       frame = Gtk::Frame.new
       frame.shadow_type = :in
-      
+
       # The alignment keeps the frame from growing when users resize
       # the window
       align = Gtk::Alignment.new(0.5, 0.5, 0, 0)
@@ -54,26 +54,26 @@ module Demo
       # in the location where the file is installed.
       pixbuf = nil
       begin
-	filename = Demo.find_file('gtk-logo-rgb.gif')
-	pixbuf = Gdk::Pixbuf.new(filename)
+        filename = Demo.find_file('gtk-logo-rgb.gif')
+        pixbuf = Gdk::Pixbuf.new(filename)
       rescue
-	# This code shows off error handling. You can just use
-	# Gtk::Image.new instead if you don't want to report
-	# errors to the user. If the file doesn't load when using
-	# Gtk::Image.new, a 'missing image' icon will
-	# be displayed instead.
-	dialog = Gtk::MessageDialog.new(self,
-					Gtk::Dialog::DESTROY_WITH_PARENT,
-					Gtk::MessageDialog::ERROR,
-					Gtk::MessageDialog::BUTTONS_CLOSE,
-					"Unable to open image file 'gtk-logo-rgb.gif': #{$1}")
-	
-	dialog.signal_connect('response') do |widget, data|
-	  widget.destroy
-	end
-	dialog.show
+        # This code shows off error handling. You can just use
+        # Gtk::Image.new instead if you don't want to report
+        # errors to the user. If the file doesn't load when using
+        # Gtk::Image.new, a 'missing image' icon will
+        # be displayed instead.
+        dialog = Gtk::MessageDialog.new(self,
+                                        Gtk::Dialog::DESTROY_WITH_PARENT,
+                                        Gtk::MessageDialog::ERROR,
+                                        Gtk::MessageDialog::BUTTONS_CLOSE,
+                                        "Unable to open image file 'gtk-logo-rgb.gif': #{$1}")
+
+        dialog.signal_connect('response') do |widget, data|
+          widget.destroy
+        end
+        dialog.show
       end
-      
+
       image = Gtk::Image.new(pixbuf)
       frame.add(image)
 
@@ -82,10 +82,10 @@ module Demo
       label = Gtk::Label.new
       label.set_markup('<u>Animation loaded from a file</u>')
       vbox.pack_start(label, :expand => false, :fill => false, :padding => 0)
-      
+
       frame = Gtk::Frame.new
       frame.shadow_type = :in
-      
+
       # The alignment keeps the frame from growing when users resize
       # the window
       align = Gtk::Alignment.new(0.5, 0.5, 0, 0)
@@ -95,16 +95,16 @@ module Demo
       filename = Demo.find_file('floppybuddy.gif')
       image = Gtk::Image.new(filename)
       frame.add(image)
-      
+
 
       # Progressive
       label = Gtk::Label.new
       label.set_markup('<u>Progressive image loading</u>')
       vbox.pack_start(label, :expand => false, :fill => false, :padding => 0)
-      
+
       frame = Gtk::Frame.new(nil)
       frame.shadow_type = :in
-      
+
       # The alignment keeps the frame from growing when users resize
       # the window
       align = Gtk::Alignment.new(0.5, 0.5, 0, 0)
@@ -123,65 +123,65 @@ module Demo
       vbox.pack_start(button, :expand => false, :fill => false, :padding => 0)
 
       button.signal_connect('toggled') do |widget|
-	vbox.children.each do |widget|
-	  if widget != button
-	    widget.sensitive = ! button.active?
-	  end
-	end
+        vbox.children.each do |widget|
+          if widget != button
+            widget.sensitive = ! button.active?
+          end
+        end
       end
     end
 
     def start_progressive_loading(image)
       @load_timeout = Gtk.timeout_add(150) do
-	progressive_timeout(image)
+        progressive_timeout(image)
       end
     end
 
     def progressive_timeout(image)
       if @image_stream
-	buf = @image_stream.read(256)
-	
-	@pixbuf_loader.write(buf)
-	
-	if @image_stream.eof?
-	  @image_stream.close
-	  @image_stream = nil
-	  
-	  @pixbuf_loader.close
-	  @pixbuf_loader = nil
-	end
+        buf = @image_stream.read(256)
+
+        @pixbuf_loader.write(buf)
+
+        if @image_stream.eof?
+          @image_stream.close
+          @image_stream = nil
+
+          @pixbuf_loader.close
+          @pixbuf_loader = nil
+        end
       else
-	filename = Demo.find_file('alphatest.png')
-	@image_stream = File.open(filename, 'rb')
-
-	if @pixbuf_loader != nil
-	  @pixbuf_loader.close
-	  @pixbuf_loader = nil
-	end
-	
-	@pixbuf_loader = Gdk::PixbufLoader.new
-	
-	@pixbuf_loader.signal_connect('area_prepared') do |loader|
-	  pixbuf = loader.pixbuf
-
-	  # Avoid displaying random memory contents, since the pixbuf
-	  # isn't filled in yet.
-	  pixbuf.fill!(0xaaaaaaff)
-	  
-	  image.pixbuf = pixbuf
-	end
-	
-	@pixbuf_loader.signal_connect('area_updated') do
-	  # We know the pixbuf inside the Gtk::Image has changed, but the image
-	  # itself doesn't know this; so queue a redraw.  If we wanted to be
-	  # really efficient, we could use a drawing area or something
-	  # instead of a Gtk::Image, so we could control the exact position of
-	  # the pixbuf on the display, then we could queue a draw for only
-	  # the updated area of the image.
-	  image.queue_draw
-	end
+        filename = Demo.find_file('alphatest.png')
+        @image_stream = File.open(filename, 'rb')
+
+        if @pixbuf_loader != nil
+          @pixbuf_loader.close
+          @pixbuf_loader = nil
+        end
+
+        @pixbuf_loader = Gdk::PixbufLoader.new
+
+        @pixbuf_loader.signal_connect('area_prepared') do |loader|
+          pixbuf = loader.pixbuf
+
+          # Avoid displaying random memory contents, since the pixbuf
+          # isn't filled in yet.
+          pixbuf.fill!(0xaaaaaaff)
+
+          image.pixbuf = pixbuf
+        end
+
+        @pixbuf_loader.signal_connect('area_updated') do
+          # We know the pixbuf inside the Gtk::Image has changed, but the image
+          # itself doesn't know this; so queue a redraw.  If we wanted to be
+          # really efficient, we could use a drawing area or something
+          # instead of a Gtk::Image, so we could control the exact position of
+          # the pixbuf on the display, then we could queue a draw for only
+          # the updated area of the image.
+          image.queue_draw
+        end
       end
-      
+
       # leave timeout installed
       return true
     end
@@ -190,7 +190,7 @@ module Demo
       @pixbuf_loader.close if @pixbuf_loader
       @pixbuf_loader = nil
       if @load_timeout != 0
-	Gtk.timeout_remove(@load_timeout)
+        Gtk.timeout_remove(@load_timeout)
       end
     end
   end