3 Commits

3 changed files with 15 additions and 6 deletions

View File

@ -73,8 +73,16 @@ class MessageArea(QtWidgets.QPlainTextEdit):
if text.startswith('file://'): if text.startswith('file://'):
file_name = self.parse_file_name(text) file_name = self.parse_file_name(text)
self.parent.profile.send_file(file_name) self.parent.profile.send_file(file_name)
else: elif text:
self.insertPlainText(text) self.insertPlainText(text)
else:
image = QtWidgets.QApplication.clipboard().image()
if image is not None:
byte_array = QtCore.QByteArray()
buffer = QtCore.QBuffer(byte_array)
buffer.open(QtCore.QIODevice.WriteOnly)
image.save(buffer, 'PNG')
self.parent.profile.send_screenshot(bytes(byte_array.data()))
def parse_file_name(self, file_name): def parse_file_name(self, file_name):
import urllib import urllib

View File

@ -597,7 +597,7 @@ class Profile(basecontact.BaseContact, Singleton):
False) False)
else: else:
data = message.get_data() data = message.get_data()
self.create_gc_message_item(data[0], data[2], data[1], data[4], data[3]) self.create_gc_message_item(data[0], data[2], data[1], data[4], data[3], False)
self._load_history = True self._load_history = True
def export_db(self, directory): def export_db(self, directory):
@ -1099,10 +1099,11 @@ class Profile(basecontact.BaseContact, Singleton):
file_name, file_name,
friend.number, friend.number,
st.get_file_number()) st.get_file_number())
item = self.create_file_transfer_item(tm)
friend.append_message(tm) friend.append_message(tm)
st.set_state_changed_handler(item.update_transfer_state) if friend_number == self.get_active_number():
self._messages.scrollToBottom() item = self.create_file_transfer_item(tm)
st.set_state_changed_handler(item.update_transfer_state)
self._messages.scrollToBottom()
def send_file(self, path, number=None, is_resend=False, file_id=None): def send_file(self, path, number=None, is_resend=False, file_id=None):
""" """

View File

@ -5,7 +5,7 @@ import sys
import re import re
program_version = '0.4.2' program_version = '0.4.3'
def cached(func): def cached(func):