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 /TamTamMini.activity | |
| parent | df7ec8fec47ce557e188d1f87f6c4e56c8eb7ba9 (diff) | |
| parent | e726c1bde003f2903d0ef9ac51a4489fc684a6ad (diff) | |
Merge branch 'master' of git+ssh://olipet@dev.laptop.org/git/projects/tamtam
Diffstat (limited to 'TamTamMini.activity')
| -rw-r--r-- | TamTamMini.activity/Mini/miniTamTamMain.py | 2 | ||||
| -rw-r--r-- | TamTamMini.activity/TamTamMini.py | 5 |
2 files changed, 3 insertions, 4 deletions
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 |