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

bugs and typo fixes

Browse Source
This commit is contained in:
ingvar1995 2016-04-28 20:06:02 +03:00
parent 3b54f5a828
commit c30abec24d
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/install.md
View File

@ -32,7 +32,7 @@ You can compile Toxygen using [PyInstaller](http://www.pyinstaller.org/):
On Linux: On Linux:
``pyinstaller --windowed src/main.py`` ``pyinstaller --windowed main.py``
On Windows: On Windows:

5
src/mainscreen.py
View File

@ -20,6 +20,9 @@ class MessageArea(QtGui.QPlainTextEdit):
self.appendPlainText('') self.appendPlainText('')
else: else:
self.parent.send_message() self.parent.send_message()
if self.timer.isActive():
self.timer.stop()
self.parent.profile.send_typing(False)
elif event.key() == QtCore.Qt.Key_Up and not self.toPlainText(): elif event.key() == QtCore.Qt.Key_Up and not self.toPlainText():
self.appendPlainText(Profile.get_instance().get_last_message()) self.appendPlainText(Profile.get_instance().get_last_message())
else: else:
@ -197,6 +200,7 @@ class MainWindow(QtGui.QMainWindow):
self.account_avatar.setScaledContents(True) self.account_avatar.setScaledContents(True)
self.account_name = DataLabel(Form) self.account_name = DataLabel(Form)
self.account_name.setGeometry(QtCore.QRect(100, 30, 400, 25)) self.account_name.setGeometry(QtCore.QRect(100, 30, 400, 25))
self.account_name.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse)
font = QtGui.QFont() font = QtGui.QFont()
font.setFamily("Times New Roman") font.setFamily("Times New Roman")
font.setPointSize(14) font.setPointSize(14)
@ -205,6 +209,7 @@ class MainWindow(QtGui.QMainWindow):
self.account_name.setObjectName("account_name") self.account_name.setObjectName("account_name")
self.account_status = DataLabel(Form) self.account_status = DataLabel(Form)
self.account_status.setGeometry(QtCore.QRect(100, 50, 400, 25)) self.account_status.setGeometry(QtCore.QRect(100, 50, 400, 25))
self.account_status.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse)
font.setPointSize(12) font.setPointSize(12)
font.setBold(False) font.setBold(False)
self.account_status.setFont(font) self.account_status.setFont(font)

4
src/profile.py
View File

@ -876,6 +876,8 @@ class Profile(Contact, Singleton):
:param file_number: file number :param file_number: file number
:param already_cancelled: was cancelled by friend :param already_cancelled: was cancelled by friend
""" """
self.get_friend_by_number(friend_number).update_transfer_data(file_number,
FILE_TRANSFER_MESSAGE_STATUS['CANCELLED'])
if (friend_number, file_number) in self._file_transfers: if (friend_number, file_number) in self._file_transfers:
tr = self._file_transfers[(friend_number, file_number)] tr = self._file_transfers[(friend_number, file_number)]
if not already_cancelled: if not already_cancelled:
@ -885,8 +887,6 @@ class Profile(Contact, Singleton):
del self._file_transfers[(friend_number, file_number)] del self._file_transfers[(friend_number, file_number)]
else: else:
self._tox.file_control(friend_number, file_number, TOX_FILE_CONTROL['CANCEL']) self._tox.file_control(friend_number, file_number, TOX_FILE_CONTROL['CANCEL'])
self.get_friend_by_number(friend_number).update_transfer_data(file_number,
FILE_TRANSFER_MESSAGE_STATUS['CANCELLED'])
def accept_transfer(self, item, path, friend_number, file_number, size, inline=False): def accept_transfer(self, item, path, friend_number, file_number, size, inline=False):
""" """