primitivus card_game: bug fix and improvement

- changeset 56f8a9c99194 introduced a bug because it connected all the list widgets to the parameter change callback. This is not OK because the Tarot is using a list form that is not a parameter.
- some list processing was raising an error when the data is not initialized
- display the "choose contrat" dialog with valign='top' to allow the user see his hand while taking the decision.
This commit is contained in:
souliane 2013-10-28 19:04:49 +01:00
commit a154d9acbb
3 changed files with 17 additions and 11 deletions

View file

@ -109,9 +109,12 @@ class Hand(urwid.WidgetWrap):
def update(self, hand): def update(self, hand):
"""Update the hand displayed in this widget """Update the hand displayed in this widget
@param hand: list of Card""" @param hand: list of Card"""
del self.columns.widget_list[:] try:
del self.columns.column_types[:] del self.columns.widget_list[:]
self.columns.contents.append((urwid.Text(''),('weight',1, False))) del self.columns.column_types[:]
except IndexError:
pass
self.columns.contents.append((urwid.Text(''), ('weight', 1, False)))
for card in hand: for card in hand:
widget = CardDisplayer(card) widget = CardDisplayer(card)
self.columns.widget_list.append(widget) self.columns.widget_list.append(widget)
@ -260,7 +263,7 @@ class CardGame(QuickCardGame, urwid.WidgetWrap):
@param xml_data: SàT xml representation of the form""" @param xml_data: SàT xml representation of the form"""
misc = {'callback': self.contratSelected} misc = {'callback': self.contratSelected}
form = XMLUI(self.parent.host, xml_data, title=_('Please choose your contrat'), options=['NO_CANCEL'], misc=misc) form = XMLUI(self.parent.host, xml_data, title=_('Please choose your contrat'), options=['NO_CANCEL'], misc=misc)
form.show() form.show(valign='top')
def showCards(self, game_stage, cards, data): def showCards(self, game_stage, cards, data):
"""Display cards in the middle of the game (to show for e.g. chien ou poignée)""" """Display cards in the middle of the game (to show for e.g. chien ou poignée)"""

View file

@ -321,10 +321,10 @@ class PrimitivusApp(QuickApp, InputHistory):
#we still have popup to show, we display it #we still have popup to show, we display it
self.showPopUp(next_popup) self.showPopUp(next_popup)
def showPopUp(self, pop_up_widget, perc_width=40, perc_height=40): def showPopUp(self, pop_up_widget, perc_width=40, perc_height=40, valign='middle'):
"Show a pop-up window if possible, else put it in queue" "Show a pop-up window if possible, else put it in queue"
if not isinstance(self.loop.widget,urwid.Overlay): if not isinstance(self.loop.widget, urwid.Overlay):
display_widget = urwid.Overlay(pop_up_widget, self.main_widget, 'center', ('relative', perc_width), 'middle', ('relative', perc_height)) display_widget = urwid.Overlay(pop_up_widget, self.main_widget, 'center', ('relative', perc_width), valign, ('relative', perc_height))
self.loop.widget = display_widget self.loop.widget = display_widget
self.redraw() self.redraw()
else: else:

View file

@ -105,7 +105,7 @@ class XMLUI(urwid.WidgetWrap):
self.ctrl_list[name] = ({'type':type_, 'control':ctrl}) self.ctrl_list[name] = ({'type':type_, 'control':ctrl})
elif type_=="list": elif type_=="list":
style=[] if elem.getAttribute("multi")=='yes' else ['single'] style=[] if elem.getAttribute("multi")=='yes' else ['single']
ctrl = sat_widgets.List(options=[option.getAttribute("value") for option in elem.getElementsByTagName("option")], style=style, on_change=self.onParamChange) ctrl = sat_widgets.List(options=[option.getAttribute("value") for option in elem.getElementsByTagName("option")], style=style, on_change=self.onParamChange if self.type == "param" else None)
ctrl.selectValue(elem.getAttribute("value")) ctrl.selectValue(elem.getAttribute("value"))
self.ctrl_list[name] = ({'type':type_, 'control':ctrl}) self.ctrl_list[name] = ({'type':type_, 'control':ctrl})
elif type_=="button": elif type_=="button":
@ -210,15 +210,18 @@ class XMLUI(urwid.WidgetWrap):
ret_wid.addFooter(grid_wid) ret_wid.addFooter(grid_wid)
return ret_wid return ret_wid
def show(self,show_type = 'popup'): def show(self, show_type='popup', valign='middle'):
"""Show the constructed UI """Show the constructed UI
@param show_type: how to show the UI: @param show_type: how to show the UI:
- popup - popup
- window""" - window
@param valign: vertical alignment when show_type is 'popup'.
Ignored when show_type is 'window'.
"""
self.__dest = "popup" self.__dest = "popup"
decorated = sat_widgets.LabelLine(self, sat_widgets.SurroundedText(self.title or '')) decorated = sat_widgets.LabelLine(self, sat_widgets.SurroundedText(self.title or ''))
if show_type == 'popup': if show_type == 'popup':
self.host.showPopUp(decorated) self.host.showPopUp(decorated, valign=valign)
elif show_type == 'window': elif show_type == 'window':
self.host.addWindow(decorated) self.host.addWindow(decorated)
else: else: