From 0b3feaadbda8a047fc9d74759e965421274a8eae Mon Sep 17 00:00:00 2001
From: Nat <natcl@hotmail.com>
Date: Mon, 20 Aug 2007 17:38:24 +0000
Subject: merge fix

---
(limited to 'Edit')

diff --git a/Edit/EditToolbars.py b/Edit/EditToolbars.py
index ed5fb74..e91cc89 100644
--- a/Edit/EditToolbars.py
+++ b/Edit/EditToolbars.py
@@ -400,7 +400,6 @@ class generationPalette(Palette):
         for scale in scales:
             self.scaleBox.append_item(scales.index(scale), scale)
         self.scaleBox.connect('changed', self.handleScale)
-        self.scaleBox.set_active(0)
 
         self.modeBoxHBox = gtk.HBox()
         self.modeBoxLabel = gtk.Label(_('Mode: '))
@@ -409,7 +408,6 @@ class generationPalette(Palette):
         for mode in modes:
             self.modeBox.append_item(modes.index(mode), mode)
         self.modeBox.connect('changed', self.handleMode)
-        self.modeBox.set_active(0)
 
         self.scaleBoxHBox.pack_start(self.scaleBoxLabel, False, False, padding = 10)
         self.scaleBoxHBox.pack_start(self.scaleBox, False, False, padding = 10)
@@ -476,6 +474,10 @@ class generationPalette(Palette):
         self.colors = { "Beat_Line":   colormap.alloc_color( "#959595", True, True ), 
                         "Note_Border": colormap.alloc_color( Config.BG_COLOR, True, True ),
                         "Note_Fill":   colormap.alloc_color( Config.FG_COLOR, True, True ) }
+        
+        self.scaleBox.set_active(0)
+        self.modeBox.set_active(0)
+
 
     def handleXAdjustment1( self, data ):
         self.rythmDensity = self.XAdjustment1.value * .01
--
cgit v0.9.1