Colors and layout

4 files changed, 18 insertions, 25 deletions

diff --git a/Config.py b/Config.py
index b60f56f..75886d9 100644
--- a/Config.py
+++ b/Config.py
@@ -378,7 +378,7 @@ IMAGE_ROOT = TAM_TAM_ROOT + '/Resources/Images/'
 
 MAIN_WINDOW_PADDING = 5
 
-BG_COLOR = '#515151'
+BG_COLOR = '#404040'
 
 NOTE_HEIGHT = 9     # pixels
 NOTE_IMAGE_PADDING = 6
@@ -446,7 +446,7 @@ CATEGORY_BCK_COLOR = '#222222'
 INSTRUMENT_GRID_COLOR = '#CCCCCC'
 
 ###Welcome Screen Specific###
-WS_PANEL_COLOR = '#515151'
+WS_PANEL_COLOR = '#404040'
 WS_BCK_COLOR = '#CCCCCC'
 
 # hardware keycodes for mod keys
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")
diff --git a/icons/grid.svg b/icons/grid.svg
index 8876477..5286401 100644
--- a/icons/grid.svg
+++ b/icons/grid.svg
@@ -3,6 +3,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">

 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"

 	 width="75px" height="30px" viewBox="0 0 75 30" enable-background="new 0 0 75 30" xml:space="preserve">

+<rect x="15.833" y="0.667" fill="#7D7D7D" stroke="#7D7D7D" stroke-width="0.25" stroke-linecap="round" stroke-linejoin="round" width="44.333" height="25.833"/>

 <line fill="none" stroke="#FFFFFF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="60" y1="0.97" x2="60" y2="25.97"/>

 <line fill="none" stroke="#FFFFFF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="15.51" y1="25.97" x2="15.51" y2="-0.03"/>

 <line fill="none" stroke="#FFFFFF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="42.204" y1="1.303" x2="42.204" y2="26.304"/>

@@ -13,13 +14,13 @@
 <line fill="none" stroke="#FFFFFF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="60.493" y1="0.463" x2="15.833" y2="0.463"/>

 <g>

 	<g>

-		<line fill="#808292" x1="45.25" y1="14.833" x2="54.667" y2="24.333"/>

-		<polygon fill="#808292" points="42.765,12.325 47.711,14.428 45.436,15.02 44.824,17.289 		"/>

+		<line fill="#808292" x1="43.584" y1="12.999" x2="53.001" y2="22.5"/>

+		<polygon fill="#808292" points="47.04,12.54 44.236,13.657 43.094,16.45 40.433,9.82 		"/>

 	</g>

 	<g>

 		

-			<line fill="none" stroke="#969696" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" x1="45.25" y1="14.833" x2="54.667" y2="24.333"/>

-		<polygon fill="#969696" points="37.794,7.311 52.632,13.619 45.808,15.396 43.972,22.203 		"/>

+			<line fill="none" stroke="#323232" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" x1="43.584" y1="12.999" x2="53.001" y2="22.5"/>

+		<polygon fill="#323232" points="53.952,11.62 45.541,14.973 42.114,23.354 34.13,3.461 		"/>

 	</g>

 </g>

 </svg>