Primitivus (xmlui): fixed window closing on save params + removed now unused onConfigureRoom in Chat

This commit is contained in:
Goffi 2014-09-08 18:32:36 +02:00
commit 171f1677d2
3 changed files with 6 additions and 10 deletions

View file

@ -26,7 +26,6 @@ from urwid_satext.files_management import FileDialog
from sat_frontends.quick_frontend.quick_chat import QuickChat
from sat_frontends.primitivus.card_game import CardGame
from sat_frontends.quick_frontend.quick_utils import escapePrivate, unescapePrivate
from sat_frontends.primitivus import xmlui
from sat_frontends.primitivus.constants import Const as C
from sat_frontends.primitivus.keys import action_key_map as a_key
import time
@ -372,13 +371,6 @@ class Chat(urwid.WidgetWrap, QuickChat):
else:
self.host.bridge.tarotGameCreate(self.id, list(self.occupants), self.host.profile)
def onConfigureRoom(self, menu):
def gotUI(xml_ui):
self.host.addWindow(xmlui.create(self.host, xml_ui))
def configureError(failure):
self.host.showPopUp(sat_widgets.Alert(failure.fullname, failure.message, ok_cb=self.host.removePopUp))
self.host.bridge.configureRoom(self.id, self.host.profile, callback=gotUI, errback=configureError)
def onSendFileRequest(self, menu):
# TODO: move this to core with dynamic menus
dialog = FileDialog(ok_cb=self.onFileSelected, cancel_cb=self.host.removePopUp)

View file

@ -657,7 +657,8 @@ class PrimitivusApp(QuickApp, InputHistory):
def onParam(self, menu):
def success(params):
self.addWindow(xmlui.create(self, xml_data=params))
ui = xmlui.create(self, xml_data=params)
ui.show()
def failure(error):
self.showPopUp(sat_widgets.Alert(_("Error"), _("Can't get parameters (%s)") % error, ok_cb=self.removePopUp))

View file

@ -20,6 +20,7 @@
from sat.core.i18n import _
import urwid
import copy
from sat.core import exceptions
from urwid_satext import sat_widgets
from urwid_satext import files_management
from sat.core.log import getLogger
@ -405,8 +406,10 @@ class XMLUIPanel(xmlui.XMLUIPanel, urwid.WidgetWrap):
def _xmluiClose(self):
if self._dest == 'window':
self.host.removeWindow()
else:
elif self._dest == 'popup':
self.host.removePopUp()
else:
raise exceptions.InternalError("self._dest unknown, are you sure you have called XMLUI.show ?")
class XMLUIDialog(xmlui.XMLUIDialog):