diff -r 34a9287b6c7d -r bcbd41efd846 connectors/WAMP/__init__.py --- a/connectors/WAMP/__init__.py Thu Apr 19 09:50:00 2018 +0200 +++ b/connectors/WAMP/__init__.py Fri Apr 20 11:21:20 2018 +0200 @@ -25,7 +25,10 @@ from __future__ import absolute_import from __future__ import print_function -import sys +import wx +from controls.UriLocationEditor import IConnectorPanel +from zope.interface import implementer + import traceback from threading import Thread, Event @@ -40,6 +43,7 @@ _WampSession = None _WampConnection = None _WampSessionEvent = Event() +URITypes = ["WAMP", "WAMPS"] class WampSession(wamp.ApplicationSession): @@ -158,3 +162,86 @@ confnodesroot.logger.write_error(_("WAMP connection to '%s' failed.\n") % location) confnodesroot.logger.write_error(traceback.format_exc()) return None + + +def WAMP_connector_dialog(confnodesroot): + [ID_IPTEXT, ID_PORTTEXT, ID_REALMTEXT, ID_WAMPIDTEXT, ID_SECURECHECKBOX] = [wx.NewId() for _init_ctrls in range(5)] + + + @implementer(IConnectorPanel) + class WAMPConnectorPanel(wx.Panel): + def __init__(self, typeConnector, parrent, *args, **kwargs): + self.type = typeConnector + self.parrent = parrent + wx.Panel.__init__(self, parrent, *args, **kwargs) + self._init_ctrls() + self._init_sizers() + self.uri = None + + def _init_ctrls(self): + self.IpText = wx.TextCtrl(parent=self, id=ID_IPTEXT, size = wx.Size(200, -1)) + self.PortText = wx.TextCtrl(parent=self, id=ID_PORTTEXT, size = wx.Size(200, -1)) + self.RealmText = wx.TextCtrl(parent=self, id=ID_REALMTEXT, size = wx.Size(200, -1)) + self.WAMPIDText = wx.TextCtrl(parent=self, id=ID_WAMPIDTEXT, size = wx.Size(200, -1)) + self.SecureCheckbox = wx.CheckBox(self, ID_SECURECHECKBOX, _("Is connection secure?")) + + def _init_sizers(self): + self.mainSizer = wx.BoxSizer(wx.VERTICAL) + self.uriSizer = wx.BoxSizer(wx.HORIZONTAL) + self.portSizer = wx.BoxSizer(wx.HORIZONTAL) + self.realmSizer = wx.BoxSizer(wx.HORIZONTAL) + self.wampIDSizer = wx.BoxSizer(wx.HORIZONTAL) + + self.uriSizer.Add(wx.StaticText(self, wx.ID_ANY, _("URI host:"), size = wx.Size(70, -1)), proportion=0, flag=wx.ALIGN_CENTER_VERTICAL) + self.uriSizer.AddSpacer((0,0)) + self.uriSizer.Add(self.IpText, proportion=1, flag=wx.ALIGN_RIGHT) + self.mainSizer.Add(self.uriSizer, border=2, flag=wx.ALL) + + self.portSizer.Add(wx.StaticText(self, wx.ID_ANY, _("URI port:"), size = wx.Size(70, -1)), proportion=0, flag=wx.ALIGN_CENTER_VERTICAL) + self.portSizer.AddSpacer((0,0)) + self.portSizer.Add(self.PortText, proportion=1, flag=wx.ALIGN_RIGHT) + self.mainSizer.Add(self.portSizer, border=2, flag=wx.ALL) + + self.realmSizer.Add(wx.StaticText(self, wx.ID_ANY, _("Realm:"), size = wx.Size(70, -1)), proportion=0, flag=wx.ALIGN_CENTER_VERTICAL) + self.realmSizer.AddSpacer((0, 0)) + self.realmSizer.Add(self.RealmText, proportion=1, flag=wx.ALIGN_RIGHT) + self.mainSizer.Add(self.realmSizer, border=2, flag=wx.ALL) + + self.wampIDSizer.Add(wx.StaticText(self, wx.ID_ANY, _("WAMP ID:"), size = wx.Size(70, -1)), proportion=0, flag=wx.ALIGN_CENTER_VERTICAL) + self.wampIDSizer.AddSpacer((0, 0)) + self.wampIDSizer.Add(self.WAMPIDText, proportion=1, flag=wx.ALIGN_RIGHT) + self.mainSizer.Add(self.wampIDSizer, border=2, flag=wx.ALL) + + self.mainSizer.Add(self.SecureCheckbox, proportion=1, flag=wx.ALIGN_LEFT) + + self.SetSizer(self.mainSizer) + + def SetURI(self, uri): + self.uri = uri + uri_list = uri.strip().split(":") + length = len(uri_list) + + if length > 0: + if uri_list[0] == URITypes[1]: + self.SecureCheckbox.SetValue(True) + + if length > 2: + self.IpText.SetValue(uri_list[1].strip("/")) + wampSett = uri_list[2].split("#") + length2 = len(wampSett) + if length2 > 0: + self.PortText.SetValue(wampSett[0]) + if length2 > 1: + self.RealmText.SetValue(wampSett[1]) + if length2 > 2: + self.WAMPIDText.SetValue(wampSett[2]) + + def GetURI(self): + if self.IpText.Validate(): + typeForURI = self.type + "S" if self.SecureCheckbox.GetValue() else self.type + self.uri = typeForURI + "://" + self.IpText.GetValue() + ":" + self.PortText.GetValue() + "#" + self.RealmText.GetValue() + "#" + self.WAMPIDText.GetValue() + return self.uri + else: + return "" + + return WAMPConnectorPanel("WAMP", confnodesroot)