From: pin Date: Thu, 10 Jun 2010 12:11:04 +0000 (+0000) Subject: layout de l'écran d'options. X-Git-Url: https://scm.cri.mines-paristech.fr/git/minwii.git/commitdiff_plain/5e2c28ffb37d613169726d87d858250305439566 layout de l'écran d'options. git-svn-id: https://svn.cri.ensmp.fr/svn/minwii/trunk@224 fe552daf-6dbe-4428-90eb-1537e0879342 --- diff --git a/src/minwii/widgets/home.py b/src/minwii/widgets/home.py index 18e1c6f..8f145b4 100755 --- a/src/minwii/widgets/home.py +++ b/src/minwii/widgets/home.py @@ -21,12 +21,17 @@ from minwii.globals import PLAYING_MODES from songfilebrowser import FileOpenDialog import os.path -STYLE_LEFT_COL = {'border_right' : 2, - 'border_left' : 2, - 'align' : 1} -STYLE_RIGHT_COL = {'border_right' : 2, - 'border_left' : 2, - 'align' : -1} +STYLE_LEFT_COL = {#'border_right' : 2, + #'border_left' : 2, + 'align' : 1, + 'padding_top' : 30, + 'padding_right' : 10} + +STYLE_RIGHT_COL = {#'border_right' : 2, + #'border_left' : 2, + 'align' : -1, + 'padding_top' : 30, + 'padding_left' : 20} class Home(Table) : @@ -38,7 +43,6 @@ class Home(Table) : style = {'valign' : 0, 'width' : pygame.display.get_surface().get_width(), 'height' : pygame.display.get_surface().get_height()} - print style params['style'] = style Table.__init__(self,**params) self.songPath = params.get('songPath', '.') @@ -47,7 +51,7 @@ class Home(Table) : self.spaceSize = (100,100) self.font = pygame.font.Font(None,70) self._fill() - #self._initLocalListeners() + self._initLocalListeners() def _fill(self): @@ -57,49 +61,44 @@ class Home(Table) : # bouton pour browser de fichiers self.tr() - self.td(self.createLabel("Chanson :"), style = STYLE_LEFT_COL) + st = STYLE_LEFT_COL.copy() + st['valign'] = -1 + self.td(self.createLabel("Chanson :"), rowspan=2, style = st) self.browseButton = Button(self.createLabel("Choisir...")) self.td(self.browseButton,colspan=2, style = STYLE_RIGHT_COL) -# self.tr() -# self.songTitle = self.createLabel(u' ') -# self.td(self.songTitle, colspan=2, style = STYLE) -# -# # choix du niveau -# self.tr() -# self.td(self.createLabel("Niveau :")) -# self.modeSelect = Select('NORMAL') -# for k, caption in PLAYING_MODES : -# self.modeSelect.add(self.createLabel(caption), k) -# self.td(self.modeSelect,colspan=3) -# -# #self.tr() -# #self.td(Spacer(*self.spaceSize)) -# -# # choix des wiimotes -# self.tr() -# self.td(self.createLabel("Wiimote :", self.font)) -# playerTable = Table() -# -# self.selectedWiimote = Group(name='selectedWiimote', value=0) -# for i in range(self.nwiimotes): -# r = Radio(self.selectedWiimote, i) -# playerTable.td(r) -# playerTable.td(self.createLabel(" %d " % (i+1))) -# self.td(playerTable,colspan = 3) -# -# #self.tr() -# #self.td(Spacer(*self.spaceSize)) -# -# # boutons jouer / quitter -# self.tr() -# self.quitButton = Button(self.createLabel("Quitter")) -# self.td(self.quitButton) -# self.playButton = Button(self.createLabel("Jouer"), disabled=True) -# self.td(self.playButton,colspan=3) + self.tr() + self.songTitle = self.createLabel(u'bonjour le monde !') + st = STYLE_RIGHT_COL.copy() + del st['padding_top'] + self.td(self.songTitle, style = st) - #self.tr() - #self.td(Spacer(500,500)) + # choix du niveau + self.tr() + self.td(self.createLabel("Niveau :"), style=STYLE_LEFT_COL) + self.modeSelect = Select('NORMAL') + for k, caption in PLAYING_MODES : + self.modeSelect.add(self.createLabel(caption), k) + self.td(self.modeSelect,colspan=3, style=STYLE_RIGHT_COL) + + # choix des wiimotes + self.tr() + self.td(self.createLabel("Wiimote :", self.font), style=STYLE_LEFT_COL) + playerTable = Table() + + self.selectedWiimote = Group(name='selectedWiimote', value=0) + for i in range(self.nwiimotes): + r = Radio(self.selectedWiimote, i) + playerTable.td(r) + playerTable.td(self.createLabel(" %d " % (i+1))) + self.td(playerTable, style=STYLE_RIGHT_COL) + + # boutons jouer / quitter + self.tr() + self.quitButton = Button(self.createLabel("Quitter")) + self.td(self.quitButton, style={'padding_top' : 50}) + self.playButton = Button(self.createLabel("Jouer"), disabled=True) + self.td(self.playButton, style={'padding_top' : 50}) @property def selectedWiimoteIndex(self) : @@ -134,7 +133,7 @@ class Home(Table) : if dlg.value and os.path.isfile(dlg.value): self.remove(self.songTitle) self.songTitle = self.createLabel(os.path.basename(dlg.value)) - self.td(self.songTitle, col=0, row=1, colspan=2, style={'align':1}) + self.td(self.songTitle, col=1, row=1, style=STYLE_RIGHT_COL) self.songFile = dlg.value self.playButton.disabled = False