green_shoes 1.0.273 → 1.0.282

data/VERSION

@@ -1 +1 @@
-1.0.273
+1.0.282

data/lib/green_shoes.rb

@@ -61,5 +61,4 @@ require_relative 'plugins/treeview'
 autoload :ChipMunk, File.join(Shoes::DIR, 'ext/chipmunk')
 autoload :Bloops, File.join(Shoes::DIR, 'ext/bloops')
 autoload :Projector, File.join(Shoes::DIR, 'ext/projector')
-autoload :Hpricot, File.join(Shoes::DIR, 'ext/hpricot')
 autoload :HH, File.join(Shoes::DIR, 'ext/highlighter')

data/lib/shoes/app.rb

@@ -10,7 +10,7 @@ class Shoes
       win_title = @owner.instance_variable_get('@title')
       class << @owner; self end.
       class_eval do
-        define_method :to_s do
+        define_method :inspect do
           win_title or 'green shoes'
         end
       end if @owner

data/lib/shoes/basic.rb

@@ -92,10 +92,8 @@ class Shoes
           @app.cslot.contents.delete self
           remove
           @real = nil
-        when TextBlock
-          @real.clear if @real
         else 
-          (@real.clear; @real.destroy) if @real
+          @real.clear if @real
       end
     end
 

data/lib/shoes/help.rb

@@ -1,3 +1,11 @@
+begin
+  require 'hpricot'
+rescue LoadError 
+  require File.join(Shoes::DIR, 'ext/hpricot')
+end
+
+require 'nkf'
+
 class Manual < Shoes
   url '/', :index
   url '/manual/(\d+)', :index
@@ -206,6 +214,7 @@ class Manual < Shoes
 
   def self.load_docs path
     str = IO.read(path).force_encoding("UTF-8")
+    str = NKF.nkf('-wLu', str) unless RUBY_PLATFORM =~ /mingw/
     (str.split(/^= (.+?) =/)[1..-1]/2).map do |k, v|
       sparts = v.split(/^== (.+?) ==/)
       sections = (sparts[1..-1]/2).map do |k2, v2|

data/lib/shoes/helper_methods.rb

@@ -225,7 +225,7 @@ class Shoes
 
   def self.mouse_click_control app
     app.mccs.each do |e|
-      e.click_proc[*app.mouse] if mouse_on? e
+      e.click_proc[*app.mouse] if mouse_on?(e) && !$dde
     end
   end
   
@@ -263,7 +263,7 @@ class Shoes
     app.mlcs.each do |tb|
       next if tb.hided
       link_proc,  = mouse_on_link(tb, app)
-      link_proc.call if link_proc
+      link_proc.call if link_proc && !$dde
     end
   end
   

data/lib/shoes/main.rb

@@ -48,6 +48,7 @@ class Shoes
       app.mouse_pos = app.win.pointer
       mouse_click_control app
       mouse_link_control app
+      $dde = false
     end
     
     win.signal_connect "button_release_event" do

data/lib/shoes/manual.rb

@@ -1,5 +1,5 @@
 class Shoes
-  def self.show_manual lang
+  def self.show_manual lang='English'
     $lang = lang
     load File.join(DIR, 'shoes/help.rb')
   end

data/lib/shoes/ruby.rb

@@ -7,7 +7,8 @@ end
 
 class Object
   include Types
-  def alert msg
+  def alert msg, options={:block => true}
+    $dde = true
     dialog = Gtk::MessageDialog.new(
       get_win,
       Gtk::Dialog::MODAL,
@@ -16,11 +17,17 @@ class Object
       msg.to_s
     )
     dialog.title = "Green Shoes says:"
-    dialog.run
-    dialog.destroy
+    if options[:block]
+      dialog.run
+      dialog.destroy
+    else
+      dialog.signal_connect("response"){ dialog.destroy }
+      dialog.show
+    end
   end
 
   def confirm msg
+    $dde = true
     dialog = Gtk::Dialog.new(
       "Green Shoes asks:", 
       get_win,
@@ -37,6 +44,7 @@ class Object
   end
 
   def ask msg, args={}
+    $dde = true
     dialog = Gtk::Dialog.new(
       "Green Shoes asks:", 
       get_win,
@@ -71,6 +79,7 @@ class Object
   end
 
   def dialog_chooser title, action, button
+    $dde = true
     dialog = Gtk::FileChooserDialog.new(
       title,
       get_win,
@@ -85,6 +94,7 @@ class Object
   end
 
   def ask_color title = 'Pick a color...'
+    $dde = true
     dialog = Gtk::ColorSelectionDialog.new title
     dialog.icon = Gdk::Pixbuf.new File.join(DIR, '../static/gshoes-icon.png')
     dialog.run
@@ -148,6 +158,11 @@ class Array
   def clear_all
     self.each &:clear_all
   end
+
+  alias :_to_s :to_s
+  def to_s
+    self.map(&:to_s)._to_s
+  end
 end
 
 class NilClass

data/static/manual-en.txt

@@ -638,7 +638,7 @@ are trying to sniff out what release of Green Shoes is running.
  end
 }}}
 
-=== alert(message: a string) » nil ===
+=== alert(message: a string, :block => true or false) » nil ===
 
 Pops up a window containing a short message.
 
@@ -651,6 +651,8 @@ Please use alerts sparingly, as they are incredibly annoying!  If you are using
 alerts to show messages to help you debug your program, try checking out the
 standard Ruby method `puts` or `p` methods.
 
+If you want to make alert() thread safe, i.e. unblock main thread, use `:block => false` option.
+
 === ask(message: a string) » a string ===
 
 Pops up a window and asks a question. For example, you may want to ask someone
@@ -2209,6 +2211,11 @@ colors with a #06E (blue) colored stroke.
 
 The default LinkHover style is also single-underlined with a #039 (dark blue) stroke.
 
+=== link(text){ ... } » Shoes::Link ===
+
+Creates a Link text block. You can also write with this style. When user clicks the link text, 
+the block will be launched.
+
 === list_box(:items => [strings, ...]) » Shoes::ListBox ===
 
 Adds a drop-down list box containing entries for everything in the `items`
@@ -2328,11 +2335,11 @@ window.  This way the child window can call the parent.
 {{{
  #!ruby
  Shoes.app title: "The Owner" do
-   button "Pop up?" do
-     window do
-       para "Okay, popped up from [#{owner}]."
-     end
+  button "Pop up?" do
+   window do
+    para "Okay, popped up from [#{owner.inspect}]."
    end
+  end
  end
 }}}
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: green_shoes
 version: !ruby/object:Gem::Version
-  version: 1.0.273
+  version: 1.0.282
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-18 00:00:00.000000000Z
+date: 2011-09-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk2
-  requirement: &16045188 !ruby/object:Gem::Requirement
+  requirement: &16049412 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16045188
+  version_requirements: *16049412
 description: Green Shoes is one of colorful Shoes, written in pure Ruby with Ruby/GTK2.
 email: ashbbb@gmail.com
 executables: []