Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Ortiz <rafael@activitycentral.com>2011-12-20 19:43:03 (GMT)
committer Rafael Ortiz <rafael@activitycentral.com>2011-12-20 19:43:03 (GMT)
commitc6569abd39b95eb0ed7bc66ee570f374283ab9f9 (patch)
treee4200cfbce440c0ebd9bed5fcdc23033521cf64a
parent5fb62f2e61e03e0269a6548a725d9b7a3a686689 (diff)
adjustment for olidata screen
-rw-r--r--Mini/InstrumentPanel.py17
-rw-r--r--Mini/miniTamTamMain.py6
2 files changed, 13 insertions, 10 deletions
diff --git a/Mini/InstrumentPanel.py b/Mini/InstrumentPanel.py
index b6c1229..fc0af18 100644
--- a/Mini/InstrumentPanel.py
+++ b/Mini/InstrumentPanel.py
@@ -157,7 +157,7 @@ class InstrumentPanel( gtk.EventBox ):
scrollbox = HScrolledBox(scroll_policy=gtk.POLICY_NEVER)
scrollbox.set_viewport(self.toolbarBox)
scrollbox.modify_bg(gtk.STATE_NORMAL, style.Color(Config.PANEL_BCK_COLOR).get_gdk_color())
- self.mainVBox.pack_end(scrollbox, False, False)
+ self.mainVBox.pack_start(scrollbox, False, False)
self.firstTbBtn = None
self.loadStage[1] = 1
@@ -241,25 +241,24 @@ class InstrumentPanel( gtk.EventBox ):
return True
def loadInstrumentViewport( self ):
- self.instrumentBox = RoundHBox(fillcolor = Config.INSTRUMENT_GRID_COLOR, bordercolor = Config.PANEL_BCK_COLOR, radius = Config.PANEL_RADIUS)
+ self.instrumentBox= RoundHBox(fillcolor= Config.INSTRUMENT_GRID_COLOR, bordercolor= Config.PANEL_BCK_COLOR, radius= Config.PANEL_RADIUS)
- self.tableEventBox = gtk.EventBox()
- color = gtk.gdk.color_parse(Config.INSTRUMENT_GRID_COLOR)
+ self.tableEventBox= gtk.EventBox()
+ color= gtk.gdk.color_parse(Config.INSTRUMENT_GRID_COLOR)
self.tableEventBox.modify_bg(gtk.STATE_NORMAL, color)
- scrollwin = gtk.ScrolledWindow()
+ scrollwin= gtk.ScrolledWindow()
scrollwin.set_policy(gtk.POLICY_NEVER,gtk.POLICY_AUTOMATIC)
scrollwin.add_with_viewport(self.tableEventBox)
- alignment = gtk.Alignment(1, 0, 0, 1)
+ alignment= gtk.Alignment(1, 0, 0, 1)
alignment.add(scrollwin)
self.tableEventBox.get_parent().set_shadow_type( gtk.SHADOW_NONE )
self.instrumentBox.pack_start(alignment, True, True, 0)
- self.mainVBox.pack_start(self.instrumentBox)
+ self.mainVBox.pack_end(self.instrumentBox)
self.show_all()
def prepareInstrumentTable(self,category = 'all'):
-
self.category = category
if self.enterMode:
@@ -275,7 +274,7 @@ class InstrumentPanel( gtk.EventBox ):
instrumentNum = len(self.instrumentList[category])
instruments = self.instrumentList[category]
- cols = self.rowLen
+ cols = 8
if instrumentNum < cols:
cols = instrumentNum
rows = (instrumentNum // cols)
diff --git a/Mini/miniTamTamMain.py b/Mini/miniTamTamMain.py
index f1b142a..9cb1aca 100644
--- a/Mini/miniTamTamMain.py
+++ b/Mini/miniTamTamMain.py
@@ -98,7 +98,11 @@ class miniTamTamMain(gtk.EventBox):
self.mainWindowBox.pack_start(self.rightBox, False, True)
self.mainWindowBox.pack_start(self.leftBox, True, True)
self.masterVBox.pack_start(self.mainWindowBox)
- self.add(self.masterVBox)
+
+ scroll= gtk.ScrolledWindow()
+ scroll.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
+ scroll.add_with_viewport (self.masterVBox)
+ self.add(scroll)
self.enableKeyboard()
self.setInstrument(self.instrument)