emdee/toxygen
1
0
Fork 0
Code Issues 1 Pull Requests Actions Wiki Activity

incoming call widget update

Browse Source
This commit is contained in:
ingvar1995 2017-06-15 21:34:43 +03:00
parent 0a378c1682
commit 9031a4a3e3
2 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
setup.py
View File

@ -8,15 +8,15 @@ import sys
version = program_version + '.0' version = program_version + '.0'
MODULES = ['numpy'] MODULES = ['numpy', 'PyQt5']
if system() in ('Windows', 'Darwin'): if system() in ('Windows', 'Darwin'):
MODULES.extend(['PyAudio', 'PyQt5']) MODULES.append('PyAudio')
else: else:
try: try:
import pyaudio import pyaudio
except ImportError: except ImportError:
MODULES.append('PyAudio') # TODO: ? MODULES.append('PyAudio')
DEP_LINKS = [] DEP_LINKS = []

35
toxygen/avwidgets.py
View File

@ -7,8 +7,6 @@ import wave
import settings import settings
from util import curr_directory from util import curr_directory
# TODO: improve IncomingCallWidget
class IncomingCallWidget(widgets.CenteredWidget): class IncomingCallWidget(widgets.CenteredWidget):
@ -21,6 +19,7 @@ class IncomingCallWidget(widgets.CenteredWidget):
self.avatar_label.setScaledContents(False) self.avatar_label.setScaledContents(False)
self.name = widgets.DataLabel(self) self.name = widgets.DataLabel(self)
self.name.setGeometry(QtCore.QRect(90, 20, 300, 25)) self.name.setGeometry(QtCore.QRect(90, 20, 300, 25))
self._friend_number = friend_number
font = QtGui.QFont() font = QtGui.QFont()
font.setFamily(settings.Settings.get_instance()['font']) font.setFamily(settings.Settings.get_instance()['font'])
font.setPointSize(16) font.setPointSize(16)
@ -53,10 +52,10 @@ class IncomingCallWidget(widgets.CenteredWidget):
self.setWindowTitle(text) self.setWindowTitle(text)
self.name.setText(name) self.name.setText(name)
self.call_type.setText(text) self.call_type.setText(text)
pr = profile.Profile.get_instance() self._processing = False
self.accept_audio.clicked.connect(lambda: pr.accept_call(friend_number, True, False) or self.stop()) self.accept_audio.clicked.connect(self.accept_call_with_audio)
self.accept_video.clicked.connect(lambda: pr.accept_call(friend_number, True, True) or self.stop()) self.accept_video.clicked.connect(self.accept_call_with_video)
self.decline.clicked.connect(lambda: pr.stop_call(friend_number, False) or self.stop()) self.decline.clicked.connect(self.decline_call)
class SoundPlay(QtCore.QThread): class SoundPlay(QtCore.QThread):
@ -107,6 +106,30 @@ class IncomingCallWidget(widgets.CenteredWidget):
self.thread.wait() self.thread.wait()
self.close() self.close()
def accept_call_with_audio(self):
if self._processing:
return
self._processing = True
pr = profile.Profile.get_instance()
pr.accept_call(self._friend_number, True, False)
self.stop()
def accept_call_with_video(self):
if self._processing:
return
self._processing = True
pr = profile.Profile.get_instance()
pr.accept_call(self._friend_number, True, True)
self.stop()
def decline_call(self):
if self._processing:
return
self._processing = True
pr = profile.Profile.get_instance()
pr.stop_call(self._friend_number, False)
self.stop()
def set_pixmap(self, pixmap): def set_pixmap(self, pixmap):
self.avatar_label.setPixmap(pixmap) self.avatar_label.setPixmap(pixmap)