copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix html

Browse source
This commit is contained in:
Denis Fomin 2013-01-11 01:53:09 +04:00
parent 8079736493
commit 520665a6cc
2 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/common/helpers.py
View file

@ -1460,7 +1460,8 @@ def _get_img_direct(attrs):
""" """
Download an image. This function should be launched in a separated thread. Download an image. This function should be launched in a separated thread.
""" """
mem, alt = '', '' mem = b''
alt = ''
# Wait maximum 5s for connection # Wait maximum 5s for connection
socket.setdefaulttimeout(5) socket.setdefaulttimeout(5)
try: try:

26
src/htmltextview.py
View file

@ -238,7 +238,7 @@ class HtmlHandler(xml.sax.handler.ContentHandler):
def _get_current_attributes(self): def _get_current_attributes(self):
attrs = self.textview.get_default_attributes() attrs = self.textview.get_default_attributes()
self.iter.backward_char() self.iter.backward_char()
self.iter.get_attributes(attrs) attrs = (self.iter.get_attributes())[1]
self.iter.forward_char() self.iter.forward_char()
return attrs return attrs
@ -265,7 +265,8 @@ class HtmlHandler(xml.sax.handler.ContentHandler):
frac = val/100 frac = val/100
if font_relative: if font_relative:
attrs = self._get_current_attributes() attrs = self._get_current_attributes()
font_size = attrs.font.get_size() / Pango.SCALE if not attrs.font:
font_size = self.get_font_size()
callback(frac*display_resolution*font_size, *args) callback(frac*display_resolution*font_size, *args)
elif block_relative: elif block_relative:
# CSS says 'Percentage values: refer to width of the closest # CSS says 'Percentage values: refer to width of the closest
@ -297,14 +298,17 @@ class HtmlHandler(xml.sax.handler.ContentHandler):
elif value.endswith('em'): # ems, the width of the element's font elif value.endswith('em'): # ems, the width of the element's font
attrs = self._get_current_attributes() attrs = self._get_current_attributes()
font_size = attrs.font.get_size() / Pango.SCALE if not attrs.font:
font_size = self.get_font_size()
callback(get_val()*display_resolution*font_size, *args) callback(get_val()*display_resolution*font_size, *args)
elif value.endswith('ex'): # x-height, ~ the height of the letter 'x' elif value.endswith('ex'): # x-height, ~ the height of the letter 'x'
# FIXME: figure out how to calculate this correctly # FIXME: figure out how to calculate this correctly
# for now 'em' size is used as approximation # for now 'em' size is used as approximation
attrs = self._get_current_attributes() attrs = self._get_current_attributes()
font_size = attrs.font.get_size() / Pango.SCALE if not attrs.font:
font_size = self.get_font_size()
callback(get_val()*display_resolution*font_size, *args) callback(get_val()*display_resolution*font_size, *args)
elif value.endswith('px'): # pixels elif value.endswith('px'): # pixels
@ -359,13 +363,14 @@ class HtmlHandler(xml.sax.handler.ContentHandler):
pass pass
else: else:
attrs = self._get_current_attributes() attrs = self._get_current_attributes()
tag.set_property('scale', scale / attrs.font_scale) if attrs.font_scale ==0:
tag.set_property('scale', scale)
return return
if value == 'smaller': if value == 'smaller':
tag.set_property('scale', Pango.SCALE_SMALL) tag.set_property('scale', 0.8333333333333)
return return
if value == 'larger': if value == 'larger':
tag.set_property('scale', Pango.SCALE_LARGE) tag.set_property('scale', 1.2)
return return
# font relative (5 ~ 4pt, 110 ~ 72pt) # font relative (5 ~ 4pt, 110 ~ 72pt)
self._parse_length(value, True, False, 5, 110,self.__parse_font_size_cb, self._parse_length(value, True, False, 5, 110,self.__parse_font_size_cb,
@ -758,7 +763,7 @@ class HtmlHandler(xml.sax.handler.ContentHandler):
self.list_counters.append(0) self.list_counters.append(0)
elif name == 'li': elif name == 'li':
if self.list_counters[-1] is None: if self.list_counters[-1] is None:
li_head = unichr(0x2022) li_head = chr(0x2022)
else: else:
self.list_counters[-1] += 1 self.list_counters[-1] += 1
li_head = '%i.' % self.list_counters[-1] li_head = '%i.' % self.list_counters[-1]
@ -820,6 +825,11 @@ class HtmlHandler(xml.sax.handler.ContentHandler):
self._jump_line() self._jump_line()
self._end_span() self._end_span()
def get_font_size(self):
context = self.conv_textview.tv.get_style_context()
font = context.get_font(Gtk.StateType.NORMAL)
return font.get_size() / Pango.SCALE
class HtmlTextView(Gtk.TextView): class HtmlTextView(Gtk.TextView):
def __init__(self): def __init__(self):