ability to retrieve PM logs in history window when typing room_jid. Autocompletion can now complete to room_jid/nicks. Fixes #7670
This commit is contained in:
parent
00bbfc2475
commit
bc4a4a06e2
|
@ -179,6 +179,7 @@ class HistoryWindow:
|
||||||
# Warning : This for is time critical with big DB
|
# Warning : This for is time critical with big DB
|
||||||
for key in keys:
|
for key in keys:
|
||||||
completed = key
|
completed = key
|
||||||
|
completed2 = None
|
||||||
contact = completion_dict[completed]
|
contact = completion_dict[completed]
|
||||||
if contact:
|
if contact:
|
||||||
info_name = contact.get_shown_name()
|
info_name = contact.get_shown_name()
|
||||||
|
@ -200,15 +201,25 @@ class HistoryWindow:
|
||||||
room, nick = gajim.get_room_and_nick_from_fjid(completed)
|
room, nick = gajim.get_room_and_nick_from_fjid(completed)
|
||||||
info_completion = '%s from %s' % (nick, room)
|
info_completion = '%s from %s' % (nick, room)
|
||||||
completed = info_completion
|
completed = info_completion
|
||||||
|
info_completion2 = '%s/%s' % (room, nick)
|
||||||
|
completed2 = info_completion2
|
||||||
info_name = nick
|
info_name = nick
|
||||||
else:
|
else:
|
||||||
pix = contact_pix
|
pix = contact_pix
|
||||||
|
|
||||||
|
if len(completed) > 70:
|
||||||
|
completed = completed[:70] + '[\u2026]'
|
||||||
liststore.append((pix, completed))
|
liststore.append((pix, completed))
|
||||||
self.completion_dict[key] = (info_jid, info_acc, info_name,
|
self.completion_dict[key] = (info_jid, info_acc, info_name,
|
||||||
info_completion)
|
info_completion)
|
||||||
self.completion_dict[completed] = (info_jid, info_acc,
|
self.completion_dict[completed] = (info_jid, info_acc,
|
||||||
info_name, info_completion)
|
info_name, info_completion)
|
||||||
|
if completed2:
|
||||||
|
if len(completed2) > 70:
|
||||||
|
completed2 = completed2[:70] + '[\u2026]'
|
||||||
|
liststore.append((pix, completed2))
|
||||||
|
self.completion_dict[completed2] = (info_jid, info_acc,
|
||||||
|
info_name, info_completion2)
|
||||||
if key == actual_jid:
|
if key == actual_jid:
|
||||||
self._load_history(info_jid, info_acc)
|
self._load_history(info_jid, info_acc)
|
||||||
yield True
|
yield True
|
||||||
|
|
Loading…
Reference in New Issue