Use imagedir/fontdir.

diff --git a/Rakefile b/Rakefile
index a1603451c29fcc120a0b0a5b79dcf4b01e84b533..d5aaccdc6a11e0186d04c1b947082a401fe46f89 100644 (file)
--- a/Rakefile
+++ b/Rakefile
@@ -1,4 +1,4 @@
-# $Id: Rakefile 1 2005-04-19 09:41:42Z tilman $
+# $Id: Rakefile 26 2005-06-22 20:19:41Z tilman $
 
 require "rake/clean"
 
@@ -19,5 +19,5 @@ deps = FileList["**/*.rb", "**/*.sma", "README", "acknowledge.txt"]
 
 desc "Build #{EDJ}"
 file EDJ => deps do |t|
-       sh "redact #{SRC} -o #{EDJ}"
+       sh "redact --image_dir images --font_dir fonts #{SRC} -o #{EDJ}"
 end

diff --git a/src/button.rb b/src/button.rb
index bb4c009f55cea5206effaf5085b73f0b54057e49..d3e107ae519eaf54cc8aa5c582bf2b3a73a00e1e 100644 (file)
--- a/src/button.rb
+++ b/src/button.rb
@@ -1,4 +1,4 @@
-# $Id: button.rb 1 2005-04-19 09:41:42Z tilman $
+# $Id: button.rb 26 2005-06-22 20:19:41Z tilman $
 
 class Button
        attr_reader :part
@@ -30,7 +30,7 @@ class Button
                                        d.rel[0].set_offset(@x, @y)
 
                                        d.auto_rel = true
-                                       d.image = "images/#{@image}-#{state}.png"
+                                       d.image = "#{@image}-#{state}.png"
                                end
                        end
                end
@@ -105,7 +105,7 @@ class ButtonLed
                                d.rel[0].set_offset(@x, @y)
 
                                d.auto_rel = true
-                               d.image = "images/#{@image}.png"
+                               d.image = "#{@image}.png"
                        end
 
                        p.description("hover") do |d|
@@ -115,7 +115,7 @@ class ButtonLed
                                d.rel[0].set_offset(@x, @y)
 
                                d.auto_rel = true
-                               d.image = "images/#{@image}.png"
+                               d.image = "#{@image}.png"
                        end
                end
 
@@ -168,7 +168,7 @@ class ToggleButton
                                        d.rel[0].set_offset(@x, @y)
 
                                        d.auto_rel = true
-                                       d.image = "images/#{@image}-#{state}.png"
+                                       d.image = "#{@image}-#{state}.png"
                                end
                        end
                end

diff --git a/src/intro.rb b/src/intro.rb
index 589d5cf4f0194d2661b00ff7f04a45b95d5ae88a..b500680667f4991062c0b3830932d228fa515df9 100644 (file)
--- a/src/intro.rb
+++ b/src/intro.rb
@@ -1,4 +1,4 @@
-# $Id: intro.rb 1 2005-04-19 09:41:42Z tilman $
+# $Id: intro.rb 26 2005-06-22 20:19:41Z tilman $
 
 c = EDJE.collection("euphoria")
 
@@ -9,10 +9,10 @@ c.part("player.normal.animation.intro", :image) do |p|
                d.rel[1].set_rel(0.0, 0.0)
 
                d.auto_rel = true
-               d.image = "images/anim-intro_00.png"
+               d.image = "anim-intro_00.png"
 
                1.upto(74) do |i|
-                       d.tweens << "images/anim-intro_%02i.png" % i
+                       d.tweens << "anim-intro_%02i.png" % i
                end
        end
 end

diff --git a/src/player-display-background.rb b/src/player-display-background.rb
index 71c04327423db656203b3cf1d2e1062aa6689061..392154cf8276d0d7c8e5b6121924ab65f3fdf67b 100644 (file)
--- a/src/player-display-background.rb
+++ b/src/player-display-background.rb
@@ -1,4 +1,4 @@
-# $Id: player-display-background.rb 1 2005-04-19 09:41:42Z tilman $
+# $Id: player-display-background.rb 26 2005-06-22 20:19:41Z tilman $
 
 c = EDJE.collection("euphoria")
 root = c.part("player.normal.group.display")
@@ -7,7 +7,7 @@ c.part("player.normal.background.display", :image) do |p|
        p.description do |d|
                d.rel[0].to = d.rel[1].to = root
 
-               d.image = "images/background-display.png"
+               d.image = "background-display.png"
        end
 end
 
@@ -15,7 +15,7 @@ c.part("player.normal.background.display.overlay", :image) do |p|
        p.description do |d|
                d.rel[0].to = d.rel[1].to = root
 
-               d.image = "images/background-display-overlay.png"
+               d.image = "background-display-overlay.png"
        end
 end
 
@@ -25,6 +25,6 @@ c.part("player.normal.background.display.details", :image) do |p|
                d.rel[0].set_offset(5, 3)
 
                d.auto_rel = true
-               d.image = "images/background-display-details.png"
+               d.image = "background-display-details.png"
        end
 end

diff --git a/src/player-display-seeker.rb b/src/player-display-seeker.rb
index 074ad61b9953846fdabbb3f6835333aee1eba96a..41ce9af03eecea7ea9340a67942ea84a224e5bc8 100644 (file)
--- a/src/player-display-seeker.rb
+++ b/src/player-display-seeker.rb
@@ -1,4 +1,4 @@
-# $Id: player-display-seeker.rb 1 2005-04-19 09:41:42Z tilman $
+# $Id: player-display-seeker.rb 26 2005-06-22 20:19:41Z tilman $
 
 c = EDJE.collection("euphoria")
 parent = c.part("player.normal.group.display")
@@ -13,7 +13,7 @@ c.part("#{name}.progress", :image) do |p|
                d.rel[0].set_offset(15, 80)
 
                d.auto_rel = true
-               d.image = "images/anim-seek-progress.png"
+               d.image = "anim-seek-progress.png"
        end
 end
 

diff --git a/src/player-display-track.rb b/src/player-display-track.rb
index 324afa77d2cad3be2e232c065c5d3ec78cd0bbcd..e37c56af86ec804ea64092a499500785446dc386 100644 (file)
--- a/src/player-display-track.rb
+++ b/src/player-display-track.rb
@@ -1,4 +1,4 @@
-# $Id: player-display-track.rb 18 2005-04-29 14:31:10Z tilman $
+# $Id: player-display-track.rb 26 2005-06-22 20:19:41Z tilman $
 
 c = EDJE.collection("euphoria")
 parent = c.part("player.normal.group.display")
@@ -19,7 +19,7 @@ c.part("player.time", :text) do |p|
                d.outline_color = OUTLINE_COLOR
 
                d.text = "00:06:35"
-               d.font = "fonts/acknowledge2.ttf"
+               d.font = "acknowledge2.ttf"
                d.font_size = 15
                d.set_text_align(1.0, 0.5)
        end
@@ -35,7 +35,7 @@ c.part("player.songname", :text) do |p|
                d.set_align(0.0)
 
                d.text = "Metallica - Battery"
-               d.font = "fonts/acknowledge2.ttf"
+               d.font = "acknowledge2.ttf"
                d.font_size = 14
                d.set_text_min(true, true)
                d.set_text_align(0.0)

diff --git a/src/player-drawer-bottom-eq.rb b/src/player-drawer-bottom-eq.rb
index 57f1b61080335f073eb2bc34b2372826d4ec28ed..06e2213e46e4d32f1d43979697d026d34ee375a3 100644 (file)
--- a/src/player-drawer-bottom-eq.rb
+++ b/src/player-drawer-bottom-eq.rb
@@ -1,4 +1,4 @@
-# $Id: player-drawer-bottom-eq.rb 1 2005-04-19 09:41:42Z tilman $
+# $Id: player-drawer-bottom-eq.rb 26 2005-06-22 20:19:41Z tilman $
 
 c = EDJE.collection("euphoria")
 parts = []
@@ -18,7 +18,7 @@ c.part("player.background.eq", :image) do |p|
                d.rel[0].set_offset(4, 41)
 
                d.auto_rel = true
-               d.image = "images/background-eq.png"
+               d.image = "background-eq.png"
        end
 
        h = {"preamp" => 11, "band01" => 28, "band02" => 42,

diff --git a/src/player-drawer-bottom.rb b/src/player-drawer-bottom.rb
index 621a146b073c43e98431d62fdd6c383a1c53bfc1..8b7d247394e2aaf2260f783e45bc9e6cf7321cc3 100644 (file)
--- a/src/player-drawer-bottom.rb
+++ b/src/player-drawer-bottom.rb
@@ -1,4 +1,4 @@
-# $Id: player-drawer-bottom.rb 1 2005-04-19 09:41:42Z tilman $
+# $Id: player-drawer-bottom.rb 26 2005-06-22 20:19:41Z tilman $
 
 c = EDJE.collection("euphoria")
 root = c.part("root")
@@ -29,7 +29,7 @@ c.part("player.background.drawer.bottom.shadow", :image) do |p|
 
        p.description do |d|
                d.rel[0].to = d.rel[1].to = bottom.first
-               d.image = "images/background-drawer-bottom-shadow.png"
+               d.image = "background-drawer-bottom-shadow.png"
        end
 end
 
@@ -40,7 +40,7 @@ c.part("player.background.drawer.bottom.top", :image) do |p|
                d.rel[0].to = d.rel[1].to = bottom.first
 
                d.auto_rel = true
-               d.image = "images/background-drawer-bottom-top.png"
+               d.image = "background-drawer-bottom-top.png"
        end
 end
 
@@ -52,7 +52,7 @@ c.part("player.background.drawer.bottom.bottom", :image) do |p|
                d.rel[0].set_offset(0, 37)
 
                d.auto_rel = true
-               d.image = "images/background-drawer-bottom-bottom.png"
+               d.image = "background-drawer-bottom-bottom.png"
        end
 end
 
@@ -64,7 +64,7 @@ c.part("player.background.drawer.bottom.arm", :image) do |p|
                d.rel[0].set_offset(64, 0)
 
                d.auto_rel = true
-               d.image = "images/background-drawer-bottom-arm.png"
+               d.image = "background-drawer-bottom-arm.png"
        end
 end
 
@@ -76,7 +76,7 @@ c.part("player.background.drawer.bottom.title", :image) do |p|
                d.rel[0].set_offset(9, 26)
 
                d.auto_rel = true
-               d.image = "images/background-drawer-bottom-title.png"
+               d.image = "background-drawer-bottom-title.png"
        end
 end
 

diff --git a/src/player-drawer-left.rb b/src/player-drawer-left.rb
index 2f1c56e05e300647dc3a2375d6b36f909723112d..87f429f7f86258f453f5d625e9027584ce4134fb 100644 (file)
--- a/src/player-drawer-left.rb
+++ b/src/player-drawer-left.rb
@@ -1,4 +1,4 @@
-# $Id: player-drawer-left.rb 21 2005-05-07 16:05:49Z tilman $
+# $Id: player-drawer-left.rb 26 2005-06-22 20:19:41Z tilman $
 
 c = EDJE.collection("euphoria")
 
@@ -25,7 +25,7 @@ c.part("player.background.drawer.left.shadow", :image) do |p|
        p.description do |d|
                d.rel[0].to = d.rel[1].to = parts.first
 
-               d.image = "images/background-drawer-left-shadow.png"
+               d.image = "background-drawer-left-shadow.png"
        end
 end
 
@@ -35,7 +35,7 @@ c.part("player.background.drawer.left", :image) do |p|
        p.description do |d|
                d.rel[0].to = d.rel[1].to = parts.first
 
-               d.image = "images/background-drawer-left.png"
+               d.image = "background-drawer-left.png"
        end
 end
 
@@ -47,7 +47,7 @@ c.part("player.background.drawer.left.arm", :image) do |p|
                d.rel[0].set_offset(34, 49)
 
                d.auto_rel = true
-               d.image = "images/background-drawer-left-arm.png"
+               d.image = "background-drawer-left-arm.png"
        end
 end
 

diff --git a/src/player-drawer-volume.rb b/src/player-drawer-volume.rb
index d1cae30075c5fe97b5d722c13549cc7dd2ec5db9..c9d7b69f647848a5b5b8a164f27437dcd89b6432 100644 (file)
--- a/src/player-drawer-volume.rb
+++ b/src/player-drawer-volume.rb
@@ -1,4 +1,4 @@
-# $Id: player-drawer-volume.rb 1 2005-04-19 09:41:42Z tilman $
+# $Id: player-drawer-volume.rb 26 2005-06-22 20:19:41Z tilman $
 
 c = EDJE.collection("euphoria")
 root = c.part("root")
@@ -30,7 +30,7 @@ c.part("player.background.drawer.volume.shadow", :image) do |p|
                d.rel[0].to = d.rel[1].to = root
 
                d.auto_rel = true
-               d.image = "images/background-drawer-volume-shadow.png"
+               d.image = "background-drawer-volume-shadow.png"
        end
 end
 
@@ -39,7 +39,7 @@ c.part("player.background.drawer.volume", :image) do |p|
                d.rel[0].to = d.rel[1].to = root
 
                d.auto_rel = true
-               d.image = "images/background-drawer-volume.png"
+               d.image = "background-drawer-volume.png"
        end
 
        VerticalSlider.new(c, "player.slider.volume", p, 38, 21)

diff --git a/src/player-main-background.rb b/src/player-main-background.rb
index 2cd039f48250a6fa362fdbc0cc87aacea199279d..a3ed0225439ae5d9118385b695aeb3611f0d57f0 100644 (file)
--- a/src/player-main-background.rb
+++ b/src/player-main-background.rb
@@ -1,4 +1,4 @@
-# $Id: player-main-background.rb 2 2005-04-23 13:23:58Z tilman $
+# $Id: player-main-background.rb 26 2005-06-22 20:19:41Z tilman $
 
 c = EDJE.collection("euphoria")
 root = c.part("root")
@@ -9,7 +9,7 @@ c.part("player.normal.background.shadow", :image) do |p|
        p.description do |d|
                d.rel[0].to = d.rel[1].to = root
 
-               d.image = "images/background-shadow.png"
+               d.image = "background-shadow.png"
        end
 end
 
@@ -19,7 +19,7 @@ c.part("player.normal.background.main", :image) do |p|
        p.description do |d|
                d.rel[0].to = d.rel[1].to = root
 
-               d.image = "images/background-alpha.png"
+               d.image = "background-alpha.png"
        end
 end
 
@@ -31,7 +31,7 @@ c.part("player.normal.background.titlebar", :image) do |p|
                d.rel[0].set_offset(45, 0)
 
                d.auto_rel = true
-               d.image = "images/background-titlebar.png"
+               d.image = "background-titlebar.png"
        end
 end
 
@@ -43,7 +43,7 @@ c.part("player.normal.background.titlebar.text", :image) do |p|
                d.rel[0].set_offset(70, 6)
 
                d.auto_rel = true
-               d.image = "images/background-titlebar-title.png"
+               d.image = "background-titlebar-title.png"
        end
 end
 
@@ -55,6 +55,6 @@ c.part("player.normal.background.bottom", :image) do |p|
                d.rel[0].set_offset(46, 46)
 
                d.auto_rel = true
-               d.image = "images/background-bottom.png"
+               d.image = "background-bottom.png"
        end
 end

diff --git a/src/playlist-background.rb b/src/playlist-background.rb
index 6226f64f259efdab9d5e4a2b32bcf54e42777c0f..1861e314cfa0f04f7c168fbc3ca772394b625d15 100644 (file)
--- a/src/playlist-background.rb
+++ b/src/playlist-background.rb
@@ -1,4 +1,4 @@
-# $Id: playlist-background.rb 16 2005-04-25 22:01:53Z tilman $
+# $Id: playlist-background.rb 26 2005-06-22 20:19:41Z tilman $
 
 c = EDJE.collection("playlist")
 root = c.part("root")
@@ -10,7 +10,7 @@ c.part("playlist.background.titlebar.left", :image) do |p|
                d.rel[0].to = d.rel[1].to = root
                d.auto_rel = true
 
-               d.image = "images/background-titlebar-left.png"
+               d.image = "background-titlebar-left.png"
        end
 end
 
@@ -26,7 +26,7 @@ c.part("playlist.background.titlebar.right", :image) do |p|
                d.rel[0].set_offset(-12, 0)
                d.rel[1].set_offset(-1, 17)
 
-               d.image = "images/background-titlebar-right.png"
+               d.image = "background-titlebar-right.png"
        end
 end
 
@@ -40,7 +40,7 @@ c.part("playlist.background.titlebar.middle", :image) do |p|
                d.rel[0].set_rel(1.0, 0.0)
                d.rel[1].set_rel(0.0, 1.0)
 
-               d.image = "images/background-titlebar-middle.png"
+               d.image = "background-titlebar-middle.png"
        end
 end
 
@@ -52,7 +52,7 @@ c.part("playlist.background.titlebar.text", :image) do |p|
                d.rel[0].set_offset(25, 6)
 
                d.auto_rel = true
-               d.image = "images/background-title-pl.png"
+               d.image = "background-title-pl.png"
        end
 end
 
@@ -64,7 +64,7 @@ c.part("playlist.background.titlebar.inset", :image) do |p|
                d.rel[0].set_offset(79, 6)
 
                d.auto_rel = true
-               d.image = "images/background-title-inset.png"
+               d.image = "background-title-inset.png"
        end
 end
 
@@ -80,7 +80,7 @@ end
                        d.rel[0].set_rel(0.0, 1.0)
                        d.rel[1].set_offset(-1, 11)
 
-                       d.image = "images/background-main-top#{id}.png"
+                       d.image = "background-main-top#{id}.png"
                end
        end
 end
@@ -95,7 +95,7 @@ c.part("playlist.background.top", :image) do |p|
                d.rel[0].set_rel(1.0, 0.0)
                d.rel[1].set_rel(0.0, 1.0)
 
-               d.image = "images/background-main-topmiddle.png"
+               d.image = "background-main-topmiddle.png"
        end
 end
 
@@ -111,7 +111,7 @@ end
                        d.rel[0].set_rel(0.0, 1.0)
                        d.rel[1].set_offset(-1, -25)
 
-                       d.image = "images/background-main-middle#{id}.png"
+                       d.image = "background-main-middle#{id}.png"
                end
        end
 end
@@ -128,7 +128,7 @@ c.part("playlist.background.footer.left", :image) do |p|
                d.rel[0].set_offset(0, -26)
                d.rel[1].set_offset(11, -1)
 
-               d.image = "images/background-main-footer-left.png"
+               d.image = "background-main-footer-left.png"
        end
 end
 
@@ -141,7 +141,7 @@ c.part("playlist.background.footer.right", :image) do |p|
                d.rel[0].set_rel(1.0, 1.0)
                d.rel[0].set_offset(-12, -26)
 
-               d.image = "images/background-main-footer-right.png"
+               d.image = "background-main-footer-right.png"
        end
 end
 
@@ -155,7 +155,7 @@ c.part("playlist.background.footer.middle", :image) do |p|
                d.rel[0].set_rel(1.0, 0.0)
                d.rel[1].set_rel(0.0, 1.0)
 
-               d.image = "images/background-main-footer-middle.png"
+               d.image = "background-main-footer-middle.png"
        end
 end
 
@@ -176,7 +176,7 @@ end
                                d.rel[0].set_offset(0, i.zero? ? -14 : -38)
 
                                img = (i.zero? ? "bottom#{id}" : "middle#{id}-2")
-                               d.image = "images/background-main-#{img}.png"
+                               d.image = "background-main-#{img}.png"
                        end
                end
        end
@@ -192,7 +192,7 @@ c.part("playlist.background.bottom", :image) do |p|
                d.rel[0].set_rel(1.0, 0.0)
                d.rel[1].set_rel(0.0, 1.0)
 
-               d.image = "images/background-main-bottommiddle.png"
+               d.image = "background-main-bottommiddle.png"
        end
 end
 
@@ -204,7 +204,7 @@ c.part("playlist.background.middle", :image) do |p|
                d.rel[0].set_rel(1.0, 1.0)
                d.rel[1].set_rel(0.0, 0.0)
 
-               d.image = "images/background-main-middle.png"
+               d.image = "background-main-middle.png"
        end
 end
 

diff --git a/src/playlist-scrollbar.rb b/src/playlist-scrollbar.rb
index b1637061298cf53cd15cfe0c11799f0ffb5f6bb1..1d21e93d4d0112e65c1c4592aee04a00a6275589 100644 (file)
--- a/src/playlist-scrollbar.rb
+++ b/src/playlist-scrollbar.rb
@@ -1,4 +1,4 @@
-# $Id: playlist-scrollbar.rb 16 2005-04-25 22:01:53Z tilman $
+# $Id: playlist-scrollbar.rb 26 2005-06-22 20:19:41Z tilman $
 
 c = EDJE.collection("playlist")
 
@@ -25,7 +25,7 @@ c.part("playlist.scrollbar.handle", :image) do |p|
 
                p.description(s) do |d|
                        d.set_size(13, 41)
-                       d.image = "images/scroll-grip-#{state}.png"
+                       d.image = "scroll-grip-#{state}.png"
                end
        end
 end

diff --git a/src/playlist_item.rb b/src/playlist_item.rb
index ffd58e45566fd114ef365fa9b154a74c4a92e878..7e8c51b429f2a2dbaffa858eb2b5b08a67011de7 100644 (file)
--- a/src/playlist_item.rb
+++ b/src/playlist_item.rb
@@ -1,4 +1,4 @@
-# $Id: playlist_item.rb 25 2005-05-28 21:23:33Z tilman $
+# $Id: playlist_item.rb 26 2005-06-22 20:19:41Z tilman $
 
 TEXT_COLOR_HILIGHT = "#f0fafd"
 
@@ -20,7 +20,7 @@ EDJE.collection("playlist_item") do |c|
                                        d.color = color
                                        d.outline_color = OUTLINE_COLOR
 
-                                       d.font = "fonts/acknowledge2.ttf"
+                                       d.font = "acknowledge2.ttf"
                                        d.font_size = 12
                                        d.text = "Dark Tranquillity - Through Smudged Lenses"
                                        d.set_text_align(0.0)

diff --git a/src/slider.rb b/src/slider.rb
index 53c60f04f8cf63ea55b4b156c63dfb13fdc8efd6..4b3c5d788d620989ec48bab32924e0f4a6ad6bb6 100644 (file)
--- a/src/slider.rb
+++ b/src/slider.rb
@@ -1,4 +1,4 @@
-# $Id: slider.rb 1 2005-04-19 09:41:42Z tilman $
+# $Id: slider.rb 26 2005-06-22 20:19:41Z tilman $
 
 class VerticalSlider
        def initialize(c, name, rel, x, y, height = 95)
@@ -15,7 +15,7 @@ class VerticalSlider
                                d.rel[1].set_rel(0.0, 0.0)
                                d.rel[1].set_offset(x + 6, y + height)
 
-                               d.image = "images/background-fillbar-vertical.png"
+                               d.image = "background-fillbar-vertical.png"
                        end
                end
 
@@ -49,7 +49,7 @@ class VerticalSlider
                                s = state == "normal" ? "default" : state
                                p.description(s) do |d|
                                        d.set_size(15, 12)
-                                       d.image = "images/slider-grip-#{state}.png"
+                                       d.image = "slider-grip-#{state}.png"
                                end
                        end
                end
@@ -64,7 +64,7 @@ class VerticalSlider
                                d.rel[0].to = d.rel[1].to = main
 
                                d.auto_rel = true
-                               d.image = "images/slider-grip-led.png"
+                               d.image = "slider-grip-led.png"
                        end
 
                        p.description("visible") do |d|
@@ -74,7 +74,7 @@ class VerticalSlider
                                d.rel[0].to = d.rel[1].to = main
 
                                d.auto_rel = true
-                               d.image = "images/slider-grip-led.png"
+                               d.image = "slider-grip-led.png"
                        end
                end