Gateway registration, unregistration & edition

- default values added in form
- DBus bridge: fixed array of struct management when adding dynamically a method
- fixed doc for some methods
- ugly fix for presence status
- added dependency for XEP-0077 in XEP-0100 plugin
- Wix: added unregister button in gateways manager
- Wix: added privacy warning in gateways manager
This commit is contained in:
Goffi 2009-12-15 01:27:32 +11:00
commit e3a3c1e975
3 changed files with 159 additions and 39 deletions

View file

@ -100,8 +100,10 @@ class DBusBridgeFrontend(BridgeFrontend):
def confirmationAnswer(self, id, accepted, data):
return self.db_req_iface.confirmationAnswer(id, accepted, data)
def submitForm(self, target, data):
return self.db_req_iface.submitForm(target, data)
def gatewayRegister(self, action, target, data):
if data == None:
data = [('', '')] #XXX: we have to this awful hack because python dbus need to guess the signature
return self.db_req_iface.gatewayRegister(action, target, data)
def getProgress(self, id):
return self.db_req_iface.getProgress(id)

View file

@ -103,23 +103,21 @@ class Form(wx.Frame):
for ctrl in self.ctl_list:
data.append((ctrl["name"], ctrl["control"].GetValue()))
print "submitting:",data
id = self.host.bridge.submitForm(self.target, data)
id = self.host.bridge.gatewayRegister("SUBMIT",self.target, data)
self.host.current_action_ids.add(id)
print "action id:",id
event.Skip()
self.MakeModal(False)
self.Destroy()
def onFormCancelled(self, event):
"""Called when cancel button is clicked"""
debug("Cancelling form")
#id = self.host.bridge.submitForm("button", data)
#self.host.current_action_ids.add(id)
#print "action id:",id
event.Skip()
self.MakeModal(False)
self.Close()
def onClose(self, event):
"""Close event: we have to send the form."""
debug("close")
self.MakeModal(False)
event.Skip()

View file

@ -27,6 +27,8 @@ from xml.dom import minidom
from logging import debug, info, error
from tools.jid import JID
WARNING_MSG = u"""Be careful ! Gateways allow you to use an external IM (legacy IM), so you can see your contact as jabber contacts.
But when you do this, all your messages go throught the external legacy IM server, it is a huge privacy issue (i.e.: all your messages throught the gateway can be monitored, recorded, analyzed by the external server, most of time a private company)."""
class GatewaysManager(wx.Frame):
def __init__(self, host, gateways, title="Gateways manager"):
@ -44,8 +46,14 @@ class GatewaysManager(wx.Frame):
self.ctl_list = {} # usefull to access ctrl, key = (name, category)
self.sizer = wx.BoxSizer(wx.VERTICAL)
warning = wx.TextCtrl(self, -1, value=WARNING_MSG, style = wx.TE_MULTILINE |
wx.TE_READONLY |
wx.TE_LEFT)
warning.SetFont(self.bold_font)
self.sizer.Add(warning, 0, wx.EXPAND)
warning.ShowPosition(0)
self.panel = wx.Panel(self)
self.panel.sizer = wx.FlexGridSizer(cols=4)
self.panel.sizer = wx.FlexGridSizer(cols=5)
self.panel.SetSizer(self.panel.sizer)
self.panel.SetAutoLayout(True)
self.sizer.Add(self.panel, 1, flag=wx.EXPAND)
@ -64,12 +72,14 @@ class GatewaysManager(wx.Frame):
self.panel.sizer.Add(title_name)
self.panel.sizer.Add(title_type)
self.panel.sizer.Add(wx.Window(self.panel, -1))
self.panel.sizer.Add(wx.Window(self.panel, -1))
for gateway in gateways:
self.addGateway(gateway, gateways[gateway])
self.panel.sizer.Fit(self)
#self.panel.sizer.Fit(self)
self.sizer.Fit(self)
self.Show()
@ -121,24 +131,40 @@ class GatewaysManager(wx.Frame):
id = self.host.bridge.in_band_register(gateway_jid)
self.host.current_action_ids.add(id)
print "register id:",id
self.MakeModal(False)
self.Destroy()
event.Skip()
def unregister_cb(event):
"""Called when unregister button is clicked"""
gateway_jid = event.GetEventObject().gateway_jid
id = self.host.bridge.gatewayRegister("CANCEL",gateway_jid, None)
self.host.current_action_ids.add(id)
print "unregister id:",id
self.MakeModal(False)
self.Destroy()
event.Skip()
button_font = wx.Font(6, wx.DEFAULT, wx.NORMAL, wx.BOLD)
reg_button = wx.Button(self.panel, -1, "Register", size=wx.Size(-1, 8))
reg_button.SetFont(button_font)
reg_button.gateway_jid = JID(gateway)
self.panel.Bind(wx.EVT_BUTTON, register_cb, reg_button)
unreg_button = wx.Button(self.panel, -1, "Unregister", size=wx.Size(-1, 8))
unreg_button.SetFont(button_font)
unreg_button.gateway_jid = JID(gateway)
self.panel.Bind(wx.EVT_BUTTON, unregister_cb, unreg_button)
self.panel.sizer.Add(im_icon)
self.panel.sizer.Add(label)
self.panel.sizer.Add(type_label)
self.panel.sizer.Add(reg_button, 1, wx.EXPAND)
self.panel.sizer.Add(unreg_button, 1, wx.EXPAND)
def onClose(self, event):
"""Close event"""
debug("close")
#now we save the modifier params
self.MakeModal(False)
event.Skip()