support for all protocols
This commit is contained in:
parent
9c1b688e4f
commit
a6934f6796
|
@ -235,9 +235,9 @@ class NetworkDialog(QDialog):
|
||||||
if not self.exec_():
|
if not self.exec_():
|
||||||
return
|
return
|
||||||
|
|
||||||
server = ':'.join([str( self.server_host.text() ),
|
host = str( self.server_host.text() )
|
||||||
str( self.server_port.text() ),
|
port = str( self.server_port.text() )
|
||||||
(protocol_letters[self.server_protocol.currentIndex()]) ])
|
protocol = protocol_letters[self.server_protocol.currentIndex()]
|
||||||
|
|
||||||
if self.proxy_mode.currentText() != 'NONE':
|
if self.proxy_mode.currentText() != 'NONE':
|
||||||
proxy = { 'mode':str(self.proxy_mode.currentText()).lower(),
|
proxy = { 'mode':str(self.proxy_mode.currentText()).lower(),
|
||||||
|
@ -248,5 +248,5 @@ class NetworkDialog(QDialog):
|
||||||
|
|
||||||
auto_connect = self.autocycle_cb.isChecked()
|
auto_connect = self.autocycle_cb.isChecked()
|
||||||
|
|
||||||
self.network.set_parameters(server, proxy, auto_connect)
|
self.network.set_parameters(host, port, protocol, proxy, auto_connect)
|
||||||
return True
|
return True
|
||||||
|
|
|
@ -225,7 +225,7 @@ class Interface(threading.Thread):
|
||||||
|
|
||||||
|
|
||||||
def poll(self):
|
def poll(self):
|
||||||
self.send([])
|
self.send([], None)
|
||||||
|
|
||||||
|
|
||||||
def send_http(self, messages, callback):
|
def send_http(self, messages, callback):
|
||||||
|
|
|
@ -52,7 +52,7 @@ class Network(threading.Thread):
|
||||||
self.default_server = self.config.get('server')
|
self.default_server = self.config.get('server')
|
||||||
self.callbacks = {}
|
self.callbacks = {}
|
||||||
|
|
||||||
self.protocol = 's'
|
self.protocol = self.config.get('protocol','s')
|
||||||
self.irc_servers = [] # returned by interface (list from irc)
|
self.irc_servers = [] # returned by interface (list from irc)
|
||||||
self.disconnected_servers = []
|
self.disconnected_servers = []
|
||||||
self.recent_servers = self.config.get('recent_servers',[]) # successful connections
|
self.recent_servers = self.config.get('recent_servers',[]) # successful connections
|
||||||
|
@ -173,13 +173,18 @@ class Network(threading.Thread):
|
||||||
self.interface.connect_event.wait()
|
self.interface.connect_event.wait()
|
||||||
|
|
||||||
|
|
||||||
def set_parameters(self, server, proxy, auto_connect):
|
def set_parameters(self, host, port, protocol, proxy, auto_connect):
|
||||||
|
|
||||||
|
|
||||||
self.config.set_key("proxy", proxy, True)
|
self.config.set_key("proxy", proxy, True)
|
||||||
self.proxy = proxy
|
self.proxy = proxy
|
||||||
|
|
||||||
|
self.config.set_key("protocol", protocol, True)
|
||||||
|
self.protocol = protocol
|
||||||
|
|
||||||
self.config.set_key('auto_cycle', auto_connect, True)
|
self.config.set_key('auto_cycle', auto_connect, True)
|
||||||
|
|
||||||
|
server = ':'.join([ host, port, protocol ])
|
||||||
self.config.set_key("server", server, True)
|
self.config.set_key("server", server, True)
|
||||||
|
|
||||||
if auto_connect:
|
if auto_connect:
|
||||||
|
|
Loading…
Reference in New Issue