gtk3 2.2.0 → 2.2.1

data/sample/misc/cursor.rb

@@ -7,15 +7,17 @@
   $Id: cursor.rb,v 1.7 2006/06/17 13:18:12 mutoh Exp $
 =end
 
-require 'gtk3'
+require "gtk3"
 
 window = Gtk::Window.new("Gdk::Cursor sample")
+window.signal_connect('destroy') {Gtk.main_quit}
 window.realize
 
 button = Gtk::Button.new(:label => "Click!")
 button.use_underline = false
 
 cursors = Gdk::Cursor::Type.values - [Gdk::Cursor::Type::CURSOR_IS_PIXMAP]
+cursors -= [Gdk::Cursor::Type::LAST_CURSOR]
 
 cnt = 0
 button.signal_connect('clicked') do

data/sample/misc/dialog.rb

@@ -8,30 +8,30 @@
   $Id: dialog.rb,v 1.6 2006/06/17 13:18:12 mutoh Exp $
 =end
 
-require 'gtk3'
+require "gtk3"
 
 window = Gtk::Window.new("Gtk::Dialog sample")
-button = Gtk::Button.new("Create Dialog")
-button.signal_connect("clicked") do 
+button = Gtk::Button.new(:label => "Create Dialog")
+button.signal_connect("clicked") do
   dialog = Gtk::Dialog.new
   dialog.title = "Gtk::Dialog Sample"
   dialog.transient_for = window
   dialog.set_default_size(300, 300)
-  dialog.vbox.add(Gtk::Label.new("Gtk::Dialog Sample"))
+  dialog.child.add(Gtk::Label.new("Gtk::Dialog Sample"))
 
 
-  dialog.add_button("OK", Gtk::Dialog::RESPONSE_OK)
-  dialog.add_button(Gtk::Stock::CANCEL, Gtk::Dialog::RESPONSE_CANCEL)
-  dialog.add_button(Gtk::Stock::CLOSE, Gtk::Dialog::RESPONSE_CLOSE)
-  dialog.set_default_response(Gtk::Dialog::RESPONSE_CANCEL)
+  dialog.add_button("OK", Gtk::ResponseType::OK)
+  dialog.add_button(Gtk::Stock::CANCEL, Gtk::ResponseType::CANCEL)
+  dialog.add_button(Gtk::Stock::CLOSE, Gtk::ResponseType::CLOSE)
+  dialog.set_default_response(Gtk::ResponseType::CANCEL)
 
   dialog.signal_connect("response") do |widget, response|
     case response
-    when Gtk::Dialog::RESPONSE_OK
+    when Gtk::ResponseType::OK
       p "OK"
-    when Gtk::Dialog::RESPONSE_CANCEL
+    when Gtk::ResponseType::CANCEL
       p "Cancel"
-    when Gtk::Dialog::RESPONSE_CLOSE
+    when Gtk::ResponseType::CLOSE
       p "Close"
       dialog.destroy
     end
@@ -39,6 +39,6 @@ button.signal_connect("clicked") do
   dialog.show_all
 end
 
-window.add(button).show_all.signal_connect("destroy"){Gtk.main_quit}
+window.add(button).show_all.signal_connect("destroy") {Gtk.main_quit}
 
 Gtk.main

data/sample/misc/dialog2.rb

@@ -8,32 +8,29 @@
   $Id: dialog2.rb,v 1.7 2006/06/17 13:18:12 mutoh Exp $
 =end
 
-require 'gtk3'
+require "gtk3"
 
 window = Gtk::Window.new("Gtk::Dialog sample2")
-button = Gtk::Button.new("Create Dialog")
-button.signal_connect("clicked") do 
-  dialog = Gtk::Dialog.new("Gtk::Dialog Sample 2", window, 
-                           Gtk::Dialog::MODAL|Gtk::Dialog::NO_SEPARATOR,
-                           [Gtk::Stock::OK, Gtk::Dialog::RESPONSE_OK],
-                           [Gtk::Stock::CANCEL, Gtk::Dialog::RESPONSE_CANCEL])
-  dialog.vbox.add(Gtk::Label.new("Gtk::Dialog Sample 2"))
+button = Gtk::Button.new(:label => "Create Dialog")
+button.signal_connect("clicked") do
+  dialog = Gtk::Dialog.new(:title =>"Gtk::Dialog Sample 2",
+                           :parent => window,
+                           :flags => Gtk::Dialog::Flags::MODAL,
+                           :buttons => [[Gtk::Stock::OK, Gtk::ResponseType::OK],
+                           [Gtk::Stock::CANCEL, Gtk::ResponseType::CANCEL]])
+  dialog.child.add(Gtk::Label.new("Gtk::Dialog Sample 2"))
   dialog.set_default_size(300, 300)
-  dialog.vbox.show_all
+  dialog.child.show_all
   result = dialog.run
   case result
-  when Gtk::Dialog::RESPONSE_OK
+  when Gtk::ResponseType::OK
     p "OK"
-  when Gtk::Dialog::RESPONSE_CANCEL
+  when Gtk::ResponseType::CANCEL
     p "Cancel"
   end
   dialog.destroy
 end
 
-window.add(button).show_all.signal_connect("destroy"){Gtk.main_quit}
+window.add(button).show_all.signal_connect("destroy") {Gtk.main_quit}
 
 Gtk.main
-
-
-                         
-

data/sample/misc/drawing.rb

@@ -12,17 +12,24 @@ require 'gtk3'
 class Canvas < Gtk::DrawingArea
   def initialize
     super
-    signal_connect("draw") { |w,e| expose_event(w,e) }
-    signal_connect("configure_event") { |w, e| configure_event(w,e) }
+    signal_connect("draw") do |w, e|
+      expose_event(w, e)
+    end
+    signal_connect("configure_event") do |w, e|
+      configure_event(w, e)
+    end
     @buffer = nil
     @bgc = nil
   end
 
-  def expose_event(w,e)
+  def expose_event(w, e)
     unless @buffer.nil?
       rec = e.area
-      w.window.draw_drawable(@bgc, @buffer, rec.x, rec.y,
-			   rec.x, rec.y, rec.width, rec.height)
+      w.window.draw_drawable(@bgc,
+                             @buffer,
+                             rec.x, rec.y,
+                             rec.x, rec.y,
+                             rec.width, rec.height)
     end
     false
   end
@@ -33,18 +40,22 @@ class Canvas < Gtk::DrawingArea
     g = b.size
     @bgc = self.style.bg_gc(self.state) if @bgc.nil?
     if (g[0] > 0 && g[1] > 0)
-      b.draw_rectangle(@bgc, true, 0,0, g[0], g[1])
+      b.draw_rectangle(@bgc, true, 0, 0, g[0], g[1])
     end
   end
 
-  def configure_event(w,e)
+  def configure_event(w, e)
     g = w.window.geometry
     if (g[2] > 0 && g[3] > 0)
       b = Gdk::Pixmap::new(w.window, g[2], g[3], -1)
       clear(b)
       if not @buffer.nil?
-	g = @buffer.size
-	b.draw_drawable(@bgc, @buffer, 0, 0, 0, 0, g[0], g[1])
+        g = @buffer.size
+        b.draw_drawable(@bgc,
+                        @buffer,
+                        0, 0,
+                        0, 0,
+                        g[0], g[1])
       end
       @buffer = b
     end
@@ -55,24 +66,30 @@ end
 class A < Canvas
   def initialize
     super
-    signal_connect("button_press_event") { |w,e| pressed(w,e) }
+    signal_connect("button_press_event") do |w, e|
+      pressed(w, e)
+    end
     set_events(Gdk::Event::BUTTON_PRESS_MASK)
   end
 
   def pressed(widget, ev)
     if not @last.nil?
       @buffer.draw_line(widget.style.fg_gc(widget.state),
-			@last.x, @last.y, ev.x, ev.y)
+                        @last.x, @last.y,
+                        ev.x, ev.y)
 
-      x1,x2 = if (@last.x < ev.x)
-	      then [@last.x, ev.x]
-	      else [ev.x,    @last.x]
-	      end
-      y1,y2 = if (@last.y < ev.y)
-	    then [@last.y, ev.y]
-	    else [ev.y,    @last.y]
-	    end
-      widget.queue_draw_area(x1, y1, x2 - x1 + 1, y2 - y1 + 1)
+      x1, x2 = if (@last.x < ev.x)
+                 [@last.x, ev.x]
+               else
+                 [ev.x,    @last.x]
+               end
+      y1, y2 = if (@last.y < ev.y)
+                 [@last.y, ev.y]
+               else
+                 [ev.y,    @last.y]
+               end
+      widget.queue_draw_area(x1, y1,
+                             x2 - x1 + 1, y2 - y1 + 1)
     end
     @last = nil
     @last = ev
@@ -81,7 +98,9 @@ class A < Canvas
 end
 
 window = Gtk::Window.new("drawing test")
-window.signal_connect("destroy") { Gtk.main_quit }
+window.signal_connect("destroy") do
+  Gtk.main_quit
+end
 
 canvas = A.new
 window.add(canvas)

data/sample/misc/statusicon.rb

@@ -10,10 +10,10 @@
   $Id: statusicon.rb,v 1.1 2006/11/17 18:12:41 mutoh Exp $
 =end
 
-require 'gtk3'
+require "gtk3"
 
-if str = Gtk.check_version(2, 10, 0)
-  puts "This sample requires GTK+ 2.10.0 or later"
+if str = Gtk.check_version(3, 10, 7)
+  puts "This sample requires GTK+ 3.10.7 or later"
   puts str
   exit
 end
@@ -27,44 +27,35 @@ class StatusIconSample < Gtk::StatusIcon
     @status = STATUS_INFO
     update_icon
 
-    set_blinking(true)
-    signal_connect("activate"){
-      icon_activated
-    }
-    signal_connect("popup-menu"){|w, button, activate_time|
+    signal_connect("activate") {icon_activated}
+    signal_connect("popup-menu") do |w, button, activate_time|
       menu = Gtk::Menu.new
-      checkmenuitem = Gtk::CheckMenuItem.new("Blink")
-      checkmenuitem.active = blinking?
-      checkmenuitem.signal_connect("activate"){|w|
-        set_blinking(w.active?)
-      }
-      menu.append(checkmenuitem)
       
       menuitem = Gtk::MenuItem.new("Quit")
-      menuitem.signal_connect("activate"){
+      menuitem.signal_connect("activate") do
         set_visible(false)
         Gtk.main_quit
-      }
+      end
       menu.append(menuitem)
       menu.show_all
       menu.popup(nil, nil, button, activate_time)
-    }
+    end
 
-    timeout_func
+    @timeout = timeout_func
   end
 
   def update_icon
     if @status == STATUS_INFO
-      set_icon_name(Gtk::Stock::DIALOG_INFO)
-      set_tooltip("Some Information ...")
+      self.stock = Gtk::Stock::DIALOG_INFO
+      set_tooltip_text("Some Information ...")
     else
-      set_icon_name(Gtk::Stock::DIALOG_QUESTION)
-      set_tooltip("Some Question ...")
+      self.stock = Gtk::Stock::DIALOG_QUESTION
+      set_tooltip_text("Some Question ...")
     end
   end
 
   def timeout_func
-    GLib::Timeout.add(2000) {
+    GLib::Timeout.add(2000) do
       if @status == STATUS_INFO
         @status = STATUS_QUESTION
       else
@@ -72,50 +63,42 @@ class StatusIconSample < Gtk::StatusIcon
       end
       update_icon
       true
-    }
+    end
   end
 
   def icon_activated
     unless @dialog
-      @dialog = Gtk::MessageDialog.new(nil, 0,
-                                       Gtk::MessageDialog::QUESTION,
-                                       Gtk::MessageDialog::BUTTONS_CLOSE,
-                                       "You wanna test the status icon?")
-      @dialog.window_position = Gtk::Window::POS_CENTER
+      @dialog = Gtk::MessageDialog.new(:parent => nil, :flags => 0,
+                                       :type => Gtk::MessageType::QUESTION,
+                                       :buttons_type => Gtk::MessageDialog::ButtonsType::CLOSE,
+                                       :message => "You wanna test the status icon?")
+      @dialog.window_position = Gtk::Window::Position::CENTER
       
-      @dialog.signal_connect("response"){ @dialog.hide }
-      @dialog.signal_connect("delete_event"){ @dialog.hide_on_delete }
+      @dialog.signal_connect("response") {@dialog.hide}
+      @dialog.signal_connect("delete_event") {@dialog.hide_on_delete}
       
       toggle = Gtk::ToggleButton.new("_Show the icon")
-      @dialog.vbox.pack_end(toggle, true, true, 6)
+      @dialog.child.pack_end(toggle, :expand => true, :fill => true, :padding => 6)
       toggle.active = visible?
-      toggle.signal_connect("toggled"){|w|
+      toggle.signal_connect("toggled") do |w|
         set_visible(w.active?)
-      }
+      end
 
-      toggle = Gtk::ToggleButton.new("_Blink the icon")
-      @dialog.vbox.pack_end(toggle, true, true, 6)
-      toggle.active = blinking?
-      toggle.signal_connect("toggled"){|w|
-        set_blinking(w.active?)
-      }
- 
       toggle = Gtk::ToggleButton.new("_Change the icon")
-      @dialog.vbox.pack_end(toggle, true, true, 6)
+      @dialog.child.pack_end(toggle, :expand => true, :fill => true, :padding => 6)
       toggle.active = (@timeout != 0)
-      toggle.signal_connect("toggled"){ 
+      toggle.signal_connect("toggled") do
         if @timeout and @timeout > 0
           GLib::Source.remove(@timeout)
           @timeout = 0
         else 
           @timeout = timeout_func
         end
-      }
+      end
     end
     @dialog.show_all
     @dialog.present
   end
-
 end
 
 StatusIconSample.new

data/sample/misc/threads.rb

@@ -8,39 +8,39 @@
   $Id: threads.rb,v 1.5 2006/06/17 13:18:12 mutoh Exp $
 =end
 
-require 'gtk3'
-require 'thread'
+require "gtk3"
+require "thread"
 
 label = Gtk::Label.new
 
-Thread.new {
-  (0...1000).each { |cnt|
+Thread.new do
+  (0...1000).each do |cnt|
     p "A:" + cnt.to_s
     label.label = "A:" + cnt.to_s
     sleep(2)
-  }
-}
+  end
+end
 
 start_button = Gtk::Button.new("start")
 stop_button = Gtk::Button.new("stop")
 
 start_button.signal_connect("clicked") do
-  start_button.sensitive=false
-  @th = Thread.new {
-    (0...10).each { |cnt|
+  start_button.sensitive = false
+  @th = Thread.new do
+    (0...10).each do |cnt|
       p "B:" + cnt.to_s
       label.label = "B:" + cnt.to_s
       sleep(2)
-    }
+    end
     @th = nil
     start_button.sensitive = true
     start_button.grab_focus
     stop_button.sensitive = false
-  }
+  end
   stop_button.sensitive = true
   stop_button.grab_focus
 end
-  
+
 stop_button.signal_connect("clicked") do
   if @th
     @th.kill
@@ -54,8 +54,8 @@ end
 
 stop_button.sensitive = false
 
-box = Gtk::VBox.new.
-  set_size_request(100,100)
+box = Gtk::VBox.new
+box.set_size_request(100, 100)
 
 box << label << start_button << stop_button
 
@@ -63,10 +63,8 @@ win = Gtk::Window.new << box
 
 win.show_all.signal_connect("delete_event") do
   p "Exiting..."
-  Gtk.main_quit 
-  Thread.list.each {|t| t.kill }
+  Gtk.main_quit
+  Thread.list.each {|t| t.kill}
 end
 
 Gtk.main
-
-

data/sample/misc/tree_progress.rb

@@ -9,7 +9,7 @@
 =end
 
 
-require 'gtk3'
+require "gtk3"
 
 win = Gtk::Window.new("Gtk::CellRendererProgress sample")
 win.set_default_size(300, 50)
@@ -36,28 +36,26 @@ prenderer = Gtk::CellRendererProgress.new
 pcol = Gtk::TreeViewColumn.new("Progress", prenderer, :value  => 1)
 view.append_column(pcol)
 
-win.signal_connect("delete_event"){
+win.signal_connect("delete_event") do
   Gtk.main_quit
-}
+end
 
 win.add(view)
 win.show_all
 
 dir = 1
 thr = Thread.new do
-  loop {
-    prog2[1] += dir
-    if prog2[1] > 100
-      prog2[1] = 100
+  loop do
+    value = prog2[1] + dir
+    if value > 100
       dir = - dir
     end
-    if prog2[1] < 0
-      prog2[1] = 0
+    if value < 0
       dir = - dir
     end
-    sleep 0.01
-  }
+    prog2[1] += dir
+    sleep 0.1
+  end
 end
 
 Gtk.main
-