diff options
| author | Nat <natcl@hotmail.com> | 2007-07-06 15:26:54 (GMT) |
|---|---|---|
| committer | Nat <natcl@hotmail.com> | 2007-07-06 15:26:54 (GMT) |
| commit | 0722a4c2c95cc4dccaa1d8fdc82b758eca6f1933 (patch) | |
| tree | 39609ec6d7b53467789c9d0aecb9e9ccecc188ea /Edit | |
| parent | 265a77be550050376e9d37297816d247bf3868db (diff) | |
| parent | 4e0cb2ceee99dd381e98a35011b7ceee25a62323 (diff) | |
Merge branch 'master' of git+ssh://natcl@dev.laptop.org/git/projects/tamtam
Diffstat (limited to 'Edit')
| -rw-r--r-- | Edit/MainWindow.py | 18 | ||||
| -rw-r--r-- | Edit/Properties.py | 2 |
2 files changed, 4 insertions, 16 deletions
diff --git a/Edit/MainWindow.py b/Edit/MainWindow.py index 3b18748..faf4e46 100644 --- a/Edit/MainWindow.py +++ b/Edit/MainWindow.py @@ -275,9 +275,9 @@ class MainWindow( SubActivity ): self.GUI["2toolPencilButton"] = ImageRadioButton( self.GUI["2toolPointerButton"], Config.IMAGE_ROOT+"pencil.png", Config.IMAGE_ROOT+"pencilDown.png", backgroundFill = Config.BG_COLOR ) self.GUI["2toolPencilButton"].connect( "clicked", self.handleToolClick , "draw" ) self.GUI["2toolBox"].pack_start( self.GUI["2toolPencilButton"] ) - self.GUI["2toolPencilButton"] = ImageRadioButton( self.GUI["2toolPointerButton"], Config.IMAGE_ROOT+"brush.png", Config.IMAGE_ROOT+"brushDown.png", backgroundFill = Config.BG_COLOR ) - self.GUI["2toolPencilButton"].connect( "clicked", self.handleToolClick , "paint" ) - self.GUI["2toolBox"].pack_start( self.GUI["2toolPencilButton"] ) + self.GUI["2toolBrushButton"] = ImageRadioButton( self.GUI["2toolPointerButton"], Config.IMAGE_ROOT+"brush.png", Config.IMAGE_ROOT+"brushDown.png", backgroundFill = Config.BG_COLOR ) + self.GUI["2toolBrushButton"].connect( "clicked", self.handleToolClick , "paint" ) + self.GUI["2toolBox"].pack_start( self.GUI["2toolBrushButton"] ) self.GUI["2toolPanel"].pack_start( self.GUI["2toolBox"], False, False ) self.GUI["2rightPanel"].pack_start( self.GUI["2toolPanel"], False ) @@ -1463,12 +1463,6 @@ class MainWindow( SubActivity ): else: string = '2instrument' + str(i+1) + 'volumeAdjustment' self.GUI[string].set_value(self._data['track_volume'][i]) - for tid in range(Config.NUMBER_OF_TRACKS): - self.last_clicked_instTrackID = tid - if tid == 4: - self.donePickDrum(self.trackInstrument[tid].name) - else: - self.donePickInstrument(self.trackInstrument[tid].name) ifile.close() self.tuneInterface.selectPages( self.noteDB.tune ) @@ -1502,12 +1496,6 @@ class MainWindow( SubActivity ): else: string = '2instrument' + str(i+1) + 'volumeAdjustment' self.GUI[string].set_value(self._data['track_volume'][i]) - for tid in range(Config.NUMBER_OF_TRACKS): - self.last_clicked_instTrackID = tid - if tid == 4: - self.donePickDrum(self.trackInstrument[tid].name) - else: - self.donePickInstrument(self.trackInstrument[tid].name) ifile.close() self.tuneInterface.selectPages( self.noteDB.tune ) diff --git a/Edit/Properties.py b/Edit/Properties.py index 7e64b4b..be47286 100644 --- a/Edit/Properties.py +++ b/Edit/Properties.py @@ -248,7 +248,7 @@ class Properties( gtk.VBox ): #algoRadioButtonBox.set_border_width(3) #algoRadioButtonBox.set_radius(10) - self.GUI['line'] = ImageRadioButton( None, Config.IMAGE_ROOT + 'propDrunk.png', Config.IMAGE_ROOT + 'propDrunkDown.png', Config.IMAGE_ROOT + 'propDrunkOver.png' ) + self.GUI['line'] = ImageRadioButton( None, Config.IMAGE_ROOT + 'propLine.png', Config.IMAGE_ROOT + 'propLineDown.png', Config.IMAGE_ROOT + 'propLineOver.png' ) self.GUI['line'].connect( "toggled", self.handleAlgo, 0 ) algoRadioButtonBox.pack_start( self.GUI['line'], False, False, 1 ) self.GUI['drunk'] = ImageRadioButton( self.GUI['line'], Config.IMAGE_ROOT + 'propDrunk.png', Config.IMAGE_ROOT + 'propDrunkDown.png', Config.IMAGE_ROOT + 'propDrunkOver.png' ) |