New checkboxes

1 files changed, 11 insertions, 12 deletions

diff --git a/Edit/MainWindow.py b/Edit/MainWindow.py
index 56b9bb5..e2d3c95 100644
--- a/Edit/MainWindow.py
+++ b/Edit/MainWindow.py
@@ -116,12 +116,12 @@ class MainWindow( SubActivity ):
                 self.GUI["2instrument1volumeSlider"].set_inverted(True)
                 self.GUI["2instrument1volumeSlider"].set_size_request( 30, -1 )
                 self.GUI["2instrument1volumeAdjustment"].connect( "value-changed", self.handleTrackVolume, 0 )
-                self.GUI["2instrument1muteButton"] = gtk.CheckButton(label = None)
+                self.GUI["2instrument1muteButton"] = ImageToggleButton(Config.IMAGE_ROOT+"checkOff.svg",Config.IMAGE_ROOT+"checkOn.svg")
                 self.GUI["2instrument1muteButton"].connect("toggled",self.handlemuteButton,0)
                 self.GUI["2instrument1muteButton"].connect("button-press-event",self.handlemuteButtonRightClick,0)
                 self.GUI["2instrument1muteButton"].set_active(True)
                 self.GUI["2instrument1volBox"].pack_start( self.GUI["2instrument1volumeSlider"], True, True, 0 )
-                self.GUI["2instrument1volBox"].pack_start( self.GUI["2instrument1muteButton"], False, False, 0 )
+                self.GUI["2instrument1volBox"].pack_start( self.GUI["2instrument1muteButton"], False, False, 5 )
                 self.GUI["2instrument1Box"].pack_start( self.GUI["2instrument1volBox"], False, False, 0 )
                 self.GUI["2instrument1Button"] = ImageToggleButton(Config.IMAGE_ROOT + self.trackInstrument[0].name + '.png', Config.IMAGE_ROOT + self.trackInstrument[0].name + '.png')
                 self.GUI["2instrument1Button"].connect("toggled", self.pickInstrument, 0 )
@@ -137,12 +137,12 @@ class MainWindow( SubActivity ):
                 self.GUI["2instrument2volumeSlider"].set_inverted(True)
                 self.GUI["2instrument2volumeSlider"].set_size_request( 30, -1 )
                 self.GUI["2instrument2volumeAdjustment"].connect( "value-changed", self.handleTrackVolume, 1 )
-                self.GUI["2instrument2muteButton"] = gtk.CheckButton(label = None)
+                self.GUI["2instrument2muteButton"] = ImageToggleButton(Config.IMAGE_ROOT+"checkOff.svg",Config.IMAGE_ROOT+"checkOn.svg")
                 self.GUI["2instrument2muteButton"].connect("toggled",self.handlemuteButton,1)
                 self.GUI["2instrument2muteButton"].connect("button-press-event",self.handlemuteButtonRightClick,1)
                 self.GUI["2instrument2muteButton"].set_active(True)
                 self.GUI["2instrument2volBox"].pack_start( self.GUI["2instrument2volumeSlider"], True, True, 0 )
-                self.GUI["2instrument2volBox"].pack_start( self.GUI["2instrument2muteButton"], False, False, 0 )
+                self.GUI["2instrument2volBox"].pack_start( self.GUI["2instrument2muteButton"], False, False, 5 )
                 self.GUI["2instrument2Box"].pack_start( self.GUI["2instrument2volBox"], False, False, 0 )
                 self.GUI["2instrument2Button"] = ImageToggleButton(Config.IMAGE_ROOT + self.trackInstrument[1].name + '.png', Config.IMAGE_ROOT + self.trackInstrument[1].name + '.png')
                 self.GUI["2instrument2Button"].connect("toggled", self.pickInstrument, 1 )
@@ -158,12 +158,12 @@ class MainWindow( SubActivity ):
                 self.GUI["2instrument3volumeSlider"].set_inverted(True)
                 self.GUI["2instrument3volumeSlider"].set_size_request( 30, -1 )
                 self.GUI["2instrument3volumeAdjustment"].connect( "value-changed", self.handleTrackVolume, 2 )
-                self.GUI["2instrument3muteButton"] = gtk.CheckButton(label = None)
+                self.GUI["2instrument3muteButton"] = ImageToggleButton(Config.IMAGE_ROOT+"checkOff.svg",Config.IMAGE_ROOT+"checkOn.svg")
                 self.GUI["2instrument3muteButton"].connect("toggled",self.handlemuteButton,2)
                 self.GUI["2instrument3muteButton"].connect("button-press-event",self.handlemuteButtonRightClick,2)
                 self.GUI["2instrument3muteButton"].set_active(True)
                 self.GUI["2instrument3volBox"].pack_start( self.GUI["2instrument3volumeSlider"], True, True, 0 )
-                self.GUI["2instrument3volBox"].pack_start( self.GUI["2instrument3muteButton"], False, False, 0 )
+                self.GUI["2instrument3volBox"].pack_start( self.GUI["2instrument3muteButton"], False, False, 5 )
                 self.GUI["2instrument3Box"].pack_start( self.GUI["2instrument3volBox"], False, False, 0 )
                 self.GUI["2instrument3Button"] = ImageToggleButton(Config.IMAGE_ROOT + self.trackInstrument[2].name + '.png', Config.IMAGE_ROOT + self.trackInstrument[2].name + '.png')
                 self.GUI["2instrument3Button"].connect("toggled", self.pickInstrument, 2 )
@@ -179,12 +179,12 @@ class MainWindow( SubActivity ):
                 self.GUI["2instrument4volumeSlider"].set_inverted(True)
                 self.GUI["2instrument4volumeSlider"].set_size_request( 30, -1 )
                 self.GUI["2instrument4volumeAdjustment"].connect( "value-changed", self.handleTrackVolume, 3 )
-                self.GUI["2instrument4muteButton"] = gtk.CheckButton(label = None)
+                self.GUI["2instrument4muteButton"] = ImageToggleButton(Config.IMAGE_ROOT+"checkOff.svg",Config.IMAGE_ROOT+"checkOn.svg")
                 self.GUI["2instrument4muteButton"].connect("toggled",self.handlemuteButton,3)
                 self.GUI["2instrument4muteButton"].connect("button-press-event",self.handlemuteButtonRightClick,3)
                 self.GUI["2instrument4muteButton"].set_active(True)
                 self.GUI["2instrument4volBox"].pack_start( self.GUI["2instrument4volumeSlider"], True, True, 0 )
-                self.GUI["2instrument4volBox"].pack_start( self.GUI["2instrument4muteButton"], False, False, 0 )
+                self.GUI["2instrument4volBox"].pack_start( self.GUI["2instrument4muteButton"], False, False, 5 )
                 self.GUI["2instrument4Box"].pack_start( self.GUI["2instrument4volBox"], False, False, 0 )
                 self.GUI["2instrument4Button"] = ImageToggleButton(Config.IMAGE_ROOT + self.trackInstrument[3].name + '.png', Config.IMAGE_ROOT + self.trackInstrument[3].name + '.png')
                 self.GUI["2instrument4Button"].connect("toggled", self.pickInstrument, 3 )
@@ -200,12 +200,12 @@ class MainWindow( SubActivity ):
                 self.GUI["2drumvolumeSlider"].set_inverted(True)
                 self.GUI["2drumvolumeSlider"].set_size_request( 30, -1 )
                 self.GUI["2drumvolumeAdjustment"].connect( "value-changed", self.handleTrackVolume, 4 )
-                self.GUI["2drumMuteButton"] = gtk.CheckButton(label = None)
+                self.GUI["2drumMuteButton"] = ImageToggleButton(Config.IMAGE_ROOT+"checkOff.svg",Config.IMAGE_ROOT+"checkOn.svg")
                 self.GUI["2drumMuteButton"].connect("toggled",self.handlemuteButton,4)
                 self.GUI["2drumMuteButton"].connect("button-press-event",self.handlemuteButtonRightClick,4)
                 self.GUI["2drumMuteButton"].set_active(True)
                 self.GUI["2drumVolBox"].pack_start( self.GUI["2drumvolumeSlider"], True, True, 0 )
-                self.GUI["2drumVolBox"].pack_start( self.GUI["2drumMuteButton"], False, False, 0 )
+                self.GUI["2drumVolBox"].pack_start( self.GUI["2drumMuteButton"], False, False, 5 )
                 self.GUI["2drumBox"].pack_start( self.GUI["2drumVolBox"], False, False, 0 )
                 self.GUI["2drumButton"] = ImageToggleButton(Config.IMAGE_ROOT + self.trackInstrument[4].name + '.png', Config.IMAGE_ROOT + self.trackInstrument[4].name + '.png')
                 self.GUI["2drumButton"].connect("toggled", self.pickDrum)
@@ -909,7 +909,6 @@ class MainWindow( SubActivity ):
                         self.GUI["2drumMuteButton"].set_active(True)
                     else:
                         self.GUI["2instrument" + str(i+1) + "muteButton"].set_active(True)
-                self.updatePagesPlaying()
             else:
                 for i in range(Config.NUMBER_OF_TRACKS):
                     if i != track:
@@ -917,7 +916,7 @@ class MainWindow( SubActivity ):
                             self.GUI["2drumMuteButton"].set_active(False)
                         else:
                             self.GUI["2instrument" + str(i+1) + "muteButton"].set_active(False)
-                self.updatePagesPlaying()
+            self.updatePagesPlaying()
                     
     #-----------------------------------
     # generation functions