Generate Toolbar

2 files changed, 40 insertions, 20 deletions

diff --git a/Edit/EditToolbars.py b/Edit/EditToolbars.py
index 372d963..ef0873b 100644
--- a/Edit/EditToolbars.py
+++ b/Edit/EditToolbars.py
@@ -117,21 +117,6 @@ class mainToolbar(gtk.Toolbar):
         self.insert(self.volumeTempoButton, -1)
         self.volumeTempoButton.show()
 
-        #Generation button
-        self._generationPalette = generationPalette(_('Generation'), self.edit)
-        self.generationButton = ToggleToolButton('dice')
-        #self.generationButton.connect(None)
-        self.generationButton.set_palette(self._generationPalette)
-        self.insert(self.generationButton, -1)
-        self.generationButton.show()
-
-        #Properties button
-        self._propertiesPalette = propertiesPalette(_('Properties'), self.edit)
-        self.propsButton = ToggleToolButton('props')
-        self.propsButton.set_palette(self._propertiesPalette)
-        self.insert(self.propsButton, -1)
-        self.propsButton.show()
-
     def handlePlayPause(self, widget, data = None):
         if widget.get_active():
             self.edit.handlePlay(widget)
@@ -153,6 +138,37 @@ class mainToolbar(gtk.Toolbar):
             elif self.edit.getContext() == 2: #Note
                 self.edit.noteDuplicateWidget(widget)
             widget.set_active(False)
+            
+class generateToolbar(gtk.Toolbar):
+    def __init__(self,toolbox, edit):
+        gtk.Toolbar.__init__(self)
+
+        def _insertSeparator(x = 1):
+            for i in range(x):
+                self.separator = gtk.SeparatorToolItem()
+                self.separator.set_draw(True)
+                self.insert(self.separator,-1)
+                self.separator.show()
+
+        self.toolbox = toolbox
+        self.edit = edit
+
+        self.tooltips = gtk.Tooltips()
+        
+        #Generation button
+        self._generationPalette = generationPalette(_('Generation'), self.edit)
+        self.generationButton = ToggleToolButton('dice')
+        #self.generationButton.connect(None)
+        self.generationButton.set_palette(self._generationPalette)
+        self.insert(self.generationButton, -1)
+        self.generationButton.show()
+
+        #Properties button
+        self._propertiesPalette = propertiesPalette(_('Properties'), self.edit)
+        self.propsButton = ToggleToolButton('props')
+        self.propsButton.set_palette(self._propertiesPalette)
+        self.insert(self.propsButton, -1)
+        self.propsButton.show()
 
 class recordPalette(Palette):
     def __init__(self, label, edit):
@@ -989,16 +1005,16 @@ class propertiesPalette(Palette):
 
     def handlePopup(self, widget, data = None):
         if self.edit.getContext() == 0: #Page
-            self.setContext('page', self.edit._mainToolbar._generationPalette.scale, self.edit.tuneInterface.getSelectedIds())
+            self.setContext('page', self.edit._generateToolbar._generationPalette.scale, self.edit.tuneInterface.getSelectedIds())
         elif self.edit.getContext() == 1: #Track
-            self.setContext('track', self.edit._mainToolbar._generationPalette.scale, self.edit.tuneInterface.getSelectedIds(), [ i for i in range(Config.NUMBER_OF_TRACKS) if self.edit.trackSelected[i] ])
+            self.setContext('track', self.edit._generateToolbar._generationPalette.scale, self.edit.tuneInterface.getSelectedIds(), [ i for i in range(Config.NUMBER_OF_TRACKS) if self.edit.trackSelected[i] ])
         elif self.edit.getContext() == 2: #Note
             ids = self.edit.trackInterface.getSelectedNotes()
             notes = { self.edit.displayedPage: {} }
             for t in range(Config.NUMBER_OF_TRACKS):
                 if len(ids[t]):
                     notes[self.edit.displayedPage][t] = [ self.edit.noteDB.getNote( self.edit.displayedPage, t, id ) for id in ids[t] ]
-            self.setContext('note', self.edit._mainToolbar._generationPalette.scale, notes = notes)
+            self.setContext('note', self.edit._generateToolbar._generationPalette.scale, notes = notes)
 
     def handlePopdown(self, widget, data = None):
         self.resetGeneCheckButton(self.cancelButton)
diff --git a/Edit/MainWindow.py b/Edit/MainWindow.py
index 0d66f68..eadd798 100644
--- a/Edit/MainWindow.py
+++ b/Edit/MainWindow.py
@@ -14,6 +14,7 @@ from Util.InstrumentPanel import InstrumentPanel
 from Util.InstrumentPanel import DrumPanel
 from Util.CSoundNote import CSoundNote
 from EditToolbars import mainToolbar
+from EditToolbars import generateToolbar
 from gettext import gettext as _
 from subprocess import Popen
 import time
@@ -383,9 +384,12 @@ class MainWindow( SubActivity ):
         # Toolbar
         self.activity.activity_toolbar.keep.show()
         self._mainToolbar = mainToolbar(self.activity.toolbox, self)
+        self._generateToolbar = generateToolbar(self.activity.toolbox, self)
         self.activity.toolbox.add_toolbar(_('Compose'), self._mainToolbar)
+        self.activity.toolbox.add_toolbar(_('Generate'), self._generateToolbar)
         self.activity.toolbox.set_current_toolbar(1)
         self._mainToolbar.show()
+        self._generateToolbar.show()
 
         self.show_all()  #gtk command
 
@@ -1881,9 +1885,9 @@ class MainWindow( SubActivity ):
         self.context = context
 
         if self.context == CONTEXT.NOTE:
-            self._mainToolbar.generationButton.set_sensitive(False)
+            self._generateToolbar.generationButton.set_sensitive(False)
         else:
-            self._mainToolbar.generationButton.set_sensitive(True)
+            self._generateToolbar.generationButton.set_sensitive(True)
 
     def getContext(self):
         return self.context