Path and icons changes

15 files changed, 16 insertions, 87 deletions

diff --git a/Config.py b/Config.py
index 7dd76dc..47dd713 100644
--- a/Config.py
+++ b/Config.py
@@ -26,8 +26,10 @@ print 'INFO: loaded TAMTAM_ROOT=%s' % TAM_TAM_ROOT
 
 
 #PATHS
-SOUNDS_DIR = "/usr/share/activities/TamTamEdit.activity/Resources/Sounds"
-#SOUNDS_DIR = TAM_TAM_ROOT + "/Resources/Sounds"
+if os.path.isdir('/usr/share/activities/TamTamEdit.activity/Resources/Sounds'):
+    SOUNDS_DIR = "/usr/share/activities/TamTamEdit.activity/Resources/Sounds"
+else:
+    SOUNDS_DIR = TAM_TAM_ROOT + "/Resources/Sounds"
 FILES_DIR = TAM_TAM_ROOT + "/Resources"
 TUNE_DIR='/'
 SYNTH_DIR='/'
diff --git a/Edit/EditToolbars.py b/Edit/EditToolbars.py
index 875e20e..408416d 100644
--- a/Edit/EditToolbars.py
+++ b/Edit/EditToolbars.py
@@ -45,14 +45,14 @@ class mainToolbar(gtk.Toolbar):
         self.tooltips = gtk.Tooltips()
 
         #Play button
-        self.playButton = ToggleToolButton('play')
+        self.playButton = ToggleToolButton('media-playback-start')
         self.playButtonHandler = self.playButton.connect('toggled', self.handlePlayPause)
         self.insert(self.playButton, -1)
         self.playButton.show()
         self.playButton.set_tooltip(_('Play / Pause'))
 
         #Stop button
-        self.stopButton = ToolButton('pstop')
+        self.stopButton = ToolButton('media-playback-stop')
         self.stopButton.connect('clicked', self.handleStop)
         self.insert(self.stopButton, -1)
         self.stopButton.show()
@@ -60,12 +60,12 @@ class mainToolbar(gtk.Toolbar):
 
         #Play button Image
         self.playButtonImg = gtk.Image()
-        self.playButtonImg.set_from_icon_name('play', gtk.ICON_SIZE_LARGE_TOOLBAR)
+        self.playButtonImg.set_from_icon_name('media-playback-start', gtk.ICON_SIZE_LARGE_TOOLBAR)
         self.playButtonImg.show()
 
         #Pause button Image
         self.pauseButtonImg = gtk.Image()
-        self.pauseButtonImg.set_from_icon_name('pause', gtk.ICON_SIZE_LARGE_TOOLBAR)
+        self.pauseButtonImg.set_from_icon_name('media-playback-pause', gtk.ICON_SIZE_LARGE_TOOLBAR)
         self.pauseButtonImg.show()
 
         #Record button
diff --git a/activity/activity.info b/activity/activity.info
index af99687..c9ed8a3 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -3,4 +3,4 @@ name = TamTam
 service_name = org.laptop.TamTam
 icon = activity-tamtam
 class = TamTam.TamTam
-activity_version = 39
+activity_version = 40
\ No newline at end of file
diff --git a/activity/activity_edit.info b/activity/activity_edit.info
index ac49ece..65e5044 100644
--- a/activity/activity_edit.info
+++ b/activity/activity_edit.info
@@ -3,4 +3,4 @@ name = TamTamEdit
 service_name = org.laptop.TamTamEdit
 icon = activity-tamtamedit
 class = TamTam.TamTamEdit
-activity_version = 39
+activity_version = 40
diff --git a/activity/activity_jam.info b/activity/activity_jam.info
index 8465e0f..423ad09 100644
--- a/activity/activity_jam.info
+++ b/activity/activity_jam.info
@@ -3,4 +3,4 @@ name = TamTamJam
 service_name = org.laptop.TamTamJam
 icon = activity-tamtam
 class = TamTam.TamTamJam
-activity_version = 39
+activity_version = 40
diff --git a/activity/activity_mini.info b/activity/activity_mini.info
index 9f39f88..351e4f8 100644
--- a/activity/activity_mini.info
+++ b/activity/activity_mini.info
@@ -3,4 +3,4 @@ name = TamTamMini
 service_name = org.laptop.TamTamMini
 icon = activity-tamtam
 class = TamTam.TamTamMini
-activity_version = 39
+activity_version = 40
diff --git a/activity/activity_sl.info b/activity/activity_sl.info
index 44bafe7..7a64eec 100644
--- a/activity/activity_sl.info
+++ b/activity/activity_sl.info
@@ -3,4 +3,4 @@ name = TamTamSynthLab
 service_name = org.laptop.TamTamSynthLab
 icon = activity-tamtamsynthlab
 class = TamTam.TamTamSynthLab
-activity_version = 39
+activity_version = 40
diff --git a/icons/pause.svg b/icons/pause.svg
deleted file mode 100644
index 2dcc875..0000000
--- a/icons/pause.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!-- Generator: Adobe Illustrator 13.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->

-<!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">

-<g>

-	<circle fill="#808284" cx="27.5" cy="27.5" r="22.5"/>

-	<circle fill="none" stroke="#4C4D4F" stroke-width="2.25" cx="27.501" cy="27.5" r="18.677"/>

-</g>

-<g>

-	<line fill="none" stroke="#FFFFFF" stroke-width="4" stroke-linecap="round" x1="32.396" y1="21.474" x2="32.396" y2="33.641"/>

-	<line fill="none" stroke="#FFFFFF" stroke-width="4" stroke-linecap="round" x1="22.604" y1="21.359" x2="22.604" y2="33.527"/>

-</g>

-</svg>

diff --git a/icons/play.svg b/icons/play.svg
deleted file mode 100644
index 0b52488..0000000
--- a/icons/play.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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">

-<g>

-	<g>

-		<g>

-			<circle fill="#808284" cx="27.5" cy="27.5" r="22.5"/>

-			<polygon fill="#FFFFFF" points="36.842,27.75 22.873,35.648 22.873,19.852 			"/>

-		</g>

-	</g>

-	<circle fill="none" stroke="#4C4D4F" stroke-width="2.25" cx="27.499" cy="27.592" r="18.677"/>

-</g>

-</svg>

diff --git a/icons/pstop.svg b/icons/pstop.svg
deleted file mode 100644
index 8fbdbd5..0000000
--- a/icons/pstop.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!-- Generator: Adobe Illustrator 13.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->

-<!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">

-<circle fill="#808284" cx="27.5" cy="27.5" r="22.5"/>

-<circle fill="none" stroke="#4C4D4F" stroke-width="2.25" cx="27.499" cy="27.592" r="18.677"/>

-<rect x="20.75" y="20.041" fill="#FFFFFF" width="13.5" height="14.1"/>

-</svg>

diff --git a/icons/record.svg b/icons/record.svg
deleted file mode 100644
index 2440bf7..0000000
--- a/icons/record.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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">

-<path fill="#808284" d="M50,27.5C50,39.931,39.931,50,27.5,50C15.07,50,5,39.931,5,27.5C5,15.07,15.07,5,27.5,5

-	C39.931,5,50,15.07,50,27.5z"/>

-<path fill="#FFFFFF" d="M35.394,27.5c0,4.354-3.54,7.894-7.894,7.894c-4.354,0-7.894-3.54-7.894-7.894

-	c0-4.354,3.54-7.894,7.894-7.894C31.854,19.606,35.394,23.146,35.394,27.5z"/>

-</svg>

diff --git a/icons/rewind.svg b/icons/rewind.svg
deleted file mode 100644
index 00dbf9d..0000000
--- a/icons/rewind.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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">

-<g>

-	<g>

-		<g>

-			<path fill="#808284" d="M50,27.5C50,39.931,39.931,50,27.5,50C15.07,50,5,39.931,5,27.5C5,15.07,15.07,5,27.5,5

-				C39.931,5,50,15.07,50,27.5z"/>

-			<polygon fill="#FFFFFF" points="13.404,27.391 25.432,20.58 25.432,34.201 			"/>

-			<polygon fill="#FFFFFF" points="25.007,27.391 37.047,20.58 37.047,34.201 			"/>

-		</g>

-	</g>

-</g>

-</svg>

diff --git a/icons/stop.svg b/icons/stop.svg
deleted file mode 100644
index d945237..0000000
--- a/icons/stop.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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">

-<circle fill="#808284" cx="27.5" cy="27.5" r="22.5"/>

-<circle fill="none" stroke="#4C4D4F" stroke-width="2.25" cx="27.499" cy="27.592" r="18.677"/>

-<rect x="20.75" y="20.041" fill="#FFFFFF" width="13.5" height="14.1"/>

-</svg>

diff --git a/miniTamTam/miniTamTamMain.py b/miniTamTam/miniTamTamMain.py
index a127984..eae7ace 100644
--- a/miniTamTam/miniTamTamMain.py
+++ b/miniTamTam/miniTamTamMain.py
@@ -141,12 +141,12 @@ class miniTamTamMain(SubActivity):
 
         #Play button Image
         self.playButtonImg = gtk.Image()
-        self.playButtonImg.set_from_icon_name('play', gtk.ICON_SIZE_LARGE_TOOLBAR)
+        self.playButtonImg.set_from_icon_name('media-playback-start', gtk.ICON_SIZE_LARGE_TOOLBAR)
         self.playButtonImg.show()          
         
         #Stop button Image
         self.stopButtonImg = gtk.Image()
-        self.stopButtonImg.set_from_icon_name('pstop', gtk.ICON_SIZE_LARGE_TOOLBAR)
+        self.stopButtonImg.set_from_icon_name('media-playback-stop', gtk.ICON_SIZE_LARGE_TOOLBAR)
         self.stopButtonImg.show()
         # Toolbar
         self.activity.activity_toolbar.share.show()
diff --git a/miniTamTam/miniToolbars.py b/miniTamTam/miniToolbars.py
index 4717d00..057262b 100644
--- a/miniTamTam/miniToolbars.py
+++ b/miniTamTam/miniToolbars.py
@@ -24,7 +24,7 @@ class playToolbar(gtk.Toolbar):
 
         self.tooltips = gtk.Tooltips()
 
-        self.playButton = ToggleToolButton('play')
+        self.playButton = ToggleToolButton('media-playback-start')
         self.playButton.connect('clicked',self.miniTamTam.handlePlayButton)
         self.insert(self.playButton, -1)
         self.playButton.show()