Merge branch 'master' of git+ssh://dev.laptop.org/git/projects/tamtam

4 files changed, 55 insertions, 38 deletions

diff --git a/TamTamEdit.activity/Edit/MainWindow.py b/TamTamEdit.activity/Edit/MainWindow.py
index 4842013..bb81391 100644
--- a/TamTamEdit.activity/Edit/MainWindow.py
+++ b/TamTamEdit.activity/Edit/MainWindow.py
@@ -616,7 +616,9 @@ class MainWindow( gtk.EventBox ):
                     self.handleRewind()
 
                 self.audioRecordState = True
-                self.audioFileName = chooser.get_filename()
+                head, tail = os.path.split(chooser.get_filename())
+                tailfilt = '_'.join(tail.split())
+                self.audioFileName = os.path.join(head, tailfilt)
                 if self.audioFileName[-4:] != '.ogg':
                     self.audioFileName += '.ogg'
 
@@ -2141,7 +2143,7 @@ class instrumentPalette( Popup ):
         self.volumeSlider.set_inverted(False)
         self.volumeSlider.set_draw_value(False)
 
-        self.categories = [cat.capitalize() for cat in Config.CATEGORIES]
+        self.categories = [cat.capitalize() for cat in Config.CATEGORIES if cat != 'mysounds']
         self.instruments = self.getInstruments()
 
         self.categoryBox = BigComboBox()
@@ -2218,7 +2220,7 @@ class instrumentPalette( Popup ):
 
     def getInstruments(self, category = 'all'):
         if category == 'all':
-            return sorted([instrument for instrument in self.instrumentDB.instNamed.keys() if not instrument.startswith('drum') and not instrument.startswith('guid')])
+            return sorted([instrument for instrument in self.instrumentDB.instNamed.keys() if not instrument.startswith('drum') and not instrument.startswith('guid') and not instrument.startswith('mic') and not instrument.startswith('lab')])
         else:
             return sorted([instrument for instrument in self.instrumentDB.instNamed.keys() if not instrument.startswith('drum') and not instrument.startswith('guid') and self.instrumentDB.instNamed[instrument].category == category])
 
diff --git a/TamTamEdit.activity/MANIFEST b/TamTamEdit.activity/MANIFEST
index 4b92652..0574d0f 100644
--- a/TamTamEdit.activity/MANIFEST
+++ b/TamTamEdit.activity/MANIFEST
@@ -4,47 +4,58 @@ setup.py
 TamTamEdit.py
 activity/activity-tamtamedit.svg
 activity/activity.info
-po/ne.po
+po/TamTamEdit.pot
 po/am.po
-po/fa.po
-po/en.po
-po/ca.po
 po/ar.po
-po/ig.po
-po/yo.po
+po/ay.po
+po/bg.po
 po/bn.po
-po/qu.po
-po/pseudo.po
+po/bn_IN.po
+po/ca.po
+po/de.po
+po/dz.po
 po/el.po
-po/ur.po
-po/bg.po
-po/hi.po
-po/fa_AF.po
-po/pt_BR.po
-po/nl.po
-po/te.po
+po/en.po
 po/es.po
-po/mk.po
-po/pl.po
-po/ro.po
-po/bn_IN.po
+po/fa.po
+po/fa_AF.po
+po/ff.po
+po/fr.po
+po/gu.po
+po/ha.po
+po/hi.po
+po/ht.po
+po/ig.po
+po/is.po
+po/it.po
 po/ja.po
-po/dz.po
+po/km.po
+po/ko.po
+po/mk.po
+po/ml.po
+po/mn.po
+po/mr.po
+po/ne.po
+po/nl.po
 po/pa.po
-po/TamTamEdit.pot
-po/ay.po
+po/pl.po
 po/ps.po
-po/de.po
-po/ml.po
-po/th.po
-po/rw.po
-po/fr.po
+po/pseudo.po
 po/pt.po
-po/is.po
-po/ff.po
+po/pt_BR.po
+po/qu.po
+po/ro.po
 po/ru.po
-po/ha.po
-po/mn.po
+po/rw.po
+po/si.po
+po/te.po
+po/th.po
+po/tr.po
+po/ur.po
+po/vi.po
+po/yo.po
+po/zh_CN.po
+po/zh_TW.po
 icons/XYBut.svg
 icons/XYButDown.svg
 icons/XYButDownClick.svg
diff --git a/TamTamEdit.activity/NEWS b/TamTamEdit.activity/NEWS
index 48a200b..7be5f54 100644
--- a/TamTamEdit.activity/NEWS
+++ b/TamTamEdit.activity/NEWS
@@ -1,5 +1,9 @@
 48
 
+* TamTamEdit saves OGG files in the journal (Olipet)
+* Removed mic and lab sounds (Olipet)
+* Edit follows security model (Olipet)
+
 47
 
 * Updated po files (Flipo)
diff --git a/TamTamEdit.activity/TamTamEdit.py b/TamTamEdit.activity/TamTamEdit.py
index 99a0fc3..8400e82 100644
--- a/TamTamEdit.activity/TamTamEdit.py
+++ b/TamTamEdit.activity/TamTamEdit.py
@@ -23,10 +23,10 @@ class TamTamEdit(activity.Activity):
     def __init__(self, handle):
         activity.Activity.__init__(self, handle)
 
-        for snd in ['mic1','mic2','mic3','mic4','lab1','lab2','lab3','lab4', 'lab5', 'lab6']:
-            if not os.path.isfile(os.path.join(Config.DATA_DIR, snd)):
-                shutil.copyfile(Config.SOUNDS_DIR + '/' + snd , Config.DATA_DIR + '/' + snd)
-                os.system('chmod 0777 ' + Config.DATA_DIR + '/' + snd + ' &')
+#        for snd in ['mic1','mic2','mic3','mic4','lab1','lab2','lab3','lab4', 'lab5', 'lab6']:
+#            if not os.path.isfile(os.path.join(Config.DATA_DIR, snd)):
+#                shutil.copyfile(Config.SOUNDS_DIR + '/' + snd , Config.DATA_DIR + '/' + snd)
+#                os.system('chmod 0777 ' + Config.DATA_DIR + '/' + snd + ' &')
 
         color = gtk.gdk.color_parse(Config.WS_BCK_COLOR)
         self.modify_bg(gtk.STATE_NORMAL, color)