projects
/
redact.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Comment fix.
[redact.git]
/
lib
/
redact
/
part.rb
diff --git
a/lib/redact/part.rb
b/lib/redact/part.rb
index f915a4b5edf1ba2f2139f66d63c13c18c4e4149c..974a6bec8ba47d8bc7720039582b2541e56ad61a 100644
(file)
--- a/
lib/redact/part.rb
+++ b/
lib/redact/part.rb
@@
-1,5
+1,5
@@
#--
#--
-# $Id: part.rb 2
2 2005-04-02 22:29:50
Z tilman $
+# $Id: part.rb 2
9 2005-04-16 15:59:07
Z tilman $
#
# Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
#
#
# Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
#
@@
-31,8
+31,8
@@
module Redact
include Comparable
include Comparable
- attr_reader :collection, :id, :name, :dragable, :clip
-
attr_accessor
:mouse_events, :repeat_events
+ attr_reader :collection, :id, :name, :dragable, :clip
,
+
:mouse_events, :repeat_events
def initialize(collection, id, name)
@collection = collection
def initialize(collection, id, name)
@collection = collection
@@
-57,6
+57,14
@@
module Redact
@id <=> b.id
end
@id <=> b.id
end
+ def mouse_events=(val)
+ @mouse_events = (val == true)
+ end
+
+ def repeat_events=(val)
+ @repeat_events = (val == true)
+ end
+
def clip=(part)
if part == self
raise(ArgumentError, "cannot clip part to itself")
def clip=(part)
if part == self
raise(ArgumentError, "cannot clip part to itself")
@@
-213,8
+221,8
@@
module Redact
end
class Description
end
class Description
- attr_reader :rel, :aspect, :step
- attr_accessor :
visible, :aspect_preference, :color_class
+ attr_reader :rel, :aspect, :step
, :visible, :color_class
+ attr_accessor :
aspect_preference
def initialize(name = "default", value = 0.0)
@name = name.to_str.dup.freeze
def initialize(name = "default", value = 0.0)
@name = name.to_str.dup.freeze
@@
-231,6
+239,14
@@
module Redact
@color_class = ""
end
@color_class = ""
end
+ def visible=(v)
+ @visible = (v == true)
+ end
+
+ def color_class=(v)
+ @color_class = v.to_str.dup
+ end
+
def set_step(x = 0, y = 0)
@step = [x, y]
end
def set_step(x = 0, y = 0)
@step = [x, y]
end
@@
-331,6
+347,7
@@
module Redact
"border.r" => [0],
"border.t" => [0],
"border.b" => [0],
"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],
"fill.smooth" => [true],
"fill.pos_rel_x" => [0.0, :double],
"fill.pos_abs_x" => [0],
@@
-370,6
+387,7
@@
module Redact
@id = image.id
end
@id = image.id
end
+ protected
def to_eet_name
"Edje_Part_Image_Id"
end
def to_eet_name
"Edje_Part_Image_Id"
end
@@
-388,7
+406,7
@@
module Redact
end
class ImageDescription < Description
end
class ImageDescription < Description
- attr_reader :image, :auto_rel, :tweens
+ attr_reader :image, :auto_rel, :tweens
, :border_fill_middle
def initialize(name = "default", value = 0.0)
super
def initialize(name = "default", value = 0.0)
super
@@
-396,10
+414,15
@@
module Redact
@image = nil
@tweens = Tweens.new
@border = [0, 0, 0, 0]
@image = nil
@tweens = Tweens.new
@border = [0, 0, 0, 0]
+ @border_fill_middle = true
@fill_smooth = true
@auto_rel = false
end
@fill_smooth = true
@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
def image=(im)
return if !@image.nil? && im == @image.filename
@@
-428,6
+451,7
@@
module Redact
@border = [r, r, t, b]
end
@border = [r, r, t, b]
end
+ protected
def to_eet_properties
super.merge!(
{"image.id" => [@image.nil? ? -1 : @image.id],
def to_eet_properties
super.merge!(
{"image.id" => [@image.nil? ? -1 : @image.id],
@@
-436,6
+460,7
@@
module Redact
"border.r" => [@border[1]],
"border.t" => [@border[2]],
"border.b" => [@border[3]],
"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.smooth" => [@fill_smooth],
"fill.pos_rel_x" => [0.0, :double],
"fill.pos_abs_x" => [0],
@@
-449,8
+474,7
@@
module Redact
end
class TextDescription < Description
end
class TextDescription < Description
- attr_reader :font
- attr_accessor :text, :font_size, :text_class
+ attr_reader :font, :text, :font_size, :text_class
def initialize(name = "default", value = 0.0)
super
def initialize(name = "default", value = 0.0)
super
@@
-468,6
+492,18
@@
module Redact
@text_id_text_source = -1
end
@text_id_text_source = -1
end
+ def text=(v)
+ @text = v.to_str.dup
+ end
+
+ def font_size=(v)
+ @font_size = v.to_int
+ end
+
+ def text_class=(v)
+ @text_class = v.to_str.dup
+ end
+
def set_fit(x = false, y = false)
@fit = [x, y]
end
def set_fit(x = false, y = false)
@fit = [x, y]
end
@@
-481,7
+517,8
@@
module Redact
end
def font=(f)
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?
unless md.nil?
found = EDJE.font_dir.find { |font| font.filename == f }
if found.nil?
@@
-489,7
+526,7
@@
module Redact
end
end
end
end
- @font = f
.dup
+ @font = f
end
def outline_color=(c)
end
def outline_color=(c)
@@
-500,6
+537,7
@@
module Redact
@shadow_color = parse_hex_color(c)
end
@shadow_color = parse_hex_color(c)
end
+ protected
def to_eet_properties
super.merge!(
{"color2.r" => [@outline_color[0], :char],
def to_eet_properties
super.merge!(
{"color2.r" => [@outline_color[0], :char],