Commits August 2018

commits@gajim.org

1 participants
79 discussions

[Git][gajim/gajim][gajim_1.1] 5 commits: Display only emojis the font supports
by Philipp Hörist 25 Aug '18

25 Aug '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 2e47f932 by Philipp Hörist at 2018-08-25T07:42:09Z Display only emojis the font supports Fixes #9299 - - - - - 33effbbe by Philipp Hörist at 2018-08-25T07:42:09Z Call link() on correct object - - - - - 163f98f7 by Philipp Hörist at 2018-08-25T07:42:09Z Windows: Fix gstreamer/farstream plugin paths - - - - - 3d477437 by Philipp Hörist at 2018-08-25T07:42:09Z Appveyor: add cssutils dependency - - - - - 0bbcc937 by Philipp Hörist at 2018-08-25T07:42:09Z Fix MUC invite notification Fixes #9309 - - - - - 8 changed files: - gajim/common/app.py - gajim/common/helpers.py - gajim/common/jingle_rtp.py - gajim/gtk/emoji_chooser.py - gajim/gui_interface.py - gajim/notify.py - win/_base.sh - win/dev_env.sh Changes: ===================================== gajim/common/app.py ===================================== --- a/gajim/common/app.py +++ b/gajim/common/app.py @@ -32,6 +32,7 @@ import os import sys import logging import uuid +from pathlib import Path from distutils.version import LooseVersion as V from collections import namedtuple @@ -229,8 +230,11 @@ def detect_dependencies(): # FARSTREAM try: if os.name == 'nt': - os.environ['FS_PLUGIN_PATH'] = 'gtk\\lib\\farstream-0.1' - os.environ['GST_PLUGIN_PATH'] = 'gtk\\lib\\gstreamer-0.10' + root_path = Path(sys.executable).parents[1] + fs_plugin_path = str(root_path / 'lib' / 'farstream-0.2') + gst_plugin_path = str(root_path / 'lib' / 'gstreamer-1.0') + os.environ['FS_PLUGIN_PATH'] = fs_plugin_path + os.environ['GST_PLUGIN_PATH'] = gst_plugin_path gi.require_version('Farstream', '0.2') from gi.repository import Farstream gi.require_version('Gst', '1.0') ===================================== gajim/common/helpers.py ===================================== --- a/gajim/common/helpers.py +++ b/gajim/common/helpers.py @@ -1478,11 +1478,7 @@ def version_condition(current_version, required_version): return True def get_available_emoticon_themes(): - emoticons_themes = [] - if sys.platform not in ('win32', 'darwin'): - # Colored emoji fonts only supported on Linux - emoticons_themes.append('font') - + emoticons_themes = ['font'] files = [] dir_iterator = os.scandir(configpaths.get('EMOTICONS')) for folder in dir_iterator: ===================================== gajim/common/jingle_rtp.py ===================================== --- a/gajim/common/jingle_rtp.py +++ b/gajim/common/jingle_rtp.py @@ -243,7 +243,7 @@ class JingleRTPContent(JingleContent): # Add fallback source self.src_bin = self.get_fallback_src() self.pipeline.add(self.src_bin) - self.src_bin.link(sink_pad) + self.src_bin.get_static_pad('src').link(sink_pad) self.stream_failed_once = True else: reason = nbxmpp.Node('reason') ===================================== gajim/gtk/emoji_chooser.py ===================================== --- a/gajim/gtk/emoji_chooser.py +++ b/gajim/gtk/emoji_chooser.py @@ -21,6 +21,7 @@ from collections import OrderedDict from gi.repository import Gtk from gi.repository import GLib from gi.repository import GdkPixbuf +from gi.repository import Pango from gajim.common import app from gajim.common import helpers @@ -38,8 +39,9 @@ log = logging.getLogger('gajim.emoji') class Section(Gtk.Box): - def __init__(self, name, search_entry, press_cb): + def __init__(self, name, search_entry, press_cb, chooser): Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL) + self._chooser = chooser self._press_cb = press_cb self.pixbuf_generator = None self.heading = Gtk.Label(label=name) @@ -83,22 +85,44 @@ class Section(Gtk.Box): emoji_pixbufs[codepoint] = pixbuf else: if pixbuf is not None: - chooser = self._get_emoji_modifier( - codepoint, pixbuf, attrs) - chooser.flowbox.connect( - 'child-activated', self._press_cb) + chooser = ModifierChooser() + + # Iterate over the variations and add the codepoints + for codepoint_ in variations.keys(): + pixbuf_ = self._get_next_pixbuf() + if pixbuf_ is None: + continue + + if pixbuf_ == 'font': + if not self._chooser._font_supports_codepoint( + codepoint_): + continue + else: + emoji_pixbufs[codepoint_] = pixbuf_ + + # Only codepoints are added which the + # font or theme supports + chooser.add_emoji(codepoint_, pixbuf_) + + # Check if we successfully added codepoints with modifiers + if chooser.has_child: + # If we have children then add a button + # and set the popover + child = EmojiModifierChild( + codepoint, pixbuf, attrs['desc']) + child.button.set_popover(chooser) + chooser.flowbox.connect( + 'child-activated', self._press_cb) + else: + # If no children were added, destroy the chooser + # and add a EmojiChild instead of a EmojiModifierChild + chooser.destroy() + child = EmojiChild(codepoint, pixbuf, attrs['desc']) if pixbuf != 'font': emoji_pixbufs[codepoint] = pixbuf - for codepoint, attrs in variations.items(): - pixbuf = self._get_next_pixbuf() - if pixbuf is None: - continue - chooser.add_emoji(codepoint, pixbuf) - - if pixbuf != 'font': - emoji_pixbufs[codepoint] = pixbuf + self.flowbox.add(child) else: # We dont have a image for the base codepoint # so skip all modifiers of it @@ -112,13 +136,6 @@ class Section(Gtk.Box): emoji.destroy() self.flowbox.foreach(_remove_emoji) - def _get_emoji_modifier(self, codepoint, pixbuf, attrs): - chooser = ModifierChooser() - modifier_button = EmojiModifierChild(codepoint, pixbuf, attrs['desc']) - modifier_button.button.set_popover(chooser) - self.flowbox.add(modifier_button) - return chooser - def _get_next_pixbuf(self): if self.pixbuf_generator is None: return 'font' @@ -193,6 +210,7 @@ class ModifierChooser(Gtk.Popover): def __init__(self): Gtk.Popover.__init__(self) self.set_name('EmoticonPopover') + self._has_child = False self.flowbox = Gtk.FlowBox() self.flowbox.get_style_context().add_class( @@ -202,8 +220,13 @@ class ModifierChooser(Gtk.Popover): self.flowbox.show() self.add(self.flowbox) + @property + def has_child(self): + return self._has_child + def add_emoji(self, codepoint, pixbuf): self.flowbox.add(EmojiChild(codepoint, pixbuf, None)) + self._has_child = True class EmojiChooser(Gtk.Popover): @@ -224,6 +247,7 @@ class EmojiChooser(Gtk.Popover): self.set_name('EmoticonPopover') self._text_widget = None self._load_source_id = None + self._pango_layout = Pango.Layout(self.get_pango_context()) self._builder = get_builder('emoji_chooser.ui') self._search = self._builder.get_object('search') @@ -232,7 +256,7 @@ class EmojiChooser(Gtk.Popover): self._sections = OrderedDict() for name in self._section_names: self._sections[name] = Section( - name, self._search, self._on_emoticon_press) + name, self._search, self._on_emoticon_press, self) section_box = self._builder.get_object('section_box') for section in self._sections.values(): @@ -326,21 +350,35 @@ class EmojiChooser(Gtk.Popover): self._clear_sections() emoji_pixbufs.clear() - factory = self._emoji_factory() + factory = self._emoji_factory(theme == 'font') self._load_source_id = GLib.idle_add(lambda: next(factory, False), priority=GLib.PRIORITY_LOW) - def _emoji_factory(self): + def _emoji_factory(self, font): for codepoint, attrs in emoji_data.items(): if not attrs['fully-qualified']: # We dont add these to the UI continue + if font and not self._font_supports_codepoint(codepoint): + continue + section = self._sections[attrs['group']] yield section.add_emoji(codepoint, attrs) self._load_source_id = None emoji_pixbufs.complete = True + def _font_supports_codepoint(self, codepoint): + self._pango_layout.set_text(codepoint, -1) + if self._pango_layout.get_unknown_glyphs_count(): + return False + if len(codepoint) > 1: + # The font supports each of the codepoints + # Check if the rendered glyph is more than one char + if self._pango_layout.get_size()[0] > 19000: + return False + return True + def _get_next_pixbuf(self, path): src_x = src_y = cur_column = 0 atlas = GdkPixbuf.Pixbuf.new_from_file(path) ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -661,8 +661,8 @@ class Interface: text = _('You are invited to {room} by {user}').format( room=obj.room_jid, user=str(obj.from_)) app.notification.popup( - event_type, obj.room_jid, obj.account, 'gc-invitation', - 'gajim-gc_invitation', event_type, text) + event_type, str(obj.from_), obj.account, 'gc-invitation', + 'gajim-gc_invitation', event_type, text, room_jid=obj.room_jid) def forget_gpg_passphrase(self, keyid): if keyid in self.gpg_passphrase: ===================================== gajim/notify.py ===================================== --- a/gajim/notify.py +++ b/gajim/notify.py @@ -153,7 +153,7 @@ class Notification: return gtkgui_helpers.get_iconset_name_for(obj.show) def popup(self, event_type, jid, account, type_='', icon_name=None, - title=None, text=None, timeout=-1): + title=None, text=None, timeout=-1, room_jid=None): """ Notify a user of an event using GNotification and GApplication under Linux, Use PopupNotificationWindow under Windows @@ -206,7 +206,7 @@ class Notification: _('Contact Changed Status')): notif_id = self._id('contact-status-changed', account, jid) elif event_type == _('Groupchat Invitation'): - notif_id = self._id('gc-invitation', account, jid) + notif_id = self._id('gc-invitation', account, room_jid) elif event_type == _('Connection Failed'): notif_id = self._id('connection-failed', account) elif event_type in (_('New Message'), _('New Single Message'), ===================================== win/_base.sh ===================================== --- a/win/_base.sh +++ b/win/_base.sh @@ -97,6 +97,7 @@ keyring python-gnupg python-axolotl qrcode +cssutils " build_pip install $(echo "$PIP_REQUIREMENTS" | tr ["\\n"] [" "]) ===================================== win/dev_env.sh ===================================== --- a/win/dev_env.sh +++ b/win/dev_env.sh @@ -30,6 +30,7 @@ docutils qrcode keyring pillow==4.3.0 +cssutils " pip3 install --no-binary ":all:" \ View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/e8526bb063a9d58c1de94c1d89c05fbe4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/e8526bb063a9d58c1de94c1d89c05fbe4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix MUC invite notification
by Philipp Hörist 24 Aug '18

24 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: e665ee1f by Philipp Hörist at 2018-08-24T20:03:33Z Fix MUC invite notification Fixes #9309 - - - - - 2 changed files: - gajim/gui_interface.py - gajim/notify.py Changes: ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -661,8 +661,8 @@ class Interface: text = _('You are invited to {room} by {user}').format( room=obj.room_jid, user=str(obj.from_)) app.notification.popup( - event_type, obj.room_jid, obj.account, 'gc-invitation', - 'gajim-gc_invitation', event_type, text) + event_type, str(obj.from_), obj.account, 'gc-invitation', + 'gajim-gc_invitation', event_type, text, room_jid=obj.room_jid) def forget_gpg_passphrase(self, keyid): if keyid in self.gpg_passphrase: ===================================== gajim/notify.py ===================================== --- a/gajim/notify.py +++ b/gajim/notify.py @@ -153,7 +153,7 @@ class Notification: return gtkgui_helpers.get_iconset_name_for(obj.show) def popup(self, event_type, jid, account, type_='', icon_name=None, - title=None, text=None, timeout=-1): + title=None, text=None, timeout=-1, room_jid=None): """ Notify a user of an event using GNotification and GApplication under Linux, Use PopupNotificationWindow under Windows @@ -206,7 +206,7 @@ class Notification: _('Contact Changed Status')): notif_id = self._id('contact-status-changed', account, jid) elif event_type == _('Groupchat Invitation'): - notif_id = self._id('gc-invitation', account, jid) + notif_id = self._id('gc-invitation', account, room_jid) elif event_type == _('Connection Failed'): notif_id = self._id('connection-failed', account) elif event_type in (_('New Message'), _('New Single Message'), View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e665ee1fbed235ed6f9575f5808d3ceeaf… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e665ee1fbed235ed6f9575f5808d3ceeaf… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Appveyor: add cssutils dependency
by Philipp Hörist 23 Aug '18

23 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: bf64d040 by Philipp Hörist at 2018-08-23T17:48:36Z Appveyor: add cssutils dependency - - - - - 2 changed files: - win/_base.sh - win/dev_env.sh Changes: ===================================== win/_base.sh ===================================== --- a/win/_base.sh +++ b/win/_base.sh @@ -97,6 +97,7 @@ keyring python-gnupg python-axolotl qrcode +cssutils " build_pip install $(echo "$PIP_REQUIREMENTS" | tr ["\\n"] [" "]) ===================================== win/dev_env.sh ===================================== --- a/win/dev_env.sh +++ b/win/dev_env.sh @@ -30,6 +30,7 @@ docutils qrcode keyring pillow==4.3.0 +cssutils " pip3 install --no-binary ":all:" \ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/bf64d040467d6a8d5e3ce1877db62c3f0f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/bf64d040467d6a8d5e3ce1877db62c3f0f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Call link() on correct object
by Philipp Hörist 21 Aug '18

21 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: fb4c5a23 by Philipp Hörist at 2018-08-21T16:48:20Z Call link() on correct object - - - - - a087486e by Philipp Hörist at 2018-08-21T17:21:07Z Windows: Fix gstreamer/farstream plugin paths - - - - - 2 changed files: - gajim/common/app.py - gajim/common/jingle_rtp.py Changes: ===================================== gajim/common/app.py ===================================== --- a/gajim/common/app.py +++ b/gajim/common/app.py @@ -32,6 +32,7 @@ import os import sys import logging import uuid +from pathlib import Path from distutils.version import LooseVersion as V from collections import namedtuple @@ -229,8 +230,11 @@ def detect_dependencies(): # FARSTREAM try: if os.name == 'nt': - os.environ['FS_PLUGIN_PATH'] = 'gtk\\lib\\farstream-0.1' - os.environ['GST_PLUGIN_PATH'] = 'gtk\\lib\\gstreamer-0.10' + root_path = Path(sys.executable).parents[1] + fs_plugin_path = str(root_path / 'lib' / 'farstream-0.2') + gst_plugin_path = str(root_path / 'lib' / 'gstreamer-1.0') + os.environ['FS_PLUGIN_PATH'] = fs_plugin_path + os.environ['GST_PLUGIN_PATH'] = gst_plugin_path gi.require_version('Farstream', '0.2') from gi.repository import Farstream gi.require_version('Gst', '1.0') ===================================== gajim/common/jingle_rtp.py ===================================== --- a/gajim/common/jingle_rtp.py +++ b/gajim/common/jingle_rtp.py @@ -243,7 +243,7 @@ class JingleRTPContent(JingleContent): # Add fallback source self.src_bin = self.get_fallback_src() self.pipeline.add(self.src_bin) - self.src_bin.link(sink_pad) + self.src_bin.get_static_pad('src').link(sink_pad) self.stream_failed_once = True else: reason = nbxmpp.Node('reason') View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/fef8cff254434525f0588eff2cbeb8524… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/fef8cff254434525f0588eff2cbeb8524… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Display only emojis the font supports
by Philipp Hörist 20 Aug '18

20 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: fef8cff2 by Philipp Hörist at 2018-08-20T17:18:07Z Display only emojis the font supports Fixes #9299 - - - - - 2 changed files: - gajim/common/helpers.py - gajim/gtk/emoji_chooser.py Changes: ===================================== gajim/common/helpers.py ===================================== --- a/gajim/common/helpers.py +++ b/gajim/common/helpers.py @@ -1478,11 +1478,7 @@ def version_condition(current_version, required_version): return True def get_available_emoticon_themes(): - emoticons_themes = [] - if sys.platform not in ('win32', 'darwin'): - # Colored emoji fonts only supported on Linux - emoticons_themes.append('font') - + emoticons_themes = ['font'] files = [] dir_iterator = os.scandir(configpaths.get('EMOTICONS')) for folder in dir_iterator: ===================================== gajim/gtk/emoji_chooser.py ===================================== --- a/gajim/gtk/emoji_chooser.py +++ b/gajim/gtk/emoji_chooser.py @@ -21,6 +21,7 @@ from collections import OrderedDict from gi.repository import Gtk from gi.repository import GLib from gi.repository import GdkPixbuf +from gi.repository import Pango from gajim.common import app from gajim.common import helpers @@ -38,8 +39,9 @@ log = logging.getLogger('gajim.emoji') class Section(Gtk.Box): - def __init__(self, name, search_entry, press_cb): + def __init__(self, name, search_entry, press_cb, chooser): Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL) + self._chooser = chooser self._press_cb = press_cb self.pixbuf_generator = None self.heading = Gtk.Label(label=name) @@ -83,22 +85,44 @@ class Section(Gtk.Box): emoji_pixbufs[codepoint] = pixbuf else: if pixbuf is not None: - chooser = self._get_emoji_modifier( - codepoint, pixbuf, attrs) - chooser.flowbox.connect( - 'child-activated', self._press_cb) + chooser = ModifierChooser() + + # Iterate over the variations and add the codepoints + for codepoint_ in variations.keys(): + pixbuf_ = self._get_next_pixbuf() + if pixbuf_ is None: + continue + + if pixbuf_ == 'font': + if not self._chooser._font_supports_codepoint( + codepoint_): + continue + else: + emoji_pixbufs[codepoint_] = pixbuf_ + + # Only codepoints are added which the + # font or theme supports + chooser.add_emoji(codepoint_, pixbuf_) + + # Check if we successfully added codepoints with modifiers + if chooser.has_child: + # If we have children then add a button + # and set the popover + child = EmojiModifierChild( + codepoint, pixbuf, attrs['desc']) + child.button.set_popover(chooser) + chooser.flowbox.connect( + 'child-activated', self._press_cb) + else: + # If no children were added, destroy the chooser + # and add a EmojiChild instead of a EmojiModifierChild + chooser.destroy() + child = EmojiChild(codepoint, pixbuf, attrs['desc']) if pixbuf != 'font': emoji_pixbufs[codepoint] = pixbuf - for codepoint, attrs in variations.items(): - pixbuf = self._get_next_pixbuf() - if pixbuf is None: - continue - chooser.add_emoji(codepoint, pixbuf) - - if pixbuf != 'font': - emoji_pixbufs[codepoint] = pixbuf + self.flowbox.add(child) else: # We dont have a image for the base codepoint # so skip all modifiers of it @@ -112,13 +136,6 @@ class Section(Gtk.Box): emoji.destroy() self.flowbox.foreach(_remove_emoji) - def _get_emoji_modifier(self, codepoint, pixbuf, attrs): - chooser = ModifierChooser() - modifier_button = EmojiModifierChild(codepoint, pixbuf, attrs['desc']) - modifier_button.button.set_popover(chooser) - self.flowbox.add(modifier_button) - return chooser - def _get_next_pixbuf(self): if self.pixbuf_generator is None: return 'font' @@ -193,6 +210,7 @@ class ModifierChooser(Gtk.Popover): def __init__(self): Gtk.Popover.__init__(self) self.set_name('EmoticonPopover') + self._has_child = False self.flowbox = Gtk.FlowBox() self.flowbox.get_style_context().add_class( @@ -202,8 +220,13 @@ class ModifierChooser(Gtk.Popover): self.flowbox.show() self.add(self.flowbox) + @property + def has_child(self): + return self._has_child + def add_emoji(self, codepoint, pixbuf): self.flowbox.add(EmojiChild(codepoint, pixbuf, None)) + self._has_child = True class EmojiChooser(Gtk.Popover): @@ -224,6 +247,7 @@ class EmojiChooser(Gtk.Popover): self.set_name('EmoticonPopover') self._text_widget = None self._load_source_id = None + self._pango_layout = Pango.Layout(self.get_pango_context()) self._builder = get_builder('emoji_chooser.ui') self._search = self._builder.get_object('search') @@ -232,7 +256,7 @@ class EmojiChooser(Gtk.Popover): self._sections = OrderedDict() for name in self._section_names: self._sections[name] = Section( - name, self._search, self._on_emoticon_press) + name, self._search, self._on_emoticon_press, self) section_box = self._builder.get_object('section_box') for section in self._sections.values(): @@ -326,21 +350,35 @@ class EmojiChooser(Gtk.Popover): self._clear_sections() emoji_pixbufs.clear() - factory = self._emoji_factory() + factory = self._emoji_factory(theme == 'font') self._load_source_id = GLib.idle_add(lambda: next(factory, False), priority=GLib.PRIORITY_LOW) - def _emoji_factory(self): + def _emoji_factory(self, font): for codepoint, attrs in emoji_data.items(): if not attrs['fully-qualified']: # We dont add these to the UI continue + if font and not self._font_supports_codepoint(codepoint): + continue + section = self._sections[attrs['group']] yield section.add_emoji(codepoint, attrs) self._load_source_id = None emoji_pixbufs.complete = True + def _font_supports_codepoint(self, codepoint): + self._pango_layout.set_text(codepoint, -1) + if self._pango_layout.get_unknown_glyphs_count(): + return False + if len(codepoint) > 1: + # The font supports each of the codepoints + # Check if the rendered glyph is more than one char + if self._pango_layout.get_size()[0] > 19000: + return False + return True + def _get_next_pixbuf(self, path): src_x = src_y = cur_column = 0 atlas = GdkPixbuf.Pixbuf.new_from_file(path) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/fef8cff254434525f0588eff2cbeb8524c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/fef8cff254434525f0588eff2cbeb8524c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new tag gajim-1.1.0-beta1
by Yann Leboulanger 20 Aug '18

20 Aug '18

Yann Leboulanger pushed new tag gajim-1.1.0-beta1 at gajim / gajim -- View it on GitLab: https://dev.gajim.org/gajim/gajim/tree/gajim-1.1.0-beta1 You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] HistoryManager: Convert RGB to hex
by Philipp Hörist 19 Aug '18

19 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2a4e5965 by Philipp Hörist at 2018-08-19T21:48:44Z HistoryManager: Convert RGB to hex - - - - - 1 changed file: - gajim/history_manager.py Changes: ===================================== gajim/history_manager.py ===================================== --- a/gajim/history_manager.py +++ b/gajim/history_manager.py @@ -89,6 +89,7 @@ from gajim.gtk import YesNoDialog from gajim.gtk import ErrorDialog from gajim.gtk import ConfirmationDialog from gajim.gtk.filechoosers import FileSaveDialog +from gajim.gtk.util import convert_rgb_to_hex from gajim import gtkgui_helpers @@ -393,16 +394,18 @@ class HistoryManager: else: color = None if kind in (KindConstant.SINGLE_MSG_RECV, - KindConstant.CHAT_MSG_RECV, KindConstant.GC_MSG): - # it is the other side - color = app.css_config.get_value('.gajim-incoming-nickname', StyleAttr.COLOR) # so incoming color + KindConstant.CHAT_MSG_RECV, + KindConstant.GC_MSG): + color = app.css_config.get_value( + '.gajim-incoming-nickname', StyleAttr.COLOR) elif kind in (KindConstant.SINGLE_MSG_SENT, - KindConstant.CHAT_MSG_SENT): # it is us - color = app.css_config.get_value('.gajim-outgoing-nickname', StyleAttr.COLOR) # so outgoing color + KindConstant.CHAT_MSG_SENT): + color = app.css_config.get_value( + '.gajim-outgoing-nickname', StyleAttr.COLOR) elif kind in (KindConstant.STATUS, - KindConstant.GCSTATUS): # is is statuses - # so status color - color = app.css_config.get_value('.gajim-status-message', StyleAttr.COLOR) + KindConstant.GCSTATUS): + color = app.css_config.get_value( + '.gajim-status-message', StyleAttr.COLOR) # include status into (status) message if message is None: message = '' @@ -413,10 +416,11 @@ class HistoryManager: message_ = '<span' if color: - message_ += ' foreground="%s"' % color + message_ += ' foreground="%s"' % convert_rgb_to_hex(color) message_ += '>%s</span>' % GLib.markup_escape_text(message) - self.logs_liststore.append((str(log_line_id), str(jid_id), - time_, message_, subject, nickname)) + self.logs_liststore.append( + (str(log_line_id), str(jid_id), + time_, message_, subject, nickname)) def _fill_search_results_listview(self, text): """ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2a4e59654f62ba63fba2cf9d32036a6404… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2a4e59654f62ba63fba2cf9d32036a6404… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] HistoryManager: Convert RGB to hex
by Philipp Hörist 19 Aug '18

19 Aug '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: e8526bb0 by Philipp Hörist at 2018-08-19T21:48:07Z HistoryManager: Convert RGB to hex - - - - - 1 changed file: - gajim/history_manager.py Changes: ===================================== gajim/history_manager.py ===================================== --- a/gajim/history_manager.py +++ b/gajim/history_manager.py @@ -89,6 +89,7 @@ from gajim.gtk import YesNoDialog from gajim.gtk import ErrorDialog from gajim.gtk import ConfirmationDialog from gajim.gtk.filechoosers import FileSaveDialog +from gajim.gtk.util import convert_rgb_to_hex from gajim import gtkgui_helpers @@ -393,16 +394,18 @@ class HistoryManager: else: color = None if kind in (KindConstant.SINGLE_MSG_RECV, - KindConstant.CHAT_MSG_RECV, KindConstant.GC_MSG): - # it is the other side - color = app.css_config.get_value('.gajim-incoming-nickname', StyleAttr.COLOR) # so incoming color + KindConstant.CHAT_MSG_RECV, + KindConstant.GC_MSG): + color = app.css_config.get_value( + '.gajim-incoming-nickname', StyleAttr.COLOR) elif kind in (KindConstant.SINGLE_MSG_SENT, - KindConstant.CHAT_MSG_SENT): # it is us - color = app.css_config.get_value('.gajim-outgoing-nickname', StyleAttr.COLOR) # so outgoing color + KindConstant.CHAT_MSG_SENT): + color = app.css_config.get_value( + '.gajim-outgoing-nickname', StyleAttr.COLOR) elif kind in (KindConstant.STATUS, - KindConstant.GCSTATUS): # is is statuses - # so status color - color = app.css_config.get_value('.gajim-status-message', StyleAttr.COLOR) + KindConstant.GCSTATUS): + color = app.css_config.get_value( + '.gajim-status-message', StyleAttr.COLOR) # include status into (status) message if message is None: message = '' @@ -413,10 +416,11 @@ class HistoryManager: message_ = '<span' if color: - message_ += ' foreground="%s"' % color + message_ += ' foreground="%s"' % convert_rgb_to_hex(color) message_ += '>%s</span>' % GLib.markup_escape_text(message) - self.logs_liststore.append((str(log_line_id), str(jid_id), - time_, message_, subject, nickname)) + self.logs_liststore.append( + (str(log_line_id), str(jid_id), + time_, message_, subject, nickname)) def _fill_search_results_listview(self, text): """ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e8526bb063a9d58c1de94c1d89c05fbe44… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e8526bb063a9d58c1de94c1d89c05fbe44… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Time: use classes from standard library
by Philipp Hörist 19 Aug '18

19 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5d853e90 by André Apitzsch at 2018-08-19T21:29:05Z Time: use classes from standard library - - - - - 1 changed file: - gajim/common/modules/entity_time.py Changes: ===================================== gajim/common/modules/entity_time.py ===================================== --- a/gajim/common/modules/entity_time.py +++ b/gajim/common/modules/entity_time.py @@ -25,8 +25,6 @@ from gajim.common.nec import NetworkIncomingEvent log = logging.getLogger('gajim.c.m.entity_time') -ZERO = datetime.timedelta(0) - class EntityTime: def __init__(self, con): @@ -79,7 +77,7 @@ class EntityTime: tzo = '0:0' try: tzoh, tzom = tzo.split(':') - except Exception as e: + except Exception: log.warning('Wrong tzo node: %s', stanza) return utc_time = time_.getTag('utc').getData() @@ -106,8 +104,11 @@ class EntityTime: e, stanza.getFrom()) return - t = t.replace(tzinfo=UTC()) - return t.astimezone(contact_tz(tzoh, tzom)).strftime('%c') + utc = datetime.timezone(datetime.timedelta(0)) + t = t.replace(tzinfo=utc) + utc_offset = datetime.timedelta(hours=int(tzoh), minutes=int(tzom)) + contact_tz = datetime.timezone(utc_offset, "remote timezone") + return t.astimezone(contact_tz).strftime('%c') def _answer_request(self, con, stanza): log.info('%s asked for the time', stanza.getFrom()) @@ -138,33 +139,5 @@ class TimeResultReceivedEvent(NetworkIncomingEvent): return True -class UTC(datetime.tzinfo): - def utcoffset(self, dt): - return ZERO - - def tzname(self, dt): - return "UTC" - - def dst(self, dt): - return ZERO - - -class contact_tz(datetime.tzinfo): - - def __init__(self, tzoh, tzom): - self._tzoh = tzoh - self._tzom = tzom - - def utcoffset(self, dt): - return datetime.timedelta(hours=int(self._tzoh), - minutes=int(self._tzom)) - - def tzname(self, dt): - return "remote timezone" - - def dst(self, dt): - return ZERO - - def get_instance(*args, **kwargs): return EntityTime(*args, **kwargs), 'EntityTime' View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5d853e902a0506f88393b1e8a4ab16a971… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5d853e902a0506f88393b1e8a4ab16a971… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] Appveyor: build correct branch
by Philipp Hörist 19 Aug '18

19 Aug '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: b0aa555a by Philipp Hörist at 2018-08-19T20:30:34Z Appveyor: build correct branch - - - - - 1 changed file: - appveyor.yml Changes: ===================================== appveyor.yml ===================================== --- a/appveyor.yml +++ b/appveyor.yml @@ -10,7 +10,7 @@ environment: branches: only: - - master + - gajim_1.1 clone_depth: 1 View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b0aa555ac85e83e76ddfadc1ba2e8dcc45… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b0aa555ac85e83e76ddfadc1ba2e8dcc45… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits August 2018