Colors and layout

2 files changed, 11 insertions, 19 deletions

diff --git a/Edit/EditToolbars.py b/Edit/EditToolbars.py
index e0976ac..0c1ac6d 100644
--- a/Edit/EditToolbars.py
+++ b/Edit/EditToolbars.py
@@ -127,11 +127,11 @@ class mainToolbar(gtk.Toolbar):
     def handlePencil(self, widget, data = None):
         if widget.get_active():
             if self._pencilPalette.checkbox.get_active():
-                self.edit.handleToolClick2(widget, 'paint')
+                self.edit.handleToolClick(widget, 'paint')
             else:
-                self.edit.handleToolClick2(widget, 'draw')
+                self.edit.handleToolClick(widget, 'draw')
         else:
-            self.edit.handleToolClick2(widget, 'default')
+            self.edit.handleToolClick(widget, 'default')
 
     def handleDuplicate(self, widget):
         if widget.get_active():
@@ -206,12 +206,12 @@ class pencilPalette(Palette):
     def handleCheckBox(self, widget, data = None):
         if widget.get_active():
             if self._mainToolbar.pencilButton.get_active():
-                self.edit.handleToolClick2(widget, 'paint')
+                self.edit.handleToolClick(widget, 'paint')
         else:
             if self._mainToolbar.pencilButton.get_active():
-                self.edit.handleToolClick2(widget, 'draw')
+                self.edit.handleToolClick(widget, 'draw')
             else:
-                self.edit.handleToolClick2(widget, 'default')
+                self.edit.handleToolClick(widget, 'default')
                 
     def handleNoteDur(self, widget):
         pass
@@ -497,7 +497,7 @@ class propertiesPalette(Palette):
         self.pageColorBox.pack_end(self.pageColorComboBox, False, False, padding = 55)
         
         self.pageSeparator = gtk.HSeparator()
-        self.pageSeparator.set_size_request(80, -1)
+        self.pageSeparator.set_size_request(20, -1)
 
         self.transposeBox = gtk.HBox()
         self.transposeLabel = gtk.Label(_('Transposition: '))
@@ -607,6 +607,7 @@ class propertiesPalette(Palette):
         self.filterCutoffBox.pack_end(self.filterCutoffSlider, False, False, padding = 5)
 
         self.generationMainBox = gtk.VBox()
+        self.generationSeparator = gtk.HSeparator()
         self.generationLabel = gtk.Label(_('Generation'))
 
         self.generationTypeBox = gtk.HBox()
@@ -654,7 +655,7 @@ class propertiesPalette(Palette):
 
         self.mainBox.pack_start(self.gridDivisionBox, padding = 3)
         self.mainBox.pack_start(self.pageColorBox, padding = 3)
-        self.mainBox.pack_start(self.pageSeparator, padding = 3)
+        self.mainBox.pack_start(self.pageSeparator, padding = 10)
         self.mainBox.pack_start(self.transposeBox, padding = 3)
         self.mainBox.pack_start(self.volumeBox, padding = 3)
         self.mainBox.pack_start(self.panBox, padding = 3)
@@ -663,6 +664,7 @@ class propertiesPalette(Palette):
         self.mainBox.pack_start(self.decayDurBox, padding = 3)
         self.mainBox.pack_start(self.filterTypeBox, padding = 3)
         self.mainBox.pack_start(self.filterCutoffBox, padding = 3)
+        self.generationMainBox.pack_start(self.generationSeparator, padding = 5)
         self.generationMainBox.pack_start(self.generationLabel, padding = 10)
         self.generationMainBox.pack_start(self.generationTypeBox, padding = 3)
         self.generationMainBox.pack_start(self.minimumBox, padding = 3)
diff --git a/Edit/MainWindow.py b/Edit/MainWindow.py
index 59630bc..0131cff 100644
--- a/Edit/MainWindow.py
+++ b/Edit/MainWindow.py
@@ -386,6 +386,7 @@ class MainWindow( SubActivity ):
         self.activity.toolbox.add_toolbar(_('Compose'), self._mainToolbar)
         self.activity.toolbox.set_current_toolbar(1)
         self._mainToolbar.show()
+        
         self.show_all()  #gtk command
 
         self.setContext( CONTEXT.PAGE )
@@ -938,9 +939,6 @@ class MainWindow( SubActivity ):
             self.csnd.loopSetTempo(self._data['tempo'])
 
     def handleToolClick( self, widget, mode ):
-        if widget.get_active(): self.trackInterface.setInterfaceMode( mode )
-
-    def handleToolClick2( self, widget, mode ):
         self.trackInterface.setInterfaceMode( mode )
 
     def getTool( self ):
@@ -1120,10 +1118,6 @@ class MainWindow( SubActivity ):
         return self.noteDB.pasteClipboard( pages, offset, trackMap, instrumentMap )
 
     def cleanupClipboard( self ):
-        if self.skipCleanup != "note" and self.GUI["2noteDuplicateButton"].get_active():
-            self.GUI["2noteDuplicateButton"].set_active(False)
-        if self.skipCleanup != "track" and self.GUI["2trackDuplicateButton"].get_active():
-            self.GUI["2trackDuplicateButton"].set_active(False)
         self.trackInterface.donePaste()
 
 
@@ -1172,8 +1166,6 @@ class MainWindow( SubActivity ):
             stream += [ self.displayedPage, t, N ] + ids[t]
         if len(stream):
             self.skipCleanup = "note"
-            if self.GUI["2trackDuplicateButton"].get_active():
-                self.GUI["2trackDuplicateButton"].set_active( False )
             self.skipCleanup = ""
             self.noteDB.notesToClipboard( stream + [-1] )
             self.trackInterface.setInterfaceMode("paste_notes")
@@ -1300,8 +1292,6 @@ class MainWindow( SubActivity ):
 
         if len(trackIds):
             self.skipCleanup = "track"
-            if self.GUI["2noteDuplicateButton"].get_active():
-                self.GUI["2noteDuplicateButton"].set_active( False )
             self.skipCleanup = ""
             self.noteDB.tracksToClipboard( pageIds, trackIds )
             self.trackInterface.setInterfaceMode("paste_tracks")