Changeset 4686 for pjproject/branches/projects/pjsua2/pjsip-apps/src/pygui/application.py

Timestamp:

Dec 5, 2013 11:04:36 AM (10 years ago)

Author:

nanang

Message:

Re #1708:

• Changed participant managements in Chat, e.g: changed Buddy based to URI based, create temporary Buddy for incoming call/IM from non-buddy.
• Implemented simple media features in chat window (mute, volume, codec info).
• Misc: added window menu listing chat windows, changed behaviour on closing chat window, etc.

File:

• pjproject/branches/projects/pjsua2/pjsip-apps/src/pygui/application.py (modified) (4 diffs)

pjproject/branches/projects/pjsua2/pjsip-apps/src/pygui/application.py

@@ -209 +209 @@
                 file_menu.add_command(label="Quit", command=self._onMenuQuit)
 
+                # Window menu
+                self.window_menu = tk.Menu(self.menubar, tearoff=False)
+                self.menubar.add_cascade(label="Window", menu=self.window_menu)
+                
                 # Help menu
                 help_menu = tk.Menu(self.menubar, tearoff=False)
                 self.menubar.add_cascade(label="Help", menu=help_menu)
                 help_menu.add_command(label="About", underline=2, command=self._onMenuAbout)
+        
+        def _showChatWindow(self, chat_inst):
+                chat_inst.showWindow()
+                
+        def updateWindowMenu(self):
+                # Chat windows
+                self.window_menu.delete(0, tk.END)
+                for acc in self.accList:
+                        for c in acc.chatList:
+                                cmd = lambda arg=c: self._showChatWindow(arg)
+                                self.window_menu.add_command(label=c.title, command=cmd)
                 
         def _createContextMenu(self):
@@ -312 +327 @@
                                 bud = self._getSelectedBuddy()
                                 acc = bud.account
-                                chat = acc.findChat(bud)
+                                chat = acc.findChat(bud.cfg.uri)
                                 if not chat:
-                                        chat = acc.newChat(bud)
+                                        chat = acc.newChat(bud.cfg.uri)
                                 chat.showWindow()
         
@@ -377 +392 @@
                         
                 if label=='Audio call':
-                        chat = acc.findChat(bud)
-                        if not chat: chat = acc.newChat(bud)
+                        chat = acc.findChat(bud.cfg.uri)
+                        if not chat: chat = acc.newChat(bud.cfg.uri)
                         chat.showWindow()
                         chat.startCall()
                 elif label=='Send instant message':
-                        chat = acc.findChat(bud)
-                        if not chat: chat = acc.newChat(bud)
+                        chat = acc.findChat(bud.cfg.uri)
+                        if not chat: chat = acc.newChat(bud.cfg.uri)
                         chat.showWindow()
                 elif label=='Subscribe':
@@ -493 +508 @@
                 
 if __name__ == '__main__':
-        print pj
         main()