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

bug fixes

Browse Source
This commit is contained in:
ingvar1995 2016-07-28 18:04:02 +03:00
parent c7f50af25c
commit 52e6ace847
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
toxygen/mainscreen.py
View File

@ -365,7 +365,7 @@ class MainWindow(QtGui.QMainWindow, Singleton):
msgBox = QtGui.QMessageBox() msgBox = QtGui.QMessageBox()
msgBox.setWindowTitle(QtGui.QApplication.translate("MainWindow", "About", None, QtGui.QApplication.UnicodeUTF8)) msgBox.setWindowTitle(QtGui.QApplication.translate("MainWindow", "About", None, QtGui.QApplication.UnicodeUTF8))
text = (QtGui.QApplication.translate("MainWindow", 'Toxygen is Tox client written on Python.\nVersion: ', None, QtGui.QApplication.UnicodeUTF8)) text = (QtGui.QApplication.translate("MainWindow", 'Toxygen is Tox client written on Python.\nVersion: ', None, QtGui.QApplication.UnicodeUTF8))
msgBox.setText(text + util.program_version + '\nGitHub: github.com/xveduk/toxygen/') msgBox.setText(text + util.program_version + '\nGitHub: https://github.com/toxygen-project/toxygen/')
msgBox.exec_() msgBox.exec_()
def network_settings(self): def network_settings(self):

14
toxygen/profile.py
View File

@ -176,10 +176,11 @@ class Profile(contact.Contact, Singleton):
self._friends[self._active_friend].curr_text = self._screen.messageEdit.toPlainText() self._friends[self._active_friend].curr_text = self._screen.messageEdit.toPlainText()
except: except:
pass pass
self._active_friend = value
friend = self._friends[value] friend = self._friends[value]
self._friends[value].reset_messages() if self._active_friend != value:
self._screen.messageEdit.setPlainText(friend.curr_text) self._screen.messageEdit.setPlainText(friend.curr_text)
self._active_friend = value
self._friends[value].reset_messages()
self._messages.clear() self._messages.clear()
friend.load_corr() friend.load_corr()
messages = friend.get_corr()[-PAGE_SIZE:] messages = friend.get_corr()[-PAGE_SIZE:]
@ -490,7 +491,7 @@ class Profile(contact.Contact, Singleton):
data[1], data[1],
data[3], data[3],
False) False)
elif message.get_type() == MESSAGE_TYPE['FILE_TRANSFER']: elif message.get_type() == MESSAGE_TYPE['FILE_TRANSFER']: # file transfer
if message.get_status() is None: if message.get_status() is None:
self.create_unsent_file_item(message) self.create_unsent_file_item(message)
continue continue
@ -502,14 +503,15 @@ class Profile(contact.Contact, Singleton):
ft.signal() ft.signal()
except: except:
print('Incoming not started transfer - no info found') print('Incoming not started transfer - no info found')
elif message.get_type() == MESSAGE_TYPE['INLINE']: # inline elif message.get_type() == MESSAGE_TYPE['INLINE']: # inline image
self.create_inline_item(message.get_data()) self.create_inline_item(message.get_data(), False)
else: # info message else: # info message
data = message.get_data() data = message.get_data()
self.create_message_item(data[0], self.create_message_item(data[0],
data[2], data[2],
'', '',
data[3]) data[3],
False)
self._load_history = True self._load_history = True
def export_history(self, directory): def export_history(self, directory):