diff --git a/toxygen/images/videocall.png b/toxygen/images/call_video.png similarity index 100% rename from toxygen/images/videocall.png rename to toxygen/images/call_video.png diff --git a/toxygen/images/finish_call_video.png b/toxygen/images/finish_call_video.png new file mode 100755 index 0000000..8465106 Binary files /dev/null and b/toxygen/images/finish_call_video.png differ diff --git a/toxygen/images/incoming_call_video.png b/toxygen/images/incoming_call_video.png new file mode 100755 index 0000000..4fe4c98 Binary files /dev/null and b/toxygen/images/incoming_call_video.png differ diff --git a/toxygen/list_items.py b/toxygen/list_items.py index 9ef4e84..8e58c59 100644 --- a/toxygen/list_items.py +++ b/toxygen/list_items.py @@ -533,16 +533,14 @@ class InlineImageItem(QtWidgets.QScrollArea): self._elem.setSizeHint(QtCore.QSize(self.width(), self.height())) elif event.button() == QtCore.Qt.RightButton: # save inline directory = QtWidgets.QFileDialog.getExistingDirectory(self, - QtWidgets.QApplication.translate("MainWindow", - 'Choose folder'), - curr_directory(), - QtWidgets.QFileDialog.ShowDirsOnly | QtWidgets.QFileDialog.DontUseNativeDialog) + QtWidgets.QApplication.translate("MainWindow", + 'Choose folder'), + curr_directory(), + QtWidgets.QFileDialog.ShowDirsOnly | QtWidgets.QFileDialog.DontUseNativeDialog) if directory: fl = QtCore.QFile(directory + '/toxygen_inline_' + curr_time().replace(':', '_') + '.png') self._pixmap.save(fl, 'PNG') - return False - def mark_as_sent(self): return False diff --git a/toxygen/mainscreen.py b/toxygen/mainscreen.py index 84d266c..669ec65 100644 --- a/toxygen/mainscreen.py +++ b/toxygen/mainscreen.py @@ -568,13 +568,12 @@ class MainWindow(QtWidgets.QMainWindow, Singleton): self.update_call_state('call') def update_call_state(self, fl): - # TODO: do smth with video call button os.chdir(curr_directory() + '/images/') pixmap = QtGui.QPixmap(curr_directory() + '/images/{}.png'.format(fl)) icon = QtGui.QIcon(pixmap) self.callButton.setIcon(icon) self.callButton.setIconSize(QtCore.QSize(50, 50)) - pixmap = QtGui.QPixmap(curr_directory() + '/images/videocall.png') + pixmap = QtGui.QPixmap(curr_directory() + '/images/{}_video.png') icon = QtGui.QIcon(pixmap) self.videocallButton.setIcon(icon) self.videocallButton.setIconSize(QtCore.QSize(35, 35)) diff --git a/toxygen/util.py b/toxygen/util.py index 2c9483d..bd9574a 100644 --- a/toxygen/util.py +++ b/toxygen/util.py @@ -4,7 +4,7 @@ import shutil import sys import re -program_version = '0.2.8' +program_version = '0.3.0' def log(data):