emdee/toxygen
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

unsent files fixes - part 1

Browse source
This commit is contained in:
ingvar1995 2018-05-19 21:04:40 +03:00
parent 6495aa9920
commit 206c5c4905
4 changed files with 36 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

4
toxygen/ui/main_screen.py
View file

@ -316,8 +316,8 @@ class MainWindow(QtWidgets.QMainWindow):
def load(pos):
if not pos:
friend = self._contacts_manager.get_curr_friend()
self._history_loader.load_history(friend)
contact = self._contacts_manager.get_curr_contact()
self._history_loader.load_history(contact)
self.messages.verticalScrollBar().setValue(1)
self.messages.verticalScrollBar().valueChanged.connect(load)
self.messages.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)

15
toxygen/ui/messages_widgets.py
View file

@ -253,7 +253,8 @@ class FileTransferItem(QtWidgets.QListWidget):
icon = QtGui.QIcon(pixmap)
self.cancel.setIcon(icon)
self.cancel.setIconSize(QtCore.QSize(30, 30))
self.cancel.setVisible(transfer_message.state in ACTIVE_FILE_TRANSFERS)
self.cancel.setVisible(transfer_message.state in ACTIVE_FILE_TRANSFERS or
transfer_message.state == FILE_TRANSFER_STATE['UNSENT'])
self.cancel.clicked.connect(
lambda: self.cancel_transfer(transfer_message.friend_number, transfer_message.file_number))
self.cancel.setStyleSheet('QPushButton:hover { border: 1px solid #3A3939; background-color: none;}')
@ -268,6 +269,9 @@ class FileTransferItem(QtWidgets.QListWidget):
elif transfer_message.state == FILE_TRANSFER_STATE['PAUSED_BY_USER']: # setup for continue
self.accept_or_pause.setVisible(True)
self.button_update('resume')
elif transfer_message.state == FILE_TRANSFER_STATE['UNSENT']:
self.accept_or_pause.setVisible(False)
self.setStyleSheet('QListWidget { border: 1px solid #FF8000; }')
else: # pause
self.accept_or_pause.setVisible(True)
self.button_update('pause')
@ -382,17 +386,12 @@ class FileTransferItem(QtWidgets.QListWidget):
self.state = state
self.time_left.setVisible(True)
@staticmethod
def mark_as_sent():
return False
class UnsentFileItem(FileTransferItem):
def __init__(self, transfer_message, file_transfer_handler, settings, width, parent=None):
super().__init__(transfer_message, file_transfer_handler, settings, width, parent)
self._time = time
self.pb.setVisible(False)
movie = QtGui.QMovie(util.join_path(util.get_images_directory(), 'spinner.gif'))
self.time.setMovie(movie)
movie.start()
@ -448,7 +447,3 @@ class InlineImageItem(QtWidgets.QScrollArea):
if directory:
fl = QtCore.QFile(directory + '/toxygen_inline_' + util.curr_time().replace(':', '_') + '.png')
self._pixmap.save(fl, 'PNG')
@staticmethod
def mark_as_sent():
return False