hueso/gajim-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Clickable nicknames] Fix

Browse Source
This commit is contained in:
Yann Leboulanger
2018-02-17 22:45:12 +01:00
parent 7de985db84
commit 30b7550593
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
clickable_nicknames/clickable_nicknames.py
View File

@@ -91,7 +91,7 @@ class Base(object):
Gtk.TextWindowType.TEXT).get_pointer()[1:3] Gtk.TextWindowType.TEXT).get_pointer()[1:3]
x, y = self.textview.tv.window_to_buffer_coords(Gtk.TextWindowType.TEXT, x, y = self.textview.tv.window_to_buffer_coords(Gtk.TextWindowType.TEXT,
pointer_x, pointer_y) pointer_x, pointer_y)
tags = self.textview.tv.get_iter_at_location(x, y).get_tags() tags = self.textview.tv.get_iter_at_location(x, y)[1].get_tags()
tag_table = self.textview.tv.get_buffer().get_tag_table() tag_table = self.textview.tv.get_buffer().get_tag_table()
if self.change_cursor: if self.change_cursor:
self.textview.tv.get_window(Gtk.TextWindowType.TEXT).set_cursor( self.textview.tv.get_window(Gtk.TextWindowType.TEXT).set_cursor(
@@ -102,7 +102,6 @@ class Base(object):
self.textview.tv.get_window(Gtk.TextWindowType.TEXT).set_cursor( self.textview.tv.get_window(Gtk.TextWindowType.TEXT).set_cursor(
Gdk.Cursor.new(Gdk.CursorType.HAND2)) Gdk.Cursor.new(Gdk.CursorType.HAND2))
self.change_cursor = True self.change_cursor = True
self.textview.on_textview_motion_notify_event(widget, event)
def insert_nick(self, texttag, widget, event, iter_, kind): def insert_nick(self, texttag, widget, event, iter_, kind):
# insert nickname to message buffer # insert nickname to message buffer
@@ -120,11 +119,11 @@ class Base(object):
word = buffer_.get_text(begin_iter, end_iter, True) word = buffer_.get_text(begin_iter, end_iter, True)
nick = word.rstrip().rstrip(app.config.get('after_nickname')) nick = word.rstrip().rstrip(app.config.get('after_nickname'))
if nick.startswith('* '): if nick.startswith('* '):
nick = nick.lstrip('* ').split(' ')[0] nick = nick.lstrip('* ').split(' ')[0] + ' '
nick = nick.lstrip(app.config.get('before_nickname')) nick = nick.lstrip(app.config.get('before_nickname'))
nicks = app.contacts.get_nick_list(self.chat_control.account, nicks = app.contacts.get_nick_list(self.chat_control.account,
self.chat_control.room_jid) self.chat_control.room_jid)
if nick[1:] not in nicks: if nick[:-1] not in nicks:
return return
message_buffer = self.chat_control.msg_textview.get_buffer() message_buffer = self.chat_control.msg_textview.get_buffer()
@@ -135,7 +134,12 @@ class Base(object):
if message_buffer.get_text(start, end, True)[-1] != ' ': if message_buffer.get_text(start, end, True)[-1] != ' ':
nick = ' ' + nick nick = ' ' + nick
nick += ' ' nick += ' '
# delete PLACEHOLDER
start_iter = message_buffer.get_start_iter()
end_iter = message_buffer.get_end_iter()
placeholder = self.chat_control.msg_textview.PLACEHOLDER
if message_buffer.get_text(start_iter, end_iter, False) == placeholder:
message_buffer.set_text('', -1)
message_buffer.insert_at_cursor(nick) message_buffer.insert_at_cursor(nick)
self.chat_control.msg_textview.grab_focus() self.chat_control.msg_textview.grab_focus()

2
clickable_nicknames/manifest.ini
View File

@@ -1,7 +1,7 @@
[info] [info]
name: Clickable Nicknames name: Clickable Nicknames
short_name: clickable_nicknames short_name: clickable_nicknames
version: 0.4 version: 0.5
description: Clickable nicknames in the conversation textview. description: Clickable nicknames in the conversation textview.
authors: Andrey Musikhin <melomansegfault@gmail.com> authors: Andrey Musikhin <melomansegfault@gmail.com>
Denis Fomin <fominde@gmail.com> Denis Fomin <fominde@gmail.com>