green_shoes 0.176.0 → 0.179.0

data/VERSION

@@ -1 +1 @@
-0.176.0
+0.179.0

data/lib/shoes/app.rb

@@ -159,61 +159,68 @@ class Shoes
       Gtk::Image.new(name).size_request
     end
 
-    def button name, args={}, &blk
+    def button name, args={}
       args = basic_attributes args
       b = Gtk::Button.new name
       b.set_size_request args[:width], args[:height] if args[:width] > 0 and args[:height] > 0
-      b.signal_connect "clicked", &blk if blk
+      b.signal_connect "clicked" do
+        yield @_b
+      end if block_given?
       @canvas.put b, args[:left], args[:top]
       b.show_now
       args[:real], args[:text], args[:app] = b, name, self
-      Button.new args
+      @_b = Button.new args
     end
 
-    def check args={}, &blk
+    def check args={}
       args = basic_attributes args
       cb = Gtk::CheckButton.new
       cb.active = true if args[:checked]
-      cb.signal_connect "clicked", &blk if blk
+      cb.signal_connect "clicked" do
+        yield @_cb
+      end if block_given?
       @canvas.put cb, args[:left], args[:top]
       cb.show_now
       args[:real], args[:app] = cb, self
-      Check.new args
+      @_cb = Check.new args
     end
     
-    def radio *attrs, &blk
+    def radio *attrs
       args = attrs.last.class == Hash ? attrs.pop : {}
       group = attrs.first unless attrs.empty?
       group = group ? (@radio_groups[group] ||= Gtk::RadioButton.new) : cslot.radio_group
       args = basic_attributes args
       rb = Gtk::RadioButton.new group
       rb.active = true if args[:checked]
-      rb.signal_connect "clicked", &blk if blk
+      rb.signal_connect "clicked" do
+        yield @_rb
+      end if block_given?
       @canvas.put rb, args[:left], args[:top]
       rb.show_now
       args[:real], args[:app] = rb, self
-      Radio.new args
+      @_rb = Radio.new args
     end
 
     def edit_line args={}
       args = basic_attributes args
       args[:width] = 200 if args[:width].zero?
+      args[:height] = 28 if args[:height].zero?
       el = Gtk::Entry.new
       el.text = args[:text].to_s
-      el.width_chars = args[:width] / 6
+      el.set_size_request args[:width], args[:height]
       el.signal_connect "changed" do
-        yield el
+        yield @_el
       end if block_given?
       @canvas.put el, args[:left], args[:top]
       el.show_now
       args[:real], args[:app] = el, self
-      EditLine.new args
+      @_el = EditLine.new args
     end
 
     def edit_box args={}
       args = basic_attributes args
       args[:width] = 200 if args[:width].zero?
-      args[:height] = 200 if args[:height].zero?
+      args[:height] = 108 if args[:height].zero?
       tv = Gtk::TextView.new
       tv.wrap_mode = Gtk::TextTag::WRAP_WORD
       tv.buffer.text = args[:text].to_s
@@ -225,29 +232,31 @@ class Shoes
       eb.add tv
 
       tv.buffer.signal_connect "changed" do
-        yield tv.buffer
+        yield @_eb
       end if block_given?
 
       @canvas.put eb, args[:left], args[:top]
       eb.show_now
       args[:real], args[:app], args[:textview] = eb, self, tv
-      EditBox.new args
+      @_eb = EditBox.new args
     end
     
-    def list_box args={}, &blk
+    def list_box args={}
       args = basic_attributes args
       args[:width] = 200 if args[:width].zero?
+      args[:height] = 28 if args[:height].zero?
       cb = Gtk::ComboBox.new
       args[:items] ||= []
       args[:items].each{|item| cb.append_text item.to_s}
+      cb.set_size_request args[:width], args[:height]
       cb.active = args[:items].index(args[:choose]) if args[:choose]
       cb.signal_connect("changed") do
-        blk.call args[:items][cb.active]
-      end if blk
+        yield @_lb
+      end if block_given?
       @canvas.put cb, args[:left], args[:top]
       cb.show_now
       args[:real], args[:app] = cb, self
-      ListBox.new args
+      @_lb = ListBox.new args
     end
 
     def animate n=10, repaint=true, &blk
@@ -650,5 +659,11 @@ class Shoes
     def flush
       Shoes.call_back_procs self
     end
+
+    [:append, :prepend, :after, :before].each do |m|
+      define_method m do |*args, &blk|
+        top_slot.send m, *args, &blk
+      end
+    end
   end
 end

data/lib/shoes/basic.rb

@@ -81,6 +81,7 @@ class Shoes
         when Button, EditLine, EditBox, ListBox
           @app.cslot.contents.delete self
           remove
+          @real = nil
         else @real.clear
       end
     end
@@ -125,22 +126,6 @@ class Shoes
   end
 
   class Image < Basic; end
-  class Button < Basic
-    def click &blk
-      real.signal_connect "clicked", &blk if blk
-    end
-  end
-  class ToggleButton < Button
-    def checked?
-      real.active?
-    end
-    
-    def checked=(tof)
-      real.active = tof
-    end
-  end
-  class Check < ToggleButton; end
-  class Radio < ToggleButton; end
 
   class Pattern < Basic
     def move2 x, y
@@ -202,7 +187,29 @@ class Shoes
   class Para < TextBlock; end
   class Inscription < TextBlock; end
 
-  class EditLine < Basic
+  class Native < Basic
+    def change obj, &blk
+      obj.signal_connect "changed", &proc{parent.append{blk[self]}} if blk
+    end
+  end
+  class Button < Native
+    def click &blk
+      real.signal_connect "clicked", &proc{parent.append{blk[self]}} if blk
+    end
+  end
+  class ToggleButton < Button
+    def checked?
+      real.active?
+    end
+    
+    def checked=(tof)
+      real.active = tof
+    end
+  end
+  class Check < ToggleButton; end
+  class Radio < ToggleButton; end
+
+  class EditLine < Native
     def text
       @real.text
     end
@@ -215,9 +222,13 @@ class Shoes
       @app.canvas.move @real, x, y
       move3 x, y
     end
+
+    def change &blk
+      super @real, &blk
+    end
   end
 
-  class EditBox < Basic
+  class EditBox < Native
     def text
       @textview.buffer.text
     end
@@ -230,15 +241,32 @@ class Shoes
       @app.canvas.move @real, x, y
       move3 x, y
     end
+
+    def change &blk
+      super @textview.buffer, &blk
+    end
   end
   
-  class ListBox < Basic
+  class ListBox < Native
     def text
       @items[@real.active]
     end
+
+    def choose item
+      @real.active = @items.index item
+    end
+
+    def change &blk
+      super @real, &blk
+    end
+
+    def items= items
+      @items = items
+      items.each{|item| real.append_text item.to_s}
+    end
   end
 
-  class Progress < Basic
+  class Progress < Native
     def fraction
       real.fraction
     end

data/lib/shoes/slot.rb

@@ -67,6 +67,7 @@ class Shoes
     
     def clear &blk
       @contents.each &:clear
+      contents.each{|e| @app.mlcs.delete e}
       if blk
         args = {}
         initials.keys.each{|k| args[k] = instance_variable_get "@#{k}"}

data/lib/shoes/style.rb

@@ -71,11 +71,9 @@ class Shoes
       args[:width] ||= @width
       args[:height] ||= @height
       case self
-        when Button, EditBox, ListBox
+        when Button, EditBox, EditLine, ListBox
           real.set_size_request args[:width], args[:height]
           @height = args[:height]
-        when EditLine
-          real.width_chars = args[:width] / 6
         when Progress
           real.text = ' ' * (args[:width] / 4 - 2)
         else

data/samples/sample29.rb

@@ -1,9 +1,9 @@
 require '../lib/green_shoes'
 
 Shoes.app do
-  lb = list_box items: COLORS.keys.map(&:to_s), choose: 'red' do |item|
-    @o.style fill: eval(item)
-    @p.text = item
+  lb = list_box items: COLORS.keys.map(&:to_s), choose: 'red' do |s|
+    @o.style fill: eval(s.text)
+    @p.text = s.text
   end.move(300, 0)
   @p = para
   nostroke

data/static/manual-en.txt

@@ -2904,16 +2904,16 @@ To paint a black background across the top fifty pixels of the window:
 {{{
  #!ruby
  Shoes.app do
-   background black, :height => 50
+   background black, height: 50
  end
 }}}
 
-Or, to paint a fifty pixel column on the right-side of the window:
+Or, to paint a fifty pixel column on the left-side of the window:
 
 {{{
  #!ruby
  Shoes.app do
-   background black, :width => 50, :right => 50
+   background black, width: 50
  end
 }}}
 
@@ -2926,6 +2926,8 @@ Yanks out the color, gradient or image used to paint this background and places
 it in a normal Shoes::Pattern object.  You can then pass that object to other
 backgrounds and borders.  Reuse it as you like.
 
+'''Note:''' Green Shoes doesn't support `to_pattern` method.
+
 == Border ==
 
 A border is a color, gradient or image painted in a line around the edge of any
@@ -2946,9 +2948,9 @@ Here is just such a slot:
 {{{
  #!ruby
  Shoes.app do
-   stack :width => 50 do
-     border black, :strokewidth => 5
-     para "=^.^=", :stroke => green
+   stack width: 50 do
+     border black, strokewidth: 5
+     para fg "=^.^=", green
    end
  end
 }}}
@@ -2959,17 +2961,17 @@ that slot in another slot.  Then, place the border in the outside slot.
 {{{
  #!ruby
  Shoes.app do
-   stack :width => 60 do
-     border black, :strokewidth => 5
-     stack :width => 50 do
-       para "=^.^=", :stroke => green
+   stack width: 60 do
+     border black, strokewidth: 5
+     stack width: 50 do
+       para fg "=^.^=", green
      end
    end
  end
 }}}
 
 In HTML and many other languages, the border is painted on the outside of the
-box, thus increasing the overall width of the box.  Shoes was designed with
+box, thus increasing the overall width of the box.  Green Shoes was designed with
 consistency in mind, so that if you say that a box is fifty pixels wide, it
 stays fifty pixels wide regardless of its borders or margins or anything else.
 
@@ -2981,6 +2983,8 @@ Creates a basic pattern object based on the color, gradient or image used to
 paint this border.  The pattern may then be re-used in new borders and
 backgrounds.
 
+'''Note:''' Green Shoes doesn't support `to_pattern` method.
+
 == Button ==
 
 Buttons are, you know, push buttons.  You click them and they do something.
@@ -3000,7 +3004,6 @@ order to get them to work, you've got to hook up a block to each button.
 
 {{{
  #!ruby
- # Not yet available
  Shoes.app do
    button "OK!" do
      append { para "Well okay then." }
@@ -3033,7 +3036,7 @@ difference: rather than attaching the block directly to the button, the block
 is attached later, through the `click` method.
 
 The second change isn't related to buttons at all.  The `append` block was
-dropped since Shoes allows you to add new elements directly to the slot.  So we
+dropped since Green Shoes allows you to add new elements directly to the slot.  So we
 can just call `para` directly.  (This isn't the case with the `prepend`,
 `before` or `after` methods.)
 
@@ -3050,6 +3053,8 @@ When a button is clicked, its `click` block is called.  The block is handed
 Moves focus to the button.  The button will be highlighted and, if the user
 hits Enter, the button will be clicked.
 
+'''Note:''' Green Shoes doesn't support `focus` method.
+
 == Check ==
 
 Check boxes are clickable square boxes than can be either checked or unchecked.
@@ -3122,6 +3127,8 @@ Clicks are sent for both checking and unchecking the box.
 Moves focus to the check.  The check will be highlighted and, if the user hits
 Enter, the check will be toggled between its checked and unchecked states.
 
+'''Note:''' Green Shoes doesn't support `focus` method.
+
 == EditBox ==
 
 Edit boxes are wide, rectangular boxes for entering text.  On the web, they
@@ -3135,7 +3142,7 @@ can also use `:width` and `:height` styles to set specific sizes.
  #!ruby
  Shoes.app do
    edit_box
-   edit_box :width => 100, :height => 100
+   edit_box width: 100, height: 100
  end
 }}}
 
@@ -3147,7 +3154,7 @@ every time someone types into or deletes from the box.
  #!ruby
  Shoes.app do
    edit_box do |e|
-     @counter.text = "#{e.text.size} characters"
+     @counter.text = strong("#{e.text.size}") + " characters"
    end
    @counter = para strong("0"), " characters"
  end
@@ -3170,6 +3177,8 @@ has changed.
 Moves focus to the edit box. The edit box will be highlighted and the user will
 be able to type into the edit box.
 
+'''Note:''' Green Shoes doesn't support `focus` method.
+
 === text() » self ===
 
 Return a string of characters which have been typed into the box.
@@ -3192,14 +3201,14 @@ height may vary on some platforms.
  Shoes.app do
    stack do
      edit_line
-     edit_line :width => 400
+     edit_line width: 400
    end
  end
 }}}
 
 You can change the size by styling both the `:width` and the `:height`.
 However, you generally only want to style the `:width`, as the height will be
-sized to fit the font. (And, in current versions of Shoes, the font for edit
+sized to fit the font. (And, in current versions of Green Shoes, the font for edit
 lines and edit boxes cannot be altered anyway.)
 
 If a block is given to an edit line, it receives `change` events. Check out the
@@ -3218,6 +3227,8 @@ has changed.
 Moves focus to the edit line. The edit line will be highlighted and the user
 will be able to type into the edit line.
 
+'''Note:''' Green Shoes doesn't support `focus` method.
+
 === text() » self ===
 
 Return a string of characters which have been typed into the box.
@@ -3300,7 +3311,7 @@ passed into the `:items` style.
  #!ruby
  Shoes.app do
    para "Choose a fruit:"
-   list_box :items => ["Grapes", "Pears", "Apricots"]
+   list_box items: ["Grapes", "Pears", "Apricots"]
  end
 }}}
 
@@ -3311,9 +3322,9 @@ You can adjust this length using the `:width` style.
  #!ruby
  Shoes.app do
    para "Choose a fruit:"
-   list_box :items => ["Grapes", "Pears", "Apricots"],
-     :width => 120, :choose => "Apricots" do |list|
-       @fruit.text = list
+   list_box items: ["Grapes", "Pears", "Apricots"],
+     width: 120, choose: "Apricots" do |list|
+       @fruit.text = list.text
    end
  
    @fruit = para "No fruit selected"
@@ -3347,6 +3358,8 @@ Selects the option in the list box that matches the string given by `item`.
 Moves focus to the list box. The list box will be highlighted and, if the user
 hits the up and down arrow keys, other options in the list will be selected.
 
+'''Note:''' Green Shoes doesn't support `focus` method.
+
 === items() » an array of strings ===
 
 Returns the complete list of strings that the list box presently shows as its options.

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 176
+  - 179
   - 0
-  version: 0.176.0
+  version: 0.179.0
 platform: ruby
 authors: 
 - ashbb
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-03 00:00:00 +09:00
+date: 2011-03-05 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency