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

[emoticons] Simplify displaying description/legend

Browse Source
This commit is contained in:
Philipp Hörist
2017-02-28 20:25:00 +01:00
parent 2065cab50a
commit fc77f07917
1 changed files with 11 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
emoticons_pack/emoticons_pack.py
View File

@@ -19,7 +19,6 @@ from common import gajim
from plugins import GajimPlugin from plugins import GajimPlugin
from plugins.helpers import log_calls from plugins.helpers import log_calls
from htmltextview import HtmlTextView from htmltextview import HtmlTextView
from conversation_textview import ConversationTextview
from dialogs import WarningDialog, HigDialog from dialogs import WarningDialog, HigDialog
@@ -119,19 +118,19 @@ class EmoticonsPackPlugin(GajimPlugin):
selection.connect('changed', self.emoticons_treeview_selection_changed) selection.connect('changed', self.emoticons_treeview_selection_changed)
selection.set_mode(Gtk.SelectionMode.SINGLE) selection.set_mode(Gtk.SelectionMode.SINGLE)
self.emoticons_description_textview = ConversationTextview(None) self.emoticons_description_textview = HtmlTextView()
sw = self.xml.get_object('scrolledwindow1') sw = self.xml.get_object('scrolledwindow1')
sw.add(self.emoticons_description_textview.tv) sw.add(self.emoticons_description_textview)
self.xml.connect_signals(self) self.xml.connect_signals(self)
self.window.show_all() self.window.show_all()
def on_legend_button_clicked(self, widget): def on_legend_button_clicked(self, widget):
self.xml.get_object('scrolledwindow1').get_children()[0].destroy()
treeview_selection = self.available_treeview.get_selection() treeview_selection = self.available_treeview.get_selection()
model, iter = treeview_selection.get_selected() model, iter = treeview_selection.get_selected()
name = model.get_value(iter, Column.NAME) name = model.get_value(iter, Column.NAME)
self.emoticons_description_textview.get_buffer().set_text('')
label = self.xml.get_object('label2') label = self.xml.get_object('label2')
if label.get_text() == _('Legend'): if label.get_text() == _('Legend'):
label.set_text(_('Description')) label.set_text(_('Description'))
@@ -140,11 +139,6 @@ class EmoticonsPackPlugin(GajimPlugin):
import emoticons import emoticons
imp.reload(emoticons) imp.reload(emoticons)
self.emoticons_description_textview = Gtk.TextView()
sw = self.xml.get_object('scrolledwindow1')
sw.add(self.emoticons_description_textview)
sw.show_all()
buff = self.emoticons_description_textview.get_buffer() buff = self.emoticons_description_textview.get_buffer()
for icon in emoticons.emoticons: for icon in emoticons.emoticons:
icon_file = os.path.join(self.tmp_dir, name, icon) icon_file = os.path.join(self.tmp_dir, name, icon)
@@ -169,10 +163,6 @@ class EmoticonsPackPlugin(GajimPlugin):
sys.path.remove(os.path.join(self.tmp_dir, name)) sys.path.remove(os.path.join(self.tmp_dir, name))
else: else:
self.emoticons_description_textview = ConversationTextview(None)
sw = self.xml.get_object('scrolledwindow1')
sw.add(self.emoticons_description_textview.tv)
sw.show_all()
label.set_text(_('Legend')) label.set_text(_('Legend'))
desc = _(model.get_value(iter, Column.DESCRIPTION)) desc = _(model.get_value(iter, Column.DESCRIPTION))
if not desc.startswith('<body '): if not desc.startswith('<body '):
@@ -180,9 +170,9 @@ class EmoticonsPackPlugin(GajimPlugin):
desc + ' </body>' desc + ' </body>'
desc = desc.replace('preview.image', ('file:' + os.path.join( desc = desc.replace('preview.image', ('file:' + os.path.join(
self.tmp_dir, name, 'preview.png'))).replace('\n', '<br/>') self.tmp_dir, name, 'preview.png'))).replace('\n', '<br/>')
self.emoticons_description_textview.tv.display_html( self.emoticons_description_textview.display_html(
desc, self.emoticons_description_textview) desc, self.emoticons_description_textview, None)
self.emoticons_description_textview.tv.set_property( self.emoticons_description_textview.set_property(
'sensitive', True) 'sensitive', True)
def on_inslall_upgrade_clicked(self, widget): def on_inslall_upgrade_clicked(self, widget):
@@ -319,11 +309,7 @@ class EmoticonsPackPlugin(GajimPlugin):
label.set_ellipsize(Pango.EllipsizeMode.END) label.set_ellipsize(Pango.EllipsizeMode.END)
self.homepage_linkbutton.set_property('sensitive', True) self.homepage_linkbutton.set_property('sensitive', True)
self.xml.get_object('scrolledwindow1').get_children()[0].destroy() self.emoticons_description_textview.get_buffer().set_text('')
self.emoticons_description_textview = ConversationTextview(None)
sw = self.xml.get_object('scrolledwindow1')
sw.add(self.emoticons_description_textview.tv)
sw.show_all()
desc = _(model.get_value(iter, Column.DESCRIPTION)) desc = _(model.get_value(iter, Column.DESCRIPTION))
if not desc.startswith('<body '): if not desc.startswith('<body '):
desc = '<body xmlns=\'http://www.w3.org/1999/xhtml\'>' + \ desc = '<body xmlns=\'http://www.w3.org/1999/xhtml\'>' + \
@@ -331,9 +317,9 @@ class EmoticonsPackPlugin(GajimPlugin):
else: else:
desc = desc.replace('preview.image', ('file:' + os.path.join( desc = desc.replace('preview.image', ('file:' + os.path.join(
self.tmp_dir, set_name, 'preview.png'))) self.tmp_dir, set_name, 'preview.png')))
self.emoticons_description_textview.tv.display_html( self.emoticons_description_textview.display_html(
desc, self.emoticons_description_textview.tv, None) desc, self.emoticons_description_textview, None)
self.emoticons_description_textview.tv.set_property( self.emoticons_description_textview.set_property(
'sensitive', True) 'sensitive', True)
else: else:
self.set_name.set_text('') self.set_name.set_text('')