Replaced BORDER_SIZE by PANEL_SPACING and avtivity = 14

3 files changed, 15 insertions, 14 deletions

diff --git a/Config.py b/Config.py
index 295b0de..501e794 100644
--- a/Config.py
+++ b/Config.py
@@ -355,18 +355,12 @@ NOTE_BORDER_SIZE = 1
 NOTE_BORDER_SIZE_DIV2 = NOTE_BORDER_SIZE/2.0
 MAIN_WINDOW_PADDING = 5
 TRACK_SPACING = 1
-BORDER_SIZE = 2
 BORDER_SIZE_DIV2 = BORDER_SIZE/2.0
 BORDER_SIZE_MUL2 = BORDER_SIZE*2
 BEAT_LINE_SIZE = 1
 BEAT_LINE_SIZE_DIV2 = BEAT_LINE_SIZE/2.0
 PLAYHEAD_SIZE = 2
 PLAYHEAD_SIZE_DIV2 = PLAYHEAD_SIZE/2.0
-        
-INST_BCK_COLOR = '#979DA8'
-PANEL_BCK_COLOR =  '#FFFFFF'
-PANEL_COLOR = '#707F93'
-PANEL_RADIUS = 10
 
 PAGE_BORDER_SIZE = 2
 PAGE_SELECTED_BORDER_SIZE = 5
@@ -383,6 +377,13 @@ PAGE_THUMBNAIL_PADDING_DIV2 = PAGE_THUMBNAIL_PADDING/2
 NUMBER_OF_PAGE_BANK_ROWS = 2
 NUMBER_OF_PAGE_BANK_COLUMNS = 20
 
+### miniTamTam/SYNTHLAB SPECIFIC ###
+INST_BCK_COLOR = '#979DA8'
+PANEL_BCK_COLOR =  '#FFFFFF'
+PANEL_COLOR = '#707F93'
+PANEL_RADIUS = 10
+PANEL_SPACING = 2
+
 
 # hardware keycodes for mod keys
 MOD_LSHIFT = 50
diff --git a/Player/StandalonePlayer.py b/Player/StandalonePlayer.py
index a8bafea..d840aef 100644
--- a/Player/StandalonePlayer.py
+++ b/Player/StandalonePlayer.py
@@ -135,7 +135,7 @@ class StandAlonePlayer( gtk.EventBox ):
                 
     def drawSliders( self ):     
         mainSliderBox = RoundHBox(fillcolor = Config.PANEL_COLOR, bordercolor = Config.PANEL_BCK_COLOR, radius = Config.PANEL_RADIUS)
-        mainSliderBox.set_border_width(Config.BORDER_SIZE)
+        mainSliderBox.set_border_width(Config.PANEL_SPACING)
         
         reverbSliderBox = gtk.HBox()
         self.reverbSliderBoxImgTop = gtk.Image()
@@ -169,11 +169,11 @@ class StandAlonePlayer( gtk.EventBox ):
     def drawGeneration( self ):
 
         slidersBox = RoundVBox(fillcolor = Config.PANEL_COLOR, bordercolor = Config.PANEL_BCK_COLOR, radius = Config.PANEL_RADIUS)
-        slidersBox.set_border_width(Config.BORDER_SIZE)
+        slidersBox.set_border_width(Config.PANEL_SPACING)
         geneButtonBox = RoundHBox(fillcolor = Config.PANEL_COLOR, bordercolor = Config.PANEL_BCK_COLOR, radius = Config.PANEL_RADIUS)
-        geneButtonBox.set_border_width(Config.BORDER_SIZE)
+        geneButtonBox.set_border_width(Config.PANEL_SPACING)
         transportBox = RoundHBox(fillcolor = Config.PANEL_COLOR, bordercolor = Config.PANEL_BCK_COLOR, radius = Config.PANEL_RADIUS)
-        transportBox.set_border_width(Config.BORDER_SIZE)
+        transportBox.set_border_width(Config.PANEL_SPACING)
             
         geneSliderBox = gtk.VBox()
         self.geneSliderBoxImgTop = gtk.Image()
@@ -275,7 +275,7 @@ class StandAlonePlayer( gtk.EventBox ):
             hBox = gtk.HBox()
             for instrument in self.getInstrumentList()[row*ROW_LEN:(row+1)*ROW_LEN]:
                 instBox = RoundVBox(fillcolor = Config.INST_BCK_COLOR, bordercolor = Config.PANEL_BCK_COLOR, radius = Config.PANEL_RADIUS)
-                instBox.set_border_width(Config.BORDER_SIZE)
+                instBox.set_border_width(Config.PANEL_SPACING)
                 instButton = ImageRadioButton(self.firstInstButton, Config.IMAGE_ROOT + instrument + '.png' , Config.IMAGE_ROOT + instrument + 'sel.png', Config.IMAGE_ROOT + instrument + 'sel.png')
                 if self.firstInstButton == None:
                     self.firstInstButton = instButton
@@ -290,7 +290,7 @@ class StandAlonePlayer( gtk.EventBox ):
         
         for n in ['mic1','mic2','mic3','mic4']:
             vbox1 = RoundVBox(fillcolor = Config.INST_BCK_COLOR, bordercolor = Config.PANEL_BCK_COLOR, radius = Config.PANEL_RADIUS)
-            vbox1.set_border_width(Config.BORDER_SIZE)
+            vbox1.set_border_width(Config.PANEL_SPACING)
             
             micBtn = ImageRadioButton(self.firstInstButton, Config.IMAGE_ROOT + n + '.png' , Config.IMAGE_ROOT + n + 'sel.png', Config.IMAGE_ROOT + n + 'sel.png')
             micRecBtn = ImageButton(Config.IMAGE_ROOT + 'record.png' , Config.IMAGE_ROOT + 'recordhi.png', Config.IMAGE_ROOT + 'recordsel.png')
@@ -306,7 +306,7 @@ class StandAlonePlayer( gtk.EventBox ):
             
         for n in ['lab1','lab2','lab3','lab4']:
             vbox2 = RoundVBox(fillcolor = Config.INST_BCK_COLOR, bordercolor = Config.PANEL_BCK_COLOR, radius = Config.PANEL_RADIUS)
-            vbox2.set_border_width(Config.BORDER_SIZE)
+            vbox2.set_border_width(Config.PANEL_SPACING)
             
             synthBtn = ImageRadioButton(self.firstInstButton, Config.IMAGE_ROOT + n + '.png', Config.IMAGE_ROOT + n + 'sel.png', Config.IMAGE_ROOT + n + 'sel.png')
             synthRecBtn = ImageButton(Config.IMAGE_ROOT + 'record.png' , Config.IMAGE_ROOT + 'recordhi.png', Config.IMAGE_ROOT + 'recordsel.png')
diff --git a/activity/activity.info b/activity/activity.info
index 77fba76..5d40162 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -3,4 +3,4 @@ name = TamTam
 service_name = org.laptop.TamTam
 icon = activity-tamtam
 exec = sugar-activity-factory TamTam.TamTam
-activity_version = 13
+activity_version = 14