purple_shoes 0.0.126 → 0.5.149

data/lib/shoes/helper_methods.rb

@@ -10,6 +10,10 @@ class Shoes
       @margin_bottom ||= margin_bottom
     end
 
+    def hided
+      @app.hided or @hided
+    end
+
     def click &blk
       @app.clickable self, :click, &blk
     end
@@ -18,12 +22,23 @@ class Shoes
       @app.clickable self, :release, &blk
     end
 
-    attr_reader :margin_left, :margin_top, :margin_right, :margin_bottom
+    def hover &blk
+      @hover_proc = blk
+      (@app.mhcs << self) unless @app.mhcs.include? self
+    end
+
+    def leave &blk
+      @leave_proc = blk
+      (@app.mhcs << self) unless @app.mhcs.include? self
+    end
+
+    attr_reader :margin_left, :margin_top, :margin_right, :margin_bottom, :hover_proc, :leave_proc
+    attr_accessor :hovered
   end
   
   module Mod2
     def init_app_vars
-      @contents, @mmcs, @mscs, @order = [], [], [], []
+      @contents, @mmcs, @mscs, @mhcs, @order = [], [], [], [], []
       @location = '/'
       @mouse_button, @mouse_pos = 0, [0, 0]
       @fill, @stroke = black, black
@@ -224,7 +239,9 @@ class Shoes
     vb = app.shell.getVerticalBar
     vb.setVisible(scrollable_height > h)
     if scrollable_height > h
-      vb.setMaximum scrollable_height - h + 12
+      vb.setThumb h * h / scrollable_height
+      vb.setMaximum scrollable_height - h + vb.getThumb
+      vb.setIncrement h / 2
     else
       location = app.cs.getLocation
       location.y = 0
@@ -245,6 +262,30 @@ class Shoes
   def self.mouse_motion_control app
     app.mmcs.each{|blk| blk[*app.mouse_pos]}
   end
+  
+  def self.mouse_hover_control app
+    app.mhcs.each do |e|
+      if mouse_on?(e) and !e.hovered
+        e.hovered = true
+        e.hover_proc[e] if e.hover_proc
+      end
+    end
+  end
+
+  def self.mouse_leave_control app
+    app.mhcs.each do |e|
+      if !mouse_on?(e) and e.hovered
+        e.hovered = false
+        e.leave_proc[e] if e.leave_proc
+      end
+    end
+  end
+  
+  def self.mouse_on? e
+    mb, mx, my = e.app.mouse
+    dx, dy = e.is_a?(Star) ? [e.width / 2.0, e.height / 2.0] : [0, 0]
+    e.left - dx <= mx and mx <= e.left - dx + e.width and e.top - dy <= my and my <= e.top - dy + e.height
+  end
 
   def self.mouse_shape_control app
     flag = false

data/lib/shoes/main.rb

@@ -77,6 +77,8 @@ class Shoes
         app.mouse_pos = [e.x, e.y]
         Shoes.mouse_motion_control app
         Shoes.mouse_shape_control app
+        Shoes.mouse_hover_control app
+        Shoes.mouse_leave_control app
       end
     end
     cs.addMouseMoveListener mml

data/lib/shoes/slot.rb

@@ -19,14 +19,24 @@ class Shoes
       (@parent.contents << self) unless @nocontrol
 
       if block_given?
+        if args[:hidden]
+          @hided = true
+          BASIC_ATTRIBUTES_DEFAULT.merge! hidden: true
+          SLOT_ATTRIBUTES_DEFAULT.merge! hidden: true
+          @hidden_flag = true unless @parent.instance_variable_get '@hidden'
+        end
         yield
+        if @hidden_flag
+          BASIC_ATTRIBUTES_DEFAULT.delete :hidden
+          SLOT_ATTRIBUTES_DEFAULT.delete :hidden
+        end
         @app.cslot = @parent
       else
         @left = @top = 0
       end
     end
 
-    attr_accessor :contents
+    attr_accessor :contents, :ln
     attr_reader :parent, :initials
     attr_writer :app
 
@@ -74,6 +84,11 @@ class Shoes
         tmp = self.is_a?(Stack) ? Stack.new(@app.slot_attributes(args), &blk) : Flow.new(@app.slot_attributes(args), &blk)
         self.contents = tmp.contents
         contents.each{|e| e.parent = self if e.is_a? Basic}
+      elsif !@app.cs.isDisposed
+        @app.cs.removeListener Swt::SWT::MouseDown, ln if ln
+        @app.cs.removeListener Swt::SWT::MouseUp, ln if ln
+        @app.mscs -= [self]
+        @app.mhcs -= [self]
       end
       @app.flush
     end
@@ -88,9 +103,19 @@ class Shoes
       yield
       self.contents += tmp
       @app.cslot = cslot
-      Shoes.call_back_procs @app
+      @app.aflush
+    end
+
+    def before e, &blk
+      prepend contents.index(e).to_i, &blk
     end
     
+    def after e, &blk
+      n = contents.index e
+      n = n ? n+1 : contents.length
+      prepend n, &blk
+    end
+
     def show
       @hided = true
       toggle

data/lib/shoes/style.rb

@@ -8,7 +8,8 @@ class Shoes
   end
 
   class Basic
-    def style args
+    def style args = nil
+      return @args unless args
       set_args args
       @app.cs.redraw @left, @top, @width, @height, false unless @app.cs.isDisposed
     end
@@ -21,7 +22,8 @@ class Shoes
   end  
 
   class Star < ShapeBase
-    def style args
+    def style args = nil
+      return @args unless 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
@@ -29,7 +31,8 @@ class Shoes
   end
 
   class TextBlock
-    def style args
+    def style args = nil
+      return @args unless args
       set_args args
       return if @app.cs.isDisposed
 

data/samples/sample43.rb

@@ -6,7 +6,11 @@ Shoes.app do
     status = para "One moment..."
     msg = para '0%'
     dl = download "http://antwrp.gsfc.nasa.gov/apod/image/1009/venusmoon_pascual_big.jpg",
-      save: "venusmoon_pascual_big.jpg"
+      save: "venusmoon_pascual_big.jpg" do
+      status.text = "Okay, is downloaded."
+      status.style stroke: orangered
+      image("venusmoon_pascual_big.jpg", width: 580, height: 380).move 10, 100
+    end
 
     pg = progress left: 10, top: 100, width: width - 20
     a = animate do
@@ -15,9 +19,6 @@ Shoes.app do
         msg.text = "%2d%" % (pg.fraction * 100)
       end
       if dl.finished?
-        status.text = "Okay, is downloaded."
-        status.style stroke: orangered
-        image("venusmoon_pascual_big.jpg", width: 580, height: 380).move 10, 100
         pg.hide
         a.stop
       end

data/samples/sample52.rb

@@ -0,0 +1,33 @@
+require 'purple_shoes'
+
+Shoes.app do
+ extend HH::Markup
+ colors = {
+    :comment => {:stroke => "#bba"},
+    :keyword => {:stroke => "#FCF91F"},
+    :method => {:stroke => "#C09"},
+    :symbol => {:stroke => "#9DF3C6"},
+    :string => {:stroke => "#C9F5A5"},
+    :number => {:stroke => "#C9F5A5"},
+    :regex => {:stroke => "#000", :fill => "#FFC" },
+    :attribute => {:stroke => "#C9F5A5"},
+    :expr => {:stroke => "#f33" },
+    :ident => {:stroke => "#6e7"},
+    :any => {:stroke => "#FFF"},
+    :constant => {:stroke => "#55f"},
+    :class => {:stroke => "#55f"},
+    :matching => {:stroke => "#f00"},
+  }
+  code = IO.read(ask_open_file)
+  button 'change color' do
+    @slot.clear do
+      background gray 0.1
+      para *highlight(code, nil, colors)
+    end
+    aflush
+  end
+  @slot = stack do
+    background gainsboro
+    para *highlight(code)
+  end
+end

data/static/manual-en.txt

@@ -126,7 +126,7 @@ Still, Shoes does have a few widgets like buttons and edit boxes. And many
 missing elements (like tabbed controls or toolbars) can be simulated with
 images.
 
-Shoes is written in part thanks to a very good graphical widget toolkit called '''SWT'''. 
+Purple Shoes is written in part thanks to a very good graphical widget toolkit called '''SWT'''. 
 In this way, Shoes is inspired by NodeBox and Processing, two very good languages 
 for drawing animated graphics.
 
@@ -1000,6 +1000,7 @@ query google's search engine.
 '''Note:''' Purple Shoes doesn't support the `:method`, `:headers` and `:body` styles.
 
 {{{
+ # Not yet available
  include Hpricot
  Shoes.app do
    status = para "One moment..."
@@ -1014,11 +1015,6 @@ query google's search engine.
  end
 }}}
 
-As you can see from the above example, Purple Shoes includes the Hpricot
-library for parsing HTML.
-
-'''Note:''' Windows platform only so far.
-
 === location() » a string ===
 
 Gets a string containing the URL of the current app.
@@ -1095,16 +1091,16 @@ available on every element and slot.
 Most styles can also be set by calling them as methods.  (I'd use the manual
 search to find the method.)
 
-'''Note:''' Purple Shoes doesn't support them as methods.
+'''Note:''' Purple Shoes supports them as methods, but needs to add `flush`.
 
 {{{
- # Not yet available
  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.stroke = choose.call; s.fill = choose.call
+     flush
    end
  end
 }}}
@@ -1196,7 +1192,7 @@ Indicates whether the `:top` and `:left` coordinates refer to the center of the
 shape or not.  If set to `true`, this is similar to setting the
 [[Art.transform]] method to `:center`.
 
-'''Note:''' Purple Shoes doesn't support `:center` style.
+'''Note:''' Purple Shoes supports `:center` style only for oval and rect for now.
 
 === :change » a proc ===
 
@@ -1348,9 +1344,6 @@ displayed on the screen.  Neither are its children.
  end
 }}}
 
-'''Note:''' Purple Shoes supports `:hidden` style for only slots, shapes, textblocks 
-and images so far.
-
 === :inner » a number ===
 
 For: ''star''.
@@ -1483,7 +1476,7 @@ scrollbar will appear and disappear as needed.  It will also appear inside the
 width of the slot, meaning the slot's width will never change, regardless of
 whether there is a scrollbar or not.
 
-'''Note:''' Purple Shoes has restrictions. `:scroll` style is just a trial so far.
+'''Note:''' Purple Shoes doesn't support `:scroll` style.
 
  * common Slot instance methods, i.e. clear, hide, etc., don't work well
  * doesn't manage any mouse events 
@@ -1785,7 +1778,7 @@ setting `:angle1` to 0 and `:angle2` to `2*Math::PI`.)
    cap :curve
  
    a = animate 12 do |i|
-     @e.remove if @e
+     @e.clear if @e
      r = i * (Math::PI * 0.01)
      @e = arc 100, 50, 180, 360, 0, r
      a.stop if r >= 2*Math::PI
@@ -1841,7 +1834,8 @@ To draw a star with an image pattern:
 {{{
  #!ruby
  Shoes.app do
-   fill File.join(DIR, "../static/gshoes-icon.png")
+   fill File.join(DIR,
+     "../static/purple_shoes-icon.png")
    star 200, 200, 5, 100, 50
  end
 }}}
@@ -1897,8 +1891,6 @@ Draw circular form using a style hash.  The following styles are supported:
 
 These styles may also be altered using the `style` method on the Shape object.
 
-'''Note:''' Purple Shoes doesn't support `center` style.
-
 === rect(top, left, width, height) » Shoes::Rect ===
 
 Draws a rectangle starting from coordinates (top, left) with dimensions of
@@ -1932,8 +1924,6 @@ Draw a rectangle using a style hash.  The following styles are supported:
 
 These styles may also be altered using the `style` method on the Shape object.
 
-'''Note:''' Purple Shoes doesn't support `center` style.
-
 === rotate(degrees: a number) » self ===
 
 Rotates the pen used for drawing by a certain number of `degrees`, so that any
@@ -1945,7 +1935,7 @@ In this example below, the rectangle drawn at (30, 30) will be rotated 45 degree
  #!ruby
  Shoes.app do
    fill "#333"
-   rotate 45
+   rotate 45, 30, 30
    rect 30, 30, 40, 40
  end
 }}}
@@ -1962,7 +1952,7 @@ and arcs and bends.
    fill yellow
    shape do
      move_to 50, 30
-     curve_to 100, 100, 10, 20, 100, 50
+     quad_to 100, 100, 80, 20
      line_to 20, 100
      line_to 30, 30
    end
@@ -1975,7 +1965,7 @@ the other methods in this [[Art]] section) inside a shape, but they will not be
 part of the line.  They will be more like a group of shapes are all drawn as
 one.
 
-'''Note:''' The above `line_to`, `move_to` and `curve_to` are Cairo::Context methods. 
+'''Note:''' The above `line_to`, `move_to` and `quad_to` are SWT methods. 
 Purple Shoes uses them directly inside the block. So, Purple Shoes doesn't support `arc_to`.
 Also Purple Shoes shape can not contain other shapes.
 
@@ -2397,18 +2387,18 @@ Whenever a key (or combination of keys) is pressed, the block gets called.  The
 block is sent a `key` which is a string representing the character (such as the
 letter or number) on the key. 
 
-So, for example, if `Shift-a` is pressed, the block will get the string `"Shift_L"` and `"A"`.
+So, for example, if `Shift-a` is pressed, the block will get the string `"SHIFT"` and `"A"`.
 
 And if the `F1` key is pressed, the `"F1"` string is received. 
 
-The left side modifier keys are `"Control_L"`, `"Shift_L"` and `"Alt_L"`.  They appear in that order.
+The modifier keys are `"CTRL"`, `"SHIFT"` and `"ALT"`.  They appear in that order.
 If `Shift-Control-Alt-PgUp` is pressed, the strings will be
-`"Shift_L"`, `"Control_L"`, `"Alt_L"` and `"Page_Up"`.
+`"SHIFT"`, `"CTRL"`, `"ALT"` and `"PAGE_UP"`.
 
 One thing about the shift key.  On
-US keyboards, `Shift-7` is an ampersand.  So you'll get the string `"Shift_L"` and `"ampersand"` rather
-than `"Shift_L"` and `"7"`.  And, if you press `Shift-Alt-7` on such a keyboard, you'll
-get the strings: `"Shift_L"`, `"Alt_L"` and `"ampersand"`.  
+US keyboards, `Shift-7` is an ampersand.  So you'll get the string `"SHIFT"` and `"&"` rather
+than `"SHIFT"` and `"7"`.  And, if you press `Shift-Alt-7` on such a keyboard, you'll
+get the strings: `"SHIFT"`, `"ALT"` and `"&"`.  
 
 {{{
  #!ruby
@@ -3349,7 +3339,7 @@ You can use web URLs directly as well.
 {{{
  #!ruby
  Shoes.app do
-   image "http://is.gd/c0mBtb"
+   image "http://is.gd/GVAGF7"
  end
 }}}
 
@@ -3393,10 +3383,11 @@ Rotates the Image element by a certain number of `degrees`.
 
 {{{
  Shoes.app do
-   img = image File.join(DIR, '../samples/cy.png')
-   img.move 200, 200
+   g = image File.join(DIR, '../samples/cy.png')
+   g.move 200, 200
    animate do |i|
-     img.rotate i*10
+     g.rotate = 
+       [i*10, g.left+g.width/2, g.top+g.height/2]
    end
  end
 }}}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: purple_shoes
 version: !ruby/object:Gem::Version
-  version: 0.0.126
+  version: 0.5.149
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-10 00:00:00.000000000 Z
+date: 2012-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: swt
-  requirement: &17597616 !ruby/object:Gem::Requirement
+  requirement: &16443456 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17597616
+  version_requirements: *16443456
 description: Purple Shoes is one of colorful Shoes, written in JRuby and SWT.
 email: ashbbb@gmail.com
 executables:
@@ -33,6 +33,10 @@ files:
 - VERSION
 - bin/pshoes
 - bin/pshoes.bat
+- lib/ext/highlighter.rb
+- lib/ext/highlighter/common.rb
+- lib/ext/highlighter/lang/ruby.rb
+- lib/ext/highlighter/markup.rb
 - lib/plugins/video.rb
 - lib/purple_shoes.rb
 - lib/shoes/anim.rb
@@ -153,6 +157,7 @@ files:
 - samples/sample49.rb
 - samples/sample5.rb
 - samples/sample50.rb
+- samples/sample52.rb
 - samples/sample58.rb
 - samples/sample6.rb
 - samples/sample7.rb
@@ -207,6 +212,7 @@ files:
 - snapshots/sample49.png
 - snapshots/sample5.png
 - snapshots/sample50.png
+- snapshots/sample52.png
 - snapshots/sample58.png
 - snapshots/sample6.png
 - snapshots/sample7.png
@@ -215,6 +221,7 @@ files:
 - snapshots/sample99.png
 - static/code_highlighter.js
 - static/code_highlighter_ruby.js
+- static/downloading.png
 - static/man-editor-notepad.png
 - static/man-editor-osx.png
 - static/man-ele-background.png