plugin XEP-0077, plugin XEP-0100, frontends: gateways have been entirely implemented in backend using the new refactored XMLUI and AdvancedListContainer. The now useless code has been removed from frontends.
This commit is contained in:
parent
7d313660eb
commit
c6aaaaa297
5 changed files with 227 additions and 522 deletions
|
|
@ -1,87 +0,0 @@
|
|||
#!/usr/bin/python
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
# Primitivus: a SAT frontend
|
||||
# Copyright (C) 2009, 2010, 2011, 2012, 2013 Jérôme Poisson (goffi@goffi.org)
|
||||
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Affero General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU Affero General Public License for more details.
|
||||
|
||||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
from sat.core.i18n import _
|
||||
import urwid
|
||||
from urwid_satext import sat_widgets
|
||||
from sat_frontends.quick_frontend.quick_gateways import QuickGatewaysManager
|
||||
from sat.tools.jid import JID
|
||||
|
||||
|
||||
class GatewaysManager(urwid.WidgetWrap, QuickGatewaysManager):
|
||||
|
||||
def __init__(self, host, gateways, title=_("Gateways manager"), server=None):
|
||||
QuickGatewaysManager.__init__(self, host, gateways, server)
|
||||
if server:
|
||||
title+=" (%s)" % server
|
||||
widget_list = urwid.SimpleListWalker([])
|
||||
widget_list.append(urwid.Text(self.WARNING_MSG))
|
||||
widget_list.append(urwid.Divider('-'))
|
||||
for gateway in gateways:
|
||||
self.addGateway(widget_list,gateway, gateways[gateway])
|
||||
widget_list.append(urwid.Divider())
|
||||
self.ext_serv = sat_widgets.AdvancedEdit(_("Use external XMPP server: "))
|
||||
go_button = sat_widgets.CustomButton( _("GO !"),self.browseExternalServer)
|
||||
ext_serv_col = urwid.Columns([self.ext_serv,('fixed',go_button.getSize(),go_button)])
|
||||
widget_list.append(ext_serv_col)
|
||||
list_wid = urwid.ListBox(widget_list)
|
||||
decorated = sat_widgets.LabelLine(list_wid, sat_widgets.SurroundedText(title))
|
||||
urwid.WidgetWrap.__init__(self, decorated)
|
||||
|
||||
def browseExternalServer(self, button):
|
||||
"""Open the gateway manager on given server"""
|
||||
server = self.ext_serv.get_edit_text()
|
||||
if not server:
|
||||
popup = sat_widgets.Alert(_("Error"), _("You must enter an external server JID"), ok_cb=self.host.removePopUp)
|
||||
self.host.showPopUp(popup)
|
||||
return
|
||||
action_id = self.host.bridge.findGateways(server, self.host.profile)
|
||||
self.host.current_action_ids.add(action_id)
|
||||
self.host.current_action_ids_cb[action_id] = self.host.onGatewaysFound
|
||||
self.host.removeWindow()
|
||||
|
||||
def addGateway(self, widget_list, gateway, param):
|
||||
|
||||
widget_col = []
|
||||
widget_col.append(('weight',4,urwid.Text(unicode(param['name'])))) #FIXME: unicode to be remove when DBus bridge will not give dbus.String anymore
|
||||
|
||||
#Then the transport type message
|
||||
widget_col.append(('weight',6,urwid.Text(self.getGatewayDesc(param['type']))))
|
||||
|
||||
#The buttons
|
||||
|
||||
reg_button = sat_widgets.CustomButton( _("Register"), self.onRegister)
|
||||
reg_button.gateway_jid = JID(gateway)
|
||||
widget_col.append(('fixed',reg_button.getSize(),reg_button))
|
||||
unreg_button = sat_widgets.CustomButton( _("Unregister"), self.onUnregister)
|
||||
unreg_button.gateway_jid = JID(gateway)
|
||||
widget_col.append(('fixed',unreg_button.getSize(),unreg_button))
|
||||
widget_list.append(urwid.Columns(widget_col,1))
|
||||
|
||||
def onRegister(self, button):
|
||||
"""Called when register button is clicked"""
|
||||
gateway_jid = button.gateway_jid
|
||||
action_id = self.host.bridge.in_band_register(gateway_jid, self.host.profile)
|
||||
self.host.current_action_ids.add(action_id)
|
||||
|
||||
def onUnregister(self, button):
|
||||
"""Called when unregister button is clicked"""
|
||||
gateway_jid = button.gateway_jid
|
||||
action_id = self.host.bridge.gatewayRegister("CANCEL",gateway_jid, None, self.host.profile)
|
||||
self.host.current_action_ids.add(action_id)
|
||||
|
|
@ -28,7 +28,6 @@ from sat_frontends.quick_frontend.quick_utils import getNewPath, unescapePrivate
|
|||
from sat_frontends.primitivus.profile_manager import ProfileManager
|
||||
from sat_frontends.primitivus.contact_list import ContactList
|
||||
from sat_frontends.primitivus.chat import Chat
|
||||
from sat_frontends.primitivus.gateways import GatewaysManager
|
||||
from sat_frontends.primitivus.xmlui import XMLUI
|
||||
from sat_frontends.primitivus.progress import Progress
|
||||
from sat_frontends.primitivus.notify import Notify
|
||||
|
|
@ -294,7 +293,6 @@ class PrimitivusApp(QuickApp, InputHistory):
|
|||
menu.addMenu(contact, _("Remove contact"), self.onRemoveContactRequest)
|
||||
communication = _("Communication")
|
||||
menu.addMenu(communication, _("Join room"), self.onJoinRoomRequest, 'meta j')
|
||||
menu.addMenu(communication, _("Find Gateways"), self.onFindGatewaysRequest, 'meta g')
|
||||
#additionals menus
|
||||
#FIXME: do this in a more generic way (in quickapp)
|
||||
add_menus = self.bridge.getMenus('', Const.NO_SECURITY_LIMIT)
|
||||
|
|
@ -496,6 +494,7 @@ class PrimitivusApp(QuickApp, InputHistory):
|
|||
self.showPopUp(pop_up_widget)
|
||||
|
||||
def actionResult(self, type, id, data, profile):
|
||||
# FIXME: to be removed
|
||||
if not self.check_profile(profile):
|
||||
return
|
||||
|
||||
|
|
@ -588,12 +587,6 @@ class PrimitivusApp(QuickApp, InputHistory):
|
|||
pop_up_widget = sat_widgets.InputDialog(_("Entering a MUC room"), _("Please enter MUC's JID"), default_txt = 'room@muc_service.server.tld', cancel_cb=self.removePopUp, ok_cb=self.onJoinRoom)
|
||||
self.showPopUp(pop_up_widget)
|
||||
|
||||
def onFindGatewaysRequest(self, e):
|
||||
debug(_("Find gateways request"))
|
||||
id = self.bridge.findGateways(self.profiles[self.profile]['whoami'].domain, self.profile)
|
||||
self.current_action_ids.add(id)
|
||||
self.current_action_ids_cb[id] = self.onGatewaysFound
|
||||
|
||||
def onAddContactRequest(self, menu):
|
||||
pop_up_widget = sat_widgets.InputDialog(_("Adding a contact"), _("Please enter new contact JID"), default_txt = 'name@server.tld', cancel_cb=self.removePopUp, ok_cb=self.onAddContact)
|
||||
self.showPopUp(pop_up_widget)
|
||||
|
|
@ -611,13 +604,6 @@ class PrimitivusApp(QuickApp, InputHistory):
|
|||
|
||||
#MISC CALLBACKS#
|
||||
|
||||
def onGatewaysFound(self, data):
|
||||
"""Called when SàT has found the server gateways"""
|
||||
target = data['__private__']['target']
|
||||
del data['__private__']
|
||||
gatewayManager = GatewaysManager(self, data, server=target)
|
||||
self.addWindow(gatewayManager)
|
||||
|
||||
def chatStateReceived(self, from_jid_s, state, profile):
|
||||
"""Signal observer to display a contact chat state
|
||||
@param from_jid_s: contact who sent his new state
|
||||
|
|
|
|||
|
|
@ -1,56 +0,0 @@
|
|||
#!/usr/bin/python
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
# helper class for making a SAT frontend
|
||||
# Copyright (C) 2009, 2010, 2011, 2012, 2013 Jérôme Poisson (goffi@goffi.org)
|
||||
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Affero General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU Affero General Public License for more details.
|
||||
|
||||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
|
||||
|
||||
|
||||
from sat.core.i18n import _
|
||||
class QuickGatewaysManager(object):
|
||||
|
||||
|
||||
def __init__(self, host, gateways, title=_("Gateways manager"), server=None):
|
||||
self.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).""")
|
||||
self.host = host
|
||||
|
||||
def getGatewayDesc(self, gat_type):
|
||||
"""Return a human readable description of gateway type
|
||||
@param gat_type: type of gateway, as given by SàT"""
|
||||
desc = _('Unknown IM')
|
||||
|
||||
if gat_type == 'irc':
|
||||
desc = "Internet Relay Chat"
|
||||
elif gat_type == 'xmpp':
|
||||
desc = "XMPP"
|
||||
elif gat_type == 'qq':
|
||||
desc = "Tencent QQ"
|
||||
elif gat_type == 'simple':
|
||||
desc = "SIP/SIMPLE"
|
||||
elif gat_type == 'icq':
|
||||
desc = "ICQ"
|
||||
elif gat_type == 'yahoo':
|
||||
desc = "Yahoo! Messenger"
|
||||
elif gat_type == 'gadu-gadu':
|
||||
desc = "Gadu-Gadu"
|
||||
elif gat_type == 'aim':
|
||||
desc = "AOL Instant Messenger"
|
||||
elif gat_type == 'msn':
|
||||
desc = 'Windows Live Messenger'
|
||||
|
||||
return desc
|
||||
|
|
@ -1,168 +0,0 @@
|
|||
#!/usr/bin/python
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
# wix: a SAT frontend
|
||||
# Copyright (C) 2009, 2010, 2011, 2012, 2013 Jérôme Poisson (goffi@goffi.org)
|
||||
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Affero General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU Affero General Public License for more details.
|
||||
|
||||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
|
||||
|
||||
from sat.core.i18n import _
|
||||
import wx
|
||||
import pdb
|
||||
from xml.dom import minidom
|
||||
from logging import debug, info, error
|
||||
from sat.tools.jid import JID
|
||||
from sat_frontends.quick_frontend.quick_gateways import QuickGatewaysManager
|
||||
|
||||
class GatewaysManager(wx.Frame,QuickGatewaysManager):
|
||||
|
||||
def __init__(self, host, gateways, title=_("Gateways manager"), server=None):
|
||||
wx.Frame.__init__(self, None, title=title)
|
||||
QuickGatewaysManager.__init__(self, host, gateways, server)
|
||||
|
||||
if server:
|
||||
self.SetTitle(title+" (%s)" % server)
|
||||
|
||||
#Fonts
|
||||
self.normal_font = wx.Font(8, wx.DEFAULT, wx.NORMAL, wx.NORMAL)
|
||||
self.bold_font = wx.Font(8, wx.DEFAULT, wx.NORMAL, wx.BOLD)
|
||||
self.italic_font = wx.Font(8, wx.DEFAULT, wx.FONTSTYLE_ITALIC, wx.NORMAL)
|
||||
self.button_font = wx.Font(6, wx.DEFAULT, wx.NORMAL, wx.BOLD)
|
||||
|
||||
|
||||
self.modified = {} # dict of modified data (i.e. what we have to save)
|
||||
self.ctl_list = {} # usefull to access ctrl, key = (name, category)
|
||||
|
||||
self.sizer = wx.BoxSizer(wx.VERTICAL)
|
||||
warning = wx.TextCtrl(self, -1, value=self.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=5)
|
||||
self.panel.SetSizer(self.panel.sizer)
|
||||
self.panel.SetAutoLayout(True)
|
||||
self.sizer.Add(self.panel, 1, flag=wx.EXPAND)
|
||||
self.SetSizer(self.sizer)
|
||||
self.SetAutoLayout(True)
|
||||
|
||||
#events
|
||||
self.Bind(wx.EVT_CLOSE, self.onClose, self)
|
||||
|
||||
self.MakeModal()
|
||||
self.panel.sizer.Add(wx.Window(self.panel, -1))
|
||||
title_name = wx.StaticText(self.panel, -1, "Name")
|
||||
title_name.SetFont(self.bold_font)
|
||||
title_type = wx.StaticText(self.panel, -1, "Type")
|
||||
title_type.SetFont(self.bold_font)
|
||||
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.ext_server_panel = wx.Panel(self)
|
||||
self.ext_server_panel.sizer = wx.BoxSizer(wx.HORIZONTAL)
|
||||
self.ext_server_panel.SetSizer(self.ext_server_panel.sizer)
|
||||
self.ext_server_panel.SetAutoLayout(True)
|
||||
self.sizer.Add(self.ext_server_panel, 0, flag=wx.EXPAND)
|
||||
|
||||
ext_server_label = wx.StaticText(self.ext_server_panel, -1, _("Use external XMPP server: "))
|
||||
ext_server_label.SetFont(wx.ITALIC_FONT)
|
||||
self.ext_server_text = wx.TextCtrl(self.ext_server_panel, -1)
|
||||
ext_server_button = wx.Button(self.ext_server_panel, -1, _("GO !"))
|
||||
self.ext_server_panel.Bind(wx.EVT_BUTTON, self.browseExternalServer, ext_server_button)
|
||||
|
||||
self.ext_server_panel.sizer.Add(ext_server_label)
|
||||
self.ext_server_panel.sizer.Add(self.ext_server_text, 1, flag=wx.EXPAND)
|
||||
self.ext_server_panel.sizer.Add(ext_server_button)
|
||||
|
||||
#self.panel.sizer.Fit(self)
|
||||
self.sizer.Fit(self)
|
||||
|
||||
self.Show()
|
||||
|
||||
def browseExternalServer(self, event):
|
||||
"""Open the gateway manager on given server"""
|
||||
server = self.ext_server_text.GetValue()
|
||||
debug(_("Opening gateways manager on [%s]") % server)
|
||||
id = self.host.bridge.findGateways(server, self.host.profile)
|
||||
self.host.current_action_ids.add(id)
|
||||
self.host.current_action_ids_cb[id] = self.host.onGatewaysFound
|
||||
self.MakeModal(False)
|
||||
self.Destroy()
|
||||
|
||||
|
||||
def addGateway(self, gateway, param):
|
||||
|
||||
#First The icon
|
||||
isz = (16,16)
|
||||
im_icon = wx.StaticBitmap(self.panel, -1, wx.ArtProvider.GetBitmap(wx.ART_GO_FORWARD, wx.ART_TOOLBAR, isz))
|
||||
|
||||
#Then the name
|
||||
|
||||
label=wx.StaticText(self.panel, -1, param['name'])
|
||||
label.SetFont(self.normal_font)
|
||||
|
||||
#Then the transport type message
|
||||
type_label_txt = self.getGatewayDesc(param['type'])
|
||||
|
||||
type_label = wx.StaticText(self.panel, -1, type_label_txt)
|
||||
type_label.SetFont(self.italic_font)
|
||||
|
||||
#The buttons
|
||||
def register_cb(event):
|
||||
"""Called when register button is clicked"""
|
||||
gateway_jid = event.GetEventObject().gateway_jid
|
||||
id = self.host.bridge.in_band_register(gateway_jid, self.host.profile)
|
||||
self.host.current_action_ids.add(id)
|
||||
self.MakeModal(False)
|
||||
self.Destroy()
|
||||
|
||||
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.profile)
|
||||
self.host.current_action_ids.add(id)
|
||||
self.MakeModal(False)
|
||||
self.Destroy()
|
||||
|
||||
reg_button = wx.Button(self.panel, -1, _("Register"), size=wx.Size(-1, 8))
|
||||
reg_button.SetFont(self.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(self.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"))
|
||||
self.MakeModal(False)
|
||||
event.Skip()
|
||||
|
||||
|
|
@ -25,7 +25,6 @@ import wx
|
|||
from sat_frontends.wix.contact_list import ContactList
|
||||
from sat_frontends.wix.chat import Chat
|
||||
from sat_frontends.wix.xmlui import XMLUI
|
||||
from sat_frontends.wix.gateways import GatewaysManager
|
||||
from sat_frontends.wix.profile import Profile
|
||||
from sat_frontends.wix.profile_manager import ProfileManager
|
||||
import os.path
|
||||
|
|
@ -42,7 +41,7 @@ idADD_CONTACT,\
|
|||
idREMOVE_CONTACT,\
|
||||
idSHOW_PROFILE,\
|
||||
idJOIN_ROOM,\
|
||||
idFIND_GATEWAYS = range(10)
|
||||
= range(9)
|
||||
|
||||
class ChatList(QuickChatList):
|
||||
"""This class manage the list of chat windows"""
|
||||
|
|
@ -131,7 +130,6 @@ class MainWindow(wx.Frame, QuickApp):
|
|||
contactMenu.Append(idSHOW_PROFILE, _("&Show profile"), _(" Show contact's profile"))
|
||||
communicationMenu = wx.Menu()
|
||||
communicationMenu.Append(idJOIN_ROOM, _("&Join Room"),_(" Join a Multi-User Chat room"))
|
||||
communicationMenu.Append(idFIND_GATEWAYS, _("&Find Gateways"),_(" Find gateways to legacy IM"))
|
||||
self.menuBar = wx.MenuBar()
|
||||
self.menuBar.Append(connectMenu,_("&General"))
|
||||
self.menuBar.Append(contactMenu,_("&Contacts"))
|
||||
|
|
@ -176,8 +174,6 @@ class MainWindow(wx.Frame, QuickApp):
|
|||
wx.EVT_MENU(self, idREMOVE_CONTACT, self.onRemoveContact)
|
||||
wx.EVT_MENU(self, idSHOW_PROFILE, self.onShowProfile)
|
||||
wx.EVT_MENU(self, idJOIN_ROOM, self.onJoinRoom)
|
||||
wx.EVT_MENU(self, idFIND_GATEWAYS, self.onFindGateways)
|
||||
|
||||
|
||||
def newMessage(self, from_jid, to_jid, msg, _type, extra, profile):
|
||||
QuickApp.newMessage(self, from_jid, to_jid, msg, _type, extra, profile)
|
||||
|
|
@ -511,18 +507,6 @@ class MainWindow(wx.Frame, QuickApp):
|
|||
else:
|
||||
error (_("'%s' is an invalid JID !"), room_jid)
|
||||
|
||||
def onFindGateways(self, e):
|
||||
debug(_("Find Gateways request"))
|
||||
_id = self.bridge.findGateways(self.profiles[self.profile]['whoami'].domain, self.profile)
|
||||
self.current_action_ids.add(_id)
|
||||
self.current_action_ids_cb[_id] = self.onGatewaysFound
|
||||
|
||||
def onGatewaysFound(self, data):
|
||||
"""Called when SàT has found the server gateways"""
|
||||
target = data['__private__']['target']
|
||||
del data['__private__']
|
||||
gatewayManager = GatewaysManager(self, data, server=target)
|
||||
|
||||
def onClose(self, e):
|
||||
QuickApp.onExit(self)
|
||||
info(_("Exiting..."))
|
||||
|
|
|
|||
Loading…
Reference in a new issue