short bug fix
This commit is contained in:
parent
298dba4d6c
commit
01854ff2d0
3 changed files with 12 additions and 6 deletions
|
@ -20,7 +20,7 @@ class MessageArea(QtGui.QPlainTextEdit):
|
||||||
def keyPressEvent(self, event):
|
def keyPressEvent(self, event):
|
||||||
if event.matches(QtGui.QKeySequence.Paste):
|
if event.matches(QtGui.QKeySequence.Paste):
|
||||||
self.pasteEvent()
|
self.pasteEvent()
|
||||||
elif event.key() == QtCore.Qt.Key_Return:
|
elif event.key() in (QtCore.Qt.Key_Return, QtCore.Qt.Key_Enter):
|
||||||
modifiers = event.modifiers()
|
modifiers = event.modifiers()
|
||||||
if modifiers & QtCore.Qt.ControlModifier or modifiers & QtCore.Qt.ShiftModifier:
|
if modifiers & QtCore.Qt.ControlModifier or modifiers & QtCore.Qt.ShiftModifier:
|
||||||
self.insertPlainText('\n')
|
self.insertPlainText('\n')
|
||||||
|
|
|
@ -29,6 +29,9 @@ class PluginLoader(util.Singleton):
|
||||||
Load all plugins in plugins folder
|
Load all plugins in plugins folder
|
||||||
"""
|
"""
|
||||||
path = util.curr_directory() + '/plugins/'
|
path = util.curr_directory() + '/plugins/'
|
||||||
|
if not os.path.exists(path):
|
||||||
|
util.log('Plugin dir not found')
|
||||||
|
return
|
||||||
files = [f for f in os.listdir(path) if os.path.isfile(os.path.join(path, f))]
|
files = [f for f in os.listdir(path) if os.path.isfile(os.path.join(path, f))]
|
||||||
for fl in files:
|
for fl in files:
|
||||||
if fl in ('plugin_super_class.py', '__init__.py') or not fl.endswith('.py'):
|
if fl in ('plugin_super_class.py', '__init__.py') or not fl.endswith('.py'):
|
||||||
|
|
|
@ -372,6 +372,7 @@ class Profile(Contact, Singleton):
|
||||||
self._tox.self_set_status_message(self._status_message.encode('utf-8'))
|
self._tox.self_set_status_message(self._status_message.encode('utf-8'))
|
||||||
|
|
||||||
def new_nospam(self):
|
def new_nospam(self):
|
||||||
|
"""Sets new nospam part of tox id"""
|
||||||
import random
|
import random
|
||||||
self._tox.self_set_nospam(random.randint(0, 4294967295)) # no spam - uint32
|
self._tox.self_set_nospam(random.randint(0, 4294967295)) # no spam - uint32
|
||||||
self._tox_id = self._tox.self_get_address()
|
self._tox_id = self._tox.self_get_address()
|
||||||
|
@ -682,16 +683,16 @@ class Profile(Contact, Singleton):
|
||||||
data.reverse()
|
data.reverse()
|
||||||
data = data[self._messages.count():self._messages.count() + PAGE_SIZE]
|
data = data[self._messages.count():self._messages.count() + PAGE_SIZE]
|
||||||
for message in data:
|
for message in data:
|
||||||
if message.get_type() <= 1:
|
if message.get_type() <= 1: # text message
|
||||||
data = message.get_data()
|
data = message.get_data()
|
||||||
self.create_message_item(data[0],
|
self.create_message_item(data[0],
|
||||||
convert_time(data[2]),
|
convert_time(data[2]),
|
||||||
friend.name if data[1] == MESSAGE_OWNER['FRIEND'] else self._name,
|
friend.name if data[1] == MESSAGE_OWNER['FRIEND'] else self._name,
|
||||||
data[3],
|
data[3],
|
||||||
False)
|
False)
|
||||||
elif message.get_type() == 2:
|
elif message.get_type() == MESSAGE_TYPE['FILE_TRANSFER']:
|
||||||
item = self.create_file_transfer_item(message, False)
|
item = self.create_file_transfer_item(message, False)
|
||||||
if message.get_status() >= 2:
|
if message.get_status() >= 2: # active file transfer
|
||||||
ft = self._file_transfers[(message.get_friend_number(), message.get_file_number())]
|
ft = self._file_transfers[(message.get_friend_number(), message.get_file_number())]
|
||||||
ft.set_state_changed_handler(item.update)
|
ft.set_state_changed_handler(item.update)
|
||||||
|
|
||||||
|
@ -802,13 +803,15 @@ class Profile(Contact, Singleton):
|
||||||
:param num: number of friend in list
|
:param num: number of friend in list
|
||||||
"""
|
"""
|
||||||
friend = self._friends[num]
|
friend = self._friends[num]
|
||||||
|
settings = Settings.get_instance()
|
||||||
try:
|
try:
|
||||||
settings = Settings.get_instance()
|
|
||||||
index = map(lambda x: x[0], settings['friends_aliases']).index(friend.tox_id)
|
index = map(lambda x: x[0], settings['friends_aliases']).index(friend.tox_id)
|
||||||
del settings['friends_aliases'][index]
|
del settings['friends_aliases'][index]
|
||||||
settings.save()
|
|
||||||
except:
|
except:
|
||||||
pass
|
pass
|
||||||
|
if friend.tox_id in settings['notes']:
|
||||||
|
del settings['notes'][friend.tox_id]
|
||||||
|
settings.save()
|
||||||
self.clear_history(num)
|
self.clear_history(num)
|
||||||
if self._history.friend_exists_in_db(friend.tox_id):
|
if self._history.friend_exists_in_db(friend.tox_id):
|
||||||
self._history.delete_friend_from_db(friend.tox_id)
|
self._history.delete_friend_from_db(friend.tox_id)
|
||||||
|
|
Loading…
Reference in a new issue