rabbit 0.6.3 → 0.6.4

data/lib/rabbit/theme/per-slide-background-color/per-slide-background-color.rb

@@ -0,0 +1,18 @@
+proc_name = "per-slide-background-color"
+
+match(Slide) do |slides|
+  slides.each do |slide|
+    slide.delete_pre_draw_proc_by_name(proc_name)
+
+    background_color = slide["background-color"]
+    next if background_color.nil?
+
+    slide.add_pre_draw_proc(proc_name) do |canvas, x, y, w, h, simulation|
+      unless simulation
+        canvas.draw_rectangle(true, 0, 0, canvas.width, canvas.height,
+                              background_color)
+      end
+      [x, y, w, h]
+    end
+  end
+end

data/lib/rabbit/theme/per-slide-background-color/property.rb

@@ -0,0 +1,16 @@
+@category = N_("Toolkit")
+@title = N_("PerSlideBackgroundColor")
+@abstract = N_("Toolkit to set background color of each slide")
+@description = N_("Set background color of each slide.\n" \
+                  "\n" \
+                  "Each image is specified as a slide property:\n" \
+                  "  = target slide\n" \
+                  "  \n" \
+                  "  ...\n" \
+                  "  \n" \
+                  "  == properties\n" \
+                  "  \n" \
+                  "  : background-color\n" \
+                  "     black\n")
+@parameters = {
+}

data/lib/rabbit/theme/per-slide-background-image/per-slide-background-image.rb

@@ -0,0 +1,39 @@
+proc_name = "per-slide-background-image"
+
+match(Slide) do |slides|
+  slides.each do |slide|
+    slide.delete_pre_draw_proc_by_name(proc_name)
+
+    background_image = slide["background-image"]
+    next if background_image.nil?
+
+    properties = {}
+    slide.user_property.each do |name, value|
+      if /\Abackground-image-/ =~ name
+        properties[$POSTMATCH.gsub(/-/, '_')] = value
+      end
+    end
+    image = Image.new(canvas.full_path(background_image), properties)
+    image.horizontal_centering = true
+    image.vertical_centering = true
+    slide.add_pre_draw_proc(proc_name) do |canvas, x, y, w, h, simulation|
+      if simulation
+        _x, _y, _w, _h = 0, 0, canvas.width, canvas.height
+        image.compile(canvas, _x, _y, _w, _h)
+        if image.do_vertical_centering?
+          adjust_height = ((_h - image.height - image.padding_bottom) / 2.0).ceil
+          if _y + adjust_height > 0
+            _y += adjust_height
+            _h -= adjust_height
+            image.compile(canvas, _x, _y, _w, _h)
+          end
+        end
+        if image.do_horizontal_centering?
+          image.do_horizontal_centering(canvas, _x, _y, _w, _h)
+        end
+      end
+      image.draw(simulation)
+      [x, y, w, h]
+    end
+  end
+end

data/lib/rabbit/theme/per-slide-background-image/property.rb

@@ -0,0 +1,16 @@
+@category = N_("Toolkit")
+@title = N_("PerSlideBackgroundImage")
+@abstract = N_("Toolkit to display an image as a background of each slide")
+@description = N_("Displays an image as a background of each slide.\n" \
+                  "\n" \
+                  "Each image is specified as a slide property:\n" \
+                  "  = target slide\n" \
+                  "  \n" \
+                  "  ...\n" \
+                  "  \n" \
+                  "  == properties\n" \
+                  "  \n" \
+                  "  : background-image\n" \
+                  "     my-picture.png\n")
+@parameters = {
+}

data/lib/rabbit/theme/searcher.rb

@@ -46,6 +46,12 @@ module Rabbit
         else
           collector = "collect_all_theme"
         end
+
+        unless only_image
+          entry = SingleFileEntry.new(base_directory, theme_name)
+          return entry if entry.available?
+        end
+
         found_entry = nil
         __send__(collector) do |entry|
           if theme_name == entry.name
@@ -53,6 +59,7 @@ module Rabbit
             break
           end
         end
+
         raise LoadError, "can't find theme: #{theme_name}." if found_entry.nil?
         found_entry
       end
@@ -86,15 +93,22 @@ module Rabbit
       end
 
       def collect_theme(&block)
-        _collect_theme($LOAD_PATH, &block)
+        _collect_theme(theme_load_path, DirectoryEntry, &block)
       end
 
       def collect_image_theme(&block)
-        _collect_theme(Config::IMAGE_PATH + $LOAD_PATH,
-                       "image_dir", :image, &block)
+        _collect_theme(image_load_path, ImageDirectoryEntry, "image_dir", &block)
       end
-      
-      def _collect_theme(path, converter=nil, type=nil, &block)
+
+      def theme_load_path
+        $LOAD_PATH
+      end
+
+      def image_load_path
+        Config::IMAGE_PATH + $LOAD_PATH
+      end
+
+      def _collect_theme(path, entry_class, converter=nil, &block)
         converter ||= "theme_dir"
         themes = []
         theme_name = {}
@@ -103,8 +117,8 @@ module Rabbit
           if File.directory?(base_name)
             Dir.foreach(base_name) do |theme|
               next if /\A..?\z/ =~ theme
-              entry = Entry.new(File.join(File.expand_path(base_name), theme),
-                                type)
+              file = File.join(File.expand_path(base_name), theme)
+              entry = entry_class.new(file)
               if entry.available? and !theme_name.has_key?(theme)
                 block.call(entry) if block
                 themes << entry

data/lib/rabbit/theme/title-shadow/title-shadow.rb

@@ -3,31 +3,5 @@ proc_name = "title-shadow"
 @title_shadow_color ||= "#6f6f6fcc"
 
 match(TitleSlide, Title) do |titles|
-
-  shadow_layout = nil
-  move_x = nil
-  move_y = nil
-
-  titles.delete_pre_draw_proc_by_name(proc_name)
-
-  titles.add_pre_draw_proc(proc_name) do |title, canvas, x, y, w, h, simulation|
-    unless simulation
-      if shadow_layout.nil?
-        font_size = title.pixel_font_size
-        move_x = screen_x(font_size.to_f / screen_size(10))
-        move_y = screen_y(font_size.to_f / screen_size(20))
-
-        shadow_title = title.clone
-        shadow_title.font :color => nil
-        shadow_layout = canvas.make_layout(shadow_title.markuped_text)
-        shadow_layout.set_width(w * Pango::SCALE)
-        if title.do_horizontal_centering?
-          shadow_layout.set_alignment(Pango::Layout::ALIGN_CENTER)
-        end
-      end
-      args = [shadow_layout, x + move_x, y + move_y, @title_shadow_color]
-      canvas.draw_layout(*args)
-    end
-    [x, y, w, h]
-  end
+  titles[0]["shadow-color"] = @title_shadow_color
 end