erebion/libervia-backend
Watch
1
0
Fork
You've already forked libervia-backend
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

quick_app: self.occupants for group chat are now managed by quick_chat. self.options.profile now support unicode

Browse source
This commit is contained in:
Goffi 2010-07-16 20:12:54 +08:00
commit f18d8f2d7e
3 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
frontends/quick_frontend/quick_app.py
View file

@ -91,6 +91,8 @@ class QuickApp():
parser.add_option("-p", "--profile", help=_("Select the profile to use"))
(self.options, args) = parser.parse_args()
if self.options.profile:
self.options.profile = self.options.profile.decode('utf-8')
return args
def plug_profile(self, profile_key='@DEFAULT@'):
@ -141,7 +143,7 @@ class QuickApp():
for sub in waitingSub:
self.subscribe(waitingSub[sub], sub, profile)
#Now we open the MUC window when we already are:
#Now we open the MUC window where we already are:
for room_args in self.bridge.getRoomJoined(profile):
self.roomJoined(*room_args, profile=profile)
@ -164,7 +166,7 @@ class QuickApp():
return
debug(_("Connected"))
self.setStatusOnline(True)
#self.bridge.joinMUC('conference.necton2.int', 'test', self.profiles[self.profile]['whoami'].node, self.profile) #gof:
self.bridge.joinMUC('conference.necton2.int', 'test', self.profiles[self.profile]['whoami'].node, self.profile) #gof:
def disconnected(self, profile):

3
frontends/quick_frontend/quick_chat.py
View file

@ -48,6 +48,7 @@ class QuickChat():
if self.type != "group":
error (_("[INTERNAL] trying to set presents nicks for a non group chat window"))
raise Exception("INTERNAL ERROR") #TODO: raise proper Exception here
self.occupants.update(nicks)
def replaceUser(self, nick):
"""Add user if it is not in the group list"""
@ -55,6 +56,7 @@ class QuickChat():
if self.type != "group":
error (_("[INTERNAL] trying to replace user for a non group chat window"))
raise Exception("INTERNAL ERROR") #TODO: raise proper Exception here
self.occupants.add(nick)
def setUserNick(self, nick):
"""Set the nick of the user, usefull for e.g. change the color of the user"""
@ -66,6 +68,7 @@ class QuickChat():
if self.type != "group":
error (_("[INTERNAL] trying to remove user for a non group chat window"))
raise Exception("INTERNAL ERROR") #TODO: raise proper Exception here
self.occupants.remove(nick)
def setSubject(self, subject):
"""Set title for a group chat"""

3
frontends/wix/chat.py
View file

@ -132,7 +132,6 @@ class Chat(wx.Frame, QuickChat):
QuickChat.setPresents(self, nicks)
for nick in nicks:
self.present_panel.presents.replace(nick)
self.occupants.add(nick)
def replaceUser(self, nick):
"""Add user if it is not in the group list"""
@ -142,13 +141,11 @@ class Chat(wx.Frame, QuickChat):
return
QuickChat.replaceUser(self, nick)
self.present_panel.presents.replace(nick)
self.occupants.add(nick)
def removeUser(self, nick):
"""Remove a user from the group list"""
QuickChat.removeUser(self, nick)
self.present_panel.presents.remove(nick)
self.occupants.remove(nick)
def setSubject(self, subject):
"""Set title for a group chat"""