From 6ffa15b4d78e53512ad22c8cdaaca39083d8263f Mon Sep 17 00:00:00 2001 From: ingvar1995 Date: Tue, 22 Mar 2016 15:17:46 +0300 Subject: [PATCH] screenshot button todo --- src/mainscreen.py | 6 ++++++ src/profile.py | 5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/mainscreen.py b/src/mainscreen.py index 9eda4ec..3196900 100644 --- a/src/mainscreen.py +++ b/src/mainscreen.py @@ -103,6 +103,7 @@ class MainWindow(QtGui.QMainWindow): self.sendMessageButton.setObjectName("sendMessageButton") self.sendMessageButton.clicked.connect(self.send_message) self.fileTransferButton.clicked.connect(self.send_file) + self.screenshotButton.clicked.connect(self.send_screenshot) self.screenshotButton.setText(QtGui.QApplication.translate("Form", "Screenshot", None, QtGui.QApplication.UnicodeUTF8)) self.fileTransferButton.setText(QtGui.QApplication.translate("Form", "File", None, QtGui.QApplication.UnicodeUTF8)) self.sendMessageButton.setText(QtGui.QApplication.translate("Form", "Send", None, QtGui.QApplication.UnicodeUTF8)) @@ -282,6 +283,11 @@ class MainWindow(QtGui.QMainWindow): if name[0]: self.profile.send_file(name[0]) + def send_screenshot(self): + # TODO: add screenshots support + if self.profile.is_active_online(): # active friend exists and online + pass + # ----------------------------------------------------------------------------------------------------------------- # Functions which called when user open context menu in friends list # ----------------------------------------------------------------------------------------------------------------- diff --git a/src/profile.py b/src/profile.py index 47995ba..bf23540 100644 --- a/src/profile.py +++ b/src/profile.py @@ -720,10 +720,9 @@ class Profile(Contact, Singleton): if settings['allow_auto_accept'] and friend.tox_id in settings['auto_accept_from_friends']: path = settings['auto_accept_path'] or curr_directory() self.accept_transfer(path + '/' + file_name.decode('utf-8'), friend_number, file_number) - item = self.create_file_transfer_item(file_name.decode('utf-8'), size, friend_number, file_number, False) + self.create_file_transfer_item(file_name.decode('utf-8'), size, friend_number, file_number, False) else: - item = self.create_file_transfer_item(file_name.decode('utf-8'), size, friend_number, file_number, True) - friend.append_file_transfer((item, MESSAGE_OWNER['FRIEND'], int(time.time()), 2)) + self.create_file_transfer_item(file_name.decode('utf-8'), size, friend_number, file_number, True) def cancel_transfer(self, friend_number, file_number): if (friend_number, file_number) in self._file_transfers: