green_shoes 1.0.303 → 1.0.309

data/VERSION

@@ -1 +1 @@
-1.0.303
+1.0.309

data/lib/green_shoes.rb

@@ -60,6 +60,7 @@ require_relative 'plugins/thread'
 require_relative 'plugins/httpd'
 require_relative 'plugins/treeview'
 require_relative 'plugins/code_box'
+require_relative 'plugins/video'
 
 autoload :ChipMunk, File.join(Shoes::DIR, 'ext/chipmunk')
 autoload :Bloops, File.join(Shoes::DIR, 'ext/bloops')

data/lib/plugins/video.rb

@@ -0,0 +1,90 @@
+class Shoes
+  class Video
+    def initialize args
+      @initials = args
+      args.each do |k, v|
+        instance_variable_set "@#{k}", v
+      end
+      Video.class_eval do
+        attr_accessor *args.keys
+      end
+      args[:real].bus.add_watch do |b, message|
+        case message.type
+          when Gst::Message::EOS
+            @eos = true; pause
+          when Gst::Message::WARNING, Gst::Message::ERROR
+            p message.parse
+          else
+            #p message.type
+        end
+        true
+      end
+      @app.win.signal_connect('destroy'){@real.stop}
+      @stime = 0
+    end
+
+    def playing?
+      @eos ? false : @playing
+    end
+
+    def play
+      if @playing
+        self.time, @eos = 0, nil
+      else
+        @stime = clock_time - seek_time
+        @ready = @playing  = true
+        (self.time, @eos = 0, nil) if @eos
+      end
+      @real.play
+    end
+
+    def pause
+      if @playing
+        @real.pause
+        @stime = clock_time - @stime
+        @playing = false
+      end
+    end
+    
+    def stop
+      @eos = true
+      @real.stop
+    end
+
+    def time
+      seek_time / 1_000_000
+    end
+
+    def time=(ms)
+      if @ready
+        t = ms * 1_000_000
+        e = Gst::EventSeek.new 1.0, Gst::Format::TIME, Gst::Seek::FLAG_FLUSH, 
+          Gst::SeekType::SET, t, Gst::SeekType::NONE, Gst::ClockTime::NONE
+        @real.send_event e
+        @stime = @playing ? clock_time - t : t
+      end
+    end
+    
+    def seek_time
+      @playing ? clock_time - @stime : @stime
+    end
+    
+    def clock_time
+      @real.clock ? @real.clock.time : 0
+    end
+  end
+end
+
+class Shoes
+  class App
+    def video uri
+      args = {}
+      uri = File.join('file://', uri.gsub("\\", '/').sub(':', '')) unless uri =~ /^(http|https|file):\/\//
+      require 'gst'
+      v = Gst::ElementFactory.make 'playbin2'
+      v.uri = uri
+      args[:real], args[:app] = v, self
+      Video.new args
+    end
+  end
+end

data/lib/shoes/helper_methods.rb

@@ -64,14 +64,24 @@ class Shoes
     def basic_attributes args={}
       default = BASIC_ATTRIBUTES_DEFAULT
       default.merge!({nocontrol: true}) if @nolayout
+      replace_string_to_float args
       default.merge args
     end
 
     def slot_attributes args={}
       default = SLOT_ATTRIBUTES_DEFAULT
+      replace_string_to_float args
       default.merge args
     end
 
+    def replace_string_to_float args={}
+      [:width, :height, :left, :top].each do |k|
+        if args[k].is_a? String
+          args[k] = args[k].include?('%') ? args[k].to_f / 100 : args[k].to_i
+        end
+      end
+    end
+
     def create_tmp_png surface
       surface.write_to_png TMP_PNG_FILE
       Gtk::Image.new TMP_PNG_FILE
@@ -165,9 +175,11 @@ class Shoes
         next
       end
       tmp = max
-      max = ele.positioning x, y, max
+      max, flag = ele.positioning x, y, max
       x, y = ele.left + ele.width, ele.top + ele.height
-      slot_height += max.height unless max == tmp
+      unless max == tmp
+        slot_height = flag ? [slot_height, y].max : slot_height + max.height
+      end
     end
     slot_height
   end

data/lib/shoes/slot.rb

@@ -58,10 +58,12 @@ class Shoes
         move3 x + parent.margin_left, max.top + parent.margin_top
         @height = Shoes.contents_alignment self
         max = self if max.height < @height
+        flag = true
       else
         move3 parent.left + parent.margin_left, max.top + max.height + parent.margin_top
         @height = Shoes.contents_alignment self
         max = self
+        flag = false
       end
       case @initials[:height]
       when 0
@@ -71,7 +73,7 @@ class Shoes
         max.height = @height = @initials[:height]
       end
       contents.each &:fix_size
-      max
+      return max, flag
     end
 
     def fix_size; end

data/samples/sample58.rb

@@ -0,0 +1,24 @@
+require '../lib/green_shoes'
+
+Shoes.app width: 300, height: 100, title: 'Teeny-weeny MP3 player' do
+  space = ' '
+  background gold..cyan, angle: 30
+  song = para 'song.mp3', stroke: firebrick, left: 0, top: 70
+  file = 'https://github.com/ashbb/teeny-weeny_mp3_player/raw/master/samples/song.mp3'
+  v = video file
+
+  para link('select'){
+    unless v.playing?
+      f = ask_open_file
+      file = f if f
+      v = video file
+      song.text = fg(file.gsub("\\", '/').split('/').last, firebrick)
+    end
+  }, space, link('play'){v.play}, space, link('pause'){v.pause}, space, link('stop'){v.stop}
+  
+  img = image Dir.pwd + '/loogink.png'
+  n = 0
+  animate 5 do
+    img.move (n+=1) % 300 , 40 - rand(10) if file && v.playing?
+  end
+end

data/static/manual-en.txt

@@ -347,7 +347,7 @@ differently.  To be sure that the end of the slot is chopped off perfectly, the
 slot becomes a '''nested window'''.  A new layer is created by the operating
 system to keep the slot in a fixed square.
 
-On difference between normal slots and nested window slots is that the latter
+One difference between normal slots and nested window slots is that the latter
 can have scrollbars.
 
 {{{
@@ -365,7 +365,7 @@ These nested windows require more memory.  They tax the application a bit more.
 So if you're experiencing some slowness with hundreds of fixed-height slots,
 try a different approach.
 
-'''Note''': Fixed height magic (the slot becomes a nested window) is not implemented 
+'''Note:''' Fixed height magic (the slot becomes a nested window) is not implemented 
 in Green Shoes so far. Scrollbar will appear automatically but at main window only.
 
 {{{
@@ -441,7 +441,7 @@ The point is: it's easy to group shapes together into image or shape blocks, so
 give it a try if you're looking to gain some speed.  Shape blocks particularly
 will save you some memory and speed.
 
-'''NOTE''': Green Shoes doesn't support this magic (grouping shapes together 
+''Note:'' Green Shoes doesn't support this magic (grouping shapes together 
 into image or shape blocks) so far.
 
 ==== UTF-8 Everywhere ====
@@ -1023,7 +1023,7 @@ query google's search engine.
 As you can see from the above example, Green Shoes includes the Hpricot
 library for parsing HTML.
 
-'''Note''': Windows platform only so far.
+'''Note:''' Windows platform only so far.
 
 === location() » a string ===
 
@@ -2319,9 +2319,7 @@ Creates a Title text block.  Green Shoes styles these elements to 34 pixels high
 
 === video(path or url) » Shoes::Video ===
 
-Embeds a movie in this slot.
-
-'''Note:''' Green Shoes doesn't support `video` method.
+Play some audio files.
 
 === window(styles) { ... } » Shoes::App ===
 
@@ -2805,8 +2803,6 @@ For specific commands, see the other links to the left in the Elements section.
 Like if you want to pause or play a video file, check the [[Video]] section,
 since pausing and playing is peculiar to videos.  No sense pausing a button.
 
-'''Note:''' Green Shoes doesn't support `video` method.
-
 === displace(left: a number, top: a number) » self ===
 
 Displacing an element moves it.  But without changing the layout around it.
@@ -3779,20 +3775,11 @@ already running, it is stopped.
 
 == Video ==
 
-Shoes supports embedding of QuickTime, Flash video (FLV), DivX, Xvid and
-various other popular video formats. This is all thanks to VideoLAN and ffmpeg,
-two sensational open source libraries. Use the `video` method on a slot to
-setup a Shoes::Video object. 
-
-'''Note:''' Green Shoes doesn't support any video formats. !{:margin_left => 100}man-ele-video.png!
+Green Shoes is trying to support embedding of MP4 video format with Ruby/GStreamer. 
+But for now, not available any video formats. Just available some audio formats, 
+such as MP3 and Ogg Vorbis.
 
-In addition to video formats, some audio formats are also supported, such as
-MP3, WAV and Ogg Vorbis.
-
-Video support is optional in Shoes and some builds do not support video. For
-example, video support is unavailable for PowerPC. When you download Shoes, the
-build for your platform will be marked `novideo` in the filename if no video
-support is available.
+'''Note:''' Green Shoes doesn't support any video formats so far. !{:margin_left => 70}man-ele-video.png!
 
 === hide() » self ===
 
@@ -3800,16 +3787,22 @@ Hides the video. If already playing, the video will continue to play. This just
 turns off display of the video. One possible use of this method is to collapse
 the video area when it is playing an audio file, such as an MP3.
 
+'''Note:''' Green Shoes doesn't support hide method so far.
+
 === length() » a number ===
 
 The full length of the video in milliseconds. Returns nil if the video is not
 yet loaded.
 
+'''Note:''' Green Shoes doesn't support length method so far.
+
 === move(left, top) » self ===
 
 Moves the video to specific coordinates, the (left, top) being the upper left
 hand corner of the video.
 
+'''Note:''' Green Shoes doesn't support move method so far.
+
 === pause() » self ===
 
 Pauses the video, if it is playing.
@@ -3830,19 +3823,27 @@ The position of the video as a decimanl number (a Float) between the beginning
 (0.0) and the end (1.0). For instance, a Float value of 0.5 indicates the
 halfway point of the video.
 
+'''Note:''' Green Shoes doesn't support position method so far.
+
 === position = a decimal ===
 
 Sets the position of the video using a Float value. To move the video to its
 25% position: `@video.position = 0.25`.
 
+'''Note:''' Green Shoes doesn't support position= method so far.
+
 === remove() » self ===
 
 Removes the video from its slot. This will stop the video as well.
 
+'''Note:''' Green Shoes doesn't support remove method so far.
+
 === show() » self ===
 
 Reveals the video, if it has been hidden by the `hide()` method.
 
+'''Note:''' Green Shoes doesn't support show method so far.
+
 === stop() » self ===
 
 Stops the video, if it is playing.
@@ -3861,6 +3862,8 @@ Set the position of the video to a time in milliseconds.
 Toggles the visibility of the video. If the video can be seen, then `hide` is
 called. Otherwise, `show` is called.
 
+'''Note:''' Green Shoes doesn't support tobble method so far.
+
 = AndSoForth =
 
 A place for some other information. 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: green_shoes
 version: !ruby/object:Gem::Version
-  version: 1.0.303
+  version: 1.0.309
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-19 00:00:00.000000000Z
+date: 2011-10-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk2
-  requirement: &16927836 !ruby/object:Gem::Requirement
+  requirement: &16500636 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16927836
+  version_requirements: *16500636
 description: Green Shoes is one of colorful Shoes, written in pure Ruby with Ruby/GTK2.
 email: ashbbb@gmail.com
 executables: []
@@ -66,6 +66,7 @@ files:
 - lib/plugins/systray.rb
 - lib/plugins/thread.rb
 - lib/plugins/treeview.rb
+- lib/plugins/video.rb
 - lib/shoes/anim.rb
 - lib/shoes/app.rb
 - lib/shoes/basic.rb
@@ -203,6 +204,7 @@ files:
 - samples/sample55.rb
 - samples/sample56.rb
 - samples/sample57.rb
+- samples/sample58.rb
 - samples/sample6.rb
 - samples/sample7.rb
 - samples/sample8.rb
@@ -268,6 +270,7 @@ files:
 - snapshots/sample55.png
 - snapshots/sample56.png
 - snapshots/sample57.png
+- snapshots/sample58.png
 - snapshots/sample6.png
 - snapshots/sample7.png
 - snapshots/sample8.png
@@ -334,7 +337,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Green Shoes