diff --git a/frontends/wix/param.py b/frontends/wix/param.py index 2b38bf01..e70e8d48 100644 --- a/frontends/wix/param.py +++ b/frontends/wix/param.py @@ -62,20 +62,28 @@ class Param(wx.Frame): type = param.getAttribute("type") value = param.getAttribute("value") sizer = wx.BoxSizer(wx.HORIZONTAL) - label=wx.StaticText(panel, -1, name+" ") if type=="string": + label=wx.StaticText(panel, -1, name+" ") ctrl = wx.TextCtrl(panel, -1, value) + sizer.Add(label) elif type=="password": + label=wx.StaticText(panel, -1, name+" ") ctrl = wx.TextCtrl(panel, -1, value, style=wx.TE_PASSWORD) + sizer.Add(label) + elif type=="button": + ctrl = wx.Button(panel, -1, value) else: error("FIXME FIXME FIXME") #FIXME ! raise NotImplementedError ctrl.param_id=(name, category) - sizer.Add(label) sizer.Add(ctrl, 1, flag=wx.EXPAND) panel.sizer.Add(sizer, flag=wx.EXPAND) - panel.Bind(wx.EVT_TEXT, self.onTextChanged, ctrl) + if type=="string" or type=="password": + panel.Bind(wx.EVT_TEXT, self.onTextChanged, ctrl) + elif type=="button": + panel.Bind(wx.EVT_BUTTON, self.onButtonClicked, ctrl) + panel.SetSizer(panel.sizer) panel.SetAutoLayout(True) self.notebook.AddPage(panel, category) @@ -86,6 +94,11 @@ class Param(wx.Frame): self.modified[event.GetEventObject().param_id]=event.GetString() event.Skip() + def onButtonClicked(self, event): + """Called when a paramated is modified""" + print "Button Clicked (%s/%s)" % event.GetEventObject().param_id#TODO: gof: appeler callback + #self.modified[event.GetEventObject().param_id]=event.GetString() + event.Skip() def onClose(self, event): """Close event: we have to save the params.""" diff --git a/plugins/plugin_xep_0065.py b/plugins/plugin_xep_0065.py index e9d5f9fd..b2b9ed34 100755 --- a/plugins/plugin_xep_0065.py +++ b/plugins/plugin_xep_0065.py @@ -468,8 +468,11 @@ class XEP_0065(XMPPHandler): self.server_factory = Socks5ServerFactory() self.server_factory.protocol.host = self.host #needed for progress CB self.client_factory = Socks5ClientFactory() + + #parameters host.memory.importParams(self, XEP_0065.params) host.memory.setDefault("IP", "File Transfert", self.getExternalIP) + port = int(self.host.memory.getParamV("Port", "File Transfert")) info("Launching Socks5 Stream server on port %d", port) reactor.listenTCP(port, self.server_factory) diff --git a/tools/memory.py b/tools/memory.py index af66d279..0a6df385 100644 --- a/tools/memory.py +++ b/tools/memory.py @@ -43,6 +43,7 @@ class Param(): +