green_shoes 0.139.0 → 0.150.0

data/VERSION

@@ -0,0 +1 @@
+0.150.0

data/lib/green_shoes.rb

@@ -18,6 +18,7 @@ module Shoes
   LINK_DEFAULT = "<span underline='single' underline_color='#06E' foreground='#06E' weight='normal'>"
   LINKHOVER_DEFAULT = "<span underline='single' underline_color='#039' foreground='#039' weight='normal'>"
   ROTATE = [Gdk::Pixbuf::ROTATE_NONE, Gdk::Pixbuf::ROTATE_CLOCKWISE, Gdk::Pixbuf::ROTATE_UPSIDEDOWN, Gdk::Pixbuf::ROTATE_COUNTERCLOCKWISE]
+  VERSION = IO.read(File.join(DIR, '../VERSION')).chomp
 end
 
 class Object

data/lib/shoes/app.rb

@@ -26,8 +26,19 @@ class Shoes
     attr_reader :link_style, :linkhover_style, :animates
 
     def visit url
-      $urls.each do |k, v|
-        clear{init_app_vars; v.call self, $1} if k =~ url
+      if url =~ /^(http|https):\/\//
+        Thread.new do
+          case RUBY_PLATFORM
+          when /mingw/; system "start #{url}"
+          when /linux/; system("/etc/alternatives/x-www-browser #{url} &")
+          else
+            puts "Sorry, your platform [#{RUBY_PLATFORM}] is not supported..."
+          end
+        end
+      else
+        timer 0.001 do
+          $urls.each{|k, v| clear{init_app_vars; v.call self, $1} if k =~ url}
+        end
       end
     end
     
@@ -69,7 +80,6 @@ class Shoes
     def textblock klass, font_size, *msg
       args = msg.last.class == Hash ? msg.pop : {}
       args = basic_attributes args
-      msg = msg.map{|s| s == self ? s.to_s.gsub('<', '[').gsub('>', ']') : s}
       args[:markup] = msg.map(&:to_s).join
       attr_list, dummy_text = Pango.parse_markup args[:markup].gsub('\u0026', '@')
       dummy_attr_list, text = Pango.parse_markup args[:markup]
@@ -89,6 +99,7 @@ class Shoes
       end
       
       if args[:create_real] or !layout_control
+        args[:width] = 1 if args[:width] <= 0
         surface = Cairo::ImageSurface.new Cairo::FORMAT_ARGB32, args[:width], args[:height]
         context = Cairo::Context.new surface
         layout = context.create_pango_layout
@@ -524,6 +535,7 @@ class Shoes
       args = basic_attributes args
 
       if args[:create_real] and !args[:height].zero?
+        args[:width] = 1 if args[:width] <= 0
         surface = Cairo::ImageSurface.new Cairo::FORMAT_ARGB32, args[:width], args[:height]
         context = Cairo::Context.new surface
         context.rounded_rectangle 0, 0, args[:width], args[:height], args[:curve]
@@ -588,7 +600,11 @@ class Shoes
     end
 
     def scroll_top
-      @swin.vadjustment.value
+      @swin.vscrollbar.value
+    end
+
+    def scroll_top=(n)
+      @swin.vscrollbar.value = n
     end
   end
 end

data/lib/shoes/help.rb

@@ -6,6 +6,8 @@ class Manual < Shoes
     font LANG == 'ja' ? 'MS UI Gothic' : 'Arial'
     style Link, underline: false, weight: 'bold'
     style LinkHover, stroke: '#06E'
+    self.scroll_top = 0
+    table_of_contents.each{|toc| TOC << toc} if TOC.empty?
     manual *get_title_and_desc(pnum.to_i)
   end
   
@@ -25,6 +27,7 @@ class Manual < Shoes
       chapter, section = e
       title = section ? DOCS[chapter][1][:sections][section][1][:title] : DOCS[chapter][0]
       title = title.sub('The', '').split(' ').first
+      TOC_LIST << [title, section]
       section ? ['   ', link(title){visit "/manual/#{pnum}"}, "\n"] : [link(fg(title, darkgreen)){visit "/manual/#{pnum}"}, "\n"]
     end.flatten
   end
@@ -33,7 +36,7 @@ class Manual < Shoes
     flow do
       background tr_color("#ddd")..white, angle: 90
       background black..green, height: 90
-      para fg("The Green Shoes Manual", gray), left: 120, top: 10
+      para fg("The Green Shoes Manual #{VERSION}", gray), left: 120, top: 10
       title fg(docs_title, white), left: 120, top: 30, font: 'Coolvetica'
       image File.join(DIR, '../static/gshoes-icon.png'), left: 5, top: -12, width: 110, height: 110, nocontrol: true
 
@@ -41,7 +44,7 @@ class Manual < Shoes
 
       stack{para NL * 4}
       flow width: 0.2, margin_left: 10 do
-        para *table_of_contents
+        para *TOC
       end
         
       flow width: 0.8, margin: [10, 0, 20, 0] do
@@ -75,7 +78,7 @@ class Manual < Shoes
           n = lines[1] =~ /\#\!ruby/ ? 2 : 1
           code = lines[n...-1].join(NL+'  ')
           flow do
-            background lightsteelblue, curve: 5
+            background rgb(190, 190, 190), curve: 5
             inscription link(fg('Run this', green)){eval mk_executable(code), TOPLEVEL_BINDING}, margin_left: 480
             para '  ', fg(code, maroon), NL
           end
@@ -98,9 +101,9 @@ class Manual < Shoes
   def show_paragraph txt, intro, i, dot = nil
     txt = txt.gsub("\n", ' ').gsub(/`(.+?)`/m){fg code($1), rgb(255, 30, 0)}.
       gsub(/\^(.+?)\^/m, '\1').gsub(/'''(.+?)'''/m){strong($1)}.gsub(/''(.+?)''/m){em($1)}.
-      gsub(/\[\[BR\]\]/i, "\n").gsub(/\[\[(\S+?)\]\]/m){link ins($1.split('.').last)}.
-      gsub(/\[\[(\S+?) (.+?)\]\]/m){link ins($2)}
-    case txt
+      gsub(/\[\[BR\]\]/i, "\n")
+    txts = txt.split(/(\[\[\S+?\]\])/m).map{|s| s.split(/(\[\[\S+? .+?\]\])/m)}.flatten
+    case txts[0]
     when /\A==== (.+) ====/; caption $1, size: 24
     when /\A=== (.+) ===/; tagline $1, size: 12, weight: 'bold'
     when /\A== (.+) ==/; subtitle $1
@@ -108,7 +111,7 @@ class Manual < Shoes
     when /\A\{COLORS\}/; flow{color_page}
     when /\A\{SAMPLES\}/; flow{sample_page}
     else
-      para txt.gsub(IMAGE_RE, ''), NL, (intro and i.zero?) ? {size: 16} : ''
+      para *mk_links(txts), NL, (intro and i.zero?) ? {size: 16} : ''
       txt.gsub IMAGE_RE do
         image File.join(DIR, "../static/#{$3}"), eval("{#{$2 or "margin_left: 50"}}")
         para
@@ -116,6 +119,12 @@ class Manual < Shoes
     end
   end
 
+  def mk_links txts
+    txts.map{|txt| txt.gsub(IMAGE_RE, '')}.
+      map{|txt| txt =~ /\[\[(\S+?)\]\]/m ? (t = $1.split('.'); link(ins t.last){visit "/manual/#{find_pnum t.first}"}) : txt}.
+      map{|txt| txt =~ /\[\[(\S+?) (.+?)\]\]/m ? (url = $1; link(ins $2){visit url}) : txt}
+  end
+
   def mk_paras str
     str.split("\n\n") - ['']
   end
@@ -159,6 +168,13 @@ class Manual < Shoes
       end
     end
   end
+  
+  def find_pnum page
+    TOC_LIST.each_with_index do |e, i|
+      title, section = e
+      return i if title == page
+    end
+  end
 
   def self.load_docs path
     str = IO.read(path).force_encoding("UTF-8")
@@ -194,6 +210,7 @@ class Manual < Shoes
   DOCS = load_docs File.join(DIR, "../static/manual-#{LANG}.txt")
   PNUMS = mk_page_numbers DOCS
   PEND = PNUMS.length
+  TOC, TOC_LIST = [], []
   COLORS = Shoes::App::COLORS
 end
 

data/lib/shoes/main.rb

@@ -63,7 +63,8 @@ class Shoes
 
     app.canvas = projector ? Gtk::DrawingArea.new : Gtk::Layout.new
     swin = Gtk::ScrolledWindow.new
-    swin.set_policy Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC    
+    swin.set_policy Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC 
+    swin.vadjustment.step_increment = 10  
     swin.add app.canvas
     win.add swin
     app.canvas.style = style

data/lib/shoes/ruby.rb

@@ -37,6 +37,10 @@ class Object
     Gtk.main_quit
     File.delete Shoes::TMP_PNG_FILE if File.exist? Shoes::TMP_PNG_FILE
   end
+
+  def to_s
+    super.gsub('<', '[').gsub('>', ']')
+  end
 end
 
 class String

data/lib/shoes/slot.rb

@@ -8,7 +8,7 @@ class Shoes
       end
       
       Slot.class_eval do
-        attr_accessor *args.keys
+        attr_accessor *(args.keys - [:app])
       end
 
       set_margin
@@ -28,6 +28,11 @@ class Shoes
 
     attr_accessor :contents, :masked
     attr_reader :parent, :initials
+    attr_writer :app
+
+    def app &blk
+      blk ? @app.instance_eval(&blk) : @app
+    end
 
     def move3 x, y
       @left, @top = x, y
@@ -35,6 +40,7 @@ class Shoes
 
     def positioning x, y, max
       @width = (parent.width * @initials[:width]).to_i if @initials[:width].is_a? Float
+      @width = (parent.width + @initials[:width]) if @initials[:width] < 0
       @width -= (margin_left + margin_right)
       if parent.is_a?(Flow) and x + @width <= parent.left + parent.width
         move3 x + parent.margin_left, max.top + parent.margin_top

data/samples/sample36.rb

@@ -19,10 +19,11 @@ class Book < Shoes
         link(title){visit "/incidents/#{i}"},
         " / "
     end
-    toc[0...-1] << "\n"*3
+    toc[0...-1] << "\n"*5
   end
 
   def incident num
+    self.scroll_top = 0
     num = num.to_i
     stack  margin_left: 190 do
       banner "Incident"
@@ -34,7 +35,7 @@ class Book < Shoes
         para *table_of_contents, size: 8
       end
 
-      stack width: 460, margin_left: 10 do
+      stack width: -180, margin_left: 10 do
         INCIDENTS[num][1].split(/\n\n+/).each do |p|
           para p
         end

data/static/manual-en.txt

@@ -79,14 +79,14 @@ At first, install Ruby. On '''Windows''',
 visit the site of [[http://rubyinstaller.org/ RubyInstaller for Windows]] to 
 download '''RubyInstaller 1.9.2-p136'''.
 
-Then just do the following.
+Then just do the following one line.
 
- * gem install gtk2 --no-ri --no-rdoc
  * gem install green_shoes
 
 That's all. Too easy?
 
-''Note: green_shoes gem is now under development.''
+'''Note:''' green_shoes gem is on [[http://rubygems.org/gems/green_shoes RubyGems.org]].
+If you get some errors of rdoc, try to add `--no-ri --no-rdoc` option.
 
 ==== Step 2: Start a New Text File ====
 
@@ -263,17 +263,20 @@ Like let's say you pass around a stack object.  And you have a class that edits
 that object.
 
 {{{
- # Not yet available
  class Messenger
-   def initialize(stack)
-     @stack = stack
+   def initialize slot
+     @slot = slot
    end
-   def add(msg)
-     @stack.append do
-       para msg
-     end
+   def add msg
+     para msg rescue puts $!
    end
  end
+ 
+ Shoes.app do
+   slot = stack
+   m = Messenger.new slot
+   m.add 'hello'
+ end
 }}}
 
 So, let's assume you pass the stack object into your Messenger class when the
@@ -284,22 +287,25 @@ Nope, it won't work.  The `para` method won't be found.  The App object isn't
 around any more.  And it's the one with the `para` method.
 
 Fortunately, each Shoes object has an `app` method that will let you reopen the
-App object so you can do somefurther editing.
+App object so you can do some further editing.
 
 {{{
-# Not yet available
  class Messenger
-   def initialize(stack)
-     @stack = stack
+   def initialize slot
+     @slot = slot
    end
-   def add(msg)
-     @stack.app do
-       @stack.append do
-         para msg
-       end
+   def add msg
+     @slot.app do
+       para msg rescue puts $!
      end
    end
  end
+ 
+ Shoes.app do
+   slot = stack
+   m = Messenger.new slot
+   m.add 'hello'
+ end
 }}}
 
 As you can imagine, the `app` object changes `self` to the App object.
@@ -318,14 +324,15 @@ stack.'''
 Fixed widths on slots are great so you can split the window into columns.
 
 {{{
- # Not yet available
  Shoes.app do
    flow do
      stack :width => 200 do
+       background lavender
        caption "Column one"
        para "is 200 pixels wide"
      end
      stack :width => -200 do
+       background bisque
        caption "Column two"
        para "is 100% minus 200 pixels wide"
      end
@@ -346,7 +353,6 @@ On difference between normal slots and nested window slots is that the latter
 can have scrollbars.
 
 {{{
- # Not yet available
  Shoes.app do
    stack :width => 200, :height => 200, :scroll => true do
      background "#DFA"
@@ -361,6 +367,20 @@ 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 
+in Green Shoes so far. Scrollbar will appear automatically but at main window only.
+
+{{{
+ Shoes.app do
+   stack :width => 200 do
+     background "#DFA"
+     100.times do |i|
+       para "Paragraph No. #{i}"
+     end
+   end
+ end
+}}}
+
 ==== Image and Shape Blocks ====
 
 Most beginners start littering the window with shapes.  It's just easier to
@@ -423,6 +443,9 @@ 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 
+into image or shape blocks) so far.
+
 ==== UTF-8 Everywhere ====
 
 Ruby itself isn't Unicode aware.  And UTF-8 is a type of Unicode.  (See
@@ -430,11 +453,11 @@ Ruby itself isn't Unicode aware.  And UTF-8 is a type of Unicode.  (See
 UTF-8.)
 
 However, UTF-8 is common on the web.  And lots of different platforms support
-it.  So to cut down on the amount of conversion that Shoes has to do, Shoes
-expects all strings to be in UTF-8 format.
+it.  So to cut down on the amount of conversion that Green Shoes has to do, 
+Green Shoes expects all strings to be in UTF-8 format.
 
 This is great because you can show a myriad of languages (Russian, Japanese,
-Spanish, English) using UTF-8 in Shoes.  Just be sure that your text editor
+Spanish, English) using UTF-8 in Green Shoes.  Just be sure that your text editor
 uses UTF-8!
 
 To illustrate:
@@ -451,8 +474,8 @@ To illustrate:
 }}}
 
 This app will copy anything you paste into the edit box and display it in a
-Shoes paragraph.  You can try copying some foreign text (such as Greek or
-Japanese) into this box to see how it displays.
+Green Shoes paragraph.  You can try copying some foreign text (such as 
+Greek or Japanese) into this box to see how it displays.
 
 This is a good test because it proves that the edit box gives back UTF-8
 characters.  And the paragraph can be set to any UTF-8 characters.
@@ -473,15 +496,15 @@ UI Gothic'''.
  end
 }}}
 
-Again, anything which takes a string in Shoes will need a UTF-8 string.  Edit
-boxes, edit lines, list boxes, window titles and text blocks all take UTF-8. If
-you give a string with bad characters in it, an error will show up in the
+Again, anything which takes a string in Green Shoes will need a UTF-8 string.
+Edit boxes, edit lines, list boxes, window titles and text blocks all take UTF-8.
+If you give a string with bad characters in it, an error will show up in the
 console.
 
 ==== The Main App and Its Requires ====
 
-'''NOTE:''' This rule is for Raisins. Policeman uses TOPLEVEL_BINDING. So, you
-can get `main`, Ruby top-level object, with the first snippet. Although you
+'''NOTE:''' This rule is for Raisins. Policeman and Green Shoes use TOPLEVEL_BINDING. 
+So, you can get `main`, Ruby top-level object, with the first snippet. Although you
 need to use `Shoes::Para` instead of `Para` outside `Shoes.app` block.
 
 Each Shoes app is given a little room where it can create itself.  You can
@@ -510,7 +533,7 @@ The second part is especially important to remember.
 
 {{{
  class Storage; end
-
+ 
  Shoes.app do
    para Storage.new
  end
@@ -538,7 +561,7 @@ thorough and clear about everything.
 
 So, if you've hit this far in the manual and you're still hazy about getting
 started, you should probably either go back to the [[Hello! beginning]] of the
-manual. Or you could try [[https://github.com/downloads/shoes/shoes/nks.pdf Nobody Knows
+manual. Or you could try [[https://cloud.github.com/downloads/shoes/shoes/nks.pdf Nobody Knows
 Shoes]], the beginner's leaflet PDF.
 
 ==== Finding Your Way ====
@@ -598,19 +621,24 @@ slots.  See the section on [[Slots]] for more.
 
 ==== Built-in Constants ====
 
-Shoes also has a handful of built-in constants which may prove useful if you
-are trying to sniff out what release of Shoes is running.
+Green Shoes also has a handful of built-in constants which may prove useful if you
+are trying to sniff out what release of Green Shoes is running.
 
-'''Shoes::RELEASE_NAME''' contains a string with the name of the Shoes release.
-All Shoes releases are named, starting with Curious.
+'''DIR''' is a full path of `green_shoes/lib`. 
 
-'''Shoes::RELEASE_ID''' contains a number representing the Shoes release.  So,
-for example, Curious is number 1, as it was the first official release.
+'''COLORS''' is a complete list of colors available to the app. 
 
-'''Shoes::REVISION''' is the Subversion revision number for this build.
+'''FONTS''' is a complete list of fonts available to the app. 
 
-'''Shoes::FONTS''' is a complete list of fonts available to the app.  This list
-includes any fonts loaded by the [[Built-in.font]] method.
+{{{
+ Shoes.app do
+   para VERSION
+   para fg(DIR, red)
+   image File.join(DIR, '../static/gshoes-icon.png')
+   para fg(FONTS.join(', '), green)
+   para COLORS.map{|k, v| [k, v]}
+ end
+}}}
 
 === alert(message: a string) » nil ===
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 139
+  - 150
   - 0
-  version: 0.139.0
+  version: 0.150.0
 platform: ruby
 authors: 
 - ashbb
@@ -14,10 +14,22 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-06 00:00:00 +09:00
+date: 2011-02-10 00:00:00 +09:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: gtk2
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
 description: Green Shoes is one of colorful Shoes, written in pure Ruby with Ruby/GTK2.
 email: ashbbb@gmail.com
 executables: []
@@ -28,6 +40,7 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files: 
+- VERSION
 - lib/ext/bloops.rb
 - lib/ext/bloops/bloops.so
 - lib/ext/bloops/libportaudio-2.dll