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

Timestamp:

Dec 4, 2013 2:46:42 AM (11 years ago)

Author:

nanang

Message:

Re #1708: Initial work on chat window.

File:

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

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

@@ -52 +52 @@
                 
                 # Logger
-                self.logger = log.Logger()
+                self.logger = None #log.Logger()
                 
                 # Accounts
@@ -136 +136 @@
                 # Start polling
                 self._onTimer()
-
-        def updateCall(self, acc):
-                iid = str(acc.randId)
-                for call in acc.callList:
-                        calliid = str(call.randId)
-                        uri, status = call.statusText()
-                        if self.tv.exists(calliid):
-                                self.tv.item(call.iid, text=uri, values=(status,))
-                        else:
-                                call.iid = self.tv.insert(iid, 0, calliid, open=True, text=uri, values=(status,))
 
         def updateAccount(self, acc):
@@ -226 +216 @@
                 self.accMenu = tk.Menu(top, tearoff=False)
                 # Labels, must match with _onAccContextMenu()
-                labels = ['Call', '-', 'Unregister', 'Reregister', 'Add buddy...', '-',
+                labels = ['Unregister', 'Reregister', 'Add buddy...', '-',
                           'Online', 'Invisible', 'Away', 'Busy', '-',
                           'Settings...', '-',
@@ -238 +228 @@
                 
                 # Create Buddy context menu
-                # Labels, must match with _onAccContextMenu()
+                # Labels, must match with _onBuddyContextMenu()
                 self.buddyMenu = tk.Menu(top, tearoff=False)
-                labels = ['Video call', 'Audio call', 'Send instant message', '-',
+                labels = ['Audio call', 'Send instant message', '-',
                           'Subscribe', 'Unsubscribe', '-',
                           'Settings...', '-',
@@ -257 +247 @@
                 else:
                         self.tv.bind('<3>', self._onTvRightClick)
+                self.tv.bind('<Double-Button-1>', self._onTvDoubleClick)
 
         def _getSelectedAccount(self):
@@ -303 +294 @@
                                 self.buddyMenu.post(event.x_root, event.y_root)
         
+        def _onTvDoubleClick(self, event):
+                iid = self.tv.identify_row(event.y)
+                if iid:
+                        self.tv.selection_set( (iid,) )
+                        acc = self._getSelectedAccount()
+                        if acc:
+                                self.cfgChanged = False
+                                dlg = accountsetting.Dialog(self.master, acc.cfg)
+                                if dlg.doModal():
+                                        self.updateAccount(acc)
+                                        acc.modify(acc.cfg)
+                        else:
+                                bud = self._getSelectedBuddy()
+                                acc = bud.account
+                                chat = acc.findChat(bud)
+                                if not chat:
+                                        chat = acc.newChat(bud)
+                                chat.showWindow()
+        
         def _onAccContextMenu(self, label):
                 acc = self._getSelectedAccount()
@@ -308 +318 @@
                         return
                 
-                if label=='Call':
-                        acc.makeCall()
-                elif label=='Unregister':
+                if label=='Unregister':
                         acc.setRegistration(False)
                 elif label=='Reregister':
@@ -362 +370 @@
                 acc = bud.account
                         
-                if label=='Video call':
-                        pass
-                elif label=='Audio call':
-                        pass
+                if label=='Audio call':
+                        chat = acc.findChat(bud)
+                        if not chat: chat = acc.newChat(bud)
+                        chat.showWindow()
+                        chat.startAudio()
                 elif label=='Send instant message':
-                        pass
+                        chat = acc.findChat(bud)
+                        if not chat: chat = acc.newChat(bud)
+                        chat.showWindow()
                 elif label=='Subscribe':
                         bud.subscribePresence(True)
@@ -476 +487 @@
                 
 if __name__ == '__main__':
+        print pj
         main()