Added method to know which MUC are joined, and which subjects were received.

- plugin xep-0045: new methods getRoomJoined and getRoomSubjects
- wix: room joined are openned and subjects are set on profile plug
This commit is contained in:
Goffi 2010-03-31 17:16:27 +11:00
commit a9fc22c842
3 changed files with 54 additions and 6 deletions

View file

@ -104,10 +104,18 @@ class QuickApp():
statuses = presences[contact][res][2]
self.presenceUpdate(jabber_id, show, priority, statuses, profile)
#The waiting subscription requests
waitingSub = self.bridge.getWaitingSub(profile)
for sub in waitingSub:
self.subscribe(waitingSub[sub], sub, profile)
#Now we open the MUC window when we already are:
for room_args in self.bridge.getRoomJoined(profile):
self.roomJoined(*room_args, profile=profile)
for subject_args in self.bridge.getRoomSubjects(profile):
self.roomNewSubject(*subject_args, profile=profile)
def unplug_profile(self, profile):
"""Tell the application to not follow anymore the profile"""
if not profile in self.profiles:

View file

@ -110,6 +110,12 @@ class DBusBridgeFrontend(BridgeFrontend):
return self.db_req_iface.confirmationAnswer(id, accepted, data)
#methods from plugins
def getRoomJoined(self, profile_key='@DEFAULT@'):
return self.db_comm_iface.getRoomJoined(profile_key)
def getRoomSubjects(self, profile_key='@DEFAULT@'):
return self.db_comm_iface.getRoomSubjects(profile_key)
def joinMUC(self, service, roomId, nick, profile_key='@DEFAULT@'):
return self.db_comm_iface.joinMUC(service, roomId, nick, profile_key)

View file

@ -51,9 +51,8 @@ class Chat(wx.Frame, QuickChat):
self.conv_panel.sizer.Add(self.textBox, flag=wx.EXPAND)
self.conv_panel.SetSizer(self.conv_panel.sizer)
self.splitter.Initialize(self.conv_panel)
self.SetMenuBar(wx.MenuBar())
self.setType(self.type)
self.__createMenus()
#events
self.Bind(wx.EVT_CLOSE, self.onClose, self)
@ -86,11 +85,17 @@ class Chat(wx.Frame, QuickChat):
if type is 'group' and not self.splitter.IsSplit():
self.__createPresents()
self.subjectBox.Show()
self.__eraseMenus()
elif type is 'one2one' and self.splitter.IsSplit():
self.splitter.Unsplit(self.present_panel)
del self.present_panel
self.GetMenuBar().Show()
self.subjectBox.Hide()
self.__createMenus_O2O()
else:
self.subjectBox.Hide()
self.__createMenus_O2O()
def setPresents(self, nicks):
"""Set the users presents in the contact list for a group chat
@ -129,13 +134,20 @@ class Chat(wx.Frame, QuickChat):
self.subjectBox.SetValue(subject)
def __createMenus(self):
def __eraseMenus(self):
"""erase all menus"""
menuBar = self.GetMenuBar()
for i in range(menuBar.GetMenuCount()):
menuBar.Remove(i)
def __createMenus_O2O(self):
"""create menu bar for one 2 one chat"""
info("Creating menus")
self.__eraseMenus()
menuBar = self.GetMenuBar()
actionMenu = wx.Menu()
actionMenu.Append(idSEND, _("&SendFile CTRL-s"),_(" Send a file to contact"))
menuBar = wx.MenuBar()
menuBar.Append(actionMenu,_("&Action"))
self.SetMenuBar(menuBar)
#events
wx.EVT_MENU(self, idSEND, self.onSendFile)