7 files changed, 48 insertions, 48 deletions
diff --git a/TamTamEdit.activity/Edit/EditToolbars.py b/TamTamEdit.activity/Edit/EditToolbars.py
index 38e2e27..7854b7d 100644
--- a/TamTamEdit.activity/Edit/EditToolbars.py
+++ b/TamTamEdit.activity/Edit/EditToolbars.py
@@ -2,27 +2,27 @@
 
 import gtk
 
-import Config
+import common.Config as Config
 from sugar.graphics.toolbutton import ToolButton
 from sugar.graphics.toggletoolbutton import ToggleToolButton
 from sugar.graphics.radiotoolbutton import RadioToolButton
 from sugar.graphics.palette import Palette
 from sugar.graphics.icon import Icon
-from Util.ThemeWidgets import *
+from common.Util.ThemeWidgets import *
 from gettext import gettext as _
 
 #Generation palette
 import gobject
-from Generation.Generator import GenerationParameters
+from common.Generation.Generator import GenerationParameters
 #Generation palette and Properties palette
-from Generation.GenerationConstants import GenerationConstants
-from Generation.GenerationRythm import GenerationRythm
-from Generation.GenerationPitch import GenerationPitch
+from common.Generation.GenerationConstants import GenerationConstants
+from common.Generation.GenerationRythm import GenerationRythm
+from common.Generation.GenerationPitch import GenerationPitch
 
 #Properties palette
-from Util.NoteDB import PARAMETER
-from Generation.Drunk import *
-import Generation.Utils as Utils
+from common.Util.NoteDB import PARAMETER
+from common.Generation.Drunk import *
+import common.Generation.Utils as Utils
 from types import *
 from math import sqrt
 from random import *
@@ -986,7 +986,7 @@ class propertiesPalette(Palette):
         self.filterTypeLabel = gtk.Label(_('Filter Type: '))
         self.filterTypeComboBox = BigComboBox()
         for filtertype in self.filterTypes:
-            self.filterTypeComboBox.append_item(self.filterTypes.index(filtertype), filtertype, Config.TAM_TAM_ROOT + '/icons/test.svg', (30,30))
+            self.filterTypeComboBox.append_item(self.filterTypes.index(filtertype), filtertype)
         self.filterTypeComboBox.connect('changed', self.handleFilterTypes)
         self.filterTypeBox.pack_start(self.filterTypeLabel, False, False, padding = 5)
         self.filterTypeBox.pack_end(self.filterTypeComboBox, False, False, padding = 55)
@@ -1014,7 +1014,7 @@ class propertiesPalette(Palette):
         self.generationTypeLabel = gtk.Label(_('Type: '))
         self.generationTypeComboBox = BigComboBox()
         for genetype in self.geneTypes:
-            self.generationTypeComboBox.append_item(self.geneTypes.index(genetype), genetype, Config.TAM_TAM_ROOT + '/icons/test.svg', (30,30))
+            self.generationTypeComboBox.append_item(self.geneTypes.index(genetype), genetype)
         self.generationTypeComboBox.connect('changed', self.handleGeneTypes)
         self.generationTypeComboBox.set_active(0)
         self.generationTypeBox.pack_start(self.generationTypeLabel, False, False, padding = 5)
diff --git a/TamTamEdit.activity/Edit/HitInterface.py b/TamTamEdit.activity/Edit/HitInterface.py
index 6e77908..049c2b0 100644
--- a/TamTamEdit.activity/Edit/HitInterface.py
+++ b/TamTamEdit.activity/Edit/HitInterface.py
@@ -2,9 +2,9 @@ import pygtk
 pygtk.require( '2.0' )
 import gtk
 
-from Util.NoteDB import PARAMETER
+from common.Util.NoteDB import PARAMETER
 from Edit.NoteInterface import NoteInterface
-import Config
+import common.Config as Config
 
 class HitInterface( NoteInterface ):
 
diff --git a/TamTamEdit.activity/Edit/MainWindow.py b/TamTamEdit.activity/Edit/MainWindow.py
index 58f82f1..edcb587 100644
--- a/TamTamEdit.activity/Edit/MainWindow.py
+++ b/TamTamEdit.activity/Edit/MainWindow.py
@@ -4,15 +4,15 @@ import gtk
 
 import gobject
 
-from Util.ThemeWidgets import *
-from Util.Profiler import TP
-from Util import NoteDB
-from Util.NoteDB import PARAMETER
-from Util import ControlStream
-from Util.CSoundClient import new_csound_client
-from Util.InstrumentPanel import InstrumentPanel
-from Util.InstrumentPanel import DrumPanel
-from Util.CSoundNote import CSoundNote
+from common.Util.ThemeWidgets import *
+from common.Util.Profiler import TP
+from common.Util import NoteDB
+from common.Util.NoteDB import PARAMETER
+from common.Util import ControlStream
+from common.Util.CSoundClient import new_csound_client
+from common.Util.InstrumentPanel import InstrumentPanel
+from common.Util.InstrumentPanel import DrumPanel
+from common.Util.CSoundNote import CSoundNote
 from EditToolbars import mainToolbar
 from EditToolbars import generateToolbar
 from gettext import gettext as _
@@ -28,16 +28,15 @@ class CONTEXT:
     TRACK = 1
     NOTE = 2
 
-import Config
-from SubActivity import SubActivity
+import common.Config as Config
+#from SubActivity import SubActivity
 
-from Generation.GenerationConstants import GenerationConstants
-from Generation.GenerationParametersWindow import GenerationParametersWindow
+from common.Generation.GenerationConstants import GenerationConstants
 from Edit.Properties import Properties
 from Edit.TrackInterface import TrackInterface, TrackInterfaceParasite
 from Edit.TuneInterface import TuneInterface, TuneInterfaceParasite
 
-from Generation.Generator import generator1, GenerationParameters
+from common.Generation.Generator import generator1, GenerationParameters
 
 Tooltips = Config.Tooltips()
 KEY_MAP_PIANO = Config.KEY_MAP_PIANO
@@ -45,9 +44,10 @@ KEY_MAP_PIANO = Config.KEY_MAP_PIANO
 #-----------------------------------
 # The main TamTam window
 #-----------------------------------
-class MainWindow( SubActivity ):
+class MainWindow( gtk.EventBox ):
 
-    def __init__( self, activity, set_mode ):
+    def __init__( self, activity ):
+        gtk.EventBox.__init__(self)
         self.csnd = new_csound_client()
         self.tooltips = gtk.Tooltips()
         self.activity = activity
@@ -354,7 +354,7 @@ class MainWindow( SubActivity ):
 
         #===================================================
         # begin initialization
-        SubActivity.__init__( self, set_mode )
+        #SubActivity.__init__( self, set_mode )
 
         # keyboard variables
         self.kb_record = False
@@ -514,7 +514,7 @@ class MainWindow( SubActivity ):
         return [density, rytReg, step, pitReg, dur, silence, pattern, scale]
 
     def onActivate( self, arg ):
-        SubActivity.onActivate( self,arg )
+        #SubActivity.onActivate( self,arg )
         # whatever needs to be done on initialization
         self.csnd.loopPause()
         self.csnd.loopClear()
@@ -523,7 +523,7 @@ class MainWindow( SubActivity ):
 
 
     def onDeactivate( self ):
-        SubActivity.onDeactivate( self )
+        #SubActivity.onDeactivate( self )
         # clean up things like popups etc
         self.releaseInstrumentPanel()
         self.csnd.loopPause()
diff --git a/TamTamEdit.activity/Edit/NoteInterface.py b/TamTamEdit.activity/Edit/NoteInterface.py
index a5035dd..9dc4247 100644
--- a/TamTamEdit.activity/Edit/NoteInterface.py
+++ b/TamTamEdit.activity/Edit/NoteInterface.py
@@ -2,10 +2,10 @@ import pygtk
 pygtk.require( '2.0' )
 import gtk
 
-import Config
+import common.Config as Config
 
-from Util.NoteDB import PARAMETER
-from Util.CSoundClient import new_csound_client
+from common.Util.NoteDB import PARAMETER
+from common.Util.CSoundClient import new_csound_client
 
 class NoteInterface:
 
diff --git a/TamTamEdit.activity/Edit/Properties.py b/TamTamEdit.activity/Edit/Properties.py
index b0caae0..e72b22c 100644
--- a/TamTamEdit.activity/Edit/Properties.py
+++ b/TamTamEdit.activity/Edit/Properties.py
@@ -4,11 +4,11 @@ import gtk
 from types import *
 from math import sqrt
 from random import *
-from Generation.Drunk import *
-from Generation.GenerationConstants import GenerationConstants
-from Util.ThemeWidgets import *
-from Util.NoteDB import PARAMETER
-import Config
+from common.Generation.Drunk import *
+from common.Generation.GenerationConstants import GenerationConstants
+from common.Util.ThemeWidgets import *
+from common.Util.NoteDB import PARAMETER
+import common.Config as Config
 Tooltips = Config.Tooltips()
 
 class Properties( gtk.VBox ):
diff --git a/TamTamEdit.activity/Edit/TrackInterface.py b/TamTamEdit.activity/Edit/TrackInterface.py
index b8a3a27..5b63576 100644
--- a/TamTamEdit.activity/Edit/TrackInterface.py
+++ b/TamTamEdit.activity/Edit/TrackInterface.py
@@ -7,15 +7,15 @@ import gobject
 from math import floor
 import time
 
-import Config
+import common.Config as Config
 from Edit.NoteInterface import NoteInterface
 from Edit.HitInterface import HitInterface
 from Edit.MainWindow import CONTEXT
 
-from Util.NoteDB import PARAMETER
-from Util.CSoundNote import CSoundNote
-from Generation.GenerationConstants import GenerationConstants
-from Util.Profiler import TP
+from common.Util.NoteDB import PARAMETER
+from common.Util.CSoundNote import CSoundNote
+from common.Generation.GenerationConstants import GenerationConstants
+from common.Util.Profiler import TP
 
 class SELECTNOTES:
     ALL = -1
diff --git a/TamTamEdit.activity/Edit/TuneInterface.py b/TamTamEdit.activity/Edit/TuneInterface.py
index 3682a57..d29597b 100644
--- a/TamTamEdit.activity/Edit/TuneInterface.py
+++ b/TamTamEdit.activity/Edit/TuneInterface.py
@@ -2,12 +2,12 @@ import pygtk
 pygtk.require( '2.0' )
 import gtk
 
-import Config
+import common.Config as Config
 
-from Util.Profiler import TP
+from common.Util.Profiler import TP
 from Edit.MainWindow import CONTEXT
 
-from Util.NoteDB import PARAMETER
+from common.Util.NoteDB import PARAMETER
 
 class TuneInterfaceParasite: