Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--TamTamEdit.activity/Edit/MainWindow.py4
-rw-r--r--TamTamEdit.activity/TamTamEdit.py5
-rw-r--r--TamTamJam.activity/Jam/JamMain.py2
-rw-r--r--TamTamJam.activity/TamTamJam.py4
-rw-r--r--TamTamMini.activity/Mini/miniTamTamMain.py2
-rw-r--r--TamTamMini.activity/TamTamMini.py5
-rw-r--r--TamTamSynthLab.activity/TamTamSynthLab.py4
7 files changed, 8 insertions, 18 deletions
diff --git a/TamTamEdit.activity/Edit/MainWindow.py b/TamTamEdit.activity/Edit/MainWindow.py
index 91019d5..0780a0f 100644
--- a/TamTamEdit.activity/Edit/MainWindow.py
+++ b/TamTamEdit.activity/Edit/MainWindow.py
@@ -61,10 +61,6 @@ class MainWindow( gtk.EventBox ):
# TODO: Different parameters sets for each tracks
self.tuneForm = [[0, False, 4], [1, False, 4], [0, True, 4], [2, False, 2]]
- self.add_events(gtk.gdk.KEY_PRESS_MASK | gtk.gdk.KEY_RELEASE_MASK)
- self.connect('key-press-event', self.onKeyPress)
- self.connect('key-release-event', self.onKeyRelease)
-
def init_data( ):
TP.ProfileBegin("init_data")
self._data = {}
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 b7d1013..60a5899 100644
--- a/TamTamJam.activity/Jam/JamMain.py
+++ b/TamTamJam.activity/Jam/JamMain.py
@@ -41,8 +41,6 @@ class JamMain(gtk.EventBox):
def __init__(self, activity):
gtk.EventBox.__init__(self)
- self.connect('key-press-event', self.onKeyPress)
- self.connect('key-release-event', self.onKeyRelease)
self.activity = activity
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 53e179e..0615718 100644
--- a/TamTamMini.activity/Mini/miniTamTamMain.py
+++ b/TamTamMini.activity/Mini/miniTamTamMain.py
@@ -41,8 +41,6 @@ class miniTamTamMain(gtk.EventBox):
def __init__(self, activity):
gtk.EventBox.__init__(self)
- self.connect('key-press-event', self.onKeyPress)
- self.connect('key-release-event', self.onKeyRelease)
self.activity = activity
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 1381a65..31af843 100644
--- a/TamTamSynthLab.activity/TamTamSynthLab.py
+++ b/TamTamSynthLab.activity/TamTamSynthLab.py
@@ -37,8 +37,6 @@ class TamTamSynthLab(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 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.set_canvas( self.synthLab )