purple_shoes 0.0.115 → 0.0.126

data/VERSION

@@ -1 +1 @@
-0.0.115
+0.0.126

data/lib/purple_shoes.rb

@@ -10,6 +10,9 @@ Types = module Shoes; self end
 module Shoes
   DIR = Pathname.new(__FILE__).realpath.dirname.to_s
   FONTS = []
+  LINK_DEFAULT = {underline: true}
+  BANNER_DEFAULT, TITLE_DEFAULT, SUBTITLE_DEFAULT, TAGLINE_DEFAULT, CAPTION_DEFAULT, PARA_DEFAULT, INSCRIPTION_DEFAULT = 
+    {}, {}, {}, {}, {}, {}, {}
   SHOES_VERSION = IO.read(File.join(DIR, '../VERSION')).chomp
   BASIC_ATTRIBUTES_DEFAULT = {left: 0, top: 0, width: 0, height: 0, angle: 0, curve: 0}
   SLOT_ATTRIBUTES_DEFAULT = {left: nil, top: nil, width: 1.0, height: 0}

data/lib/shoes/app.rb

@@ -11,6 +11,7 @@ class Shoes
       end
       init_app_vars
       @top_slot, @cslot = nil, self
+      Shoes.APPS << self
     end
     
     attr_accessor :cslot, :top_slot, :contents, :mmcs, :mscs, :order, :mouse_pos, :hided
@@ -51,19 +52,20 @@ class Shoes
     def click &blk
       if blk
         app = self
-        ln = Swt::Listener.new
-        class << ln; self end.
-        instance_eval do
-          define_method :handleEvent do |e|
-            blk[*app.mouse]
+        Swt::Listener.new.tap do |ln|
+          class << ln; self end.
+          instance_eval do
+            define_method(:handleEvent){|e| blk[*app.mouse]}
+            define_method(:clear){app.cs.removeListener Swt::SWT::MouseDown, ln}
           end
+          @cs.addListener Swt::SWT::MouseDown, ln unless @cs.isDisposed
         end
-        @cs.addListener Swt::SWT::MouseDown, ln unless @cs.isDisposed
       end
     end
     
     def textblock klass, font_size, *msg
       args = msg.last.class == Hash ? msg.pop : {}
+      args = eval("#{klass.to_s[7..-1].upcase}_DEFAULT").merge args
       args = basic_attributes args
       args[:markup] = msg.map(&:to_s).join
 
@@ -152,10 +154,14 @@ class Shoes
       end
     end
 
-    def button name, args={}
+    def buttonbase klass, name, args, &blk
       args = basic_attributes args
-      b = Swt::Button.new @cs, Swt::SWT::NULL
-      b.setText name
+      args[:block] = blk
+      opt = if klass == Button then Swt::SWT::NULL
+        elsif klass == Radio then Swt::SWT::RADIO
+        elsif klass == Check then Swt::SWT::CHECK end
+      b = Swt::Button.new @cs, opt
+      b.setText name if klass == Button
       b.setLocation args[:left], args[:top]
       if args[:width] > 0 and args[:height] > 0
         b.setSize args[:width], args[:height]
@@ -163,31 +169,25 @@ class Shoes
         b.pack
       end
       args[:real], args[:text], args[:app] = b, name, self
-      Button.new(args).tap do |s|
+      klass.new(args).tap do |s|
         b.addSelectionListener do |e|
-          yield s
-        end if block_given?
+          klass == Button ? blk[s] : (blk[s] if b.getSelection)
+        end if blk
       end
     end
 
+    def button name, args={}, &blk
+      buttonbase Button, name, args, &blk
+    end
+
     def radio args={}, &blk
-      args = basic_attributes args
-      args[:block] = blk
-      b = Swt::Button.new @cs, Swt::SWT::RADIO
-      b.setLocation args[:left], args[:top]
-      if args[:width] > 0 and args[:height] > 0
-        b.setSize args[:width], args[:height]
-      else
-        b.pack
-      end
-      args[:real], args[:app] = b, self
-      Radio.new(args).tap do |s|
-        b.addSelectionListener do |e|
-          blk[s] if b.getSelection
-        end if blk
-      end
+      buttonbase Radio, nil, args, &blk
     end
     
+    def check args={}, &blk
+      buttonbase Check, nil, args, &blk
+    end
+
     def edit_text attrs
       klass, w, h, style, blk, attrs = attrs
       args = attrs.last.class == Hash ? attrs.pop : {}
@@ -251,13 +251,15 @@ class Shoes
     end
     
     def keypress &blk
-      kl = Swt::KeyListener.new
-      class << kl; self end.
-      instance_eval do
-        define_method(:keyPressed){|e| blk[KEY_NAMES[e.keyCode] || e.character.chr]}
-        define_method(:keyReleased){|e|}
+      Swt::KeyListener.new.tap do |kl|
+        class << kl; self end.
+        instance_eval do
+          define_method(:keyPressed){|e| blk[KEY_NAMES[e.keyCode] || e.character.chr]}
+          define_method(:keyReleased){|e|}
+          define_method(:clear){Shoes.shell.removeKeyListener kl}
+        end
+        @shell.addKeyListener kl
       end
-      @shell.addKeyListener kl
     end
     
     def mouse
@@ -280,6 +282,7 @@ class Shoes
         instance_eval do
           define_method :paintControl do |e|
             unless s.hided
+              s.real = Swt::Path.new(Shoes.display) if s.real.isDisposed
               gc = e.gc
               Shoes.dps_reset s.dps, gc
               gc.setAntialias Swt::SWT::ON
@@ -679,6 +682,7 @@ class Shoes
 
     def close
       @shell.close
+      Shoes.APPS.delete self
     end
 
     def flush

data/lib/shoes/basic.rb

@@ -73,15 +73,17 @@ class Shoes
     end
 
     def clear
-      @app.cs.removePaintListener pl if pl
-      @app.cs.removeListener Swt::SWT::MouseDown, ln if ln
-      @app.cs.removeListener Swt::SWT::MouseUp, ln if ln
-      @real.dispose unless @real.is_a? Symbol
-      @dps.each{|dp| dp.dispose if dp}
-      @dps.clear
-      @parent.contents -= [self]
-      @app.mscs -= [self]
-      hide
+      unless @app.cs.isDisposed
+        @app.cs.removePaintListener pl if pl
+        @app.cs.removeListener Swt::SWT::MouseDown, ln if ln
+        @app.cs.removeListener Swt::SWT::MouseUp, ln if ln
+        @real.dispose unless @real.is_a? Symbol
+        @dps.each{|dp| dp.dispose if dp}
+        @dps.clear
+        @parent.contents -= [self]
+        @app.mscs -= [self]
+        hide
+      end
     end
     
     def show
@@ -158,7 +160,7 @@ class Shoes
   class Star < ShapeBase
     def move3 x, y
       unless @app.cs.isDisposed
-        w, h = @width + 1, @height + 1
+        w, h = @width + @strokewidth + 1, @height + @strokewidth + 1
         hw, hh = w / 2, h / 2
         @app.cs.redraw @left - hw, @top - hh, w, h, false
         @app.cs.redraw x-hw, y - hh, w, h, false
@@ -167,6 +169,12 @@ class Shoes
     end
   end
   class Shape < ShapeBase
+    def move3 x, y
+      unless @app.cs.isDisposed
+        real.dispose
+      end
+      @left, @top = x, y
+    end
     def move_to x, y
       real.moveTo x + left, y + top
     end
@@ -190,6 +198,7 @@ class Shoes
     def text= s
       style markup: s
     end
+    alias :replace :text=
     def positioning x, y, max
       self.text = @args[:markup]
       super.tap{|s| s.height += (@margin_top + @margin_bottom) if s == self}
@@ -249,6 +258,7 @@ class Shoes
     end
   end
   class Radio < ToggleButton; end
+  class Check < ToggleButton; end
 
   class EditLine < Native; end
   class EditBox < Native; end

data/lib/shoes/helper_methods.rb

@@ -60,12 +60,12 @@ class Shoes
         class << ln; self end.
         instance_eval do
           define_method :handleEvent do |e|
+            mb, mx, my = e.button, e.x, e.y
             if s.is_a?(Link) and !s.parent.hided
-              mouse_x, mouse_y = e.x, e.y
-              blk[s] if ((s.pl..(s.pl+s.pw)).include?(mouse_x) and (s.sy..s.ey).include?(mouse_y) and !((s.pl..s.sx).include?(mouse_x) and (s.sy..(s.sy+s.lh)).include?(mouse_y)) and !((s.ex..(s.pl+s.pw)).include?(mouse_x) and ((s.ey-s.lh)..s.ey).include?(mouse_y)))
+              blk[mb, mx, my] if ((s.pl..(s.pl+s.pw)).include?(mx) and (s.sy..s.ey).include?(my) and !((s.pl..s.sx).include?(mx) and (s.sy..(s.sy+s.lh)).include?(my)) and !((s.ex..(s.pl+s.pw)).include?(mx) and ((s.ey-s.lh)..s.ey).include?(my)))
             elsif !s.is_a?(Link) and !s.hided
               dx, dy = s.is_a?(Star) ? [s.width / 2.0, s.height / 2.0] : [0, 0]
-              blk[s] if s.left - dx <= e.x and e.x <= s.left - dx + s.width and s.top - dy <= e.y and e.y <= s.top - dy + s.height
+              blk[mb, mx, my] if s.left - dx <= mx and mx <= s.left - dx + s.width and s.top - dy <= my and my <= s.top - dy + s.height
             end
           end
         end
@@ -127,7 +127,7 @@ class Shoes
           when :code
             font = "Lucida Console"
           when :link
-            cmds << "underline = true"
+            (cmds << "underline = true") if LINK_DEFAULT[:underline]
             fg = Swt::Color.new Shoes.display, *blue
             spos = tl.getLocation e[1].first, false
             epos = tl.getLocation e[1].last, true

data/lib/shoes/main.rb

@@ -1,11 +1,14 @@
 class Shoes
   $urls = {}
+  APPS = []
   include Swt
   
   def self.display
     @display
   end
   
+  def self.APPS; APPS end
+  
   def self.app args={}, &blk
     args[:width] ||= 600
     args[:height] ||= 500
@@ -89,6 +92,7 @@ class Shoes
   
     if @main_app == app
       while !shell.isDisposed do
+        APPS.each{|a| APPS.delete a if a.shell.isDisposed}
         @display.sleep unless @display.readAndDispatch
       end
       @display.dispose

data/lib/shoes/style.rb

@@ -1,4 +1,12 @@
 class Shoes
+  class App
+    def style klass, args={}
+      if klass.superclass == Shoes::TextBlock or klass == Shoes::Link
+        eval("#{klass.to_s[7..-1].upcase}_DEFAULT").clear.merge! args
+      end
+    end
+  end
+
   class Basic
     def style args
       set_args args
@@ -11,7 +19,15 @@ class Shoes
       @args.each{|k, v| instance_variable_set "@#{k}", v}
     end
   end  
-  
+
+  class Star < ShapeBase
+    def style args
+      set_args args
+      w, h = @width+@strokewidth+1, @height+@strokewidth+1
+      @app.cs.redraw @left-w/2 , @top-h/2, w, h, false unless @app.cs.isDisposed
+    end
+  end
+
   class TextBlock
     def style args
       set_args args

data/static/manual-en.txt

@@ -966,8 +966,8 @@ Another simple use of `download` is to save some web data to a file, using the
  
      download "http://is.gd/GVAGF7",
        :save => "nasa50th.gif" do
-	@status.text = "Okay, is downloaded."
-	image "nasa50th.gif", top: 100
+        @status.text = "Okay, is downloaded."
+        image "nasa50th.gif", top: 100
      end
    end
  end
@@ -1081,13 +1081,11 @@ app, a center `:align` style and 50 font `:size` style.
 The style hash can also be changed by using the [[Common.style]] method,
 available on every element and slot.
 
-'''Note:''' Purple Shoes can change style hash on Shape element only so far.
-
 {{{
  Shoes.app title: "A Styling Sample" do
    choose = 
      lambda{[red, blue, green, yellow].sample}
-   s = star 100, 50, 30, 200, 180, strokewidth: 5
+   s = star 300, 250, 30, 200, 180, strokewidth: 5
    button 'change colors' do
      s.style stroke: choose.call, fill: choose.call
    end
@@ -2964,7 +2962,7 @@ method again.  So, to set the button to 150 pixels wide: `@b.style(width: 150)`.
 
 A background is a color, a gradient or an image that is painted across an
 entire slot.  Both backgrounds and borders are a type of Shoes::Pattern.
-!{:margin_left => 100}man-ele-background.png!
+!{:margin_left => 70}man-ele-background.png!
 
 Even though it's called a ''background'', you may still place this element in
 front of other elements.  If a background comes after something else painted on
@@ -3019,7 +3017,7 @@ backgrounds and borders.  Reuse it as you like.
 
 A border is a color, gradient or image painted in a line around the edge of any
 slot.  Like the Background element in the last section, a Border is a kind of
-Shoes::Pattern. !{:margin_left => 100}man-ele-border.png!
+Shoes::Pattern. !{:margin_left => 70}man-ele-border.png!
 
 The first, crucial thing to know about border is that all borders paint a line
 around the '''inside''' of a slot, not the outside.  So, if you have a slot
@@ -3076,7 +3074,7 @@ backgrounds.
 
 Buttons are, you know, push buttons.  You click them and they do something.
 Buttons are known to say "OK" or "Are you sure?"  And, then, if you're sure,
-you click the button. !{:margin_left => 100}man-ele-button.png!
+you click the button. !{:margin_left => 70}man-ele-button.png!
 
 {{{
  #!ruby
@@ -3144,7 +3142,7 @@ hits Enter, the button will be clicked.
 
 Check boxes are clickable square boxes than can be either checked or unchecked.
 A single checkbox usually asks a "yes" or "no" question.  Sets of checkboxes
-are also seen in to-do lists. !{:margin_left => 100}man-ele-check.png!
+are also seen in to-do lists. !{:margin_left => 70}man-ele-check.png!
 
 Here's a sample checklist.
 
@@ -3224,7 +3222,7 @@ Enter, the check will be toggled between its checked and unchecked states.
 
 Edit boxes are wide, rectangular boxes for entering text.  On the web, they
 call these textareas.  These are multi-line edit boxes for entering longer
-descriptions.  Essays, even! !{:margin_left => 100}man-ele-editbox.png!
+descriptions.  Essays, even! !{:margin_left => 70}man-ele-editbox.png!
 
 Without any other styling, edit boxes are sized 200 pixels by 108 pixels.  You
 can also use `:width` and `:height` styles to set specific sizes.
@@ -3281,7 +3279,7 @@ Fills the edit box with the characters of `a string`.
 
 Edit lines are a slender, little box for entering text. While the EditBox is
 multi-line, an edit line is just one. Line, that is. Horizontal, in fact.
-!{:margin_left => 100}man-ele-editline.png!
+!{:margin_left => 70}man-ele-editline.png!
 
 The unstyled edit line is 200 pixels wide and 28 pixels wide. Roughly. The
 height may vary on some platforms.
@@ -3329,7 +3327,7 @@ Fills the edit line with the characters of `a string`.
 
 An image is a picture in PNG, JPEG or GIF format. Purple Shoes can resize images or
 flow them in with text. Images can be loaded from a file or directly off the
-web. !{:margin_left => 100}man-ele-image.png!
+web. !{:margin_left => 70}man-ele-image.png!
 
 To create an image, use the `image` method in a slot:
 
@@ -3407,7 +3405,7 @@ Rotates the Image element by a certain number of `degrees`.
 
 List boxes (also called "combo boxes" or "drop-down boxes" or "select boxes" in
 some places) are a list of options that drop down when you click on the box.
-!{:margin_left => 100}man-ele-listbox.png!
+!{:margin_left => 70}man-ele-listbox.png!
 
 A list box gets its options from an array.  An array (a list) of strings,
 passed into the `:items` style.
@@ -3481,7 +3479,7 @@ now. If nothing is selected, `nil` will be the reply.
 Progress bars show you how far along you are in an activity. Usually, a
 progress bar represents a percentage (from 0% to 100%.) Purple Shoes thinks of
 progress in terms of the decimal numbers 0.0 to 1.0. !{:margin_left =>
-100}man-ele-progress.png!
+70}man-ele-progress.png!
 
 A simple progress bar is 150 pixels wide, but you can use the `:width` style
 (as with all Purple Shoes elements) to lengthen it.
@@ -3515,7 +3513,7 @@ Sets the progress to a decimal number between 0.0 and 1.0.
 Radio buttons are a group of clickable circles. Click a circle and it'll be
 marked. Only one radio button can be marked at a time. (This is similar to the
 ListBox, where only one option can be selected at a time.) !{:margin_left =>
-100}man-ele-radio.png!
+70}man-ele-radio.png!
 
 So, how do you decide when to use radio buttons and when to use list boxes?
 Well, list boxes only show one highlighted item unless you click on the box and
@@ -3623,7 +3621,7 @@ Moves focus to the radio. The radio will be highlighted.
 == Shape ==
 
 A shape is a path outline usually created by drawing methods like `oval` and
-`rect`. !{:margin_left => 100}man-ele-shape.png!
+`rect`. !{:margin_left => 70}man-ele-shape.png!
 
 See the [[Common]] methods page.  Shapes respond to all of those methods.
 
@@ -3632,7 +3630,7 @@ See the [[Common]] methods page.  Shapes respond to all of those methods.
 The TextBlock object represents a group of text organized as a single element.
 A paragraph containing bolded text, for example. A caption containing links and
 bolded text. (So, a `caption` is a TextBlock type.  However, `link` and
-`strong` are Text types.) !{:margin_left => 100}man-ele-textblock.png!
+`strong` are Text types.) !{:margin_left => 70}man-ele-textblock.png!
 
 All of the various types of TextBlock are found on the [[Element Element
 Creation]] page.
@@ -3784,7 +3782,7 @@ already running, it is stopped.
 == Video ==
 
 Purple Shoes supports embedding of MP4, AVI, WMV, QuickTime and various other popular video formats. 
-This is all thanks to Ruby/GStreamer. Use the `video` method to setup a Shoes::Video object. !{:margin_left => 70}man-ele-video.png!
+This is all thanks to Ruby/GStreamer. Use the `video` method to setup a Shoes::Video object. !{:margin_left => 30}man-ele-video.png!
 
 {{{
  Shoes.app width: 400, height: 300 do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: purple_shoes
 version: !ruby/object:Gem::Version
-  version: 0.0.115
+  version: 0.0.126
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-01 00:00:00.000000000 Z
+date: 2012-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: swt
-  requirement: &18076020 !ruby/object:Gem::Requirement
+  requirement: &17597616 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18076020
+  version_requirements: *17597616
 description: Purple Shoes is one of colorful Shoes, written in JRuby and SWT.
 email: ashbbb@gmail.com
 executables: