Changeset 4677 for pjproject/branches/projects/pjsua2/pjsip-apps/src/pygui/chatgui.py

Timestamp:

Dec 4, 2013 12:19:48 PM (10 years ago)

Author:

nanang

Message:

Re #1708: Implement adding participants, also various misc updates/fixes.

File:

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

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

@@ -74 +74 @@
                 self.columnconfigure(1, weight=0)
                 
-                self._text = tk.Text(self, font=("Arial", "10"))
+                self._text = tk.Text(self, width=50, height=30, font=("Arial", "10"))
                 self._text.grid(row=0, column=0, sticky='nswe')
                 self._text.config(state=tk.DISABLED)
@@ -83 +83 @@
                 scrl.grid(row=0, column=1, sticky='nsw')
                 
-                self._typingBox = tk.Text(self, height=1, font=("Arial", "10"))
+                self._typingBox = tk.Text(self, width=50, height=1, font=("Arial", "10"))
                 self._typingBox.grid(row=1, columnspan=2, sticky='we', pady=0)
                 
@@ -112 +112 @@
                         
 class AudioObserver:
-        def onRetry(self, peer_uri):
-                pass
-        def onKick(self, peer_uri):
+        def onHangup(self, peer_uri):
                 pass
         def onHold(self, peer_uri):
+                pass
+        def onUnhold(self, peer_uri):
                 pass
         def onRxMute(self, peer_uri, is_muted):
@@ -135 +135 @@
                 self._rxMute = False
                 self._txMute = False
-
-                # internal state: 0:init - 1:established - 2:failure/rejected 3:normal cleared
                 self._state = AudioState.NULL
                 
@@ -149 +147 @@
                         self._callFrame.pack_forget()
                         self._initFrame.pack(fill=tk.BOTH)
-                        self._btnRetry.pack_forget()
                         self._btnCancel.pack(side=tk.TOP)
                         self._lblInitState['text'] = 'Intializing..'
@@ -161 +158 @@
                         if state == AudioState.FAILED:
                                 self._lblInitState['text'] = 'Failed'
-                                self._btnRetry.pack()
                         else:
                                 self._lblInitState['text'] = 'Normal cleared'
                                 self._btnCancel.pack_forget()
+                        
+                        self._btnHold['text'] = 'Hold'
+                        self._btnHold.config(state=tk.NORMAL)
                 
                 # save last state
                 self._state = state
                 
-        def _onRetry(self):
-                self._btnRetry.pack_forget()
-                self._state = 0
-                # notify app
-                self._observer.onRetry(self.peerUri)
-
-        def _onKick(self):
-                # notify app
-                self._observer.onKick(self.peerUri)
-                
         def _onHold(self):
-                # notify app
-                self._observer.onHold(self.peerUri)
+                self._btnHold.config(state=tk.DISABLED)
+                # notify app
+                if self._btnHold['text'] == 'Hold':
+                        self._observer.onHold(self.peerUri)
+                        self._btnHold['text'] = 'Unhold'
+                else:
+                        self._observer.onUnhold(self.peerUri)
+                        self._btnHold['text'] = 'Hold'
+                self._btnHold.config(state=tk.NORMAL)
 
         def _onHangup(self):
                 # notify app
-                self._observer.onKick(self.peerUri)
+                self._observer.onHangup(self.peerUri)
 
         def _onRxMute(self):
@@ -210 +206 @@
                 self._lblInitState.pack(side=tk.TOP, fill=tk.X, expand=1)
                 
-                # Operation: retry, cancel/kick
-                self._btnRetry = ttk.Button(self._initFrame, text = 'Retry', command=self._onRetry)
-                self._btnRetry.pack(side=tk.TOP)
-                self._btnCancel = ttk.Button(self._initFrame, text = 'Cancel', command=self._onKick)
+                # Operation: cancel/kick
+                self._btnCancel = ttk.Button(self._initFrame, text = 'Cancel', command=self._onHangup)
                 self._btnCancel.pack(side=tk.TOP)
                                 
@@ -383 +377 @@
                                 aud_frm.updateState(state)
                                 break
+                if state >= AudioState.DISCONNECTED and len(self._audioFrames) == 1:
+                        self.enableAudio(False)
+                else:
+                        self.enableAudio(True)
                                                 
 if __name__ == '__main__':