security model, cleanup, SynthLab to OGG

3 files changed, 13 insertions, 7 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/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)