Added a few missing 'protected' keywords.
[redact.git] / lib / redact / part.rb
index bac1ba4e51da438d9789f80e636f16eb912807b0..e052540ad5e91628a6115735c4c36d68c2d5068e 100644 (file)
@@ -1,5 +1,5 @@
 #--
-# $Id: part.rb 25 2005-04-14 19:42:06Z tilman $
+# $Id: part.rb 28 2005-04-14 19:53:45Z tilman $
 #
 # Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
 #
@@ -386,6 +386,7 @@ module Redact
                        @id = image.id
                end
 
+               protected
                def to_eet_name
                        "Edje_Part_Image_Id"
                end
@@ -444,6 +445,7 @@ module Redact
                        @border = [r, r, t, b]
                end
 
+               protected
                def to_eet_properties
                        super.merge!(
                        {"image.id" => [@image.nil? ? -1 : @image.id],
@@ -508,7 +510,8 @@ module Redact
                end
 
                def font=(f)
-                       md = f.to_str.match(/.*\.ttf/)
+                       f = f.to_str.strip
+                       md = f.match(/.*\.ttf$/)
                        unless md.nil?
                                found = EDJE.font_dir.find { |font| font.filename == f }
                                if found.nil?
@@ -516,7 +519,7 @@ module Redact
                                end
                        end
 
-                       @font = f.dup
+                       @font = f
                end
 
                def outline_color=(c)
@@ -527,6 +530,7 @@ module Redact
                        @shadow_color = parse_hex_color(c)
                end
 
+               protected
                def to_eet_properties
                        super.merge!(
                        {"color2.r" => [@outline_color[0], :char],