Commits June 2019

commits@gajim.org

1 participants
70 discussions

[Git][gajim/gajim][master] ConsistentColors: Adjust for background
by Philipp Hörist 11 Jun '19

11 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: d009a2cb by Philipp Hörist at 2019-06-11T22:14:40Z ConsistentColors: Adjust for background - - - - - 2 changed files: - gajim/conversation_textview.py - gajim/gtk/util.py Changes: ===================================== gajim/conversation_textview.py ===================================== @@ -36,8 +36,6 @@ from gi.repository import GObject from gi.repository import GLib from gi.repository import Gdk -from nbxmpp.util import text_to_colour - from gajim.common import app from gajim.common import helpers from gajim.common import i18n @@ -50,6 +48,7 @@ from gajim.gtk import util from gajim.gtk.util import load_icon from gajim.gtk.util import get_cursor from gajim.gtk.util import format_fingerprint +from gajim.gtk.util import text_to_color from gajim.gtk.emoji_data import emoji_pixbufs from gajim.gtk.emoji_data import is_emoji from gajim.gtk.emoji_data import get_emoji_pixbuf @@ -1254,7 +1253,7 @@ class ConversationTextview(GObject.GObject): def _add_new_colour_tags(self, tag, name): if self._buffer.get_tag_table().lookup(tag) is not None: return - gdk_color = Gdk.Color.from_floats(*text_to_colour(name)) + gdk_color = Gdk.Color.from_floats(*text_to_color(name)) self._buffer.create_tag(tag, foreground_gdk=gdk_color) def print_subject(self, subject, iter_=None): ===================================== gajim/gtk/util.py ===================================== @@ -32,6 +32,7 @@ from gi.repository import Gdk from gi.repository import Gtk from gi.repository import GLib from gi.repository import Pango +import nbxmpp import cairo from gajim.common import app @@ -641,3 +642,11 @@ class MaxWidthComboBoxText(Gtk.ComboBoxText): if minimum_width > self._max_width: minimum_width = self._max_width return minimum_width, natural_width + + +def text_to_color(text): + if app.css_config.prefer_dark: + background = (1, 1, 1) + else: + background = (0, 0, 0) + return nbxmpp.util.text_to_color(text, background) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d009a2cbb9ebd679b7aa22d6ae607560c0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d009a2cbb9ebd679b7aa22d6ae607560c0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] ConsistentColors: Adjust for background
by Philipp Hörist 11 Jun '19

11 Jun '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 9fd88196 by Philipp Hörist at 2019-06-11T22:03:02Z ConsistentColors: Adjust for background - Rename method - add LRU maxsize - - - - - 1 changed file: - nbxmpp/util.py Changes: ===================================== nbxmpp/util.py ===================================== @@ -233,11 +233,23 @@ def clip_rgb(red, green, blue): ) -@lru_cache() -def text_to_colour(text): +@lru_cache(maxsize=1024) +def text_to_color(text, background_color): + # background color = (rb, gb, bb) hash_ = hashlib.sha1() hash_.update(text.encode()) - hue = (int.from_bytes(hash_.digest()[:2], 'little') & 0xffff) / 0xffff + hue = int.from_bytes(hash_.digest()[:2], 'little') / 65536 red, green, blue = clip_rgb(*hsluv_to_rgb((hue * 360, 100, 50))) - return red * 0.8, green * 0.8, blue * 0.8 + + rb, gb, bb = background_color + + rb_inv = 1 - rb + gb_inv = 1 - gb + bb_inv = 1 - bb + + rc = 0.2 * rb_inv + 0.8 * red + gc = 0.2 * gb_inv + 0.8 * green + bc = 0.2 * bb_inv + 0.8 * blue + + return rc, gc, bc View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/9fd88196a947d24149927952f5… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/9fd88196a947d24149927952f5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: Fix undefined var error
by Philipp Hörist 11 Jun '19

11 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: c4012a30 by Philipp Hörist at 2019-06-11T17:31:03Z Fix undefined var error - - - - - 37507ec2 by Philipp Hörist at 2019-06-11T17:31:03Z DataForms: Add validation for list-multi fields - - - - - b262b560 by Philipp Hörist at 2019-06-11T17:31:03Z DataForms: Wrap and justify instructions and title - - - - - 1f626f51 by Philipp Hörist at 2019-06-11T17:31:03Z DataForms: Center some widgets vertically - - - - - 2 changed files: - gajim/gtk/dataform.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/gtk/dataform.py ===================================== @@ -178,6 +178,9 @@ class SizeAdjustment: class Title: def __init__(self, title): self._label = Gtk.Label(label=title) + self._label.set_line_wrap(True) + self._label.set_line_wrap_mode(Pango.WrapMode.WORD) + self._label.set_justify(Gtk.Justification.CENTER) self._label.get_style_context().add_class('data-form-title') def add(self, form_grid, row_number): @@ -189,6 +192,7 @@ class Instructions: self._label = Gtk.Label(label=instructions) self._label.set_line_wrap(True) self._label.set_line_wrap_mode(Pango.WrapMode.WORD) + self._label.set_justify(Gtk.Justification.CENTER) def add(self, form_grid, row_number): form_grid.attach(self._label, 0, row_number, 2, 1) @@ -232,7 +236,8 @@ class Field: 'jid-multi', 'text-single', 'text-private', - 'text-multi'): + 'text-multi', + 'list-multi'): form_grid.attach_next_to(self._warning_box, self._widget, Gtk.PositionType.RIGHT, 1, 1) @@ -280,6 +285,7 @@ class BooleanField(Field): self._widget = Gtk.CheckButton() self._widget.set_active(field.value) self._widget.connect('toggled', self._toggled) + self._widget.set_valign(Gtk.Align.CENTER) def _toggled(self, _widget): self._field.value = self._widget.get_active() @@ -310,6 +316,7 @@ class ListSingleField(Field): Field.__init__(self, field, form_grid, options) self._widget = Gtk.ComboBoxText() + self._widget.set_valign(Gtk.Align.CENTER) for value, label in field.iter_options(): if not label: label = value @@ -327,7 +334,7 @@ class ListMultiField(Field): Field.__init__(self, field, form_grid, options) self._label.set_valign(Gtk.Align.START) - self._treeview = ListMutliTreeView(field) + self._treeview = ListMutliTreeView(field, self) self._widget = Gtk.ScrolledWindow() self._widget.set_propagate_natural_height(True) @@ -335,12 +342,16 @@ class ListMultiField(Field): self._widget.set_max_content_height(300) self._widget.add(self._treeview) + def validate(self): + self._validate() + class ListMutliTreeView(Gtk.TreeView): - def __init__(self, field): + def __init__(self, field, multi_field): Gtk.TreeView.__init__(self) self._field = field + self._multi_field = multi_field self._store = Gtk.ListStore(str, str, bool) @@ -374,6 +385,7 @@ class ListMutliTreeView(Gtk.TreeView): current_value = self._store[iter_][2] self._store.set_value(iter_, 2, not current_value) self._set_values() + self._multi_field.validate() def _set_values(self): values = [] @@ -487,6 +499,7 @@ class TextSingleField(Field): self._widget = Gtk.Entry() self._widget.set_text(field.value) self._widget.connect('changed', self._changed) + self._widget.set_valign(Gtk.Align.CENTER) def _changed(self, _widget): self._field.value = self._widget.get_text() ===================================== gajim/gui_menu_builder.py ===================================== @@ -427,11 +427,11 @@ control=None, gc_contact=None, is_anonymous=True): con = app.connections[account] if con and (con.get_module('PrivacyLists').supported or con.get_module('Blocking').supported): + transport = app.get_transport_name_from_jid(jid, use_config_setting=False) if helpers.jid_is_blocked(account, jid): block_menuitem.set_no_show_all(True) block_menuitem.hide() - if app.get_transport_name_from_jid(jid, use_config_setting=False)\ - and transport != 'jabber': + if transport != 'jabber': unblock_menuitem.set_no_show_all(True) unblock_menuitem.hide() unignore_menuitem.set_no_show_all(False) @@ -443,8 +443,7 @@ control=None, gc_contact=None, is_anonymous=True): else: unblock_menuitem.set_no_show_all(True) unblock_menuitem.hide() - if app.get_transport_name_from_jid(jid, use_config_setting=False)\ - and transport != 'jabber': + if transport != 'jabber': block_menuitem.set_no_show_all(True) block_menuitem.hide() ignore_menuitem.set_no_show_all(False) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/29a7f5cda0f068795feee03deafe5ba64… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/29a7f5cda0f068795feee03deafe5ba64… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] RosterWindow: Fix Index out of range
by Philipp Hörist 10 Jun '19

10 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 29a7f5cd by Daniel Brötzmann at 2019-06-10T20:38:28Z RosterWindow: Fix Index out of range Currently, detecting a file drop on the roster window is not recognized correctly. This fix avoids an Index error thrown after dropping a file on the roster by checking if there is a selection before continuing. - - - - - 1 changed file: - gajim/roster_window.py Changes: ===================================== gajim/roster_window.py ===================================== @@ -4252,6 +4252,10 @@ class RosterWindow: dialog.popup() return + # Check if something is selected + if treeview.get_selection().count_selected_rows() == 0: + return + # a roster entry was dragged and dropped somewhere in the roster # source: the row that was dragged View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/29a7f5cda0f068795feee03deafe5ba645… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/29a7f5cda0f068795feee03deafe5ba645… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] CapsCache: Add room info query
by Philipp Hörist 10 Jun '19

10 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 062b62db by Daniel Brötzmann at 2019-06-10T20:35:16Z CapsCache: Add room info query - - - - - 1 changed file: - gajim/common/caps_cache.py Changes: ===================================== gajim/common/caps_cache.py ===================================== @@ -504,3 +504,21 @@ class MucCapsCache: except KeyError: pass return allowed + + def get_room_infos(self, jid): + room_info = {} + if jid in self.cache: + for form in self.cache[jid].data: + try: + room_info['name'] = form['muc#roomconfig_roomname'].value + except KeyError: + room_info['name'] = None + try: + room_info['desc'] = form['muc#roominfo_description'].value + except KeyError: + room_info['desc'] = None + try: + room_info['lang'] = form['muc#roominfo_lang'].value + except KeyError: + room_info['lang'] = None + return room_info or None View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/062b62db85dedf89bfdc7510789cdf89d4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/062b62db85dedf89bfdc7510789cdf89d4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 7 commits: Dont style delayed messages differently
by Philipp Hörist 10 Jun '19

10 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: cf7b9f26 by Philipp Hörist at 2019-06-10T17:08:55Z Dont style delayed messages differently The timestamp should be enough indication of how recent the message is - - - - - 40dd5cf7 by Philipp Hörist at 2019-06-10T19:31:19Z Remove duplicate code Same code exists in the ChatControlBase.add_message() method already - - - - - 021e3fc1 by Philipp Hörist at 2019-06-10T19:31:27Z Fix documentation - - - - - 99906bfc by Philipp Hörist at 2019-06-10T19:31:27Z Fix MUC Messages sent by the server - - - - - b23759c9 by Philipp Hörist at 2019-06-10T19:31:33Z Rename msg_stanza_id to message_id This helps to prevent confusion because there exist XEP-0359 stanza-ids which are not used here - - - - - 6d50b72e by Philipp Hörist at 2019-06-10T19:31:33Z Remove unused argument graphics was always True, we only use it in add_info_message() - - - - - 0334f676 by Philipp Hörist at 2019-06-10T19:31:33Z ChatControl: Simplify receipt code Determine if we add a receipt mark inisde ConversationsTextview instead of in the ChatControl - - - - - 7 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/config.py - gajim/conversation_textview.py - gajim/data/style/default.css - gajim/groupchat_control.py - gajim/gtk/themes.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -858,7 +858,7 @@ class ChatControl(ChatControlBase): self.add_message( obj.msgtxt, kind, tim=obj.timestamp, encrypted=obj.encrypted, correct_id=obj.correct_id, - msg_stanza_id=obj.message_id, additional_data=obj.additional_data) + message_id=obj.message_id, additional_data=obj.additional_data) def _nec_decrypted_message_received(self, obj): if not obj.msgtxt: @@ -871,18 +871,16 @@ class ChatControl(ChatControlBase): return typ = '' - xep0184_id = None if obj.mtype == 'error': typ = 'error' if obj.forwarded and obj.sent: typ = 'out' - if obj.jid != app.get_jid_from_account(obj.conn.name): - xep0184_id = obj.id_ + self.add_message(obj.msgtxt, typ, tim=obj.timestamp, encrypted=obj.encrypted, subject=obj.subject, xhtml=obj.xhtml, displaymarking=obj.displaymarking, - msg_log_id=obj.msg_log_id, msg_stanza_id=obj.id_, correct_id=obj.correct_id, - xep0184_id=xep0184_id, additional_data=obj.additional_data) + msg_log_id=obj.msg_log_id, message_id=obj.message_id, correct_id=obj.correct_id, + additional_data=obj.additional_data) if obj.msg_log_id: pw = self.parent_win end = self.conv_textview.autoscroll @@ -899,11 +897,8 @@ class ChatControl(ChatControlBase): return self.last_sent_msg = obj.stanza_id - id_ = obj.msg_iq.getID() - xep0184_id = None - if self.contact.jid != app.get_jid_from_account(self.account): - if app.config.get_per('accounts', self.account, 'request_receipt'): - xep0184_id = id_ + message_id = obj.msg_iq.getID() + if obj.label: displaymarking = obj.label.getTag('displaymarking') else: @@ -914,8 +909,8 @@ class ChatControl(ChatControlBase): self.msg_textview, 'gajim-msg-correcting') self.add_message(obj.message, self.contact.jid, tim=obj.timestamp, - encrypted=obj.encrypted, xep0184_id=xep0184_id, xhtml=obj.xhtml, - displaymarking=displaymarking, msg_stanza_id=id_, + encrypted=obj.encrypted, xhtml=obj.xhtml, + displaymarking=displaymarking, message_id=message_id, correct_id=obj.correct_id, additional_data=obj.additional_data) @@ -947,9 +942,9 @@ class ChatControl(ChatControlBase): return app.nicks[self.account] def add_message(self, text, frm='', tim=None, encrypted=None, - subject=None, xhtml=None, xep0184_id=None, - displaymarking=None, msg_log_id=None, correct_id=None, - msg_stanza_id=None, additional_data=None): + subject=None, xhtml=None, + displaymarking=None, msg_log_id=None, correct_id=None, + message_id=None, additional_data=None): """ Print a line in the conversation @@ -988,8 +983,8 @@ class ChatControl(ChatControlBase): xhtml = '<body xmlns="%s">%s</body>' % (NS_XHTML, xhtml) ChatControlBase.add_message(self, text, kind, name, tim, subject=subject, old_kind=self.old_msg_kind, xhtml=xhtml, - xep0184_id=xep0184_id, displaymarking=displaymarking, - msg_log_id=msg_log_id, msg_stanza_id=msg_stanza_id, + displaymarking=displaymarking, + msg_log_id=msg_log_id, message_id=message_id, correct_id=correct_id, additional_data=additional_data, encrypted=encrypted) if text.startswith('/me ') or text.startswith('/me\n'): @@ -1308,20 +1303,21 @@ class ChatControl(ChatControlBase): tim = float(row.time) - if app.config.get('restored_messages_small'): - small_attr = ['small'] - else: - small_attr = [] xhtml = None if msg.startswith('<body '): xhtml = msg if row.subject: msg = _('Subject: %(subject)s\n%(message)s') % \ {'subject': row.subject, 'message': msg} - ChatControlBase.add_message(self, msg, kind, name, - tim, small_attr, small_attr + ['restored_message'], - small_attr + ['restored_message'], False, - old_kind=local_old_kind, xhtml=xhtml, additional_data=additional_data) + ChatControlBase.add_message(self, + msg, + kind, + name, + tim, + restored=True, + old_kind=local_old_kind, + xhtml=xhtml, + additional_data=additional_data) if row.message.startswith('/me ') or row.message.startswith('/me\n'): local_old_kind = None else: ===================================== gajim/chat_control_base.py ===================================== @@ -931,11 +931,12 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): text, 'status', '', None) def add_message(self, text, kind, name, tim, - other_tags_for_name=None, other_tags_for_time=None, other_tags_for_text=None, - count_as_new=True, subject=None, old_kind=None, xhtml=None, - xep0184_id=None, graphics=True, displaymarking=None, msg_log_id=None, - msg_stanza_id=None, correct_id=None, additional_data=None, - encrypted=None): + other_tags_for_name=None, other_tags_for_time=None, + other_tags_for_text=None, restored=False, subject=None, + old_kind=None, xhtml=None, + displaymarking=None, msg_log_id=None, + message_id=None, correct_id=None, additional_data=None, + encrypted=None): """ Print 'chat' type messages correct_id = (message_id, correct_id) @@ -958,16 +959,14 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): textview.print_conversation_line(text, kind, name, tim, other_tags_for_name, other_tags_for_time, other_tags_for_text, - subject, old_kind, xhtml, graphics=graphics, - displaymarking=displaymarking, msg_stanza_id=msg_stanza_id, + subject, old_kind, xhtml, + displaymarking=displaymarking, message_id=message_id, correct_id=correct_id, additional_data=additional_data, encrypted=encrypted) - if xep0184_id is not None: - textview.add_xep0184_mark(xep0184_id) - - if not count_as_new: + if restored: return + if kind == 'incoming': if not self.type_id == message_control.TYPE_GC or \ app.config.notify_for_muc(jid) or \ ===================================== gajim/common/config.py ===================================== @@ -236,7 +236,6 @@ class Config: 'print_status_muc_default': [opt_bool, False, _('Default Setting: Show a status message for all status (away, dnd, etc.) changes of users in a group chat')], 'log_contact_status_changes': [opt_bool, False], 'log_xhtml_messages': [opt_bool, False, _('Log XHTML messages instead of plain text messages.')], - 'restored_messages_small': [opt_bool, True, _('If true, restored messages will use a smaller font than the default one.')], 'hide_avatar_of_transport': [opt_bool, False, _('Don\'t show avatar for the transport itself.')], 'roster_window_skip_taskbar': [opt_bool, False, _('Don\'t show roster in the system taskbar.')], 'use_urgency_hint': [opt_bool, True, _('If true, make the window flash (the default behaviour in most Window Managers) when holding pending events.')], ===================================== gajim/conversation_textview.py ===================================== @@ -206,9 +206,9 @@ class ConversationTextview(GObject.GObject): self.handlers = {} self.image_cache = {} self.xep0184_marks = {} - # self.last_sent_message_id = msg_stanza_id + # self.last_sent_message_id = message_id self.last_sent_message_id = None - # last_received_message_id[name] = (msg_stanza_id, line_start_mark) + # last_received_message_id[name] = (message_id, line_start_mark) self.last_received_message_id = {} self.autoscroll = True # connect signals @@ -285,10 +285,6 @@ class ConversationTextview(GObject.GObject): #Pango.SCALE_SMALL tag.set_property('scale', 0.8333333333333) - tag = buffer_.create_tag('restored_message') - color = app.css_config.get_value('.gajim-restored-message', StyleAttr.COLOR) - tag.set_property('foreground', color) - self.tv.create_tags() tag = buffer_.create_tag('bold') @@ -898,9 +894,9 @@ class ConversationTextview(GObject.GObject): buffer_.insert_with_tags_by_name(iter_, '\n', 'eol') self.just_cleared = False - def get_end_mark(self, msg_stanza_id, start_mark): + def get_end_mark(self, message_id, start_mark): for index, msg in enumerate(self.message_list): - if msg[2] == msg_stanza_id and msg[1] == start_mark: + if msg[2] == message_id and msg[1] == start_mark: try: end_mark = self.message_list[index + 1][1] end_mark_name = end_mark.get_name() @@ -918,7 +914,7 @@ class ConversationTextview(GObject.GObject): return None, None def get_insert_mark(self, timestamp): - # message_list = [(timestamp, line_start_mark, msg_stanza_id)] + # message_list = [(timestamp, line_start_mark, message_id)] # We check if this is a new Message try: if self.message_list[-1][0] <= timestamp: @@ -939,7 +935,7 @@ class ConversationTextview(GObject.GObject): def print_conversation_line(self, text, kind, name, tim, other_tags_for_name=None, other_tags_for_time=None, other_tags_for_text=None, subject=None, old_kind=None, xhtml=None, graphics=True, - displaymarking=None, msg_stanza_id=None, correct_id=None, additional_data=None, + displaymarking=None, message_id=None, correct_id=None, additional_data=None, encrypted=None): """ Print 'chat' type messages @@ -966,12 +962,12 @@ class ConversationTextview(GObject.GObject): index, insert_mark, old_txt = \ self.correct_message(correct_id, kind, name) if correct_id in self.corrected_text_list: - self.corrected_text_list[msg_stanza_id] = \ + self.corrected_text_list[message_id] = \ self.corrected_text_list[correct_id] + '\n{}' \ .format(GLib.markup_escape_text(old_txt)) del self.corrected_text_list[correct_id] else: - self.corrected_text_list[msg_stanza_id] = \ + self.corrected_text_list[message_id] = \ _('<b>Message corrected. Original message:</b>\n{}') \ .format(GLib.markup_escape_text(old_txt)) corrected = True @@ -989,7 +985,7 @@ class ConversationTextview(GObject.GObject): 'Printed Line: %s, %s, %s, inserted after: %s' ', stanza-id: %s, correct-id: %s', self.line, text, tim, insert_mark_name, - msg_stanza_id, correct_id) + message_id, correct_id) if not insert_mark: # Texview is empty or Message is new iter_ = buffer_.get_end_iter() @@ -1058,14 +1054,14 @@ class ConversationTextview(GObject.GObject): if corrected: # Show Correction Icon - buffer_.create_tag(tag_name=msg_stanza_id) + buffer_.create_tag(tag_name=message_id) buffer_.insert(iter_, ' ') icon = load_icon('document-edit-symbolic', self.tv, pixbuf=True) buffer_.insert_pixbuf( iter_, icon) tag_start_iter = iter_.copy() tag_start_iter.backward_chars(2) - buffer_.apply_tag_by_name(msg_stanza_id, tag_start_iter, iter_) + buffer_.apply_tag_by_name(message_id, tag_start_iter, iter_) # If we inserted a Line we add a new line at the end if insert_mark: @@ -1079,18 +1075,18 @@ class ConversationTextview(GObject.GObject): if index is None: # New Message - self.message_list.append((tim, new_mark, msg_stanza_id)) + self.message_list.append((tim, new_mark, message_id)) elif corrected: # Replace the corrected message - self.message_list[index] = (tim, new_mark, msg_stanza_id) + self.message_list[index] = (tim, new_mark, message_id) else: # We insert the message at index - self.message_list.insert(index, (tim, new_mark, msg_stanza_id)) + self.message_list.insert(index, (tim, new_mark, message_id)) if kind == 'incoming': - self.last_received_message_id[name] = (msg_stanza_id, new_mark) + self.last_received_message_id[name] = (message_id, new_mark) elif kind == 'outgoing': - self.last_sent_message_id = (msg_stanza_id, new_mark) + self.last_sent_message_id = (message_id, new_mark) if not insert_mark: if self.autoscroll or kind == 'outgoing': @@ -1101,7 +1097,9 @@ class ConversationTextview(GObject.GObject): buffer_.end_user_action() self.line += 1 - return iter_ + + if kind == 'outgoing' and message_id is not None: + self.add_xep0184_mark(message_id) def get_time_to_show(self, tim, direction_mark=''): """ ===================================== gajim/data/style/default.css ===================================== @@ -1 +1 @@ - .gajim-incoming-nickname { color: rgb(164, 0, 0) } .gajim-outgoing-nickname { color: rgb(52, 101, 164) } .gajim-outgoing-message-text { color: rgb(85, 87, 83) } .gajim-status-message { color: rgb(78, 154, 6) } .gajim-url { color: rgb(32, 74, 135) } .gajim-highlight-message { color: rgb(255, 128, 128) } .gajim-restored-message { color: rgb(85, 87, 83) } .gajim-roster-disconnected { background: rgb(171 ,97 ,97) } .gajim-roster-connected { background: rgb(173, 195, 198) } .gajim-state-composing { color: rgb(0, 139, 0) } .gajim-state-inactive { color: rgb(158, 158, 158) } .gajim-state-gone { color: rgb(128, 128, 128) } .gajim-state-paused { color: rgb(0, 0, 205) } .gajim-message-placeholder { color: rgb(195, 195, 192) } \ No newline at end of file + .gajim-incoming-nickname { color: rgb(164, 0, 0) } .gajim-outgoing-nickname { color: rgb(52, 101, 164) } .gajim-outgoing-message-text { color: rgb(85, 87, 83) } .gajim-status-message { color: rgb(78, 154, 6) } .gajim-url { color: rgb(32, 74, 135) } .gajim-highlight-message { color: rgb(255, 128, 128) } .gajim-roster-disconnected { background: rgb(171 ,97 ,97) } .gajim-roster-connected { background: rgb(173, 195, 198) } .gajim-state-composing { color: rgb(0, 139, 0) } .gajim-state-inactive { color: rgb(158, 158, 158) } .gajim-state-gone { color: rgb(128, 128, 128) } .gajim-state-paused { color: rgb(0, 0, 205) } .gajim-message-placeholder { color: rgb(195, 195, 192) } \ No newline at end of file ===================================== gajim/groupchat_control.py ===================================== @@ -56,7 +56,6 @@ from gajim.common import events from gajim.common import app from gajim.common import helpers from gajim.common.helpers import open_uri -from gajim.common.helpers import AdditionalDataDict from gajim.common import ged from gajim.common.i18n import _ from gajim.common import contacts @@ -1203,7 +1202,7 @@ class GroupchatControl(ChatControlBase): obj.msgtxt, contact=obj.nick, tim=obj.timestamp, correct_id=obj.correct_id, encrypted=obj.encrypted, - msg_stanza_id=obj.message_id, + message_id=obj.message_id, additional_data=obj.additional_data) def _nec_gc_message_received(self, obj): @@ -1217,24 +1216,14 @@ class GroupchatControl(ChatControlBase): xhtml=obj.xhtml_msgtxt, displaymarking=obj.displaymarking, additional_data=obj.additional_data) else: - # message from someone - if obj.delayed: - # don't print xhtml if it's an old message. - # Like that xhtml messages are grayed too. - self.add_delayed_message( - obj.msgtxt, contact=obj.nick, - tim=obj.timestamp, xhtml=None, encrypted=obj.encrypted, - displaymarking=obj.displaymarking, msg_stanza_id=obj.id_, - additional_data=obj.additional_data) - else: - if obj.nick == self.nick: - self.last_sent_txt = obj.msgtxt - self.add_message( - obj.msgtxt, contact=obj.nick, - tim=obj.timestamp, xhtml=obj.xhtml_msgtxt, - displaymarking=obj.displaymarking, encrypted=obj.encrypted, - correct_id=obj.correct_id, msg_stanza_id=obj.id_, - additional_data=obj.additional_data) + if obj.nick == self.nick: + self.last_sent_txt = obj.msgtxt + self.add_message( + obj.msgtxt, contact=obj.nick, + tim=obj.timestamp, xhtml=obj.xhtml_msgtxt, + displaymarking=obj.displaymarking, encrypted=obj.encrypted, + correct_id=obj.correct_id, message_id=obj.message_id, + additional_data=obj.additional_data) obj.needs_highlight = self.needs_visual_notification(obj.msgtxt) def on_private_message(self, nick, sent, msg, tim, xhtml, session, msg_log_id=None, @@ -1287,46 +1276,23 @@ class GroupchatControl(ChatControlBase): return None return self.model.get_iter(path) - - def add_delayed_message(self, text, contact='', tim=None, xhtml=None, - displaymarking=None, msg_stanza_id=None, encrypted=None, additional_data=None): - if additional_data is None: - additional_data = AdditionalDataDict() - - if contact: - if contact == self.nick: # it's us - kind = 'outgoing' - else: - kind = 'incoming' - else: - kind = 'status' - if app.config.get('restored_messages_small'): - small_attr = ['small'] - else: - small_attr = [] - - ChatControlBase.add_message(self, text, kind, contact, tim, - small_attr, small_attr + ['restored_message'], - small_attr + ['restored_message'], count_as_new=False, xhtml=xhtml, - displaymarking=displaymarking, msg_stanza_id=msg_stanza_id, - encrypted=encrypted, additional_data=additional_data) - def add_message(self, text, contact='', tim=None, xhtml=None, - graphics=True, displaymarking=None, correct_id=None, msg_stanza_id=None, - encrypted=None, additional_data=None): + displaymarking=None, correct_id=None, message_id=None, + encrypted=None, additional_data=None): """ - Print a line in the conversation + Add message to the ConversationsTextview - If contact is set: it's a message from someone or an info message - (contact = 'info' in such a case). + If contact is set: it's a message from someone If contact is not set: it's a message from the server or help. """ - if additional_data is None: - additional_data = AdditionalDataDict() + other_tags_for_name = [] other_tags_for_text = [] - if contact == self.nick: # it's us + if not contact: + # Message from the server + kind = 'status' + elif contact == self.nick: # it's us kind = 'outgoing' else: kind = 'incoming' @@ -1353,8 +1319,8 @@ class GroupchatControl(ChatControlBase): ChatControlBase.add_message(self, text, kind, contact, tim, other_tags_for_name, [], other_tags_for_text, xhtml=xhtml, - graphics=graphics, displaymarking=displaymarking, - correct_id=correct_id, msg_stanza_id=msg_stanza_id, encrypted=encrypted, + displaymarking=displaymarking, + correct_id=correct_id, message_id=message_id, encrypted=encrypted, additional_data=additional_data) def get_nb_unread(self): @@ -1533,7 +1499,7 @@ class GroupchatControl(ChatControlBase): frm = 'out' obj.session.control.add_message(obj.msgtxt, frm, tim=obj.timestamp, xhtml=obj.xhtml, encrypted=obj.encrypted, - displaymarking=obj.displaymarking, msg_stanza_id=obj.id_, + displaymarking=obj.displaymarking, message_id=obj.message_id, correct_id=obj.correct_id) else: # otherwise pass it off to the control to be queued ===================================== gajim/gtk/themes.py ===================================== @@ -153,10 +153,6 @@ CSS_STYLE_OPTIONS = [ '.gajim-msg-correcting text', StyleAttr.BACKGROUND), - StyleOption(_('Restored Message Color'), - '.gajim-restored-message', - StyleAttr.COLOR), - StyleOption(_('Contact Disconnected Background'), '.gajim-roster-disconnected', StyleAttr.BACKGROUND), View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b1decf2b142a949a4e85d9ea07521fc36… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b1decf2b142a949a4e85d9ea07521fc36… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove unused argument
by Philipp Hörist 10 Jun '19

10 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: b1decf2b by Philipp Hörist at 2019-06-10T14:17:05Z Remove unused argument - - - - - 3 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/conversation_textview.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -947,7 +947,7 @@ class ChatControl(ChatControlBase): return app.nicks[self.account] def add_message(self, text, frm='', tim=None, encrypted=None, - subject=None, xhtml=None, simple=False, xep0184_id=None, + subject=None, xhtml=None, xep0184_id=None, displaymarking=None, msg_log_id=None, correct_id=None, msg_stanza_id=None, additional_data=None): """ @@ -988,7 +988,7 @@ class ChatControl(ChatControlBase): xhtml = '<body xmlns="%s">%s</body>' % (NS_XHTML, xhtml) ChatControlBase.add_message(self, text, kind, name, tim, subject=subject, old_kind=self.old_msg_kind, xhtml=xhtml, - simple=simple, xep0184_id=xep0184_id, displaymarking=displaymarking, + xep0184_id=xep0184_id, displaymarking=displaymarking, msg_log_id=msg_log_id, msg_stanza_id=msg_stanza_id, correct_id=correct_id, additional_data=additional_data, encrypted=encrypted) ===================================== gajim/chat_control_base.py ===================================== @@ -932,7 +932,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): def add_message(self, text, kind, name, tim, other_tags_for_name=None, other_tags_for_time=None, other_tags_for_text=None, - count_as_new=True, subject=None, old_kind=None, xhtml=None, simple=False, + count_as_new=True, subject=None, old_kind=None, xhtml=None, xep0184_id=None, graphics=True, displaymarking=None, msg_log_id=None, msg_stanza_id=None, correct_id=None, additional_data=None, encrypted=None): @@ -958,7 +958,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): textview.print_conversation_line(text, kind, name, tim, other_tags_for_name, other_tags_for_time, other_tags_for_text, - subject, old_kind, xhtml, simple=simple, graphics=graphics, + subject, old_kind, xhtml, graphics=graphics, displaymarking=displaymarking, msg_stanza_id=msg_stanza_id, correct_id=correct_id, additional_data=additional_data, encrypted=encrypted) ===================================== gajim/conversation_textview.py ===================================== @@ -938,7 +938,7 @@ class ConversationTextview(GObject.GObject): def print_conversation_line(self, text, kind, name, tim, other_tags_for_name=None, other_tags_for_time=None, other_tags_for_text=None, - subject=None, old_kind=None, xhtml=None, simple=False, graphics=True, + subject=None, old_kind=None, xhtml=None, graphics=True, displaymarking=None, msg_stanza_id=None, correct_id=None, additional_data=None, encrypted=None): """ @@ -1017,8 +1017,8 @@ class ConversationTextview(GObject.GObject): self.print_encryption_status(iter_, additional_data) # print the time stamp - self.print_time(text, kind, tim, simple, direction_mark, - other_tags_for_time, iter_) + self.print_time(text, kind, tim, direction_mark, + other_tags_for_time, iter_) # If there's a displaymarking, print it here. if displaymarking: @@ -1189,12 +1189,12 @@ class ConversationTextview(GObject.GObject): trust = additional_data.get_value('encrypted', 'trust') return name, fingerprint, trust - def print_time(self, text, kind, tim, simple, direction_mark, other_tags_for_time, iter_): + def print_time(self, text, kind, tim, direction_mark, other_tags_for_time, iter_): local_tim = time.localtime(tim) buffer_ = self.tv.get_buffer() current_print_time = app.config.get('print_time') - if current_print_time == 'always' and not simple: + if current_print_time == 'always': timestamp_str = self.get_time_to_show(local_tim, direction_mark) timestamp = time.strftime(timestamp_str, local_tim) timestamp = direction_mark + timestamp + direction_mark @@ -1203,7 +1203,7 @@ class ConversationTextview(GObject.GObject): *other_tags_for_time) else: buffer_.insert(iter_, timestamp) - elif current_print_time == 'sometimes' and not simple: + elif current_print_time == 'sometimes': every_foo_seconds = 60 * app.config.get( 'print_ichat_every_foo_minutes') seconds_passed = tim - self.last_time_printout View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b1decf2b142a949a4e85d9ea07521fc36c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b1decf2b142a949a4e85d9ea07521fc36c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove unused argument
by Philipp Hörist 10 Jun '19

10 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: c3461a43 by Philipp Hörist at 2019-06-10T12:38:03Z Remove unused argument - - - - - 2 changed files: - gajim/chat_control_base.py - gajim/conversation_textview.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -923,14 +923,12 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): self.received_history_pos = pos def add_info_message(self, text): - jid = self.contact.jid self.conv_textview.print_conversation_line( - text, jid, 'info', '', None, graphics=False) + text, 'info', '', None, graphics=False) def add_status_message(self, text): - jid = self.contact.jid self.conv_textview.print_conversation_line( - text, jid, 'status', '', None) + text, 'status', '', None) def add_message(self, text, kind, name, tim, other_tags_for_name=None, other_tags_for_time=None, other_tags_for_text=None, @@ -958,7 +956,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): if additional_data is None: additional_data = AdditionalDataDict() - textview.print_conversation_line(text, jid, kind, name, tim, + textview.print_conversation_line(text, kind, name, tim, other_tags_for_name, other_tags_for_time, other_tags_for_text, subject, old_kind, xhtml, simple=simple, graphics=graphics, displaymarking=displaymarking, msg_stanza_id=msg_stanza_id, ===================================== gajim/conversation_textview.py ===================================== @@ -936,7 +936,7 @@ class ConversationTextview(GObject.GObject): # Should not happen, but who knows return None, None - def print_conversation_line(self, text, jid, kind, name, tim, + def print_conversation_line(self, text, kind, name, tim, other_tags_for_name=None, other_tags_for_time=None, other_tags_for_text=None, subject=None, old_kind=None, xhtml=None, simple=False, graphics=True, displaymarking=None, msg_stanza_id=None, correct_id=None, additional_data=None, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c3461a43e36f980d3155b986e2adb94542… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c3461a43e36f980d3155b986e2adb94542… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Add logging to user_nickname module
by Philipp Hörist 10 Jun '19

10 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 603ad003 by Philipp Hörist at 2019-06-10T12:23:31Z Add logging to user_nickname module - - - - - a0f655f2 by Philipp Hörist at 2019-06-10T12:23:31Z Refactor printing info and status messages Add some methods to ChatControlBase to add status and info message to the ConversationTextview instead of going through print_conversation() and print_conversation_line() which adds nothing to info and status messages - - - - - 54437a0f by Philipp Hörist at 2019-06-10T12:23:31Z Rename print_conversation_* methods - - - - - 8 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/modules/message.py - gajim/common/modules/user_nickname.py - gajim/groupchat_control.py - gajim/gui_interface.py - gajim/privatechat_control.py - gajim/roster_window.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -560,7 +560,7 @@ class ChatControl(ChatControlBase): if state in ('connecting', 'connected', 'stop', 'error') and reason: info = _('%(type)s state : %(state)s, reason: %(reason)s') % { 'type': jingle_type.capitalize(), 'state': state, 'reason': reason} - self.print_conversation(info, 'info') + self.add_info_message(info) states = {'connecting': self.JINGLE_STATE_CONNECTING, 'connection_received': self.JINGLE_STATE_CONNECTION_RECEIVED, @@ -855,7 +855,7 @@ class ChatControl(ChatControlBase): if obj.kind == KindConstant.CHAT_MSG_SENT: kind = 'outgoing' - self.print_conversation( + self.add_message( obj.msgtxt, kind, tim=obj.timestamp, encrypted=obj.encrypted, correct_id=obj.correct_id, msg_stanza_id=obj.message_id, additional_data=obj.additional_data) @@ -878,7 +878,7 @@ class ChatControl(ChatControlBase): typ = 'out' if obj.jid != app.get_jid_from_account(obj.conn.name): xep0184_id = obj.id_ - self.print_conversation(obj.msgtxt, typ, + self.add_message(obj.msgtxt, typ, tim=obj.timestamp, encrypted=obj.encrypted, subject=obj.subject, xhtml=obj.xhtml, displaymarking=obj.displaymarking, msg_log_id=obj.msg_log_id, msg_stanza_id=obj.id_, correct_id=obj.correct_id, @@ -913,7 +913,7 @@ class ChatControl(ChatControlBase): gtkgui_helpers.remove_css_class( self.msg_textview, 'gajim-msg-correcting') - self.print_conversation(obj.message, self.contact.jid, tim=obj.timestamp, + self.add_message(obj.message, self.contact.jid, tim=obj.timestamp, encrypted=obj.encrypted, xep0184_id=xep0184_id, xhtml=obj.xhtml, displaymarking=displaymarking, msg_stanza_id=id_, correct_id=obj.correct_id, @@ -946,7 +946,7 @@ class ChatControl(ChatControlBase): def get_our_nick(self): return app.nicks[self.account] - def print_conversation(self, text, frm='', tim=None, encrypted=None, + def add_message(self, text, frm='', tim=None, encrypted=None, subject=None, xhtml=None, simple=False, xep0184_id=None, displaymarking=None, msg_log_id=None, correct_id=None, msg_stanza_id=None, additional_data=None): @@ -967,17 +967,9 @@ class ChatControl(ChatControlBase): if additional_data is None: additional_data = AdditionalDataDict() - if frm == 'status': - if not app.config.get('print_status_in_chats'): - return - kind = 'status' - name = '' - elif frm == 'error': + if frm == 'error': kind = 'error' name = '' - elif frm == 'info': - kind = 'info' - name = '' else: if not frm: kind = 'incoming' @@ -994,7 +986,7 @@ class ChatControl(ChatControlBase): xhtml = create_xhtml(text) if xhtml: xhtml = '<body xmlns="%s">%s</body>' % (NS_XHTML, xhtml) - ChatControlBase.print_conversation_line(self, text, kind, name, tim, + ChatControlBase.add_message(self, text, kind, name, tim, subject=subject, old_kind=self.old_msg_kind, xhtml=xhtml, simple=simple, xep0184_id=xep0184_id, displaymarking=displaymarking, msg_log_id=msg_log_id, msg_stanza_id=msg_stanza_id, @@ -1217,12 +1209,12 @@ class ChatControl(ChatControlBase): if self.contact != obj.contact: return if obj.name == 'ping-sent': - self.print_conversation(_('Ping?'), 'status') + self.add_info_message(_('Ping?')) elif obj.name == 'ping-reply': - self.print_conversation( - _('Pong! (%s seconds)') % obj.seconds, 'status') + self.add_info_message( + _('Pong! (%s seconds)') % obj.seconds) elif obj.name == 'ping-error': - self.print_conversation(_('Error.'), 'status') + self.add_info_message(_('Error.')) def show_avatar(self): if not app.config.get('show_avatar_in_chat'): @@ -1326,7 +1318,7 @@ class ChatControl(ChatControlBase): if row.subject: msg = _('Subject: %(subject)s\n%(message)s') % \ {'subject': row.subject, 'message': msg} - ChatControlBase.print_conversation_line(self, msg, kind, name, + ChatControlBase.add_message(self, msg, kind, name, tim, small_attr, small_attr + ['restored_message'], small_attr + ['restored_message'], False, old_kind=local_old_kind, xhtml=xhtml, additional_data=additional_data) @@ -1358,7 +1350,7 @@ class ChatControl(ChatControlBase): kind = 'print_queue' if event.sent_forwarded: kind = 'out' - self.print_conversation(event.message, kind, tim=event.time, + self.add_message(event.message, kind, tim=event.time, encrypted=event.encrypted, subject=event.subject, xhtml=event.xhtml, displaymarking=event.displaymarking, correct_id=event.correct_id, additional_data=event.additional_data) @@ -1422,11 +1414,14 @@ class ChatControl(ChatControlBase): self.update_ui() self.parent_win.redraw_tab(self) + if not app.config.get('print_status_in_chats'): + return + if status: status = '- %s' % status status_line = _('%(name)s is now %(show)s %(status)s') % { 'name': name, 'show': uf_show, 'status': status or ''} - self.print_conversation(status_line, 'status') + self.add_status_message(status_line) def _info_bar_show_message(self): if self.info_bar.get_visible(): ===================================== gajim/chat_control_base.py ===================================== @@ -922,7 +922,17 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): else: self.received_history_pos = pos - def print_conversation_line(self, text, kind, name, tim, + def add_info_message(self, text): + jid = self.contact.jid + self.conv_textview.print_conversation_line( + text, jid, 'info', '', None, graphics=False) + + def add_status_message(self, text): + jid = self.contact.jid + self.conv_textview.print_conversation_line( + text, jid, 'status', '', None) + + def add_message(self, text, kind, name, tim, other_tags_for_name=None, other_tags_for_time=None, other_tags_for_text=None, count_as_new=True, subject=None, old_kind=None, xhtml=None, simple=False, xep0184_id=None, graphics=True, displaymarking=None, msg_log_id=None, ===================================== gajim/common/modules/message.py ===================================== @@ -226,7 +226,7 @@ class Message(BaseModule): if not event.msgtxt: event.msgtxt = _('message') if event.gc_control: - event.gc_control.print_conversation(event.msgtxt) + event.gc_control.add_info_message(event.msgtxt) else: self._log_error_message(event) error_msg = event.stanza.getErrorMsg() or event.msgtxt ===================================== gajim/common/modules/user_nickname.py ===================================== @@ -48,6 +48,8 @@ class UserNickname(BaseModule): str(properties.jid)): contact.contact_name = nick + self._log.info('Nickname for %s: %s', properties.jid, nick) + app.nec.push_incoming_event( NetworkEvent('nickname-received', account=self._account, ===================================== gajim/groupchat_control.py ===================================== @@ -1199,7 +1199,7 @@ class GroupchatControl(ChatControlBase): return if obj.archive_jid != self.room_jid: return - self.print_conversation( + self.add_message( obj.msgtxt, contact=obj.nick, tim=obj.timestamp, correct_id=obj.correct_id, encrypted=obj.encrypted, @@ -1212,7 +1212,7 @@ class GroupchatControl(ChatControlBase): if not obj.nick: # message from server - self.print_conversation( + self.add_message( obj.msgtxt, tim=obj.timestamp, xhtml=obj.xhtml_msgtxt, displaymarking=obj.displaymarking, additional_data=obj.additional_data) @@ -1221,7 +1221,7 @@ class GroupchatControl(ChatControlBase): if obj.delayed: # don't print xhtml if it's an old message. # Like that xhtml messages are grayed too. - self.print_old_conversation( + self.add_delayed_message( obj.msgtxt, contact=obj.nick, tim=obj.timestamp, xhtml=None, encrypted=obj.encrypted, displaymarking=obj.displaymarking, msg_stanza_id=obj.id_, @@ -1229,7 +1229,7 @@ class GroupchatControl(ChatControlBase): else: if obj.nick == self.nick: self.last_sent_txt = obj.msgtxt - self.print_conversation( + self.add_message( obj.msgtxt, contact=obj.nick, tim=obj.timestamp, xhtml=obj.xhtml_msgtxt, displaymarking=obj.displaymarking, encrypted=obj.encrypted, @@ -1288,7 +1288,7 @@ class GroupchatControl(ChatControlBase): return self.model.get_iter(path) - def print_old_conversation(self, text, contact='', tim=None, xhtml=None, + def add_delayed_message(self, text, contact='', tim=None, xhtml=None, displaymarking=None, msg_stanza_id=None, encrypted=None, additional_data=None): if additional_data is None: additional_data = AdditionalDataDict() @@ -1305,13 +1305,13 @@ class GroupchatControl(ChatControlBase): else: small_attr = [] - ChatControlBase.print_conversation_line(self, text, kind, contact, tim, + ChatControlBase.add_message(self, text, kind, contact, tim, small_attr, small_attr + ['restored_message'], small_attr + ['restored_message'], count_as_new=False, xhtml=xhtml, displaymarking=displaymarking, msg_stanza_id=msg_stanza_id, encrypted=encrypted, additional_data=additional_data) - def print_conversation(self, text, contact='', tim=None, xhtml=None, + def add_message(self, text, contact='', tim=None, xhtml=None, graphics=True, displaymarking=None, correct_id=None, msg_stanza_id=None, encrypted=None, additional_data=None): """ @@ -1325,19 +1325,14 @@ class GroupchatControl(ChatControlBase): additional_data = AdditionalDataDict() other_tags_for_name = [] other_tags_for_text = [] - if contact: - if contact == self.nick: # it's us - kind = 'outgoing' - elif contact == 'info': - kind = 'info' - contact = None - else: - kind = 'incoming' - # muc-specific chatstate - if self.parent_win: - self.parent_win.redraw_tab(self, 'newmsg') + + if contact == self.nick: # it's us + kind = 'outgoing' else: - kind = 'status' + kind = 'incoming' + # muc-specific chatstate + if self.parent_win: + self.parent_win.redraw_tab(self, 'newmsg') if kind == 'incoming': # it's a message NOT from us # highlighting and sounds @@ -1356,7 +1351,7 @@ class GroupchatControl(ChatControlBase): self.check_and_possibly_add_focus_out_line() - ChatControlBase.print_conversation_line(self, text, kind, contact, tim, + ChatControlBase.add_message(self, text, kind, contact, tim, other_tags_for_name, [], other_tags_for_text, xhtml=xhtml, graphics=graphics, displaymarking=displaymarking, correct_id=correct_id, msg_stanza_id=msg_stanza_id, encrypted=encrypted, @@ -1476,7 +1471,7 @@ class GroupchatControl(ChatControlBase): just_joined = self.join_time > time.time() - 10 if app.config.get('show_subject_on_join') or not just_joined: - self.print_conversation(text) + self.add_info_message(text) if event.subject == '': self.subject_button.hide() @@ -1517,7 +1512,7 @@ class GroupchatControl(ChatControlBase): self.is_anonymous = True for change in changes: - self.print_conversation(change) + self.add_info_message(change) def _nec_signed_in(self, obj): if obj.conn.name != self.account: @@ -1536,7 +1531,7 @@ class GroupchatControl(ChatControlBase): frm = '' if obj.sent: frm = 'out' - obj.session.control.print_conversation(obj.msgtxt, frm, + obj.session.control.add_message(obj.msgtxt, frm, tim=obj.timestamp, xhtml=obj.xhtml, encrypted=obj.encrypted, displaymarking=obj.displaymarking, msg_stanza_id=obj.id_, correct_id=obj.correct_id) @@ -1552,13 +1547,13 @@ class GroupchatControl(ChatControlBase): nick = obj.contact.get_shown_name() if obj.name == 'ping-sent': - self.print_conversation(_('Ping? (%s)') % nick) + self.add_info_message(_('Ping? (%s)') % nick) elif obj.name == 'ping-reply': - self.print_conversation( + self.add_info_message( _('Pong! (%(nick)s %(delay)s s.)') % {'nick': nick, 'delay': obj.seconds}) elif obj.name == 'ping-error': - self.print_conversation(_('Error.')) + self.add_info_message(_('Error.')) @property def is_connected(self) -> bool: @@ -1769,8 +1764,7 @@ class GroupchatControl(ChatControlBase): if not self.is_connected: # We just joined the room - self.print_conversation(_('You (%s) joined the room') % nick, - 'info', graphics=False) + self.add_info_message(_('You (%s) joined the room') % nick) self.add_contact_to_roster(nick) self.got_connected() @@ -1788,27 +1782,26 @@ class GroupchatControl(ChatControlBase): # We just need to invite contacts for jid in app.automatic_rooms[self.account][self.room_jid]['invities']: con.get_module('MUC').invite(self.room_jid, jid) - self.print_conversation( + self.add_info_message( _('%(jid)s has been ' - 'invited in this room') % {'jid': jid}, - graphics=False) + 'invited in this room') % {'jid': jid}) if StatusCode.NON_ANONYMOUS in status_codes: - self.print_conversation( + self.add_info_message( _('Any occupant is allowed to see your full JID')) self.is_anonymous = False if StatusCode.CONFIG_ROOM_LOGGING in status_codes: - self.print_conversation(_('Room logging is enabled')) + self.add_info_message(_('Room logging is enabled')) if StatusCode.NICKNAME_MODIFIED in status_codes: - self.print_conversation(\ + self.add_info_message(\ _('The server has assigned or modified your roomnick')) if event.properties.is_new_room: app.connections[self.account].get_module('Discovery').disco_muc( self.room_jid, self._on_room_created, update=True) - self.print_conversation(_('A new room has been created')) + self.add_info_message(_('A new room has been created')) con = app.connections[self.account] con.get_module('MUC').request_config(self.room_jid) @@ -1831,7 +1824,7 @@ class GroupchatControl(ChatControlBase): 'as {new_nick}').format(nick=nick, new_nick=new_nick) self._nick_completion.contact_renamed(nick, new_nick) - self.print_conversation(message, 'info', graphics=False) + self.add_info_message(message) tv = self.conv_textview if nick in tv.last_received_message_id: @@ -1858,14 +1851,14 @@ class GroupchatControl(ChatControlBase): if event.properties.is_muc_self_presence: message = _('You are now {show}{status}').format(show=show, status=status) - self.print_conversation(message, 'info', graphics=False) + self.add_status_message(message) elif app.config.get_per('rooms', self.room_jid, 'print_status', status_default): message = _('{nick} is now {show}{status}').format(nick=nick, show=show, status=status) - self.print_conversation(message, 'info', graphics=False) + self.add_status_message(message) self.draw_contact(nick) @@ -1899,7 +1892,7 @@ class GroupchatControl(ChatControlBase): actor=actor, reason=reason) - self.print_conversation(message, graphics=False) + self.add_info_message(message) self.draw_contact(nick) self.update_actions() @@ -1930,7 +1923,7 @@ class GroupchatControl(ChatControlBase): actor=actor, reason=reason) - self.print_conversation(message, graphics=False) + self.add_info_message(message) self.remove_contact(nick) self.add_contact_to_roster(nick) self.update_actions() @@ -1960,39 +1953,39 @@ class GroupchatControl(ChatControlBase): #Group Chat: Server kicked us because of an server error message = _('You have left due ' 'to an error{reason}').format(reason=reason) - self.print_conversation(message, 'info', graphics=False) + self.add_info_message(message) elif StatusCode.REMOVED_KICKED in status_codes: #Group Chat: We have been kicked by Alice: reason message = _('You have been ' 'kicked{actor}{reason}').format(actor=actor, reason=reason) - self.print_conversation(message, 'info', graphics=False) + self.add_info_message(message) elif StatusCode.REMOVED_BANNED in status_codes: #Group Chat: We have been banned by Alice: reason message = _('You have been ' 'banned{actor}{reason}').format(actor=actor, reason=reason) - self.print_conversation(message, 'info', graphics=False) + self.add_info_message(message) elif StatusCode.REMOVED_AFFILIATION_CHANGE in status_codes: #Group Chat: We were removed because of an affiliation change reason = _(': Affiliation changed') message = message.format(actor=actor, reason=reason) - self.print_conversation(message, 'info', graphics=False) + self.add_info_message(message) elif StatusCode.REMOVED_NONMEMBER_IN_MEMBERS_ONLY in status_codes: #Group Chat: Room configuration changed reason = _(': Room configuration changed to members-only') message = message.format(actor=actor, reason=reason) - self.print_conversation(message, 'info', graphics=False) + self.add_info_message(message) elif StatusCode.REMOVED_SERVICE_SHUTDOWN in status_codes: #Group Chat: Kicked because of server shutdown reason = ': System shutdown' message = message.format(actor=actor, reason=reason) - self.print_conversation(message, 'info', graphics=False) + self.add_info_message(message) self.autorejoin = True self.got_disconnected() @@ -2029,7 +2022,7 @@ class GroupchatControl(ChatControlBase): #Group Chat: User was kicked because of an server error: reason message = _('{nick} has left due to ' 'an error{reason}').format(nick=nick, reason=reason) - self.print_conversation(message, 'info', graphics=False) + self.add_info_message(message) elif StatusCode.REMOVED_KICKED in status_codes: #Group Chat: User was kicked by Alice: reason @@ -2037,7 +2030,7 @@ class GroupchatControl(ChatControlBase): 'kicked{actor}{reason}').format(nick=nick, actor=actor, reason=reason) - self.print_conversation(message, 'info', graphics=False) + self.add_info_message(message) elif StatusCode.REMOVED_BANNED in status_codes: #Group Chat: User was banned by Alice: reason @@ -2045,22 +2038,22 @@ class GroupchatControl(ChatControlBase): 'banned{actor}{reason}').format(nick=nick, actor=actor, reason=reason) - self.print_conversation(message, 'info', graphics=False) + self.add_info_message(message) elif StatusCode.REMOVED_AFFILIATION_CHANGE in status_codes: reason = _(': Affiliation changed') message = message.format(nick=nick, actor=actor, reason=reason) - self.print_conversation(message, 'info', graphics=False) + self.add_info_message(message) elif StatusCode.REMOVED_NONMEMBER_IN_MEMBERS_ONLY in status_codes: reason = _(': Room configuration changed to members-only') message = message.format(nick=nick, actor=actor, reason=reason) - self.print_conversation(message, 'info', graphics=False) + self.add_info_message(message) elif print_join_left: message = _('{nick} has left{reason}').format(nick=nick, reason=reason) - self.print_conversation(message, 'info', graphics=False) + self.add_info_message(message) self.remove_contact(nick) self.draw_all_roles() @@ -2079,8 +2072,7 @@ class GroupchatControl(ChatControlBase): self.add_contact_to_roster(nick) if self.is_connected and print_join_left: - self.print_conversation(_('%s has joined the group chat') % nick, - graphics=False) + self.add_info_message(_('%s has joined the group chat') % nick) def _on_presence_error(self, event): if event.account != self.account: @@ -2135,7 +2127,7 @@ class GroupchatControl(ChatControlBase): self.account, self.room_jid, win) else: - self.print_conversation( + self.add_info_message( 'Error %s: %s' % (error_type.value, error_message)) self.autorejoin = False @@ -2192,13 +2184,13 @@ class GroupchatControl(ChatControlBase): reason = '' if reason is None else ': %s' % reason message = _('Room has been destroyed') - self.print_conversation(message, 'info', graphics=False) + self.add_info_message(message) alternate = destroyed.alternate if alternate is not None: join_message = _('You can join this room ' 'instead: xmpp:%s?join') % alternate - self.print_conversation(join_message, 'info', graphics=False) + self.add_info_message(join_message) self.autorejoin = False self.got_disconnected() @@ -2492,8 +2484,8 @@ class GroupchatControl(ChatControlBase): con = app.connections[self.account] con.get_module('MUC').invite(self.room_jid, contact_jid) - self.print_conversation(_('%(jid)s has been invited in this room') % - {'jid': contact_jid}, graphics=False) + self.add_info_message(_('%(jid)s has been invited in this room') % + {'jid': contact_jid}) def _jid_not_blocked(self, bare_jid: str) -> bool: fjid = self.room_jid + '/' + bare_jid ===================================== gajim/gui_interface.py ===================================== @@ -206,7 +206,7 @@ class Interface: ctrl = self.msg_win_mgr.get_control(event.properties.jid.getBare(), event.account) if ctrl and ctrl.type_id == message_control.TYPE_GC: - ctrl.print_conversation('Error: %s' % event.properties.error) + ctrl.add_info_message('Error: %s' % event.properties.error) @staticmethod def handle_event_connection_lost(obj): @@ -360,12 +360,12 @@ class Interface: account=account, name=nick, show=show) ctrl = self.new_private_chat(gc_c, account, session) - ctrl.print_conversation(_('Error %(code)s: %(msg)s') % { - 'code': obj.error_code, 'msg': obj.error_msg}, 'status') + ctrl.add_info_message(_('Error %(code)s: %(msg)s') % { + 'code': obj.error_code, 'msg': obj.error_msg}) return - gc_control.print_conversation(_('Error %(code)s: %(msg)s') % { - 'code': obj.error_code, 'msg': obj.error_msg}, 'status') + gc_control.add_info_message(_('Error %(code)s: %(msg)s') % { + 'code': obj.error_code, 'msg': obj.error_msg}) if gc_control.parent_win and \ gc_control.parent_win.get_active_jid() == jid: gc_control.set_subject(gc_control.subject) @@ -509,9 +509,9 @@ class Interface: gc_control = self.msg_win_mgr.get_gc_control(obj.jid, account) if gc_control: - gc_control.print_conversation( + gc_control.add_info_message( _('%(jid)s has been invited in this room') % { - 'jid': jid}, graphics=False) + 'jid': jid}) del app.automatic_rooms[account][obj.jid] else: win = app.get_app_window('GroupchatConfig', account, obj.jid) @@ -525,14 +525,13 @@ class Interface: event.account) if gc_control: if event.reason: - gc_control.print_conversation( + gc_control.add_info_message( _('%(jid)s declined the invitation: %(reason)s') % { - 'jid': event.from_, 'reason': event.reason}, - graphics=False) + 'jid': event.from_, 'reason': event.reason}) else: - gc_control.print_conversation( + gc_control.add_info_message( _('%(jid)s declined the invitation') % { - 'jid': event.from_}, graphics=False) + 'jid': event.from_}) def handle_event_gc_invitation(self, event): if helpers.allow_popup_window(event.account) or not self.systray_enabled: ===================================== gajim/privatechat_control.py ===================================== @@ -114,7 +114,7 @@ class PrivateChatControl(ChatControl): message = _('{nick} is now known ' 'as {new_nick}').format(nick=nick, new_nick=new_nick) - self.print_conversation(message, 'info') + self.add_info_message(message) self.draw_banner() app.interface.msg_win_mgr.change_key(str(event.properties.jid), @@ -140,14 +140,14 @@ class PrivateChatControl(ChatControl): if event.properties.is_muc_self_presence: message = _('You are now {show}{status}').format(show=show, status=status) - self.print_conversation(message, 'info') + self.add_status_message(message) elif app.config.get_per('rooms', self.room_name, 'print_status', status_default): message = _('{nick} is now {show}{status}').format(nick=nick, show=show, status=status) - self.print_conversation(message, 'info') + self.add_status_message(message) self.parent_win.redraw_tab(self) self.update_ui() ===================================== gajim/roster_window.py ===================================== @@ -3013,9 +3013,9 @@ class RosterWindow: gc_control = app.interface.msg_win_mgr.get_gc_control(room_jid, room_account) if gc_control: - gc_control.print_conversation( + gc_control.add_info_message( _('%(jid)s has been invited in this room') % { - 'jid': contact_jid}, graphics=False) + 'jid': contact_jid}) def on_all_groupchat_maximized(self, widget, group_list): for (contact, account) in group_list: View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/0da3aa2d310d8f12dfe7206ba7259d7ad… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/0da3aa2d310d8f12dfe7206ba7259d7ad… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] PluginsGUI: Disable expand for installed plugins box
by Philipp Hörist 10 Jun '19

10 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0da3aa2d by Daniel Brötzmann at 2019-06-01T22:48:41Z PluginsGUI: Disable expand for installed plugins box - - - - - 1 changed file: - gajim/data/gui/plugins_window.ui Changes: ===================================== gajim/data/gui/plugins_window.ui ===================================== @@ -24,20 +24,16 @@ <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">18</property> - <property name="margin_right">18</property> - <property name="margin_top">18</property> - <property name="margin_bottom">18</property> + <property name="border_width">18</property> <property name="spacing">18</property> <child> - <object class="GtkBox" id="vbox6"> + <object class="GtkBox"> <property name="width_request">200</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="GtkScrolledWindow" id="scrolledwindow1"> + <object class="GtkScrolledWindow"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hscrollbar_policy">never</property> @@ -71,10 +67,10 @@ <object class="GtkToolButton" id="install_plugin_button"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">Install Plugin from File</property> + <property name="tooltip_text" translatable="yes">Install Plugin from ZIP-File</property> <property name="label" translatable="yes">Install from File…</property> <property name="use_underline">True</property> - <property name="icon_name">document-open-symbolic</property> + <property name="icon_name">system-software-install-symbolic</property> <signal name="clicked" handler="on_install_plugin_button_clicked" swapped="no"/> </object> <packing> @@ -88,7 +84,7 @@ <property name="can_focus">False</property> <property name="tooltip_text" translatable="yes">Uninstall Plugin</property> <property name="use_underline">True</property> - <property name="icon_name">list-remove-symbolic</property> + <property name="icon_name">edit-delete-symbolic</property> <signal name="clicked" handler="on_uninstall_plugin_button_clicked" swapped="no"/> </object> <packing> @@ -250,7 +246,7 @@ <property name="row_spacing">6</property> <property name="column_spacing">12</property> <child> - <object class="GtkLabel" id="label5"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -282,7 +278,7 @@ </packing> </child> <child> - <object class="GtkLabel" id="label4"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -315,7 +311,7 @@ </packing> </child> <child> - <object class="GtkLabel" id="label6"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -362,7 +358,7 @@ </object> </child> <child type="tab"> - <object class="GtkLabel" id="label1"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Installed</property> View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0da3aa2d310d8f12dfe7206ba7259d7ada… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0da3aa2d310d8f12dfe7206ba7259d7ada… 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 June 2019