...

29 files changed, 45 insertions, 46 deletions

diff --git a/Main.py b/Main.py
index c32e648..d0c6220 100644
--- a/Main.py
+++ b/Main.py
@@ -77,6 +77,14 @@ class CartoonBuilder:
             gobject.source_remove(self.playing)
             self.playing = gobject.timeout_add(self.waittime, self.playframe)
 
+    def clear_tape(self):
+        for i in range(TAPE_COUNT):
+            transpixbuf = self.gettranspixbuf(IMGWIDTH,IMGHEIGHT)
+            self.frameimgs[i].set_from_pixbuf(transpixbuf)
+            self.fgpixbufs[i] = self.gettranspixbuf(BGWIDTH,BGHEIGHT)
+        self.fgpixbuf = self.gettranspixbuf(BGWIDTH,BGHEIGHT)
+
+
 
 
 
@@ -95,13 +103,6 @@ class CartoonBuilder:
         self.fgpixbuf = self.gettranspixbuf(BGWIDTH,BGHEIGHT)
         self.drawmain()
 
-    def clearall(self, widget, data=None):
-        for i in range(TAPE_COUNT):
-            transpixbuf = self.gettranspixbuf(IMGWIDTH,IMGHEIGHT)
-            self.frameimgs[i].set_from_pixbuf(transpixbuf)
-            self.fgpixbufs[i] = self.gettranspixbuf(BGWIDTH,BGHEIGHT)
-        self.fgpixbuf = self.gettranspixbuf(BGWIDTH,BGHEIGHT)
-
     def selectframe(self, widget, event, data=None):
         if data:
             i = data-1
@@ -269,7 +270,7 @@ class CartoonBuilder:
 
     def __init__(self,insugar,toplevel_window,mdirpath):
         self.mdirpath = mdirpath
-        self.iconsdir = os.path.join(self.mdirpath, 'images', 'icons')
+        self.iconsdir = os.path.join(self.mdirpath, 'icons')
         self.playing = False
 
         self.waittime = 3*150
@@ -414,10 +415,6 @@ class CartoonBuilder:
             #fb.set_image(transimg)
             fb.add(transimg)
             self.animhbox.pack_start(fb,True,True,2)
-            #if i != 5:
-            #    ra = gtk.Arrow(gtk.ARROW_RIGHT,gtk.SHADOW_OUT)
-            #    ra.show()
-            #    self.tophbox.pack_start(ra,True,True,0)
 
 
         self.animborder = gtk.EventBox()
@@ -451,27 +448,8 @@ class CartoonBuilder:
         self.afvbox.show()
         self.afvbox.pack_start(self.animborder,False,False,0)
         self.tophbox.pack_start(self.afvbox,False,False,0)
-        #self.clrframe = gtk.Button('CLEAR FRAME')
-        cancelimg = gtk.Image()
-        #cancelimg.set_from_stock(gtk.STOCK_CANCEL,gtk.ICON_SIZE_BUTTON)
-        cancelimg.set_from_file(os.path.join(self.iconsdir,'clear.png'))
-        cancelimg.show()
-        self.clrframe = gtk.Button()
-        self.clrframe.set_label('')
-        self.clrframe.set_image(cancelimg)
-        self.clrframe.connect('clicked', self.clearall, None)
-        self.clrframe.show()
-        
-        #self.cfbox.pack_start(self.clrframe,True,True,0)
-        #self.clrall = gtk.Button('CLEAR ALL')
-        #self.clrall.connect('clicked', self.clearall, None)
-        #self.clrall.show()
-        #self.cfbox.pack_start(self.clrall,True,True,0)
-        #self.controlbox.pack_start(self.cfbox,True,True,0)
-        self.cfvbox = gtk.VBox()
-        self.cfvbox.show()
-        self.cfvbox.pack_start(self.clrframe,True,False,0)
-        self.tophbox.pack_start(self.cfvbox,False,False,5)
+
+
 
         self.frame_selected = 0
         self.fbstyle = self.framebuttons[0].get_style()
@@ -563,22 +541,18 @@ class CartoonBuilder:
         hdesktop.pack_start(leftbox,False,True,0)
         hdesktop.pack_start(cetralbox,True,True,0)
 
-        pink_arrow = gtk.Image()
-        pink_arrow.set_from_file(os.path.join(self.iconsdir, 'pink_arrow.png'))
-        pink_arrow.show()
-        self.pahbox = gtk.HBox()
-        self.pahbox.show()
-        self.pahbox.pack_start(pink_arrow,False,False,150)
-
-        self.topvbox = gtk.VBox()
-        self.topvbox.show()
-        self.topvbox.pack_start(self.tophbox,False,False,0)
-        self.topvbox.pack_start(self.pahbox,False,False,0)
+        arrow = gtk.Image()
+        arrow.set_from_file(Theme.path('icons/pink_arrow.png'))
+        arrow.show()
+        arrow_box = gtk.HBox()
+        arrow_box.show()
+        arrow_box.pack_start(arrow,False,False,150)
 
         desktop = gtk.VBox()
         desktop.show()
         desktop.pack_start(hdesktop,True,True,0)
-        desktop.pack_end(self.topvbox, False, False, 0)
+        desktop.pack_start(arrow_box, True, False, 0)
+        desktop.pack_end(self.tophbox, True, False, 0)
 
         greenbox = gtk.EventBox()
         greenbox.modify_bg(gtk.STATE_NORMAL,gtk.gdk.color_parse(BACKGROUND))
diff --git a/Toolbar.py b/Toolbar.py
index 9ed6323..add77e5 100644
--- a/Toolbar.py
+++ b/Toolbar.py
@@ -53,8 +53,20 @@ class Toolbar(gtk.Toolbar):
         tempo_item.add(tempo)
         self.insert(tempo_item, -1)
 
+        separator = gtk.SeparatorToolItem()
+        separator.set_draw(False)
+        self.insert(separator,-1)
+
+        clear_tape = ToolButton('sl-reset')
+        clear_tape.connect('clicked', self._clear_tape_cb)
+        clear_tape.set_tooltip(_(''))
+        self.insert(clear_tape, -1)
+
         self.show_all()
 
+    def _clear_tape_cb(self, widget):
+        self.app.set_tempo(widget.value)
+
     def _tempo_cb(self, widget):
         self.app.set_tempo(widget.value)
 
diff --git a/Utils.py b/Utils.py
index 83c38f4..e8dcc64 100644
--- a/Utils.py
+++ b/Utils.py
@@ -126,7 +126,7 @@ class TempoSlider(gtk.HBox):
 
         if not self._pixbuf[img]:
             self._pixbuf[img] = gtk.gdk.pixbuf_new_from_file_at_size(
-                    os.path.join(get_bundle_path(), 'images/icons/tempo' +
+                    os.path.join(get_bundle_path(), 'icons/tempo' +
                         str(img+1) + '.svg'),
                     style.STANDARD_ICON_SIZE, style.STANDARD_ICON_SIZE)
 
diff --git a/images/icons/50x50blank-trans.png b/icons/50x50blank-trans.png
index b8de5ee..b8de5ee 100644
--- a/images/icons/50x50blank-trans.png
+++ b/icons/50x50blank-trans.png
diff --git a/images/icons/big_down_arrow.png b/icons/big_down_arrow.png
index b0dd75b..b0dd75b 100644
--- a/images/icons/big_down_arrow.png
+++ b/icons/big_down_arrow.png
diff --git a/images/icons/big_left_arrow.png b/icons/big_left_arrow.png
index 9cd03c7..9cd03c7 100644
--- a/images/icons/big_left_arrow.png
+++ b/icons/big_left_arrow.png
diff --git a/images/icons/big_pause.png b/icons/big_pause.png
index 11c07cb..11c07cb 100644
--- a/images/icons/big_pause.png
+++ b/icons/big_pause.png
diff --git a/images/icons/big_right_arrow.png b/icons/big_right_arrow.png
index 026d59c..026d59c 100644
--- a/images/icons/big_right_arrow.png
+++ b/icons/big_right_arrow.png
diff --git a/images/icons/big_up_arrow.png b/icons/big_up_arrow.png
index e86e224..e86e224 100644
--- a/images/icons/big_up_arrow.png
+++ b/icons/big_up_arrow.png
diff --git a/images/icons/clear.png b/icons/clear.png
index 4885eea..4885eea 100644
--- a/images/icons/clear.png
+++ b/icons/clear.png
diff --git a/images/icons/down_arrow.png b/icons/down_arrow.png
index df950cd..df950cd 100644
--- a/images/icons/down_arrow.png
+++ b/icons/down_arrow.png
diff --git a/images/icons/filmstrip.png b/icons/filmstrip.png
index 37e3ca6..37e3ca6 100644
--- a/images/icons/filmstrip.png
+++ b/icons/filmstrip.png
diff --git a/images/icons/left_arrow.png b/icons/left_arrow.png
index bde58b9..bde58b9 100644
--- a/images/icons/left_arrow.png
+++ b/icons/left_arrow.png
diff --git a/images/icons/logo.png b/icons/logo.png
index e2b3df8..e2b3df8 100644
--- a/images/icons/logo.png
+++ b/icons/logo.png
diff --git a/images/icons/oldfilmstrip.png b/icons/oldfilmstrip.png
index 5429616..5429616 100644
--- a/images/icons/oldfilmstrip.png
+++ b/icons/oldfilmstrip.png
diff --git a/images/icons/pause.png b/icons/pause.png
index 59dc8b4..59dc8b4 100644
--- a/images/icons/pause.png
+++ b/icons/pause.png
diff --git a/images/icons/pink_arrow.png b/icons/pink_arrow.png
index bb0ac73..bb0ac73 100644
--- a/images/icons/pink_arrow.png
+++ b/icons/pink_arrow.png
diff --git a/images/icons/right_arrow.png b/icons/right_arrow.png
index 1dd5e10..1dd5e10 100644
--- a/images/icons/right_arrow.png
+++ b/icons/right_arrow.png
diff --git a/icons/sl-reset.svg b/icons/sl-reset.svg
new file mode 100644
index 0000000..833e85b
--- /dev/null
+++ b/icons/sl-reset.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14576)  -->

+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">

+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"

+	 width="55px" height="55px" viewBox="0 0 55 55" enable-background="new 0 0 55 55" xml:space="preserve">

+<polygon fill="none" stroke="#FFFFFF" stroke-width="2" points="36.668,46.959 17.384,46.671 13.751,19.147 40.626,19.147 "/>

+<path fill="none" stroke="#FFFFFF" stroke-width="2" d="M13.751,17.312c18.998-2.13,21.875-2.374,25.436-3.021

+	c3.561-0.647-8.347-2.808-12.054-2.375c-1.729,0.201-9.713,1.618-13.275,5.396"/>

+<path fill="none" stroke="#FFFFFF" stroke-width="2" d="M22.709,11.557l6.691-1.476c0,0-4.209-3.13-6.691,1.296"/>

+<line fill="none" stroke="#FFFFFF" x1="27.457" y1="24.652" x2="27.457" y2="39.763"/>

+<line fill="none" stroke="#FFFFFF" x1="35.229" y1="25.084" x2="33.502" y2="39.763"/>

+<line fill="none" stroke="#FFFFFF" x1="19.038" y1="25.731" x2="20.55" y2="39.763"/>

+</svg>

diff --git a/images/icons/tempo1.svg b/icons/tempo1.svg
index bb9aeec..bb9aeec 100644
--- a/images/icons/tempo1.svg
+++ b/icons/tempo1.svg
diff --git a/images/icons/tempo2.svg b/icons/tempo2.svg
index 4a98310..4a98310 100644
--- a/images/icons/tempo2.svg
+++ b/icons/tempo2.svg
diff --git a/images/icons/tempo3.svg b/icons/tempo3.svg
index bd893bd..bd893bd 100644
--- a/images/icons/tempo3.svg
+++ b/icons/tempo3.svg
diff --git a/images/icons/tempo4.svg b/icons/tempo4.svg
index 6fa5afa..6fa5afa 100644
--- a/images/icons/tempo4.svg
+++ b/icons/tempo4.svg
diff --git a/images/icons/tempo5.svg b/icons/tempo5.svg
index 9500e7e..9500e7e 100644
--- a/images/icons/tempo5.svg
+++ b/icons/tempo5.svg
diff --git a/images/icons/tempo6.svg b/icons/tempo6.svg
index 9844fd6..9844fd6 100644
--- a/images/icons/tempo6.svg
+++ b/icons/tempo6.svg
diff --git a/images/icons/tempo7.svg b/icons/tempo7.svg
index 54bed80..54bed80 100644
--- a/images/icons/tempo7.svg
+++ b/icons/tempo7.svg
diff --git a/images/icons/tempo8.svg b/icons/tempo8.svg
index 2c0154f..2c0154f 100644
--- a/images/icons/tempo8.svg
+++ b/icons/tempo8.svg
diff --git a/images/icons/up_arrow.png b/icons/up_arrow.png
index e37d71c..e37d71c 100644
--- a/images/icons/up_arrow.png
+++ b/icons/up_arrow.png
diff --git a/images/icons/yellow_arrow.png b/icons/yellow_arrow.png
index f3a35f2..f3a35f2 100644
--- a/images/icons/yellow_arrow.png
+++ b/icons/yellow_arrow.png