Changeset 482

Timestamp:

03/12/2008 23:54:42 (5 months ago)

Author:

why

Message:

• lib/shoes/image.rb: adding the old remote_image code from the list and merging it into the normal image method.
  

Location:

trunk

Files:

• lib/shoes.rb (modified) (1 diff)
• lib/shoes/cache.rb (modified) (2 diffs)
• lib/shoes/image.rb (added)
• shoes/ruby.h (modified) (1 diff)

trunk/lib/shoes.rb

@@ -11 +11 @@
 require 'shoes/shy'
 if Object.const_defined? :Shoes
+  require 'shoes/image'
   require 'shoes/cache'
   require 'shoes/help'

trunk/lib/shoes/cache.rb

@@ -19 +19 @@
 SITE_LIB_DIR = File.join(LIB_DIR, '+lib')
 GEM_DIR = File.join(LIB_DIR, '+gem')
-
-mkdir_p(LIB_DIR)
+CACHE_DIR = File.join(LIB_DIR, '+cache')
+
+mkdir_p(CACHE_DIR)
 $:.unshift SITE_LIB_DIR
 $:.unshift GEM_DIR
@@ -63 +64 @@
   $:.unshift path
 end
+def setup_gems_app
+  unless Shoes === Gem::DefaultUserInteraction.ui
+    app = 
+      Shoes.app :width => 370, :height => 148, :resizable => false do
+        background "#9CF"
+        image "#{DIR}/static/shoes-icon-blue.png", :top => 10, :right => 20
+        stack :margin => 18 do
+          title "", :size => 12, :weight => "bold", :margin => 0
+          para "", :size => 10, :margin => 0, :margin_top => 8, :width => 220
+          progress :width => 1.0, :top => 80
+        end
+      end
+    Gem::DefaultUserInteraction.ui = Gem::ShoesFace.new(app)
+  end
+  Gem::DefaultUserInteraction.ui
+end
 def fetch_gems(*gems, &blk)
-  ui = Gem::DefaultUserInteraction.ui
+  ui = setup_gems_app
   count, total = 0, gems.length
   ui.progress count, total

trunk/shoes/ruby.h

@@ -136 +136 @@
   f("border", border, -1); \
   f("video", video, -1); \
-  f("image", image, -1); \
+  f("image_file", image, -1); \
   f("imagesize", imagesize, 1); \
   f("animate", animate, -1); \