X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=lib%2Fredact%2Fpart.rb;h=20bd38d35421bb9baa1f3135826e9f2420c8d580;hb=dce1a66224c5acc1b0ad4ba936bbc38ddc52b229;hp=90a29776875acd36c849cc09752062ca47403475;hpb=bf303d7901b8d8105571f66c1fa4fb7f0907bed4;p=redact.git

diff --git a/lib/redact/part.rb b/lib/redact/part.rb
index 90a2977..20bd38d 100644
--- a/lib/redact/part.rb
+++ b/lib/redact/part.rb
@@ -1,5 +1,5 @@
 #--
-# $Id: part.rb 48 2005-06-08 21:38:34Z tilman $
+# $Id: part.rb 62 2005-07-16 18:51:44Z tilman $
 #
 # Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
 #
@@ -405,7 +405,7 @@ module Redact
 
 			image = EDJE.image_dir.find { |e| e.filename == im2 }
 			if image.nil?
-				image = ImageDirectoryEntry.new(im2)
+				image = ImageDirectoryEntry.new(im, im2)
 				EDJE.image_dir << image
 			end
 
@@ -425,7 +425,9 @@ module Redact
 	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
@@ -434,7 +436,13 @@ module Redact
 			@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
 
@@ -450,7 +458,7 @@ module Redact
 
 			@image = EDJE.image_dir.find { |e| e.filename == im2 }
 			if @image.nil?
-				@image = ImageDirectoryEntry.new(im2)
+				@image = ImageDirectoryEntry.new(im, im2)
 				EDJE.image_dir << @image
 			end
 
@@ -473,6 +481,26 @@ module Redact
 			@border = [r, 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
 		def to_eet_properties
 			super.merge!(
@@ -484,14 +512,14 @@ module Redact
 			 "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
@@ -557,7 +585,7 @@ module Redact
 
 				found = EDJE.font_dir.find { |font| font.filename == f2 }
 				if found.nil?
-					EDJE.font_dir << FontDirectoryEntry.new(f2)
+					EDJE.font_dir << FontDirectoryEntry.new(f, f2)
 					@font = EDJE.font_dir.last.alias
 				else
 					@font = found.alias