diff options
author | root <root@xo-05-29-F6.localdomain> | 2007-09-18 00:57:14 (GMT) |
---|---|---|
committer | root <root@xo-05-29-F6.localdomain> | 2007-09-18 00:57:14 (GMT) |
commit | 80a4dea622a9d09eded710b3e1791891af3032f9 (patch) | |
tree | ee852412f418f71095d237fc1f871938bb82f167 | |
parent | df7ec8fec47ce557e188d1f87f6c4e56c8eb7ba9 (diff) | |
parent | e726c1bde003f2903d0ef9ac51a4489fc684a6ad (diff) |
Merge branch 'master' of git+ssh://olipet@dev.laptop.org/git/projects/tamtam
-rw-r--r-- | TamTamEdit.activity/Edit/MainWindow.py | 11 | ||||
-rw-r--r-- | TamTamEdit.activity/TamTamEdit.py | 5 | ||||
-rw-r--r-- | TamTamJam.activity/Jam/JamMain.py | 3 | ||||
-rw-r--r-- | TamTamJam.activity/TamTamJam.py | 4 | ||||
-rw-r--r-- | TamTamMini.activity/Mini/miniTamTamMain.py | 2 | ||||
-rw-r--r-- | TamTamMini.activity/TamTamMini.py | 5 | ||||
-rw-r--r-- | TamTamSynthLab.activity/TamTamSynthLab.py | 2 | ||||
-rw-r--r-- | scripts/create_symlinks.sh | 8 |
8 files changed, 23 insertions, 17 deletions
diff --git a/TamTamEdit.activity/Edit/MainWindow.py b/TamTamEdit.activity/Edit/MainWindow.py index edcb587..ca37d8b 100644 --- a/TamTamEdit.activity/Edit/MainWindow.py +++ b/TamTamEdit.activity/Edit/MainWindow.py @@ -29,7 +29,6 @@ class CONTEXT: NOTE = 2 import common.Config as Config -#from SubActivity import SubActivity from common.Generation.GenerationConstants import GenerationConstants from Edit.Properties import Properties @@ -60,7 +59,7 @@ class MainWindow( gtk.EventBox ): # META ALGO: [section, variation or not, nPages] A B A C # TODO: Different parameters sets for each tracks self.tuneForm = [[0, False, 4], [1, False, 4], [0, True, 4], [2, False, 2]] - + def init_data( ): TP.ProfileBegin("init_data") self._data = {} @@ -354,7 +353,6 @@ class MainWindow( gtk.EventBox ): #=================================================== # begin initialization - #SubActivity.__init__( self, set_mode ) # keyboard variables self.kb_record = False @@ -514,7 +512,6 @@ class MainWindow( gtk.EventBox ): return [density, rytReg, step, pitReg, dur, silence, pattern, scale] def onActivate( self, arg ): - #SubActivity.onActivate( self,arg ) # whatever needs to be done on initialization self.csnd.loopPause() self.csnd.loopClear() @@ -523,7 +520,6 @@ class MainWindow( gtk.EventBox ): def onDeactivate( self ): - #SubActivity.onDeactivate( self ) # clean up things like popups etc self.releaseInstrumentPanel() self.csnd.loopPause() @@ -1418,7 +1414,7 @@ class MainWindow( gtk.EventBox ): self.csnd.setTempo(self._data['tempo']) self.initTrackVolume() - def handleSave(self, widget): + def handleSave(self, widget = None): chooser = gtk.FileChooserDialog( title='Save Tune', @@ -1552,6 +1548,9 @@ class MainWindow( gtk.EventBox ): # left/right arrows duration if keyval == gtk.keysyms.Left: self.trackInterface.noteStepOnset(-1) if keyval == gtk.keysyms.Right: self.trackInterface.noteStepOnset(1) + #Save Loop + if event.state == gtk.gdk.CONTROL_MASK and keyval == gtk.keysyms.s: + self.handleSave() def onKeyPress(self,widget,event): diff --git a/TamTamEdit.activity/TamTamEdit.py b/TamTamEdit.activity/TamTamEdit.py index 0147dff..854ff16 100644 --- a/TamTamEdit.activity/TamTamEdit.py +++ b/TamTamEdit.activity/TamTamEdit.py @@ -38,9 +38,6 @@ class TamTamEdit(activity.Activity): self.focusOutHandler = self.connect('focus_out_event',self.onFocusOut) self.connect('notify::active', self.onActive) self.connect('destroy', self.onDestroy) - self.connect( "key-press-event", self.onKeyPress ) - self.connect( "key-release-event", self.onKeyRelease ) - self.instrumentPanel = InstrumentPanel( force_load = False ) self.preloadList = [ self.instrumentPanel ] @@ -57,6 +54,8 @@ class TamTamEdit(activity.Activity): self.trackpad.setContext('edit') self.edit = MainWindow(self) + self.connect('key-press-event', self.edit.onKeyPress) + self.connect('key-release-event', self.edit.onKeyRelease) #self.modeList[mode].regenerate() if self.instrumentPanel in self.preloadList: self.instrumentPanel.load() # finish loading diff --git a/TamTamJam.activity/Jam/JamMain.py b/TamTamJam.activity/Jam/JamMain.py index 26b0c95..60a5899 100644 --- a/TamTamJam.activity/Jam/JamMain.py +++ b/TamTamJam.activity/Jam/JamMain.py @@ -313,8 +313,7 @@ class JamMain(gtk.EventBox): #========================================================== - # SubActivity Handlers - + def onActivate( self, arg ): pass def onDeactivate( self ): diff --git a/TamTamJam.activity/TamTamJam.py b/TamTamJam.activity/TamTamJam.py index 22b71bd..1b08bbb 100644 --- a/TamTamJam.activity/TamTamJam.py +++ b/TamTamJam.activity/TamTamJam.py @@ -37,8 +37,6 @@ class TamTamJam(activity.Activity): self.focusOutHandler = self.connect('focus_out_event',self.onFocusOut) self.connect('notify::active', self.onActive) self.connect('destroy', self.onDestroy) - self.connect( "key-press-event", self.onKeyPress ) - self.connect( "key-release-event", self.onKeyRelease ) #load the sugar toolbar self.toolbox = activity.ActivityToolbox(self) @@ -52,6 +50,8 @@ class TamTamJam(activity.Activity): self.trackpad.setContext('jam') self.jam = JamMain(self) + self.connect('key-press-event', self.jam.onKeyPress) + self.connect('key-release-event', self.jam.onKeyRelease) #self.modeList[mode].regenerate() self.set_canvas( self.jam ) diff --git a/TamTamMini.activity/Mini/miniTamTamMain.py b/TamTamMini.activity/Mini/miniTamTamMain.py index 352d247..f3916a9 100644 --- a/TamTamMini.activity/Mini/miniTamTamMain.py +++ b/TamTamMini.activity/Mini/miniTamTamMain.py @@ -41,7 +41,7 @@ class miniTamTamMain(gtk.EventBox): def __init__(self, activity): gtk.EventBox.__init__(self) - + self.activity = activity self.set_border_width(Config.MAIN_WINDOW_PADDING) diff --git a/TamTamMini.activity/TamTamMini.py b/TamTamMini.activity/TamTamMini.py index 0e6f4e2..edebf72 100644 --- a/TamTamMini.activity/TamTamMini.py +++ b/TamTamMini.activity/TamTamMini.py @@ -38,9 +38,6 @@ class TamTamMini(activity.Activity): self.focusOutHandler = self.connect('focus_out_event',self.onFocusOut) self.connect('notify::active', self.onActive) self.connect('destroy', self.onDestroy) - self.connect( "key-press-event", self.onKeyPress ) - self.connect( "key-release-event", self.onKeyRelease ) - self.instrumentPanel = InstrumentPanel( force_load = False ) self.preloadList = [ self.instrumentPanel ] @@ -57,6 +54,8 @@ class TamTamMini(activity.Activity): self.trackpad.setContext('mini') self.mini = miniTamTamMain(self) + self.connect('key-press-event', self.mini.onKeyPress) + self.connect('key-release-event', self.mini.onKeyRelease) #self.modeList[mode].regenerate() if self.instrumentPanel in self.preloadList: self.instrumentPanel.load() # finish loading diff --git a/TamTamSynthLab.activity/TamTamSynthLab.py b/TamTamSynthLab.activity/TamTamSynthLab.py index 2fdd6aa..6a1d085 100644 --- a/TamTamSynthLab.activity/TamTamSynthLab.py +++ b/TamTamSynthLab.activity/TamTamSynthLab.py @@ -50,6 +50,8 @@ class TamTamSynthLab(activity.Activity): self.trackpad.setContext('synthLab') self.synthLab = SynthLabMain(self) + self.connect('key-press-event', self.synthLab .onKeyPress) + self.connect('key-release-event', self.synthLab .onKeyRelease) self.connect( "key-press-event", self.synthLab.onKeyPress ) self.connect( "key-release-event", self.synthLab.onKeyRelease ) diff --git a/scripts/create_symlinks.sh b/scripts/create_symlinks.sh new file mode 100644 index 0000000..cb3d6ee --- /dev/null +++ b/scripts/create_symlinks.sh @@ -0,0 +1,8 @@ +#!/bin/sh +rm -rf /usr/share/activities/TamTamEdit.activity +rm -rf /usr/share/activities/TamTamJam.activity +rm -rf /usr/share/activities/TamTamSynthlab.activity + +ln -s /home/olpc/tamtam/TamTamEdit.activity /usr/share/activities/TamTamEdit.activity +ln -s /home/olpc/tamtam/TamTamJam.activity /usr/share/activities/TamTamJam.activity +ln -s /home/olpc/tamtam/TamTamSynthlab.activity /usr/share/activities/TamTamSynthlab.activity |