Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Dont answer groupchat receipt requests
by Philipp Hörist 19 Nov '18

19 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 15048055 by Philipp Hörist at 2018-11-19T16:51:18Z Dont answer groupchat receipt requests - - - - - 1 changed file: - gajim/common/modules/receipts.py Changes: ===================================== gajim/common/modules/receipts.py ===================================== @@ -49,7 +49,7 @@ class Receipts: 'answer_receipts'): return - if event.mtype not in ('chat', 'groupchat'): + if event.mtype not in ('chat', 'normal'): return if event.sent: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/15048055750db24f0f72ceab5eba1dc61e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/15048055750db24f0f72ceab5eba1dc61e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix missing default arg
by Philipp Hörist 19 Nov '18

19 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 596f268f by Philipp Hörist at 2018-11-19T14:04:04Z Fix missing default arg - - - - - 1 changed file: - gajim/gtk/notification.py Changes: ===================================== gajim/gtk/notification.py ===================================== @@ -57,7 +57,7 @@ class Notification: # Detect if actions are supported by the notification daemon if sys.platform not in ('win32', 'darwin'): - def on_proxy_ready(_source, res, _data): + def on_proxy_ready(_source, res, _data=None): try: proxy = Gio.DBusProxy.new_finish(res) self._daemon_capabilities = proxy.GetCapabilities() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/596f268f14be630ccea76c6e4867709d55… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/596f268f14be630ccea76c6e4867709d55… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 10 commits: Roster: Use icons from IconTheme for Roster
by Philipp Hörist 18 Nov '18

18 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: acc89ad6 by Philipp Hörist at 2018-11-18T21:24:10Z Roster: Use icons from IconTheme for Roster With this Gajim loses the ability to draw animated GIFs in the Roster GIFs have numerous drawbacks: - We cant add them to the IconTheme, which means we need a different interface to load them - The IconTheme scales all icons we load for the current scale (HiDPI) - The animation causes many updates to the Roster, and causes high cpu usage Fixes #8814, #8655 - - - - - 619793a0 by Philipp Hörist at 2018-11-18T21:24:32Z Groupchat: Use icons from IconTheme - - - - - 3ba34fa3 by Philipp Hörist at 2018-11-18T21:24:32Z Remove old iconset code - - - - - aca34d5c by Philipp Hörist at 2018-11-18T21:24:33Z Remove old icons - - - - - 1179333f by Philipp Hörist at 2018-11-18T21:24:33Z Refactor loading user supplied iconsets - - - - - 2ece342d by Philipp Hörist at 2018-11-18T21:24:33Z Notification: Use load_icon() - - - - - fedc00eb by Philipp Hörist at 2018-11-18T21:24:33Z Move notify to gtk folder - Rename notify to notification - Move get_show_in_roster() to gtk.util - Move get_show_in_systray() to gtk.util - - - - - dffa54f7 by Philipp Hörist at 2018-11-18T21:24:33Z Refactor Windows Notifications - Only show one notification at a time - Fix pylint errors - - - - - 3c32d511 by Philipp Hörist at 2018-11-18T21:24:33Z Fix deprecated init - - - - - b98f0a3f by Philipp Hörist at 2018-11-18T21:24:34Z Remove all usage of get_gtk_builder() - - - - - 30 changed files: - gajim/application.py - − gajim/cell_renderer_image.py - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/helpers.py - gajim/config.py - gajim/data/gui/popup_notification_window.ui - − gajim/data/iconsets/dcraven/16x16/away.png - − gajim/data/iconsets/dcraven/16x16/chat.png - − gajim/data/iconsets/dcraven/16x16/closed.png - − gajim/data/iconsets/dcraven/16x16/connecting.png - − gajim/data/iconsets/dcraven/16x16/dnd.png - − gajim/data/iconsets/dcraven/16x16/error.png - − gajim/data/iconsets/dcraven/16x16/event.png - − gajim/data/iconsets/dcraven/16x16/invisible.png - − gajim/data/iconsets/dcraven/16x16/muc_active.png - − gajim/data/iconsets/dcraven/16x16/muc_inactive.png - − gajim/data/iconsets/dcraven/16x16/not_in_roster.png - − gajim/data/iconsets/dcraven/16x16/offline.png - − gajim/data/iconsets/dcraven/16x16/online.png - − gajim/data/iconsets/dcraven/16x16/opened.png - − gajim/data/iconsets/dcraven/16x16/requested.png - − gajim/data/iconsets/dcraven/16x16/xa.png - − gajim/data/iconsets/dcraven/32x32/away.png - − gajim/data/iconsets/dcraven/32x32/chat.png - − gajim/data/iconsets/dcraven/32x32/closed.png - − gajim/data/iconsets/dcraven/32x32/connecting.png - − gajim/data/iconsets/dcraven/32x32/dnd.png - − gajim/data/iconsets/dcraven/32x32/error.png - − gajim/data/iconsets/dcraven/32x32/event.png The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/8be5562b92f06047dbfa17c48f9abc29f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/8be5562b92f06047dbfa17c48f9abc29f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Dont fail when IconTheme is not available
by Philipp Hörist 18 Nov '18

18 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8be5562b by Philipp Hörist at 2018-11-18T11:52:24Z Dont fail when IconTheme is not available This is needed for tests to work - - - - - 1 changed file: - gajim/gtk/util.py Changes: ===================================== gajim/gtk/util.py ===================================== @@ -32,7 +32,8 @@ from gajim.common import i18n from gajim.common.i18n import _ _icon_theme = Gtk.IconTheme.get_default() -_icon_theme.append_search_path(configpaths.get('ICONS')) +if _icon_theme is not None: + _icon_theme.append_search_path(configpaths.get('ICONS')) log = logging.getLogger('gajim.gtk.util') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8be5562b92f06047dbfa17c48f9abc29f1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8be5562b92f06047dbfa17c48f9abc29f1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 5 commits: Move htmltextview into gtk module
by Philipp Hörist 18 Nov '18

18 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: cee63aa0 by Philipp Hörist at 2018-11-18T09:35:13Z Move htmltextview into gtk module - - - - - 431d8075 by Philipp Hörist at 2018-11-18T09:35:13Z Use get_cursor from gtk.util - - - - - b5b38203 by Philipp Hörist at 2018-11-18T09:35:13Z Remove unused methods - - - - - f40f171e by Philipp Hörist at 2018-11-18T09:35:13Z Refactor parse_datetime and add unit test - - - - - d13baed8 by Philipp Hörist at 2018-11-18T09:35:13Z Improve Entity Time parsing - Use parse_datetime() - Improve tzo node validation - - - - - 7 changed files: - gajim/chat_control.py - gajim/common/modules/date_and_time.py - gajim/common/modules/entity_time.py - gajim/conversation_textview.py - gajim/htmltextview.py → gajim/gtk/htmltextview.py - gajim/gtkgui_helpers.py - + test/no_gui/unit/test_date_time.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -55,6 +55,7 @@ from gajim import dialogs from gajim.gtk.dialogs import ConfirmationDialog from gajim.gtk.add_contact import AddNewContactWindow from gajim.gtk.util import get_icon_name +from gajim.gtk.util import get_cursor from gajim.command_system.implementation.hosts import ChatCommands from gajim.command_system.framework import CommandHost # pylint: disable=unused-import @@ -596,11 +597,11 @@ class ChatControl(ChatControlBase): """ Just moved the mouse so show the cursor """ - cursor = gtkgui_helpers.get_cursor('LEFT_PTR') + cursor = get_cursor('LEFT_PTR') self.parent_win.window.get_window().set_cursor(cursor) def on_location_eventbox_enter_notify_event(self, widget, event): - cursor = gtkgui_helpers.get_cursor('HAND2') + cursor = get_cursor('HAND2') self.parent_win.window.get_window().set_cursor(cursor) def update_ui(self): ===================================== gajim/common/modules/date_and_time.py ===================================== @@ -16,8 +16,13 @@ import re import time -from datetime import datetime, timedelta, timezone, tzinfo +import logging +from datetime import datetime +from datetime import timedelta +from datetime import timezone +from datetime import tzinfo +log = logging.getLogger('gajim.c.m.date_and_time') PATTERN_DATETIME = re.compile( r'([0-9]{4}-[0-9]{2}-[0-9]{2})' @@ -91,6 +96,33 @@ class LocalTimezone(tzinfo): return tt.tm_isdst > 0 +def create_tzinfo(hours=0, minutes=0, tz_string=None): + if tz_string is None: + return timezone(timedelta(hours=hours, minutes=minutes)) + + if tz_string.lower() == 'z': + return timezone.utc + + try: + hours, minutes = map(int, tz_string.split(':')) + except Exception: + log.warning('Wrong tz string: %s', tz_string) + return + + if hours not in range(-24, 24): + log.warning('Wrong tz string: %s', tz_string) + return + + if minutes not in range(0, 59): + log.warning('Wrong tz string: %s', tz_string) + return + + if hours in (24, -24) and minutes != 0: + log.warning('Wrong tz string: %s', tz_string) + return + return timezone(timedelta(hours=hours, minutes=minutes)) + + def parse_datetime(timestring, check_utc=False, convert='utc', epoch=False): ''' @@ -133,11 +165,30 @@ def parse_datetime(timestring, check_utc=False, except ValueError: pass else: - if not check_utc and convert == 'utc': + if check_utc: + if convert != 'utc': + raise ValueError( + 'check_utc can only be used with convert="utc"') + date_time.replace(tzinfo=timezone.utc) + if epoch: + return date_time.timestamp() + return date_time + + if convert == 'utc': date_time = date_time.astimezone(timezone.utc) + if epoch: + return date_time.timestamp() + return date_time + + if epoch: + # epoch is always UTC, use convert='utc' or check_utc=True + raise ValueError( + 'epoch not available while converting to local') + if convert == 'local': date_time = date_time.astimezone(LocalTimezone()) - if epoch: - return date_time.timestamp() + return date_time + + # convert=None return date_time return None ===================================== gajim/common/modules/entity_time.py ===================================== @@ -15,13 +15,14 @@ # XEP-0202: Entity Time import logging -import datetime import time import nbxmpp from gajim.common import app -from gajim.common.nec import NetworkIncomingEvent +from gajim.common.nec import NetworkEvent +from gajim.common.modules.date_and_time import parse_datetime +from gajim.common.modules.date_and_time import create_tzinfo log = logging.getLogger('gajim.c.m.entity_time') @@ -61,10 +62,10 @@ class EntityTime: log.info('Received: %s %s', stanza.getFrom(), time_info) - app.nec.push_incoming_event( - TimeResultReceivedEvent(None, conn=self._con, - jid=stanza.getFrom(), - time_info=time_info)) + app.nec.push_incoming_event(NetworkEvent('time-result-received', + conn=self._con, + jid=stanza.getFrom(), + time_info=time_info)) @staticmethod def _extract_info(stanza): @@ -74,42 +75,24 @@ class EntityTime: return tzo = time_.getTag('tzo').getData() - if tzo.lower() == 'z': - tzo = '0:0' - try: - tzoh, tzom = tzo.split(':') - except Exception: + if not tzo: log.warning('Wrong tzo node: %s', stanza) return - utc_time = time_.getTag('utc').getData() - if utc_time[-1:] == 'Z': - # Remove the trailing 'Z' - utc_time = utc_time[:-1] - elif utc_time[-6:] == "+00:00": - # Remove the trailing "+00:00" - utc_time = utc_time[:-6] - else: + remote_tz = create_tzinfo(tz_string=tzo) + if remote_tz is None: + log.warning('Wrong tzo node: %s', stanza) + return + + utc_time = time_.getTag('utc').getData() + date_time = parse_datetime(utc_time, check_utc=True) + if date_time is None: log.warning('Wrong timezone defintion: %s %s', utc_time, stanza.getFrom()) return - try: - dtime = datetime.datetime.strptime(utc_time, '%Y-%m-%dT%H:%M:%S') - except ValueError: - try: - dtime = datetime.datetime.strptime(utc_time, - '%Y-%m-%dT%H:%M:%S.%f') - except ValueError as error: - log.warning('Wrong time format: %s %s', - error, stanza.getFrom()) - return - - utc = datetime.timezone(datetime.timedelta(0)) - dtime = dtime.replace(tzinfo=utc) - utc_offset = datetime.timedelta(hours=int(tzoh), minutes=int(tzom)) - contact_tz = datetime.timezone(utc_offset, "remote timezone") - return dtime.astimezone(contact_tz).strftime('%c') + date_time = date_time.astimezone(remote_tz) + return date_time.strftime('%c %Z') def _answer_request(self, _con, stanza): log.info('%s asked for the time', stanza.getFrom()) @@ -132,9 +115,5 @@ class EntityTime: raise nbxmpp.NodeProcessed -class TimeResultReceivedEvent(NetworkIncomingEvent): - name = 'time-result-received' - - def get_instance(*args, **kwargs): return EntityTime(*args, **kwargs), 'EntityTime' ===================================== gajim/conversation_textview.py ===================================== @@ -42,7 +42,7 @@ from gajim.common.i18n import _ from gajim.common.fuzzyclock import FuzzyClock from gajim.common.const import StyleAttr -from gajim.htmltextview import HtmlTextView +from gajim.gtk.htmltextview import HtmlTextView from gajim.gtk import util from gajim.gtk.util import load_icon ===================================== gajim/htmltextview.py → gajim/gtk/htmltextview.py ===================================== ===================================== gajim/gtkgui_helpers.py ===================================== @@ -139,11 +139,6 @@ def get_pixbuf_from_data(file_data): return pixbuf -def get_cursor(attr): - display = Gdk.Display.get_default() - cursor = getattr(Gdk.CursorType, attr) - return Gdk.Cursor.new_for_display(display, cursor) - def file_is_locked(path_to_file): """ Return True if file is locked @@ -176,33 +171,6 @@ def file_is_locked(path_to_file): hfile.Close() return False -def get_fade_color(treeview, selected, focused): - """ - Get a gdk RGBA color that is between foreground and background in 0.3 - 0.7 respectively colors of the cell for the given treeview - """ - context = treeview.get_style_context() - if selected: - if focused: # is the window focused? - state = Gtk.StateFlags.SELECTED - else: # is it not? NOTE: many gtk themes change bg on this - state = Gtk.StateFlags.ACTIVE - else: - state = Gtk.StateFlags.NORMAL - - bg = context.get_property('background-color', state) - fg = context.get_color(state) - - p = 0.3 # background - q = 0.7 # foreground # p + q should do 1.0 - return Gdk.RGBA(bg.red*p + fg.red*q, bg.green*p + fg.green*q, - bg.blue*p + fg.blue*q) - -def make_pixbuf_grayscale(pixbuf): - pixbuf2 = pixbuf.copy() - pixbuf.saturate_and_pixelate(pixbuf2, 0.0, False) - return pixbuf2 - def get_possible_button_event(event): """ Mouse or keyboard caused the event? ===================================== test/no_gui/unit/test_date_time.py ===================================== @@ -0,0 +1,99 @@ +import unittest +from datetime import datetime +from datetime import timezone +from datetime import timedelta + +from gajim.common.modules.date_and_time import parse_datetime +from gajim.common.modules.date_and_time import LocalTimezone +from gajim.common.modules.date_and_time import create_tzinfo + + +class TestDateTime(unittest.TestCase): + + def test_convert_to_utc(self): + + strings = { + # Valid UTC strings and fractions + '2017-11-05T01:41:20Z': 1509846080.0, + '2017-11-05T01:41:20.123Z': 1509846080.123, + '2017-11-05T01:41:20.123123123+00:00': 1509846080.123123, + '2017-11-05T01:41:20.123123123123123-00:00': 1509846080.123123, + + # Invalid strings + '2017-11-05T01:41:20Z+05:00': None, + '2017-11-05T01:41:20+0000': None, + '2017-11-05T01:41:20-0000': None, + + # Valid strings with offset + '2017-11-05T01:41:20-05:00': 1509864080.0, + '2017-11-05T01:41:20+05:00': 1509828080.0, + } + + strings2 = { + # Valid strings with offset + '2017-11-05T01:41:20-05:00': datetime(2017, 11, 5, 1, 41, 20, 0, create_tzinfo(hours=-5)), + '2017-11-05T01:41:20+05:00': datetime(2017, 11, 5, 1, 41, 20, 0, create_tzinfo(hours=5)), + } + + for time_string, expected_value in strings.items(): + result = parse_datetime(time_string, convert='utc', epoch=True) + self.assertEqual(result, expected_value) + + for time_string, expected_value in strings2.items(): + result = parse_datetime(time_string, convert='utc') + self.assertEqual(result, expected_value.astimezone(timezone.utc)) + + def test_convert_to_local(self): + + strings = { + # Valid UTC strings and fractions + '2017-11-05T01:41:20Z': datetime(2017, 11, 5, 1, 41, 20, 0, timezone.utc), + '2017-11-05T01:41:20.123Z': datetime(2017, 11, 5, 1, 41, 20, 123000, timezone.utc), + '2017-11-05T01:41:20.123123123+00:00': datetime(2017, 11, 5, 1, 41, 20, 123123, timezone.utc), + '2017-11-05T01:41:20.123123123123123-00:00': datetime(2017, 11, 5, 1, 41, 20, 123123, timezone.utc), + + # Valid strings with offset + '2017-11-05T01:41:20-05:00': datetime(2017, 11, 5, 1, 41, 20, 0, create_tzinfo(hours=-5)), + '2017-11-05T01:41:20+05:00': datetime(2017, 11, 5, 1, 41, 20, 0, create_tzinfo(hours=5)), + } + + for time_string, expected_value in strings.items(): + result = parse_datetime(time_string, convert='local') + self.assertEqual(result, expected_value.astimezone(LocalTimezone())) + + def test_no_convert(self): + + strings = { + # Valid UTC strings and fractions + '2017-11-05T01:41:20Z': timedelta(0), + '2017-11-05T01:41:20.123Z': timedelta(0), + '2017-11-05T01:41:20.123123123+00:00': timedelta(0), + '2017-11-05T01:41:20.123123123123123-00:00': timedelta(0), + + # Valid strings with offset + '2017-11-05T01:41:20-05:00': timedelta(hours=-5), + '2017-11-05T01:41:20+05:00': timedelta(hours=5), + } + + for time_string, expected_value in strings.items(): + result = parse_datetime(time_string, convert=None) + self.assertEqual(result.utcoffset(), expected_value) + + def test_check_utc(self): + + strings = { + # Valid UTC strings and fractions + '2017-11-05T01:41:20Z': 1509846080.0, + '2017-11-05T01:41:20.123Z': 1509846080.123, + '2017-11-05T01:41:20.123123123+00:00': 1509846080.123123, + '2017-11-05T01:41:20.123123123123123-00:00': 1509846080.123123, + + # Valid strings with offset + '2017-11-05T01:41:20-05:00': None, + '2017-11-05T01:41:20+05:00': None, + } + + for time_string, expected_value in strings.items(): + result = parse_datetime( + time_string, check_utc=True, epoch=True) + self.assertEqual(result, expected_value) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/a1b798b8fcbf8cae80a552de7728b74c0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/a1b798b8fcbf8cae80a552de7728b74c0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Test: Fix KeyError
by Philipp Hörist 17 Nov '18

17 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5c0ff1de by André Apitzsch at 2018-11-17T10:23:38Z Test: Fix KeyError The added account causes an issue with test_gui_interface, so the account needs to be removed again - - - - - dd0b7260 by André Apitzsch at 2018-11-17T10:25:24Z CI: Make test verbose - - - - - a1b798b8 by André Apitzsch at 2018-11-17T10:25:24Z Remove useless comment - - - - - 3 changed files: - .gitlab-ci.yml - test/no_gui/unit/test_protocol_caps.py - test/unit/test_gui_interface.py Changes: ===================================== .gitlab-ci.yml ===================================== @@ -10,7 +10,7 @@ stages: run-test: stage: test script: - - python3 setup.py test -s test.no_gui -q + - python3 setup.py test -s test.no_gui run-mypy: stage: test ===================================== test/no_gui/unit/test_protocol_caps.py ===================================== @@ -31,6 +31,9 @@ class TestConnectionCaps(unittest.TestCase): self.module._account = 'account' self.module._capscache = MagicMock() + def tearDown(self): + app.contacts.remove_account('account') + def _nec_caps_presence_received(self, obj): self.assertTrue( isinstance(obj.client_caps, caps_cache.ClientCaps), ===================================== test/unit/test_gui_interface.py ===================================== @@ -53,5 +53,4 @@ class TestInterface(unittest.TestCase): if __name__ == "__main__": - #import sys;sys.argv = ['', 'Test.test'] unittest.main() View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/fb5cee69cbd11bf37ec53c4ee49a62288… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/fb5cee69cbd11bf37ec53c4ee49a62288… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: HtmlTextView: Remove some unnecessary methods
by Philipp Hörist 16 Nov '18

16 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 97310a05 by Philipp Hörist at 2018-11-16T20:36:04Z HtmlTextView: Remove some unnecessary methods - - - - - eedd0c2a by Philipp Hörist at 2018-11-16T20:39:19Z HtmlTextView: Fix pylint errors and minor refactoring - - - - - 80954e95 by Philipp Hörist at 2018-11-16T20:39:45Z HtmlTextView: minor refactoring - Move updating tags into HtmlTextView - Rename some vars - Remove legacy GTK code - - - - - fb5cee69 by Philipp Hörist at 2018-11-16T20:44:20Z Dont use deprecated begins_tag() - - - - - 2 changed files: - gajim/conversation_textview.py - gajim/htmltextview.py Changes: ===================================== gajim/conversation_textview.py ===================================== @@ -172,7 +172,7 @@ class ConversationTextview(GObject.GObject): # no need to inherit TextView, use it as atrribute is safer self.tv = HtmlTextView(account) - self.tv.connect_tooltip(self.query_tooltip) + self.tv.connect('query-tooltip', self._query_tooltip) # set properties self.tv.set_border_width(1) @@ -199,7 +199,7 @@ class ConversationTextview(GObject.GObject): self.handlers[id_] = self.tv self.account = account - self.cursor_changed = False + self._cursor_changed = False self.last_time_printout = 0 self.encryption_enabled = False @@ -304,14 +304,12 @@ class ConversationTextview(GObject.GObject): self.just_cleared = False - def query_tooltip(self, widget, x_pos, y_pos, keyboard_mode, tooltip): + def _query_tooltip(self, widget, x_pos, y_pos, keyboard_mode, tooltip): window = widget.get_window(Gtk.TextWindowType.TEXT) x_pos, y_pos = self.tv.window_to_buffer_coords( Gtk.TextWindowType.TEXT, x_pos, y_pos) - if Gtk.MINOR_VERSION > 18: - iter_ = self.tv.get_iter_at_position(x_pos, y_pos)[1] - else: - iter_ = self.tv.get_iter_at_position(x_pos, y_pos)[0] + + iter_ = self.tv.get_iter_at_position(x_pos, y_pos)[1] for tag in iter_.get_tags(): tag_name = tag.get_property('name') if tag_name == 'focus-out-line': @@ -327,11 +325,11 @@ class ConversationTextview(GObject.GObject): text = text[:47] + '…' tooltip.set_text(text) window.set_cursor(get_cursor('HAND2')) - self.cursor_changed = True + self._cursor_changed = True return True if tag_name in ('url', 'mail', 'xmpp', 'sth_at_sth'): window.set_cursor(get_cursor('HAND2')) - self.cursor_changed = True + self._cursor_changed = True return False try: text = self.corrected_text_list[tag_name] @@ -339,9 +337,9 @@ class ConversationTextview(GObject.GObject): return True except KeyError: pass - if self.cursor_changed: + if self._cursor_changed: window.set_cursor(get_cursor('XTERM')) - self.cursor_changed = False + self._cursor_changed = False return False def del_handlers(self): @@ -358,11 +356,7 @@ class ConversationTextview(GObject.GObject): app.css_config.get_value('.gajim-status-message', StyleAttr.COLOR)) self.tagMarked.set_property('foreground', app.css_config.get_value('.gajim-highlight-message', StyleAttr.COLOR)) - color = app.css_config.get_value('.gajim-url', StyleAttr.COLOR) - self.tv.tagURL.set_property('foreground', color) - self.tv.tagMail.set_property('foreground', color) - self.tv.tagXMPP.set_property('foreground', color) - self.tv.tagSthAtSth.set_property('foreground', color) + self.tv.update_tags() def scroll_to_end(self, force=False): if self.autoscroll or force: ===================================== gajim/htmltextview.py ===================================== @@ -56,34 +56,32 @@ from gajim.gui_menu_builder import get_conv_context_menu log = logging.getLogger('gajim.htmlview') -__all__ = ['HtmlTextView'] - whitespace_rx = re.compile('\\s+') allwhitespace_rx = re.compile('^\\s*$') # embryo of CSS classes classes = { - #'system-message':';display: none', - 'problematic': ';color: red', + #'system-message':';display: none', + 'problematic': ';color: red', } # styles for elements _element_styles = { - 'u' : ';text-decoration: underline', - 'em' : ';font-style: oblique', - 'cite' : '; background-color:rgb(170,190,250);' - 'font-style: oblique', - 'li' : '; margin-left: 1em; margin-right: 10%', - 'strong' : ';font-weight: bold', - 'pre' : '; background-color:rgb(190,190,190);' - 'font-family: monospace; white-space: pre;' - 'margin-left: 1em; margin-right: 10%', - 'kbd' : ';background-color:rgb(210,210,210);' - 'font-family: monospace', - 'blockquote' : '; background-color:rgb(170,190,250);' - 'margin-left: 2em; margin-right: 10%', - 'dt' : ';font-weight: bold; font-style: oblique', - 'dd' : ';margin-left: 2em; font-style: oblique' + 'u' : ';text-decoration: underline', + 'em' : ';font-style: oblique', + 'cite' : '; background-color:rgb(170,190,250);' + 'font-style: oblique', + 'li' : '; margin-left: 1em; margin-right: 10%', + 'strong' : ';font-weight: bold', + 'pre' : '; background-color:rgb(190,190,190);' + 'font-family: monospace; white-space: pre;' + 'margin-left: 1em; margin-right: 10%', + 'kbd' : ';background-color:rgb(210,210,210);' + 'font-family: monospace', + 'blockquote' : '; background-color:rgb(170,190,250);' + 'margin-left: 2em; margin-right: 10%', + 'dt' : ';font-weight: bold; font-style: oblique', + 'dd' : ';margin-left: 2em; font-style: oblique' } # no difference for the moment _element_styles['dfn'] = _element_styles['em'] @@ -93,6 +91,12 @@ _element_styles['tt'] = _element_styles['kbd'] _element_styles['i'] = _element_styles['em'] _element_styles['b'] = _element_styles['strong'] +_supported_style_attrs = [ + 'background-color', 'color', 'font-family', 'font-size', 'font-style', + 'font-weight', 'margin-left', 'margin-right', 'text-align', + 'text-decoration', 'white-space', 'display', 'width', 'height' +] + # ========== # XEP-0071 # ========== @@ -182,8 +186,9 @@ for _name in BLOCK_HEAD: _num = int(_name[1]) _header_size = (_num - 1) // 2 _weight = (_num - 1) % 2 - _element_styles[_name] = '; font-size: %s; %s' % (('large', 'medium', 'small')[_header_size], - ('font-weight: bold', 'font-style: oblique')[_weight],) + _element_styles[_name] = '; font-size: %s; %s' % ( + ('large', 'medium', 'small')[_header_size], + ('font-weight: bold', 'font-style: oblique')[_weight]) def _parse_css_color(color): if color.startswith('rgb(') and color.endswith(')'): @@ -216,26 +221,35 @@ class HtmlHandler(xml.sax.handler.ContentHandler): self.list_counters = [] # stack (top at head) of list # counters, or None for unordered list + # build a dictionary mapping styles to methods + self.__style_methods = {} + for style in _supported_style_attrs: + method_names = '_parse_style_%s' % style.replace('-', '_') + self.__style_methods[style] = method_names + def _get_points_from_pixels(self, pixels): resolution = self.textview.get_screen().get_resolution() # points = pixels * 72 / resolution return pixels * 72 / resolution - def _parse_style_color(self, tag, value): + @staticmethod + def _parse_style_color(tag, value): color = _parse_css_color(value) tag.set_property('foreground-gdk', color) - def _parse_style_background_color(self, tag, value): + @staticmethod + def _parse_style_background_color(tag, value): color = _parse_css_color(value) tag.set_property('background-gdk', color) tag.set_property('paragraph-background-gdk', color) - def __parse_length_frac_size_allocate(self, textview, allocation, frac, - callback, args): + @staticmethod + def __parse_length_frac_size_allocate(_textview, allocation, frac, + callback, args): callback(allocation.width*frac, *args) def _parse_length(self, value, font_relative, block_relative, minl, maxl, - callback, *args): + callback, *args): """ Parse/calc length, converting to pixels, calls callback(length, *args) when the length is first computed or changes @@ -259,11 +273,11 @@ class HtmlHandler(xml.sax.handler.ContentHandler): # This is difficult/impossible to implement, so we use # textview width instead; a reasonable approximation.. alloc = self.textview.get_allocation() - self.__parse_length_frac_size_allocate(self.textview, alloc, - frac, callback, args) + self.__parse_length_frac_size_allocate( + self.textview, alloc, frac, callback, args) self.textview.connect('size-allocate', - self.__parse_length_frac_size_allocate, - frac, callback, args) + self.__parse_length_frac_size_allocate, + frac, callback, args) else: callback(frac, *args) return @@ -324,7 +338,8 @@ class HtmlHandler(xml.sax.handler.ContentHandler): elif type_ == 'px': tag.set_property('size-points', self._get_points_from_pixels(size)) - def _parse_style_display(self, tag, value): + @staticmethod + def _parse_style_display(tag, value): if value == 'none': tag.set_property('invisible', 'true') # FIXME: display: block, inline @@ -355,13 +370,14 @@ class HtmlHandler(xml.sax.handler.ContentHandler): self._parse_length( value, True, False, 5, 110, self.__parse_font_size_cb, tag) - def _parse_style_font_style(self, tag, value): + @staticmethod + def _parse_style_font_style(tag, value): try: style = { - 'normal': Pango.Style.NORMAL, - 'italic': Pango.Style.ITALIC, - 'oblique': Pango.Style.OBLIQUE, - }[value] + 'normal': Pango.Style.NORMAL, + 'italic': Pango.Style.ITALIC, + 'oblique': Pango.Style.OBLIQUE, + }[value] except KeyError: log.warning('unknown font-style %s', value) else: @@ -376,51 +392,55 @@ class HtmlHandler(xml.sax.handler.ContentHandler): def _parse_style_margin_left(self, tag, value): # block relative self._parse_length(value, False, True, 1, 1000, - self.__frac_length_tag_cb, tag, 'left-margin') + self.__frac_length_tag_cb, tag, 'left-margin') def _parse_style_margin_right(self, tag, value): # block relative self._parse_length(value, False, True, 1, 1000, - self.__frac_length_tag_cb, tag, 'right-margin') + self.__frac_length_tag_cb, tag, 'right-margin') - def _parse_style_font_weight(self, tag, value): + @staticmethod + def _parse_style_font_weight(tag, value): # TODO: missing 'bolder' and 'lighter' try: weight = { - '100': Pango.Weight.ULTRALIGHT, - '200': Pango.Weight.ULTRALIGHT, - '300': Pango.Weight.LIGHT, - '400': Pango.Weight.NORMAL, - '500': Pango.Weight.NORMAL, - '600': Pango.Weight.BOLD, - '700': Pango.Weight.BOLD, - '800': Pango.Weight.ULTRABOLD, - '900': Pango.Weight.HEAVY, - 'normal': Pango.Weight.NORMAL, - 'bold': Pango.Weight.BOLD, - }[value] + '100': Pango.Weight.ULTRALIGHT, + '200': Pango.Weight.ULTRALIGHT, + '300': Pango.Weight.LIGHT, + '400': Pango.Weight.NORMAL, + '500': Pango.Weight.NORMAL, + '600': Pango.Weight.BOLD, + '700': Pango.Weight.BOLD, + '800': Pango.Weight.ULTRABOLD, + '900': Pango.Weight.HEAVY, + 'normal': Pango.Weight.NORMAL, + 'bold': Pango.Weight.BOLD, + }[value] except KeyError: log.warning('unknown font-style %s', value) else: tag.set_property('weight', weight) - def _parse_style_font_family(self, tag, value): + @staticmethod + def _parse_style_font_family(tag, value): tag.set_property('family', value) - def _parse_style_text_align(self, tag, value): + @staticmethod + def _parse_style_text_align(tag, value): try: align = { - 'left': Gtk.Justification.LEFT, - 'right': Gtk.Justification.RIGHT, - 'center': Gtk.Justification.CENTER, - 'justify': Gtk.Justification.FILL, - }[value] + 'left': Gtk.Justification.LEFT, + 'right': Gtk.Justification.RIGHT, + 'center': Gtk.Justification.CENTER, + 'justify': Gtk.Justification.FILL, + }[value] except KeyError: log.warning('Invalid text-align: %s requested', value) else: tag.set_property('justification', align) - def _parse_style_text_decoration(self, tag, value): + @staticmethod + def _parse_style_text_decoration(tag, value): values = value.split(' ') if 'none' in values: tag.set_property('underline', Pango.Underline.NONE) @@ -438,7 +458,8 @@ class HtmlHandler(xml.sax.handler.ContentHandler): if 'overline' in values: log.warning('text-decoration:overline not implemented') - def _parse_style_white_space(self, tag, value): + @staticmethod + def _parse_style_white_space(tag, value): if value == 'pre': tag.set_property('wrap_mode', Gtk.WrapMode.NONE) elif value == 'normal': @@ -446,7 +467,8 @@ class HtmlHandler(xml.sax.handler.ContentHandler): elif value == 'nowrap': tag.set_property('wrap_mode', Gtk.WrapMode.NONE) - def __length_tag_cb(self, value, tag, propname): + @staticmethod + def __length_tag_cb(value, tag, propname): try: tag.set_property(propname, value) except Exception: @@ -455,29 +477,13 @@ class HtmlHandler(xml.sax.handler.ContentHandler): def _parse_style_width(self, tag, value): if value == 'auto': return - self._parse_length(value, False, False, 1, 1000, self.__length_tag_cb, - tag, "width") + self._parse_length(value, False, False, 1, 1000, + self.__length_tag_cb, tag, "width") def _parse_style_height(self, tag, value): if value == 'auto': return - self._parse_length(value, False, False, 1, 1000, self.__length_tag_cb, - tag, "height") - - - # build a dictionary mapping styles to methods, for greater speed - __style_methods = dict() - for style in ('background-color', 'color', 'font-family', 'font-size', - 'font-style', 'font-weight', 'margin-left', 'margin-right', - 'text-align', 'text-decoration', 'white-space', 'display', - 'width', 'height'): - try: - method = locals()['_parse_style_%s' % style.replace('-', '_')] - except KeyError: - log.warning('Style attribute "%s" not yet implemented', style) - else: - __style_methods[style] = method - del style # pylint: disable=undefined-loop-variable - # -- + self._parse_length(value, False, False, 1, 1000, + self.__length_tag_cb, tag, "height") def _get_style_tags(self): return [tag for tag in self.styles if tag is not None] @@ -523,8 +529,10 @@ class HtmlHandler(xml.sax.handler.ContentHandler): else: if self.conv_textview: img_mark = self.textbuf.create_mark(None, self.iter, True) - app.thread_interface(helpers.download_image, [ - self.conv_textview.account, attrs], self._update_img, + app.thread_interface( + helpers.download_image, + [self.conv_textview.account, attrs], + self._update_img, [attrs, img_mark, self._get_style_tags()]) alt = attrs.get('alt', '') if alt: @@ -542,34 +550,36 @@ class HtmlHandler(xml.sax.handler.ContentHandler): def width_cb(length): dims[0] = length # process width and height attributes - w = attrs.get('width') - h = attrs.get('height') + width = attrs.get('width') + height = attrs.get('height') # override with width and height styles for attr, val in style_iter(attrs.get('style', '')): if attr == 'width': - w = val + width = val elif attr == 'height': - h = val - if w: - self._parse_length(w, False, False, 1, 1000, width_cb) - if h: - self._parse_length(h, False, False, 1, 1000, height_cb) - def set_size(pixbuf, w, h, dims): + height = val + if width: + self._parse_length(width, False, False, 1, 1000, width_cb) + if height: + self._parse_length(height, False, False, 1, 1000, height_cb) + + def set_size(_pixbuf, width_, height_, dims): """ FIXME: Floats should be relative to the whole textview, and resize with it. This needs new pifbufs for every resize, GdkPixbuf.Pixbuf.scale_simple or similar. """ if isinstance(dims[0], float): - dims[0] = int(dims[0]*w) + dims[0] = int(dims[0] * width_) elif not dims[0]: - dims[0] = w + dims[0] = width_ if isinstance(dims[1], float): - dims[1] = int(dims[1]*h) + dims[1] = int(dims[1] * height_) if not dims[1]: - dims[1] = h + dims[1] = height_ loader.set_size(*dims) - if w or h: + + if width or height: loader.connect('size-prepared', set_size, dims) loader.write(mem) loader.close() @@ -621,12 +631,10 @@ class HtmlHandler(xml.sax.handler.ContentHandler): attr = attr.lower() val = val try: - method = self.__style_methods[attr] + getattr(self, self.__style_methods[attr])(tag, val) except KeyError: log.warning('Style attribute "%s" requested ' 'but not yet implemented', attr) - else: - method(self, tag, val) self.styles.append(tag) def _end_span(self): @@ -660,7 +668,7 @@ class HtmlHandler(xml.sax.handler.ContentHandler): else: self._insert_text(text.strip('\n')) - def _anchor_event(self, tag, textview, event, iter_, href, type_): + def _anchor_event(self, _tag, _textview, event, _iter, href, type_): if event.type == Gdk.EventType.BUTTON_PRESS: self.textview.emit('url-clicked', href, type_) return True @@ -668,8 +676,8 @@ class HtmlHandler(xml.sax.handler.ContentHandler): def handle_specials(self, text): if self.conv_textview: - self.iter = self.conv_textview.detect_and_print_special_text(text, - self._get_style_tags(), iter_=self.iter) + self.iter = self.conv_textview.detect_and_print_special_text( + text, self._get_style_tags(), iter_=self.iter) else: self._insert_text(text) @@ -682,7 +690,6 @@ class HtmlHandler(xml.sax.handler.ContentHandler): self.text += content self.starting = False - def startElement(self, name, attrs): self._flush_text() klass = [i for i in attrs.get('class', ' ').split(' ') if i] @@ -767,10 +774,10 @@ class HtmlHandler(xml.sax.handler.ContentHandler): log.warning('Unhandled element "%s"', name) def endElement(self, name): - endPreserving = False - newLine = False + end_preserving = False + newline = False if name == 'br': - newLine = True + newline = True elif name == 'hr': #FIXME: plenty of unused attributes (width, height,...) :) self._jump_line() @@ -779,7 +786,7 @@ class HtmlHandler(xml.sax.handler.ContentHandler): elif name in LIST_ELEMS: self.list_counters.pop() elif name == 'li': - newLine = True + newline = True elif name == 'img': pass elif name in ('body', 'html'): @@ -792,73 +799,62 @@ class HtmlHandler(xml.sax.handler.ContentHandler): pass elif name in BLOCK: if name == 'pre': - endPreserving = True + end_preserving = True elif name in BLOCK_STRUCT: - newLine = True + newline = True else: log.warning("Unhandled element '%s'", name) self._flush_text() - if endPreserving: + if end_preserving: self.preserve = False - if newLine: + if newline: self._jump_line() self._end_span() class HtmlTextView(Gtk.TextView): - def __init__(self, account=None): + _tags = ['url', 'mail', 'xmpp', 'sth_at_sth'] + + def __init__(self, account, standalone=False): Gtk.TextView.__init__(self) self.set_wrap_mode(Gtk.WrapMode.CHAR) self.set_editable(False) - self._changed_cursor = False self.set_has_tooltip(True) - self.connect('realize', self.on_html_text_view_realized) - self.connect('unrealize', self.on_html_text_view_unrealized) - self.connect('copy-clipboard', self.on_html_text_view_copy_clipboard) - self.id_ = self.connect('button-release-event', - self.on_left_mouse_button_release) + self.connect('copy-clipboard', self._on_copy_clipboard) self.get_buffer().eol_tag = self.get_buffer().create_tag('eol') - self.config = app.config - self.interface = app.interface + self.account = account self.plugin_modified = False + self._cursor_changed = False - def connect_tooltip(self, func=None): - self.connect('query-tooltip', func or self.__query_tooltip) + if standalone: + self.connect('query-tooltip', self._query_tooltip) + self.create_tags() def create_tags(self): - buffer_ = self.get_buffer() + color = app.css_config.get_value('.gajim-url', StyleAttr.COLOR) + + attrs = {'foreground': color, + 'underline': Pango.Underline.SINGLE} + + for tag in self._tags: + tag_ = self.get_buffer().create_tag(tag, **attrs) + tag_.connect('event', self.hyperlink_handler, tag) - self.tagURL = buffer_.create_tag('url') + def update_tags(self): + tag_table = self.get_buffer().get_tag_table() color = app.css_config.get_value('.gajim-url', StyleAttr.COLOR) - self.tagURL.set_property('foreground', color) - self.tagURL.set_property('underline', Pango.Underline.SINGLE) - self.tagURL.connect('event', self.hyperlink_handler, 'url') - - self.tagMail = buffer_.create_tag('mail') - self.tagMail.set_property('foreground', color) - self.tagMail.set_property('underline', Pango.Underline.SINGLE) - self.tagMail.connect('event', self.hyperlink_handler, 'mail') - - self.tagXMPP = buffer_.create_tag('xmpp') - self.tagXMPP.set_property('foreground', color) - self.tagXMPP.set_property('underline', Pango.Underline.SINGLE) - self.tagXMPP.connect('event', self.hyperlink_handler, 'xmpp') - - self.tagSthAtSth = buffer_.create_tag('sth_at_sth') - self.tagSthAtSth.set_property('foreground', color) - self.tagSthAtSth.set_property('underline', Pango.Underline.SINGLE) - self.tagSthAtSth.connect('event', self.hyperlink_handler, 'sth_at_sth') - - def __query_tooltip(self, widget, x_pos, y_pos, keyboard_mode, tooltip): + + for tag in self._tags: + tag_table.lookup(tag).set_property('foreground', color) + + def _query_tooltip(self, widget, x_pos, y_pos, _keyboard_mode, tooltip): window = widget.get_window(Gtk.TextWindowType.TEXT) x_pos, y_pos = self.window_to_buffer_coords( Gtk.TextWindowType.TEXT, x_pos, y_pos) - if Gtk.MINOR_VERSION > 18: - iter_ = self.get_iter_at_position(x_pos, y_pos)[1] - else: - iter_ = self.get_iter_at_position(x_pos, y_pos)[0] + iter_ = self.get_iter_at_position(x_pos, y_pos)[1] + for tag in iter_.get_tags(): if getattr(tag, 'is_anchor', False): text = getattr(tag, 'title', False) @@ -866,13 +862,19 @@ class HtmlTextView(Gtk.TextView): if len(text) > 50: text = text[:47] + '…' tooltip.set_text(text) - if not self._changed_cursor: window.set_cursor(get_cursor('HAND2')) - self._changed_cursor = True - return True - if self._changed_cursor: + self._cursor_changed = True + return True + + tag_name = tag.get_property('name') + if tag_name in ('url', 'mail', 'xmpp', 'sth_at_sth'): + window.set_cursor(get_cursor('HAND2')) + self._cursor_changed = True + return False + + if self._cursor_changed: window.set_cursor(get_cursor('XTERM')) - self._changed_cursor = False + self._cursor_changed = False return False def show_context_menu(self, _event, kind, text): @@ -880,7 +882,7 @@ class HtmlTextView(Gtk.TextView): if menu is None: return - def destroy(menu, pspec): + def destroy(menu, _pspec): visible = menu.get_property('visible') if not visible: GLib.idle_add(menu.destroy) @@ -893,7 +895,7 @@ class HtmlTextView(Gtk.TextView): if event.type == Gdk.EventType.BUTTON_PRESS: begin_iter = iter_.copy() # we get the beginning of the tag - while not begin_iter.begins_tag(texttag): + while not begin_iter.starts_tag(texttag): begin_iter.backward_char() end_iter = iter_.copy() # we get the end of the tag @@ -946,8 +948,8 @@ class HtmlTextView(Gtk.TextView): 'mlat=%(lat)s&mlon=%(lon)s&zoom=16' % \ {'lat': lat, 'lon': lon} helpers.launch_browser_mailer(kind, uri) - # other URIs else: + # other URIs helpers.launch_browser_mailer(kind, word) def display_html(self, html, textview, conv_textview, iter_=None): @@ -956,42 +958,16 @@ class HtmlTextView(Gtk.TextView): eob = iter_ else: eob = buffer_.get_end_iter() - ## this works too if libxml2 is not available - # parser = xml.sax.make_parser(['drv_libxml2']) - # parser.setFeature(xml.sax.handler.feature_validation, True) parser = xml.sax.make_parser() parser.setContentHandler(HtmlHandler(textview, conv_textview, eob)) parser.parse(StringIO(html)) - # too much space after :) - #if not eob.starts_line(): - # buffer_.insert(eob, '\n') - - def on_html_text_view_copy_clipboard(self, unused_data): - clipboard = self.get_clipboard(Gdk.SELECTION_CLIPBOARD) - selected = self.get_selected_text() + @staticmethod + def _on_copy_clipboard(textview): + clipboard = textview.get_clipboard(Gdk.SELECTION_CLIPBOARD) + selected = textview.get_selected_text() clipboard.set_text(selected, -1) - GObject.signal_stop_emission_by_name(self, 'copy-clipboard') - - def on_html_text_view_realized(self, unused_data): - self.get_buffer().remove_selection_clipboard(self.get_clipboard( - Gdk.SELECTION_PRIMARY)) - - def on_html_text_view_unrealized(self, unused_data): - self.get_buffer().add_selection_clipboard(self.get_clipboard( - Gdk.SELECTION_PRIMARY)) - - def on_left_mouse_button_release(self, widget, event): - if event.button != 1: - return - - bounds = self.get_buffer().get_selection_bounds() - if bounds: - # textview can be hidden while we add a new line in it. - if self.has_screen(): - clipboard = self.get_clipboard(Gdk.SELECTION_PRIMARY) - selected = self.get_selected_text() - clipboard.set_text(selected, -1) + GObject.signal_stop_emission_by_name(textview, 'copy-clipboard') def get_selected_text(self): bounds = self.get_buffer().get_selection_bounds() View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/63ff9478bd3eee0c5c150e8420af94a4f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/63ff9478bd3eee0c5c150e8420af94a4f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] XHTML: Fix parsing font-size
by Philipp Hörist 16 Nov '18

16 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 63ff9478 by Philipp Hörist at 2018-11-16T15:23:42Z XHTML: Fix parsing font-size Remove checking for font_scale, Gtk.TextIter.get_attributes() seems buggy at the moment, and we dont need to check the current scale to apply a new scale Fixes #9067 - - - - - 2 changed files: - gajim/htmltextview.py - test/gtk/htmltextview.py Changes: ===================================== gajim/htmltextview.py ===================================== @@ -230,13 +230,6 @@ class HtmlHandler(xml.sax.handler.ContentHandler): tag.set_property('background-gdk', color) tag.set_property('paragraph-background-gdk', color) - def _get_current_attributes(self): - attrs = self.textview.get_default_attributes() - self.iter.backward_char() - attrs = (self.iter.get_attributes())[1] - self.iter.forward_char() - return attrs - def __parse_length_frac_size_allocate(self, textview, allocation, frac, callback, args): callback(allocation.width*frac, *args) @@ -338,30 +331,19 @@ class HtmlHandler(xml.sax.handler.ContentHandler): def _parse_style_font_size(self, tag, value): try: - # see http://developer.gnome.org/pango/stable/pango-Text-Attributes.html#PANGO-SC… - # http://consciouslyusing.blogspot.ru/2012/01/heads-up-missing-pango-text-sca… scale = { - #'xx-small': Pango.SCALE_XX_SMALL, - #'x-small': Pango.SCALE_X_SMALL, - #'small': Pango.SCALE_SMALL, - #'medium': Pango.SCALE_MEDIUM, - #'large': Pango.SCALE_LARGE, - #'x-large': Pango.SCALE_X_LARGE, - #'xx-large': Pango.SCALE_XX_LARGE, - 'xx-small': 0.5787037037037, - 'x-small': 0.6444444444444, - 'small': 0.8333333333333, - 'medium': 1.0, - 'large': 1.2, - 'x-large': 1.4399999999999, - 'xx-large': 1.728, - }[value] + 'xx-small': 0.5787037037037, + 'x-small': 0.6444444444444, + 'small': 0.8333333333333, + 'medium': 1.0, + 'large': 1.2, + 'x-large': 1.4399999999999, + 'xx-large': 1.728, + }[value] except KeyError: pass else: - attrs = self._get_current_attributes() - if attrs.font_scale == 0: - tag.set_property('scale', scale) + tag.set_property('scale', scale) return if value == 'smaller': tag.set_property('scale', 0.8333333333333) ===================================== test/gtk/htmltextview.py ===================================== @@ -19,6 +19,10 @@ app.interface = Interface() XHTML = [ + ''' + <body xmlns='http://www.w3.org/1999/xhtml'>rexxnor: i nimes chum a...</body> + ''', + ''' <div> Hello View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/63ff9478bd3eee0c5c150e8420af94a4f1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/63ff9478bd3eee0c5c150e8420af94a4f1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] 3 commits: Windows: Get objdump output as string
by Philipp Hörist 16 Nov '18

16 Nov '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 9ba97c4b by Philipp Hörist at 2018-11-16T14:28:28Z Windows: Get objdump output as string Otherwise we have to guess the encoding of the host system - - - - - adfcfb1b by Philipp Hörist at 2018-11-16T14:28:28Z Fix incorrect contact status on tabs - - - - - 5271f192 by Philipp Hörist at 2018-11-16T14:28:40Z Windows: Fix build data is now a str - - - - - 2 changed files: - gajim/common/connection_handlers.py - win/misc/depcheck.py Changes: ===================================== gajim/common/connection_handlers.py ===================================== @@ -146,6 +146,7 @@ class ConnectionHandlersBase: obj.contact_list.append(obj.contact) obj.contact.resource = resource + obj.need_redraw = True obj.need_add_in_roster = True if not app.jid_is_transport(jid) and len(obj.contact_list) == 1: ===================================== win/misc/depcheck.py ===================================== @@ -47,11 +47,11 @@ SYSTEM_LIBS = ['advapi32.dll', def get_dependencies(filename): deps = [] try: - data = subprocess.check_output(["objdump", "-p", filename]) + data = subprocess.getoutput("objdump -p %s" % filename) except Exception as error: print(error) return deps - data = data.decode("utf-8") + for line in data.splitlines(): line = line.strip() if line.startswith("DLL Name:"): View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/df62671217256defc2b7e51b1e5ac76da… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/df62671217256defc2b7e51b1e5ac76da… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Windows: Fix build
by Philipp Hörist 16 Nov '18

16 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 77d64267 by Philipp Hörist at 2018-11-16T14:26:38Z Windows: Fix build data is now a str - - - - - 1 changed file: - win/misc/depcheck.py Changes: ===================================== win/misc/depcheck.py ===================================== @@ -51,7 +51,7 @@ def get_dependencies(filename): except Exception as error: print(error) return deps - data = data.decode("utf-8") + for line in data.splitlines(): line = line.strip() if line.startswith("DLL Name:"): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/77d64267c72e11d687041272a5f693847e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/77d64267c72e11d687041272a5f693847e… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits