X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=lib%2Fredact%2Fpart.rb;h=8173e71d51fe0d3484b507cdb44426d9289a65fc;hb=8198cf0b74f58dbcfa16dd68d72678725b532060;hp=e052540ad5e91628a6115735c4c36d68c2d5068e;hpb=e6589624744430b826a27a71e3d4894516969fb3;p=redact.git

diff --git a/lib/redact/part.rb b/lib/redact/part.rb
index e052540..8173e71 100644
--- a/lib/redact/part.rb
+++ b/lib/redact/part.rb
@@ -1,5 +1,5 @@
 #--
-# $Id: part.rb 28 2005-04-14 19:53:45Z tilman $
+# $Id: part.rb 67 2005-09-19 19:46:43Z tilman $
 #
 # Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
 #
@@ -216,7 +216,12 @@ module Redact
 		end
 
 		def to=(part)
-			@to_id = [].fill(part.nil? ? -1 : part.id, 0..1)
+			self.set_to(part)
+		end
+
+		def set_to(part_x, part_y = part_x)
+			@to_id = [part_x.nil? ? -1 : part_x.id,
+			          part_y.nil? ? -1 : part_y.id]
 		end
 	end
 
@@ -347,6 +352,7 @@ module Redact
 			 "border.r" => [0],
 			 "border.t" => [0],
 			 "border.b" => [0],
+			 "border.no_fill" => [false],
 			 "fill.smooth" => [true],
 			 "fill.pos_rel_x" => [0.0, :double],
 			 "fill.pos_abs_x" => [0],
@@ -394,18 +400,34 @@ module Redact
 
 	class Tweens < Array
 		def <<(im)
-			image = EDJE.image_dir.find { |e| e.filename == im }
+			im2 = find_image(im.to_str.strip)
+			raise(RedactError, "cannot find image - #{im}") if im2.nil?
+
+			image = EDJE.image_dir.find { |e| e.filename == im2 }
 			if image.nil?
-				image = ImageDirectoryEntry.new(im)
+				image = ImageDirectoryEntry.new(im, im2)
 				EDJE.image_dir << image
 			end
 
 			super(Tween.new(image))
 		end
+
+		private
+		def find_image(file)
+			[".", OPTIONS.image_dir].each do |d|
+				f2 = File.join(d, file)
+				return Pathname.new(f2).cleanpath.to_s if File.file?(f2)
+			end
+
+			nil
+		end
+
 	end
 
 	class ImageDescription < Description
-		attr_reader :image, :auto_rel, :tweens, :border_fill_middle
+		attr_reader :image, :auto_rel, :tweens, :border_fill_middle,
+		            :fill_smooth, :fill_pos_rel, :fill_pos_abs,
+		            :fill_rel, :fill_abs
 
 		def initialize(name = "default", value = 0.0)
 			super
@@ -413,16 +435,30 @@ module Redact
 			@image = nil
 			@tweens = Tweens.new
 			@border = [0, 0, 0, 0]
+			@border_fill_middle = true
+
 			@fill_smooth = true
+			@fill_pos_rel = [0.0, 0.0]
+			@fill_pos_abs = [0, 0]
+			@fill_rel = [1.0, 1.0]
+			@fill_abs = [0, 0]
+
 			@auto_rel = false
 		end
 
+		def border_fill_middle=(var)
+			@border_fill_middle = (var == true)
+		end
+
 		def image=(im)
-			return if !@image.nil? && im == @image.filename
+			im2 = find_image(im.to_str.strip)
+			raise(RedactError, "cannot find image - #{im}") if im2.nil?
+
+			return if !@image.nil? && im2 == @image.filename
 
-			@image = EDJE.image_dir.find { |e| e.filename == im }
+			@image = EDJE.image_dir.find { |e| e.filename == im2 }
 			if @image.nil?
-				@image = ImageDirectoryEntry.new(im)
+				@image = ImageDirectoryEntry.new(im, im2)
 				EDJE.image_dir << @image
 			end
 
@@ -442,7 +478,27 @@ module Redact
 		end
 
 		def set_border(l = 0, r = 0, t = 0, b = 0)
-			@border = [r, r, t, b]
+			@border = [l, r, t, b]
+		end
+
+		def fill_smooth=(v)
+			@fill_smooth = (v == true)
+		end
+
+		def fill_pos_rel=(x, y)
+			@fill_pos_rel = [x.to_f, y.to_f]
+		end
+
+		def fill_pos_abs=(x, y)
+			@fill_pos_abs = [x.to_i, y.to_i]
+		end
+
+		def fill_rel=(x, y)
+			@fill_rel = [x.to_f, y.to_f]
+		end
+
+		def fill_abs=(x, y)
+			@fill_abs = [x.to_i, y.to_i]
 		end
 
 		protected
@@ -454,15 +510,26 @@ module Redact
 			 "border.r" => [@border[1]],
 			 "border.t" => [@border[2]],
 			 "border.b" => [@border[3]],
+			 "border.no_fill" => [!@border_fill_middle],
 			 "fill.smooth" => [@fill_smooth],
-			 "fill.pos_rel_x" => [0.0, :double],
-			 "fill.pos_abs_x" => [0],
-			 "fill.rel_x" => [1.0, :double],
-			 "fill.abs_x" => [0],
-			 "fill.pos_rel_y" => [0.0, :double],
-			 "fill.pos_abs_y" => [0],
-			 "fill.rel_y" => [1.0, :double],
-			 "fill.abs_y" => [0]})
+			 "fill.pos_rel_x" => [@fill_pos_rel[0], :double],
+			 "fill.pos_abs_x" => [@fill_pos_abs[0]],
+			 "fill.rel_x" => [@fill_rel[0], :double],
+			 "fill.abs_x" => [@fill_abs[0]],
+			 "fill.pos_rel_y" => [@fill_pos_rel[1], :double],
+			 "fill.pos_abs_y" => [@fill_pos_abs[1]],
+			 "fill.rel_y" => [@fill_rel[1], :double],
+			 "fill.abs_y" => [@fill_abs[1]]})
+		end
+
+		private
+		def find_image(file)
+			[".", OPTIONS.image_dir].each do |d|
+				f2 = File.join(d, file)
+				return Pathname.new(f2).cleanpath.to_s if File.file?(f2)
+			end
+
+			nil
 		end
 	end
 
@@ -513,13 +580,19 @@ module Redact
 			f = f.to_str.strip
 			md = f.match(/.*\.ttf$/)
 			unless md.nil?
-				found = EDJE.font_dir.find { |font| font.filename == f }
+				f2 = find_font(f)
+				raise(RedactError, "cannot find font - #{f}") if f2.nil?
+
+				found = EDJE.font_dir.find { |font| font.filename == f2 }
 				if found.nil?
-					EDJE.font_dir << FontDirectoryEntry.new(f)
+					EDJE.font_dir << FontDirectoryEntry.new(f, f2)
+					@font = EDJE.font_dir.last.alias
+				else
+					@font = found.alias
 				end
+			else
+				@font = f
 			end
-
-			@font = f
 		end
 
 		def outline_color=(c)
@@ -554,5 +627,15 @@ module Redact
 			 "text.id_source" => [@text_id_source],
 			 "text.id_text_source" => [@text_id_text_source]})
 		end
+
+		private
+		def find_font(file)
+			[".", OPTIONS.font_dir].each do |d|
+				f2 = File.join(d, file)
+				return Pathname.new(f2).cleanpath.to_s if File.file?(f2)
+			end
+
+			nil
+		end
 	end
 end