diff options
author | Aleksey Lim <alsroot@sugarlabs.org> | 2012-06-06 18:00:10 (GMT) |
---|---|---|
committer | Aleksey Lim <alsroot@sugarlabs.org> | 2012-06-06 18:00:10 (GMT) |
commit | 099ce81a80c3aff188dfff5042573c9786a0e033 (patch) | |
tree | 19a17d6360e4235badff97d2bd469988ee958fda /Mini | |
parent | 89f84e1cebbc9b6dcf7fa9ce1f21553367c44bb5 (diff) |
Use down scaled images if one of screen dimensions is 800 or less
Diffstat (limited to 'Mini')
-rw-r--r-- | Mini/InstrumentPanel.py | 33 | ||||
-rw-r--r-- | Mini/miniTamTamMain.py | 14 |
2 files changed, 19 insertions, 28 deletions
diff --git a/Mini/InstrumentPanel.py b/Mini/InstrumentPanel.py index 1568a61..a9e8d4f 100644 --- a/Mini/InstrumentPanel.py +++ b/Mini/InstrumentPanel.py @@ -11,9 +11,12 @@ from common.port.scrolledbox import HScrolledBox import sugar.graphics.style as style import logging -InstrumentSize = 116 + +INSTRUMENT_SIZE = Config.scale(114) + Tooltips = Config.Tooltips + class InstrumentPanel( gtk.EventBox ): def __init__(self,setInstrument=None): gtk.EventBox.__init__(self) @@ -40,7 +43,7 @@ class InstrumentPanel( gtk.EventBox ): self.micRec = micRec if width != -1: - rowLen = width / InstrumentSize + rowLen = width / INSTRUMENT_SIZE if self.rowLen == rowLen: return @@ -247,21 +250,19 @@ 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.instBox = gtk.Alignment(0.5, 0, 0, 1) - self.tableEventBox= gtk.EventBox() - color= gtk.gdk.color_parse(Config.INSTRUMENT_GRID_COLOR) - self.tableEventBox.modify_bg(gtk.STATE_NORMAL, color) + box = gtk.EventBox() + color = gtk.gdk.color_parse(Config.INSTRUMENT_GRID_COLOR) + box.modify_bg(gtk.STATE_NORMAL, color) + box.add(self.instBox) - 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.add(scrollwin) + scrollwin.add_with_viewport(box) + box.get_parent().set_shadow_type(gtk.SHADOW_NONE) + self.mainVBox.pack_end(scrollwin) - self.tableEventBox.get_parent().set_shadow_type( gtk.SHADOW_NONE ) - self.instrumentBox.pack_start(alignment, True, True, 0) - self.mainVBox.pack_end(self.instrumentBox) self.show_all() def prepareInstrumentTable(self,category = 'all'): @@ -274,13 +275,13 @@ class InstrumentPanel( gtk.EventBox ): if self.instTable != None: for child in self.instTable.get_children()[:]: self.instTable.remove(child) - self.tableEventBox.remove(self.instTable) + self.instBox.remove(self.instTable) self.instTable.destroy() instrumentNum = len(self.instrumentList[category]) instruments = self.instrumentList[category] - cols = 8 + cols = self.rowLen if instrumentNum < cols: cols = instrumentNum rows = (instrumentNum // cols) @@ -300,7 +301,7 @@ class InstrumentPanel( gtk.EventBox ): if self.instDic.has_key(inst): self.instTable.attach(self.instDic[inst], col, col+1, row, row+1, gtk.SHRINK, gtk.SHRINK, 0, 0) - self.tableEventBox.add(self.instTable) + self.instBox.add(self.instTable) self.instTable.show_all() def selectFirstCat(self): diff --git a/Mini/miniTamTamMain.py b/Mini/miniTamTamMain.py index 0b630e1..1a2211b 100644 --- a/Mini/miniTamTamMain.py +++ b/Mini/miniTamTamMain.py @@ -91,18 +91,12 @@ class miniTamTamMain(gtk.EventBox): self.loop.beat = self.beat self.tooltips = gtk.Tooltips() - self.masterVBox = gtk.VBox() self.mainWindowBox = gtk.HBox() self.leftBox = gtk.VBox() self.rightBox = gtk.VBox() self.mainWindowBox.pack_start(self.rightBox, False, True) self.mainWindowBox.pack_start(self.leftBox, True, True) - self.masterVBox.pack_start(self.mainWindowBox) - - scroll= gtk.ScrolledWindow() - scroll.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) - scroll.add_with_viewport (self.masterVBox) - self.add(scroll) + self.add(self.mainWindowBox) self.enableKeyboard() self.setInstrument(self.instrument) @@ -211,7 +205,6 @@ class miniTamTamMain(gtk.EventBox): self.geneSlider = ImageVScale('sliderbutbleu.png', self.geneAdjustment, 5) self.geneSlider.set_inverted(False) - self.geneSlider.set_size_request(15,-1) self.geneAdjustment.connect("value_changed" , self.handleGenerationSlider) self.geneSlider.connect("button-release-event", self.handleGenerationSliderRelease) geneSliderBox.pack_start(self.geneSliderBoxImgTop, False, padding=10) @@ -226,7 +219,6 @@ class miniTamTamMain(gtk.EventBox): self.beatSlider = ImageVScale('sliderbutjaune.png', self.beatAdjustment, 5, snap=1) self.beatSlider.set_inverted(True) - self.beatSlider.set_size_request(15,-1) self.beatAdjustment.connect("value_changed" , self.handleBeatSlider) self.beatSlider.connect("button-release-event", self.handleBeatSliderRelease) beatSliderBox.pack_start(self.beatSliderBoxImgTop, False, padding=10) @@ -242,7 +234,6 @@ class miniTamTamMain(gtk.EventBox): self.tempoAdjustment = gtk.Adjustment(value=self.tempo, lower=Config.PLAYER_TEMPO_LOWER, upper=Config.PLAYER_TEMPO_UPPER, step_incr=1, page_incr=1, page_size=1) tempoSlider = ImageVScale('sliderbutvert.png', self.tempoAdjustment, 5) tempoSlider.set_inverted(True) - tempoSlider.set_size_request(15,-1) self.tempoAdjustmentHandler = self.tempoAdjustment.connect("value_changed" , self.handleTempoSliderChange) tempoSlider.connect("button-press-event", self.handleTempoSliderPress) tempoSlider.connect("button-release-event", self.handleTempoSliderRelease) @@ -257,7 +248,6 @@ class miniTamTamMain(gtk.EventBox): volumeSlider = ImageVScale('sliderbutbleu.png', self.volumeAdjustment, 5) volumeSlider.set_inverted(True) - volumeSlider.set_size_request(15,-1) self.volumeAdjustment.connect("value_changed" , self.handleVolumeSlider) #volumeSlider.connect("button-release-event", self.handleVolumeSliderRelease) volumeSliderBox.pack_start(self.volumeSliderBoxImgTop, False, padding=10) @@ -298,7 +288,6 @@ class miniTamTamMain(gtk.EventBox): fillcolor=Config.PANEL_COLOR, bordercolor=Config.PANEL_BCK_COLOR, radius=Config.PANEL_RADIUS) - drum_box.set_border_width(Config.PANEL_SPACING) drum_scroll = VScrolledBox(scroll_policy=gtk.POLICY_NEVER) drum_scroll.set_viewport(drum_box) @@ -337,6 +326,7 @@ class miniTamTamMain(gtk.EventBox): drum_size = drum_group.get_size_request() slidersBox.set_size_request(-1, drum_size[1] * 2.3) + self.rightBox.set_size_request(drum_size[0] * 2.05, -1) def loopSettingsChannel(self, channel, value): self.csnd.setChannel(channel, value) |