Commits March 2017

commits@gajim.org

1 participants
31 discussions

[Git][gajim/gajim][master] 4 commits: Simplify import and move to the top
by Philipp Hörist 11 Mar '17

11 Mar '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3f38ccc3 by Philipp Hörist at 2017-03-11T22:11:00+01:00 Simplify import and move to the top - - - - - 1e06db9f by Philipp Hörist at 2017-03-11T22:11:01+01:00 Remove smooth scrolling GTK3+ does smooth scrolling in ScrolledWindows on its own - - - - - 8547d2b4 by Philipp Hörist at 2017-03-11T22:11:02+01:00 Simplify scrolling in conversation textview - - - - - 55561b3d by Philipp Hörist at 2017-03-11T22:18:37+01:00 Merge branch 'scrolling' into 'master' Improve Scrolling See merge request !65 - - - - - 5 changed files: - src/chat_control.py - src/chat_control_base.py - src/common/config.py - src/conversation_textview.py - src/gui_interface.py Changes: ===================================== src/chat_control.py ===================================== --- a/src/chat_control.py +++ b/src/chat_control.py @@ -39,6 +39,7 @@ import gui_menu_builder import message_control import dialogs +from common import logger from common import gajim from common import helpers from common import exceptions @@ -1626,10 +1627,9 @@ class ChatControl(ChatControlBase): rows = gajim.logger.get_last_conversation_lines(jid, restore_how_many, pending_how_many, timeout, self.account) except exceptions.DatabaseMalformed: - import common.logger dialogs.ErrorDialog(_('Database Error'), _('The database file (%s) cannot be read. Try to repair it or ' - 'remove it (all history will be lost).') % common.logger.LOG_DB_PATH) + 'remove it (all history will be lost).') % logger.LOG_DB_PATH) rows = [] local_old_kind = None self.conv_textview.just_cleared = True ===================================== src/chat_control_base.py ===================================== --- a/src/chat_control_base.py +++ b/src/chat_control_base.py @@ -323,7 +323,6 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): id_ = widget.connect('changed', self.on_conversation_vadjustment_changed) self.handlers[id_] = widget - self.scroll_to_end_id = None self.was_at_the_end = True self.correcting = False self.last_sent_msg = None @@ -984,27 +983,8 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): # There were events to remove self.redraw_after_event_removed(jid) - def bring_scroll_to_end(self, textview, diff_y=0): - """ - Scroll to the end of textview if end is not visible - """ - if self.scroll_to_end_id: - # a scroll is already planned - return - buffer_ = textview.get_buffer() - end_iter = buffer_.get_end_iter() - end_rect = textview.get_iter_location(end_iter) - visible_rect = textview.get_visible_rect() - # scroll only if expected end is not visible - if end_rect.y >= (visible_rect.y + visible_rect.height + diff_y): - self.scroll_to_end_id = GLib.idle_add(self.scroll_to_end_iter, - textview) - - def scroll_to_end_iter(self, textview): - buffer_ = textview.get_buffer() - end_iter = buffer_.get_end_iter() - textview.scroll_to_iter(end_iter, 0, False, 1, 1) - self.scroll_to_end_id = None + def scroll_to_end_iter(self): + self.conv_textview.scroll_to_end_iter() return False def on_configure_event(self, msg_textview, event): @@ -1065,18 +1045,11 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): # used to stay at the end of the textview when we shrink conversation # textview. if self.was_at_the_end: - if self.conv_textview.at_the_end(): - # we are at the end - self.conv_textview.bring_scroll_to_end(-18) - else: - self.conv_textview.bring_scroll_to_end(-18, use_smooth=False) + self.scroll_to_end_iter() self.was_at_the_end = (adjustment.get_upper() - adjustment.get_value()\ - adjustment.get_page_size()) < 18 def on_conversation_vadjustment_value_changed(self, adjustment): - # stop automatic scroll when we manually scroll - if not self.conv_textview.auto_scrolling: - self.conv_textview.stop_scrolling() self.was_at_the_end = (adjustment.get_upper() - adjustment.get_value() \ - adjustment.get_page_size()) < 18 if self.resource: ===================================== src/common/config.py ===================================== --- a/src/common/config.py +++ b/src/common/config.py @@ -279,7 +279,6 @@ class Config: 'hide_groupchat_occupants_list': [opt_bool, False, _('Hides the group chat occupants list in group chat window.')], 'chat_merge_consecutive_nickname': [opt_bool, False, _('In a chat, show the nickname at the beginning of a line only when it\'s not the same person talking than in previous message.')], 'chat_merge_consecutive_nickname_indent': [opt_str, ' ', _('Indentation when using merge consecutive nickname.')], - 'use_smooth_scrolling': [opt_bool, True, _('Smooth scroll message in conversation window')], 'gc_nicknames_colors': [ opt_str, '#4e9a06:#f57900:#ce5c00:#3465a4:#204a87:#75507b:#5c3566:#c17d11:#8f5902:#ef2929:#cc0000:#a40000', _('List of colors, separated by ":", that will be used to color nicknames in group chats.'), True ], 'ctrl_tab_go_to_next_composing': [opt_bool, True, _('Ctrl-Tab go to next composing tab when none is unread.')], 'confirm_metacontacts': [ opt_str, '', _('Should we show the confirm metacontacts creation dialog or not? Empty string means we never show the dialog.')], ===================================== src/conversation_textview.py ===================================== --- a/src/conversation_textview.py +++ b/src/conversation_textview.py @@ -216,9 +216,6 @@ class ConversationTextview(GObject.GObject): # last_received_message_id[name] = (msg_stanza_id, line_start_mark) self.last_received_message_id = {} - # It's True when we scroll in the code, so we can detect scroll from user - self.auto_scrolling = False - # connect signals id_ = self.tv.connect('populate_popup', self.on_textview_populate_popup) self.handlers[id_] = self.tv @@ -325,7 +322,6 @@ class ConversationTextview(GObject.GObject): # holds a mark at the end of --- line self.focus_out_end_mark = None - self.smooth_id = None self.just_cleared = False def query_tooltip(self, widget, x_pos, y_pos, keyboard_mode, tooltip): @@ -398,87 +394,7 @@ class ConversationTextview(GObject.GObject): self.tv.tagSthAtSth.set_property('foreground', color) def at_the_end(self): - buffer_ = self.tv.get_buffer() - end_iter = buffer_.get_end_iter() - end_rect = self.tv.get_iter_location(end_iter) - visible_rect = self.tv.get_visible_rect() - if end_rect.y <= (visible_rect.y + visible_rect.height): - return True - return False - - # Smooth scrolling inspired by Pidgin code - def smooth_scroll(self): - parent = self.tv.get_parent() - if not parent: - return False - vadj = parent.get_vadjustment() - max_val = vadj.get_upper() - vadj.get_page_size() + 1 - cur_val = vadj.get_value() - # scroll by 1/3rd of remaining distance - onethird = cur_val + ((max_val - cur_val) / 3.0) - self.auto_scrolling = True - vadj.set_value(onethird) - self.auto_scrolling = False - if max_val - onethird < 0.01: - self.smooth_id = None - self.smooth_scroll_timer.cancel() - return False - return True - - def smooth_scroll_timeout(self): - GLib.idle_add(self.do_smooth_scroll_timeout) - return - - def do_smooth_scroll_timeout(self): - if not self.smooth_id: - # we finished scrolling - return - GLib.source_remove(self.smooth_id) - self.smooth_id = None - parent = self.tv.get_parent() - if parent: - vadj = parent.get_vadjustment() - self.auto_scrolling = True - vadj.set_value(vadj.get_upper() - vadj.get_page_size() + 1) - self.auto_scrolling = False - - def smooth_scroll_to_end(self): - if self.smooth_id is not None: # already scrolling - return False - self.smooth_id = GLib.timeout_add(self.SCROLL_DELAY, - self.smooth_scroll) - self.smooth_scroll_timer = Timer(self.MAX_SCROLL_TIME, - self.smooth_scroll_timeout) - self.smooth_scroll_timer.start() - return False - - def scroll_to_end(self): - parent = self.tv.get_parent() - buffer_ = self.tv.get_buffer() - end_mark = buffer_.get_mark('end') - if not end_mark: - return False - self.auto_scrolling = True - self.tv.scroll_to_mark(end_mark, 0, True, 0, 1) - adjustment = parent.get_hadjustment() - adjustment.set_value(0) - self.auto_scrolling = False - return False # when called in an idle_add, just do it once - - def bring_scroll_to_end(self, diff_y=0, use_smooth=None): - ''' scrolls to the end of textview if end is not visible ''' - if use_smooth is None: - use_smooth = gajim.config.get('use_smooth_scrolling') - buffer_ = self.tv.get_buffer() - end_iter = buffer_.get_end_iter() - end_rect = self.tv.get_iter_location(end_iter) - visible_rect = self.tv.get_visible_rect() - # scroll only if expected end is not visible - if end_rect.y >= (visible_rect.y + visible_rect.height + diff_y): - if use_smooth: - GLib.idle_add(self.smooth_scroll_to_end) - else: - GLib.idle_add(self.scroll_to_end_iter) + return gtkgui_helpers.at_the_end(self.tv.get_parent()) def scroll_to_end_iter(self): buffer_ = self.tv.get_buffer() @@ -488,12 +404,6 @@ class ConversationTextview(GObject.GObject): self.tv.scroll_to_iter(end_iter, 0, False, 1, 1) return False # when called in an idle_add, just do it once - def stop_scrolling(self): - if self.smooth_id: - GLib.source_remove(self.smooth_id) - self.smooth_id = None - self.smooth_scroll_timer.cancel() - def correct_message(self, correct_id, kind, name): allowed = True if kind == 'incoming': @@ -649,7 +559,7 @@ class ConversationTextview(GObject.GObject): if scroll: # scroll to the end (via idle in case the scrollbar has # appeared) - GLib.idle_add(self.scroll_to_end) + GLib.idle_add(self.scroll_to_end_iter) def on_textview_draw(self, widget, ctx): return @@ -1283,8 +1193,6 @@ class ConversationTextview(GObject.GObject): # even if we insert directly at the mark iter temp_mark = buffer_.create_mark('temp', iter_, left_gravity=True) - at_the_end = self.at_the_end() - if text.startswith('/me '): direction_mark = i18n.paragraph_direction_mark(str(text[3:])) else: @@ -1369,13 +1277,9 @@ class ConversationTextview(GObject.GObject): self.last_sent_message_id = (msg_stanza_id, new_mark) if not insert_mark: - if at_the_end or kind == 'outgoing': + if self.at_the_end() or kind == 'outgoing': # we are at the end or we are sending something - # scroll to the end (via idle in case the scrollbar has appeared) - if gajim.config.get('use_smooth_scrolling'): - GLib.idle_add(self.smooth_scroll_to_end) - else: - GLib.idle_add(self.scroll_to_end) + GLib.idle_add(self.scroll_to_end_iter) self.just_cleared = False buffer_.end_user_action() ===================================== src/gui_interface.py ===================================== --- a/src/gui_interface.py +++ b/src/gui_interface.py @@ -1831,7 +1831,7 @@ class Interface: # Using isinstance here because we want to catch all derived types if isinstance(ctrl, ChatControlBase): tv = ctrl.conv_textview - tv.scroll_to_end() + tv.scroll_to_end_iter() ################################################################################ ### Methods dealing with emoticons View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b7cce4e7282a3da7016d52baeef2b11de…

1 0

[Git][gajim/gajim][master] 5 commits: Refactor showing tooltip in HtmlTextView
by Philipp Hörist 11 Mar '17

11 Mar '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6de3120d by Philipp Hörist at 2017-03-07T22:06:31+01:00 Refactor showing tooltip in HtmlTextView The 'query-tooltip' event does essentially the same as the 'motion-notify-event' but supplys us with coordinates, which lets us get rid of deprecated get_client_pointer() Add a connect_tooltip() method that allows other classes that use HtmlTextView to provide their own tooltip method - - - - - c61efaa2 by Philipp Hörist at 2017-03-07T22:06:44+01:00 Replace deprecated Gdk.Cursor.new() - - - - - 209154ed by Philipp Hörist at 2017-03-08T16:14:07+01:00 Refactor showing tooltip in ConversationTextview the 'query-tooltip' event does essentially the same as the 'motion-notify-event' but supplys us with coordinates, which lets us get rid of deprecated get_client_pointer() - - - - - 8af80a61 by Philipp Hörist at 2017-03-08T19:46:39+01:00 Dont change mouse cursor on leave event GTK does this on itself - - - - - b7cce4e7 by Philipp Hörist at 2017-03-11T21:58:12+01:00 Merge branch 'refactoring' into 'master' Replace some deprecated methods See merge request !64 - - - - - 6 changed files: - src/chat_control.py - src/conversation_textview.py - src/dialogs.py - src/gtkgui_helpers.py - src/htmltextview.py - src/plugins/gui.py Changes: ===================================== src/chat_control.py ===================================== --- a/src/chat_control.py +++ b/src/chat_control.py @@ -664,11 +664,11 @@ class ChatControl(ChatControlBase): """ Just moved the mouse so show the cursor """ - cursor = Gdk.Cursor.new(Gdk.CursorType.LEFT_PTR) + cursor = gtkgui_helpers.get_cursor('LEFT_PTR') self.parent_win.window.get_window().set_cursor(cursor) def on_location_eventbox_enter_notify_event(self, widget, event): - cursor = Gdk.Cursor.new(Gdk.CursorType.HAND2) + cursor = gtkgui_helpers.get_cursor('HAND2') self.parent_win.window.get_window().set_cursor(cursor) def _on_window_motion_notify(self, widget, event): ===================================== src/conversation_textview.py ===================================== --- a/src/conversation_textview.py +++ b/src/conversation_textview.py @@ -193,9 +193,10 @@ class ConversationTextview(GObject.GObject): # no need to inherit TextView, use it as atrribute is safer self.tv = HtmlTextView() + # we have to override HtmlTextView Event handlers + # because we dont inherit self.tv.hyperlink_handler = self.hyperlink_handler - - self.tv.set_has_tooltip(True) + self.tv.connect_tooltip(self.query_tooltip) # set properties self.tv.set_border_width(1) @@ -219,23 +220,16 @@ class ConversationTextview(GObject.GObject): self.auto_scrolling = False # connect signals - id_ = self.tv.connect('motion_notify_event', - self.on_textview_motion_notify_event) - self.handlers[id_] = self.tv id_ = self.tv.connect('populate_popup', self.on_textview_populate_popup) self.handlers[id_] = self.tv id_ = self.tv.connect('button_press_event', self.on_textview_button_press_event) self.handlers[id_] = self.tv - id_ = self.tv.connect('draw', self.on_textview_draw) self.handlers[id_] = self.tv - id_ = self.tv.connect('query-tooltip', self.query_tooltip) - self.handlers[id_] = self.tv - self.account = account - self.change_cursor = False + self.cursor_changed = False self.last_time_printout = 0 style = self.tv.get_style_context() @@ -331,12 +325,11 @@ class ConversationTextview(GObject.GObject): # holds a mark at the end of --- line self.focus_out_end_mark = None - self.xep0184_warning_tooltip = tooltips.BaseTooltip() - self.smooth_id = None self.just_cleared = False def query_tooltip(self, widget, x_pos, y_pos, keyboard_mode, tooltip): + window = widget.get_window(Gtk.TextWindowType.TEXT) x_pos, y_pos = self.tv.window_to_buffer_coords( Gtk.TextWindowType.TEXT, x_pos, y_pos) if Gtk.MINOR_VERSION > 18: @@ -351,13 +344,37 @@ class ConversationTextview(GObject.GObject): 'been said since the\nlast time you paid attention to this ' 'group chat')) return True - + if tag_name == 'xep0184-warning': + tooltip.set_text(_( + 'This icon indicates that this message has not ' + 'yet\nbeen received by the remote ' + "end. If this icon stays\nfor a long time, it's likely the " + 'message got lost.')) + window.set_cursor(gtkgui_helpers.get_cursor('LEFT_PTR')) + self.cursor_changed = True + return True + if getattr(tag, 'is_anchor', False): + text = getattr(tag, 'title', False) + if text: + if len(text) > 50: + text = text[:47] + '…' + tooltip.set_text(text) + window.set_cursor(gtkgui_helpers.get_cursor('HAND2')) + self.cursor_changed = True + return True + if tag_name in ('url', 'mail', 'xmpp', 'sth_at_sth'): + window.set_cursor(gtkgui_helpers.get_cursor('HAND2')) + self.cursor_changed = True + return False try: text = self.corrected_text_list[tag_name] tooltip.set_markup(text) return True except KeyError: pass + if self.cursor_changed: + window.set_cursor(gtkgui_helpers.get_cursor('XTERM')) + self.cursor_changed = False return False def del_handlers(self): @@ -634,31 +651,6 @@ class ConversationTextview(GObject.GObject): # appeared) GLib.idle_add(self.scroll_to_end) - def show_xep0184_warning_tooltip(self): - self.xep0184_warning_tooltip.timeout = 0 - w = self.tv.get_window(Gtk.TextWindowType.TEXT) - device = w.get_display().get_device_manager().get_client_pointer() - pointer = w.get_device_position(device) - x = pointer[1] - y = pointer[2] - iter_ = self.tv.get_iter_at_location(x, y) - if isinstance(iter_, tuple): - iter_ = iter_[1] - tags = iter_.get_tags() - tag_table = self.tv.get_buffer().get_tag_table() - xep0184_warning = False - for tag in tags: - if tag == tag_table.lookup('xep0184-warning'): - xep0184_warning = True - break - if xep0184_warning and not self.xep0184_warning_tooltip.win: - # check if the current pointer is still over the line - position = w.get_origin()[1:] - self.xep0184_warning_tooltip.show_tooltip(_('This icon indicates ' - 'that this message has not yet\nbeen received by the remote ' - "end. If this icon stays\nfor a long time, it's likely the " - 'message got lost.'), 8, position[1] + y) - def on_textview_draw(self, widget, ctx): return #TODO @@ -687,45 +679,6 @@ class ConversationTextview(GObject.GObject): return True return False - def on_textview_motion_notify_event(self, widget, event): - """ - Change the cursor to a hand when we are over a mail or an url - """ - w = self.tv.get_window(Gtk.TextWindowType.TEXT) - device = w.get_display().get_device_manager().get_client_pointer() - pointer = w.get_device_position(device) - x, y = self.tv.window_to_buffer_coords(Gtk.TextWindowType.TEXT, - pointer[1], pointer[2]) - iter_ = self.tv.get_iter_at_location(x, y) - if isinstance(iter_, tuple): - iter_ = iter_[1] - tags = iter_.get_tags() - if self.change_cursor: - w.set_cursor(Gdk.Cursor.new(Gdk.CursorType.XTERM)) - self.change_cursor = False - tag_table = self.tv.get_buffer().get_tag_table() - xep0184_warning = False - - for tag in tags: - if tag in (tag_table.lookup('url'), tag_table.lookup('mail'), \ - tag_table.lookup('xmpp'), tag_table.lookup('sth_at_sth')): - w.set_cursor(Gdk.Cursor.new(Gdk.CursorType.HAND2)) - self.change_cursor = True - elif tag == tag_table.lookup('xep0184-warning'): - xep0184_warning = True - - if self.xep0184_warning_tooltip.timeout != 0 or \ - self.xep0184_warning_tooltip.shown: - # Check if we should hide the XEP-184 warning tooltip - if not xep0184_warning: - self.xep0184_warning_tooltip.hide_tooltip() - - if xep0184_warning and not self.xep0184_warning_tooltip.win: - self.xep0184_warning_tooltip.timeout = GLib.timeout_add(500, - self.show_xep0184_warning_tooltip) - w.set_cursor(Gdk.Cursor.new(Gdk.CursorType.LEFT_PTR)) - self.change_cursor = True - def clear(self, tv = None): """ Clear text in the textview ===================================== src/dialogs.py ===================================== --- a/src/dialogs.py +++ b/src/dialogs.py @@ -5723,5 +5723,5 @@ class BigAvatarWindow(Gtk.Window): """ Just moved the mouse so show the cursor """ - cursor = Gdk.Cursor.new(Gdk.CursorType.LEFT_PTR) + cursor = gtkgui_helpers.get_cursor('LEFT_PTR') self.get_window().set_cursor(cursor) ===================================== src/gtkgui_helpers.py ===================================== --- a/src/gtkgui_helpers.py +++ b/src/gtkgui_helpers.py @@ -494,6 +494,11 @@ def get_invisible_cursor(): cursor_pixbuf, 0, 0) return cursor +def get_cursor(attr): + display = Gdk.Display.get_default() + cursor = getattr(Gdk.CursorType, attr) + return Gdk.Cursor.new_for_display(display, cursor) + def get_current_desktop(window): """ Return the current virtual desktop for given window ===================================== src/htmltextview.py ===================================== --- a/src/htmltextview.py +++ b/src/htmltextview.py @@ -52,6 +52,7 @@ if __name__ == '__main__': import common.configpaths common.configpaths.gajimpaths.init(None) from common import gajim +import gtkgui_helpers from gtkgui_helpers import get_icon_pixmap from common import helpers from common.exceptions import GajimGeneralException @@ -841,21 +842,20 @@ class HtmlTextView(Gtk.TextView): self.set_wrap_mode(Gtk.WrapMode.CHAR) self.set_editable(False) self._changed_cursor = False - self.connect('destroy', self.__destroy_event) - self.connect('motion-notify-event', self.__motion_notify_event) - self.connect('leave-notify-event', self.__leave_event) - self.connect('enter-notify-event', self.__motion_notify_event) + self.set_has_tooltip(True) self.connect('realize', self.on_html_text_view_realized) self.connect('unrealize', self.on_html_text_view_unrealized) self.connect('copy-clipboard', self.on_html_text_view_copy_clipboard) self.id_ = self.connect('button-release-event', self.on_left_mouse_button_release) self.get_buffer().eol_tag = self.get_buffer().create_tag('eol') - self.tooltip = tooltips.BaseTooltip() self.config = gajim.config self.interface = gajim.interface # end big hack + def connect_tooltip(self, func=None): + self.connect('query-tooltip', func or self.__query_tooltip) + def create_tags(self): buffer_ = self.get_buffer() @@ -880,65 +880,27 @@ class HtmlTextView(Gtk.TextView): self.tagSthAtSth.set_property('underline', Pango.Underline.SINGLE) self.tagSthAtSth.connect('event', self.hyperlink_handler, 'sth_at_sth') - def __destroy_event(self, widget): - if self.tooltip.timeout != 0 or self.tooltip.shown: - self.tooltip.hide_tooltip() - - def __leave_event(self, widget, event): + def __query_tooltip(self, widget, x_pos, y_pos, keyboard_mode, tooltip): + window = widget.get_window(Gtk.TextWindowType.TEXT) + x_pos, y_pos = self.window_to_buffer_coords( + Gtk.TextWindowType.TEXT, x_pos, y_pos) + if Gtk.MINOR_VERSION > 18: + iter_ = self.get_iter_at_position(x_pos, y_pos)[1] + else: + iter_ = self.get_iter_at_position(x_pos, y_pos)[0] + for tag in iter_.get_tags(): + if getattr(tag, 'is_anchor', False): + text = getattr(tag, 'title', False) + if text: + if len(text) > 50: + text = text[:47] + '…' + tooltip.set_text(text) + if not self._changed_cursor: + window.set_cursor(gtkgui_helpers.get_cursor('HAND2')) + self._changed_cursor = True + return True if self._changed_cursor: - window = widget.get_window(Gtk.TextWindowType.TEXT) - window.set_cursor(Gdk.Cursor.new(Gdk.CursorType.XTERM)) - self._changed_cursor = False - - def show_tooltip(self, tag): - self.tooltip.timeout = 0 - if not self.tooltip.win: - # check if the current pointer is still over the line - w = self.get_window(Gtk.TextWindowType.TEXT) - device = w.get_display().get_device_manager().get_client_pointer() - pointer = w.get_device_position(device) - x = pointer[1] - y = pointer[2] - iter_ = self.get_iter_at_location(x, y) - if isinstance(iter_, tuple): - iter_ = iter_[1] - tags = iter_.get_tags() - is_over_anchor = False - for tag_ in tags: - if getattr(tag_, 'is_anchor', False): - is_over_anchor = True - break - if not is_over_anchor: - return - text = getattr(tag, 'title', False) - if text: - if len(text) > 50: - text = text[:47] + '…' - position = w.get_origin()[1:] - self.tooltip.show_tooltip(text, 8, position[1] + y) - - def __motion_notify_event(self, widget, event): - w = widget.get_window(Gtk.TextWindowType.TEXT) - device = w.get_display().get_device_manager().get_client_pointer() - pointer = w.get_device_position(device) - x = pointer[1] - y = pointer[2] - iter_ = widget.get_iter_at_location(x, y) - if isinstance(iter_, tuple): - iter_ = iter_[1] - tags = iter_.get_tags() - anchor_tags = [tag for tag in tags if getattr(tag, 'is_anchor', False)] - if self.tooltip.timeout != 0 or self.tooltip.shown: - # Check if we should hide the line tooltip - if not anchor_tags: - self.tooltip.hide_tooltip() - if not self._changed_cursor and anchor_tags: - w.set_cursor(Gdk.Cursor.new(Gdk.CursorType.HAND2)) - self._changed_cursor = True - self.tooltip.timeout = GLib.timeout_add(500, self.show_tooltip, - anchor_tags[0]) - elif self._changed_cursor and not anchor_tags: - w.set_cursor(Gdk.Cursor.new(Gdk.CursorType.XTERM)) + window.set_cursor(gtkgui_helpers.get_cursor('XTERM')) self._changed_cursor = False return False @@ -1157,13 +1119,13 @@ if __name__ == '__main__': y = pointer[2] tags = htmlview.tv.get_iter_at_location(x, y).get_tags() if change_cursor: - w.set_cursor(Gdk.Cursor.new(Gdk.CursorType.XTERM)) + w.set_cursor(gtkgui_helpers.get_cursor('XTERM')) change_cursor = None tag_table = htmlview.tv.get_buffer().get_tag_table() for tag in tags: try: if tag.is_anchor: - w.set_cursor(Gdk.Cursor.new(Gdk.CursorType.HAND2)) + w.set_cursor(gtkgui_helpers.get_cursor('HAND2')) change_cursor = tag elif tag == tag_table.lookup('focus-out-line'): over_line = True @@ -1178,7 +1140,7 @@ if __name__ == '__main__': # line_tooltip.timeout = GLib.timeout_add(500, # show_line_tooltip) # htmlview.tv.get_window(Gtk.TextWindowType.TEXT).set_cursor( - # Gdk.Cursor.new(Gdk.CursorType.LEFT_PTR)) + # gtkgui_helpers.get_cursor('LEFT_PTR')) # change_cursor = tag htmlview.tv.connect('motion_notify_event', on_textview_motion_notify_event) ===================================== src/plugins/gui.py ===================================== --- a/src/plugins/gui.py +++ b/src/plugins/gui.py @@ -70,6 +70,7 @@ class PluginsWindow(object): setattr(self, widget_name, self.xml.get_object(widget_name)) self.plugin_description_textview = HtmlTextView() + self.plugin_description_textview.connect_tooltip() self.plugin_description_textview.set_wrap_mode(Gtk.WrapMode.WORD) sw = self.xml.get_object('scrolledwindow2') sw.add(self.plugin_description_textview) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/205f5f3044a93c50edb4f9cd1e03d0556…

1 0

[Git][gajim/gajim][master] 5 commits: Fix usage of logger constants in command system
by Philipp Hörist 07 Mar '17

07 Mar '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 432ec7ff by Markus Böhme at 2017-03-07T16:46:05+01:00 Fix usage of logger constants in command system The definition of various constants was refactored to use enumerations in commit 2fbadc91e9dc. One reference in the command system was not changed to use the new enum, however. - - - - - f1ee561b by Markus Böhme at 2017-03-07T16:46:12+01:00 Fix broken command system by importing CommandContainer modules ChatControlBase was split from ChatControl into its own module in commit 80221afc2ccb. With this split the import of the CommandContainer modules was removed as well, likely because their members are not referenced anywhere. However, importing these modules even when they are not used directly is crucial because the contained CommandContainers are only registered with the command system when their definitions are evaluated. Import the modules with CommandContainers in chat_control_base.py to fix the command system. Also add a comment stating more clearly why the imports need to be kept around. - - - - - ceb7772b by Markus Böhme at 2017-03-07T16:46:12+01:00 Correct some typos in command system comments - - - - - 01893054 by Markus Böhme at 2017-03-07T16:48:32+01:00 Fix grep command in chat window Commit d75ebd95e5e3 modified the return value of logger.py's method get_search_results_for_query by appending another component to the tuple. Because of this unpacking the tuple in the command system's grep command failed. - - - - - 205f5f30 by Philipp Hörist at 2017-03-07T17:19:11+01:00 Merge branch 'command-system-regressions' into 'master' Fix various regressions in the command system See merge request !63 - - - - - 4 changed files: - src/chat_control_base.py - src/command_system/framework.py - src/command_system/implementation/middleware.py - src/command_system/implementation/standard.py Changes: ===================================== src/chat_control_base.py ===================================== --- a/src/chat_control_base.py +++ b/src/chat_control_base.py @@ -54,6 +54,13 @@ from common.connection_handlers_events import MessageOutgoingEvent from command_system.implementation.middleware import ChatCommandProcessor from command_system.implementation.middleware import CommandTools +# The members of these modules are not referenced directly anywhere in this +# module, but still they need to be kept around. Importing them automatically +# registers the contained CommandContainers with the command system, thereby +# populating the list of available commands. +import command_system.implementation.standard +import command_system.implementation.execute + try: import gtkspell HAS_GTK_SPELL = True ===================================== src/command_system/framework.py ===================================== --- a/src/command_system/framework.py +++ b/src/command_system/framework.py @@ -15,7 +15,7 @@ """ Provides a tiny framework with simple, yet powerful and extensible -architecture to implement commands in a streight and flexible, +architecture to implement commands in a straight and flexible, declarative way. """ @@ -67,7 +67,7 @@ class CommandProcessor(object): """ # This defines a command prefix (or an initializer), which should - # preceede a a text in order it to be processed as a command. + # precede a text in order for it to be processed as a command. COMMAND_PREFIX = '/' def process_as_command(self, text): ===================================== src/command_system/implementation/middleware.py ===================================== --- a/src/command_system/implementation/middleware.py +++ b/src/command_system/implementation/middleware.py @@ -75,7 +75,7 @@ class ChatCommandProcessor(CommandProcessor): self.command_succeeded = True def looks_like_command(self, text, body, name, arguments): - # Command escape stuff ggoes here. If text was prepended by the + # Command escape stuff goes here. If text was prepended by the # command prefix twice, like //not_a_command (if prefix is set # to /) then it will be escaped, that is sent just as a regular # message with one (only one) prefix removed, so message will be ===================================== src/command_system/implementation/standard.py ===================================== --- a/src/command_system/implementation/standard.py +++ b/src/command_system/implementation/standard.py @@ -24,7 +24,7 @@ import dialogs from common import gajim from common import helpers from common.exceptions import GajimGeneralException -from common.logger import Constants +from common.logger import KindConstant from ..errors import CommandError from ..framework import CommandContainer, command, doc @@ -32,10 +32,6 @@ from ..mapping import generate_usage from .hosts import ChatCommands, PrivateChatCommands, GroupChatCommands -# This holds constants fron the logger, which we'll be using in some of our -# commands. -lc = Constants() - class StandardCommonCommands(CommandContainer): """ This command container contains standard commands which are common @@ -104,10 +100,10 @@ class StandardCommonCommands(CommandContainer): raise CommandError(_("Limit must be an integer")) for row in results: - contact, time, kind, show, message, subject = row + contact, time, kind, show, message, subject, log_line_id = row if not contact: - if kind == lc.KIND_CHAT_MSG_SENT: + if kind == KindConstant.CHAT_MSG_SENT: contact = gajim.nicks[self.account] else: contact = self.contact.name View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c02260c4d18fece5541878e6635d7e4e0…

1 0

[Git][gajim/gajim][master] Move CSS Code into gajim.css
by Philipp Hörist 04 Mar '17

04 Mar '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: c02260c4 by Philipp Hörist at 2017-03-04T09:53:14+01:00 Move CSS Code into gajim.css - - - - - 5 changed files: - data/gui/chat_control.ui - data/gui/vcard_information_window.ui - data/style/gajim.css - src/chat_control.py - src/vcard.py Changes: ===================================== data/gui/chat_control.ui ===================================== --- a/data/gui/chat_control.ui +++ b/data/gui/chat_control.ui @@ -606,6 +606,7 @@ <property name="spacing">3</property> <child> <object class="GtkButton" id="authentication_button"> + <property name="name">ChatControl-AuthenticationButton</property> <property name="can_focus">True</property> <property name="focus_on_click">False</property> <property name="receives_default">True</property> ===================================== data/gui/vcard_information_window.ui ===================================== --- a/data/gui/vcard_information_window.ui +++ b/data/gui/vcard_information_window.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkWindow" id="vcard_information_window"> @@ -914,6 +914,9 @@ <property name="halign">start</property> <property name="relief">none</property> <property name="xalign">0</property> + <style> + <class name="VCard-GtkLinkButton"/> + </style> </object> <packing> <property name="left_attach">1</property> @@ -929,6 +932,9 @@ <property name="receives_default">True</property> <property name="relief">none</property> <property name="xalign">0</property> + <style> + <class name="VCard-GtkLinkButton"/> + </style> </object> <packing> <property name="left_attach">1</property> @@ -1327,6 +1333,9 @@ <property name="halign">start</property> <property name="relief">none</property> <property name="xalign">0</property> + <style> + <class name="VCard-GtkLinkButton"/> + </style> </object> <packing> <property name="left_attach">1</property> ===================================== data/style/gajim.css ===================================== --- a/data/style/gajim.css +++ b/data/style/gajim.css @@ -0,0 +1,7 @@ +/* Gajim Application CSS File */ + +/* ChatControl */ +#ChatControl-AuthenticationButton { padding-top: 0px; padding-bottom: 0px} + +/* VCardWindow */ +.VCard-GtkLinkButton { padding-left: 5px; border-left: none; } \ No newline at end of file ===================================== src/chat_control.py ===================================== --- a/src/chat_control.py +++ b/src/chat_control.py @@ -157,15 +157,6 @@ class ChatControl(ChatControlBase): # Add lock image to show chat encryption self.lock_image = self.xml.get_object('lock_image') - # Remove padding from authentication button or else it will - # be higher than the message box - style_provider = Gtk.CssProvider() - css = 'GtkButton { padding-top: 0px; padding-bottom: 0px}' - style_provider.load_from_data(css.encode()) - context = self.authentication_button.get_style_context() - context.add_provider(style_provider, - Gtk.STYLE_PROVIDER_PRIORITY_USER) - # Convert to GC icon img = self.xml.get_object('convert_to_gc_button_image') img.set_from_pixbuf(gtkgui_helpers.load_icon( ===================================== src/vcard.py ===================================== --- a/src/vcard.py +++ b/src/vcard.py @@ -147,16 +147,10 @@ class VcardWindow: buffer_ = self.xml.get_object('textview_annotation').get_buffer() buffer_.set_text(annotations[self.contact.jid]) - style_provider = Gtk.CssProvider() - css = 'GtkButton { padding-left: 5px; border-left: none; }' - style_provider.load_from_data(css.encode()) for widget_name in ('URL_label', 'EMAIL_WORK_USERID_label', 'EMAIL_HOME_USERID_label'): widget = self.xml.get_object(widget_name) - context = widget.get_style_context() - context.add_provider(style_provider, - Gtk.STYLE_PROVIDER_PRIORITY_USER) widget.hide() self.xml.connect_signals(self) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c02260c4d18fece5541878e6635d7e4e00…

1 0

[Git][gajim/gajim][master] Style GroupChatControl Banner with CSS
by Philipp Hörist 04 Mar '17

04 Mar '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9bcad9a2 by Philipp Hörist at 2017-03-04T01:24:28+01:00 Style GroupChatControl Banner with CSS - - - - - 2 changed files: - data/gui/groupchat_control.ui - src/gtkgui_helpers.py Changes: ===================================== data/gui/groupchat_control.ui ===================================== --- a/data/gui/groupchat_control.ui +++ b/data/gui/groupchat_control.ui @@ -20,6 +20,7 @@ <property name="spacing">5</property> <child> <object class="GtkEventBox" id="banner_eventbox"> + <property name="name">GroupChatControl-BannerEventBox</property> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -48,6 +49,7 @@ <property name="orientation">vertical</property> <child> <object class="GtkLabel" id="banner_name_label"> + <property name="name">GroupChatControl-BannerNameLabel</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label"><span weight="heavy" size="large">room jid</span></property> @@ -62,6 +64,7 @@ </child> <child> <object class="GtkLabel" id="banner_label"> + <property name="name">GroupChatControl-BannerLabel</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label">label</property> ===================================== src/gtkgui_helpers.py ===================================== --- a/src/gtkgui_helpers.py +++ b/src/gtkgui_helpers.py @@ -1113,6 +1113,9 @@ def convert_config_to_css(): 'ChatControl-BannerEventBox': ('bannerbgcolor', 'background'), 'ChatControl-BannerNameLabel': ('bannertextcolor', 'color'), 'ChatControl-BannerLabel': ('bannertextcolor', 'color'), + 'GroupChatControl-BannerEventBox': ('bannerbgcolor', 'background'), + 'GroupChatControl-BannerNameLabel': ('bannertextcolor', 'color'), + 'GroupChatControl-BannerLabel': ('bannertextcolor', 'color'), 'Discovery-BannerEventBox': ('bannerbgcolor', 'background'), 'Discovery-BannerLabel': ('bannertextcolor', 'color')} View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9bcad9a233552d9060663363145a8d6408…

1 0

[Git][gajim/gajim][master] Create CheckButtons with mnemonics
by Philipp Hörist 04 Mar '17

04 Mar '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: fc6b50d9 by Philipp Hörist at 2017-03-04T01:06:38+01:00 Create CheckButtons with mnemonics - - - - - 1 changed file: - src/dialogs.py Changes: ===================================== src/dialogs.py ===================================== --- a/src/dialogs.py +++ b/src/dialogs.py @@ -1671,7 +1671,7 @@ class YesNoDialog(HigDialog): on_response_no=self.on_response_no) if checktext: - self.checkbutton = Gtk.CheckButton(label=checktext) + self.checkbutton = Gtk.CheckButton.new_with_mnemonic(checktext) self.vbox.pack_start(self.checkbutton, False, True, 0) else: self.checkbutton = None @@ -1764,7 +1764,7 @@ class ConfirmationDialogCheck(ConfirmationDialog): ok_button = self.action_area.get_children()[0] # right to left ok_button.grab_focus() - self.checkbutton = Gtk.CheckButton(label=checktext) + self.checkbutton = Gtk.CheckButton.new_with_mnemonic(checktext) self.vbox.pack_start(self.checkbutton, False, True, 0) self.set_modal(is_modal) self.popup() @@ -1820,14 +1820,14 @@ class ConfirmationDialogDoubleCheck(ConfirmationDialog): ok_button.grab_focus() if checktext1: - self.checkbutton1 = Gtk.CheckButton(label=checktext1) + self.checkbutton1 = Gtk.CheckButton.new_with_mnemonic(checktext1) if tooltip1: self.checkbutton1.set_tooltip_text(tooltip1) self.vbox.pack_start(self.checkbutton1, False, True, 0) else: self.checkbutton1 = None if checktext2: - self.checkbutton2 = Gtk.CheckButton(label=checktext2) + self.checkbutton2 = Gtk.CheckButton.new_with_mnemonic(checktext2) if tooltip2: self.checkbutton2.set_tooltip_text(tooltip2) self.vbox.pack_start(self.checkbutton2, False, True, 0) @@ -2098,7 +2098,7 @@ class InputDialogCheck(InputDialog): self.input_entry.select_region(0, -1) # select all if checktext: - self.checkbutton = Gtk.CheckButton(label=checktext) + self.checkbutton = Gtk.CheckButton.new_with_mnemonic(checktext) self.vbox.pack_start(self.checkbutton, False, True, 0) self.checkbutton.show() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/fc6b50d953c00f2dc4f48a33b145217623…

1 0

[Git][gajim/gajim][master] 5 commits: Add CSS Provider and convert config values to css
by Philipp Hörist 03 Mar '17

03 Mar '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 516a18eb by Philipp Hörist at 2017-03-02T23:57:05+01:00 Add CSS Provider and convert config values to css - - - - - e00341e8 by Philipp Hörist at 2017-03-02T23:58:21+01:00 Dont use depracted override_background_color() - - - - - 9ecabd56 by Philipp Hörist at 2017-03-03T00:00:22+01:00 Dont use depracted override_color() - - - - - 0abb26ae by Philipp Hörist at 2017-03-03T00:11:23+01:00 Dont use depracted override_font() - - - - - a44be8e6 by Philipp Hörist at 2017-03-04T00:24:48+01:00 Merge branch 'master' into 'master' CSS Styling See merge request !62 - - - - - 15 changed files: - data/gui/chat_control.ui - data/gui/service_discovery_window.ui - + data/style/gajim.css - src/chat_control.py - src/chat_control_base.py - src/common/config.py - src/config.py - src/conversation_textview.py - src/dialogs.py - src/disco.py - src/gajim.py - src/groupchat_control.py - src/gtkgui_helpers.py - src/message_window.py - src/roster_window.py Changes: ===================================== data/gui/chat_control.ui ===================================== --- a/data/gui/chat_control.ui +++ b/data/gui/chat_control.ui @@ -382,6 +382,7 @@ <property name="spacing">5</property> <child> <object class="GtkEventBox" id="banner_eventbox"> + <property name="name">ChatControl-BannerEventBox</property> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -411,6 +412,7 @@ <property name="orientation">vertical</property> <child> <object class="GtkLabel" id="banner_name_label"> + <property name="name">ChatControl-BannerNameLabel</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label"><span weight="heavy" size="large">Contact name</span></property> @@ -425,6 +427,7 @@ </child> <child> <object class="GtkLabel" id="banner_label"> + <property name="name">ChatControl-BannerLabel</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label">label</property> ===================================== data/gui/service_discovery_window.ui ===================================== --- a/data/gui/service_discovery_window.ui +++ b/data/gui/service_discovery_window.ui @@ -24,6 +24,7 @@ <property name="spacing">6</property> <child> <object class="GtkEventBox" id="banner_agent_eventbox"> + <property name="name">Discovery-BannerEventBox</property> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -33,6 +34,7 @@ <property name="spacing">6</property> <child> <object class="GtkLabel" id="banner_agent_label"> + <property name="name">Discovery-BannerLabel</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="ypad">6</property> ===================================== data/style/gajim.css ===================================== --- /dev/null +++ b/data/style/gajim.css ===================================== src/chat_control.py ===================================== --- a/src/chat_control.py +++ b/src/chat_control.py @@ -1024,8 +1024,8 @@ class ChatControl(ChatControlBase): displaymarking = None if self.correcting: self.correcting = False - self.msg_textview.override_background_color( - Gtk.StateType.NORMAL, self.old_message_tv_color) + gtkgui_helpers.remove_css_class( + self.msg_textview, 'msgcorrectingcolor') self.print_conversation(message, self.contact.jid, encrypted=encrypted, xep0184_id=xep0184_id, xhtml=xhtml, @@ -1226,7 +1226,7 @@ class ChatControl(ChatControlBase): else: self.old_msg_kind = kind - def get_tab_label(self, chatstate): + def get_tab_label(self): unread = '' if self.resource: jid = self.contact.get_full_jid() @@ -1239,48 +1239,13 @@ class ChatControl(ChatControlBase): elif num_unread > 1: unread = '[' + str(num_unread) + ']' - # Draw tab label using chatstate - theme = gajim.config.get('roster_theme') - color_s = None - if not chatstate: - chatstate = self.contact.chatstate - if chatstate is not None: - if chatstate == 'composing': - color_s = gajim.config.get_per('themes', theme, - 'state_composing_color') - elif chatstate == 'inactive': - color_s = gajim.config.get_per('themes', theme, - 'state_inactive_color') - elif chatstate == 'gone': - color_s = gajim.config.get_per('themes', theme, - 'state_gone_color') - elif chatstate == 'paused': - color_s = gajim.config.get_per('themes', theme, - 'state_paused_color') - - context = self.parent_win.notebook.get_style_context() - if color_s: - # We set the color for when it's the current tab or not - color = Gdk.RGBA() - ok = Gdk.RGBA.parse(color, color_s) - if not ok: - del color - color = context.get_color(Gtk.StateFlags.ACTIVE) - # In inactive tab color to be lighter against the darker inactive - # background - if chatstate in ('inactive', 'gone') and\ - self.parent_win.get_active_control() != self: - color = self.lighten_color(color) - else: # active or not chatstate, get color from gtk - color = context.get_color(Gtk.StateFlags.ACTIVE) - name = self.contact.get_shown_name() if self.resource: name += '/' + self.resource label_str = GLib.markup_escape_text(name) if num_unread: # if unread, text in the label becomes bold label_str = '<b>' + unread + label_str + '</b>' - return (label_str, color) + return label_str def get_tab_image(self, count_unread=True): if self.resource: ===================================== src/chat_control_base.py ===================================== --- a/src/chat_control_base.py +++ b/src/chat_control_base.py @@ -158,7 +158,6 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): """ Derived types MAY implement this """ - self._paint_banner() self.draw_banner() def _update_banner_state_image(self): @@ -344,8 +343,6 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): self.msg_textview.drag_dest_set(Gtk.DestDefaults.MOTION | Gtk.DestDefaults.HIGHLIGHT, self.dnd_list, Gdk.DragAction.COPY) - self.update_font() - # Hook up send button widget = self.xml.get_object('send_button') id_ = widget.connect('clicked', self._on_send_button_clicked) @@ -371,7 +368,6 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): if gajim.config.get('use_speller') and HAS_GTK_SPELL: self.set_speller() self.conv_textview.tv.show() - self._paint_banner() # For XEP-0172 self.user_nick = None @@ -503,76 +499,6 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): # send the message self.send_message(message, xhtml=xhtml) - def _paint_banner(self): - """ - Repaint banner with theme color - """ - theme = gajim.config.get('roster_theme') - bgcolor = gajim.config.get_per('themes', theme, 'bannerbgcolor') - textcolor = gajim.config.get_per('themes', theme, 'bannertextcolor') - # the backgrounds are colored by using an eventbox by - # setting the bg color of the eventbox and the fg of the name_label - banner_eventbox = self.xml.get_object('banner_eventbox') - banner_name_label = self.xml.get_object('banner_name_label') - self.disconnect_style_event(banner_name_label) - self.disconnect_style_event(self.banner_status_label) - if bgcolor: - color = Gdk.RGBA() - Gdk.RGBA.parse(color, bgcolor) - banner_eventbox.override_background_color(Gtk.StateType.NORMAL, - color) - default_bg = False - else: - default_bg = True - if textcolor: - color = Gdk.RGBA() - Gdk.RGBA.parse(color, textcolor) - banner_name_label.override_color(Gtk.StateType.NORMAL, - color) - self.banner_status_label.override_color( - Gtk.StateType.NORMAL, color) - default_fg = False - else: - default_fg = True - if default_bg or default_fg: - self._on_style_set_event(banner_name_label, None, default_fg, - default_bg) - if self.banner_status_label.get_realized(): - # Widget is realized - self._on_style_set_event(self.banner_status_label, None, default_fg, - default_bg) - - def disconnect_style_event(self, widget): - # Try to find the event_id - for id_ in self.handlers.keys(): - if self.handlers[id_] == widget: - widget.disconnect(id_) - del self.handlers[id_] - break - - def connect_style_event(self, widget, set_fg=False, set_bg=False): - self.disconnect_style_event(widget) - id_ = widget.connect('style-set', self._on_style_set_event, set_fg, - set_bg) - self.handlers[id_] = widget - - def _on_style_set_event(self, widget, style, *opts): - """ - Set style of widget from style class *.Frame.Eventbox - opts[0] == True -> set fg color - opts[1] == True -> set bg color - """ - banner_eventbox = self.xml.get_object('banner_eventbox') - self.disconnect_style_event(widget) - context = widget.get_style_context() - if opts[1]: - bg_color = context.get_background_color(Gtk.StateFlags.SELECTED) - banner_eventbox.override_background_color(Gtk.StateType.NORMAL, bg_color) - if opts[0]: - fg_color = context.get_color(Gtk.StateFlags.SELECTED) - widget.override_color(Gtk.StateType.NORMAL, fg_color) - self.connect_style_event(widget, opts[0], opts[1]) - def _conv_textview_key_press_event(self, widget, event): # translate any layout to latin_layout valid, entries = self.keymap.get_entries_for_keyval(event.keyval) @@ -968,11 +894,6 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): gtkgui_helpers.popup_emoticons_under_button(menu, widget, self.parent_win) - def update_font(self): - font = Pango.FontDescription(gajim.config.get('conversation_font')) - self.conv_textview.tv.override_font(font) - self.msg_textview.override_font(font) - def update_tags(self): self.conv_textview.update_tags() @@ -1226,20 +1147,15 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): msg_type == 'sent' and not self.correcting and (not \ history[pos - 1].startswith('/') or history[pos - 1].startswith('/me')): self.correcting = True - context = self.msg_textview.get_style_context() - state = Gtk.StateFlags.NORMAL - self.old_message_tv_color = context.get_background_color(state) - color = Gdk.RGBA() - Gdk.RGBA.parse(color, 'PaleGoldenrod') - self.msg_textview.override_background_color(Gtk.StateType.NORMAL, - color) + gtkgui_helpers.add_css_class( + self.msg_textview, 'msgcorrectingcolor') message = history[pos - 1] msg_buf.set_text(message) return if self.correcting: # We were previously correcting - self.msg_textview.override_background_color(Gtk.StateType.NORMAL, - self.old_message_tv_color) + gtkgui_helpers.remove_css_class( + self.msg_textview, 'msgcorrectingcolor') self.correcting = False pos += -1 if direction == 'up' else +1 if pos == -1: @@ -1258,14 +1174,6 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): message = '> %s\n' % message.replace('\n', '\n> ') msg_buf.set_text(message) - def lighten_color(self, color): - p = 0.4 - mask = 0 - color.red = int((color.red * p) + (mask * (1 - p))) - color.green = int((color.green * p) + (mask * (1 - p))) - color.blue = int((color.blue * p) + (mask * (1 - p))) - return color - def widget_set_visible(self, widget, state): """ Show or hide a widget ===================================== src/common/config.py ===================================== --- a/src/common/config.py +++ b/src/common/config.py @@ -468,6 +468,7 @@ class Config: 'bannerbgcolor': [ opt_color, '', '', True ], 'bannerfont': [ opt_str, '', '', True ], 'bannerfontattrs': [ opt_str, 'B', '', True ], + 'msgcorrectingcolor': [opt_color, '#eee8aa'], # http://www.pitt.edu/~nisg/cis/web/cgi/rgb.html 'state_inactive_color': [ opt_color, 'grey62' ], ===================================== src/config.py ===================================== --- a/src/config.py +++ b/src/config.py @@ -750,6 +750,7 @@ class PreferencesWindow: # begin repainting themed widgets throughout gajim.interface.roster.repaint_themed_widgets() gajim.interface.roster.change_roster_style(None) + gtkgui_helpers.load_css() def update_theme_list(self): theme_combobox = self.xml.get_object('theme_combobox') @@ -880,14 +881,7 @@ class PreferencesWindow: else: font = '' gajim.config.set(text, font) - self.update_text_font() - - def update_text_font(self): - """ - Update text font in opened chat windows - """ - for ctrl in self._get_all_controls(): - ctrl.update_font() + gtkgui_helpers.load_css() def on_incoming_nick_colorbutton_color_set(self, widget): self.on_preference_widget_color_set(widget, 'inmsgcolor') ===================================== src/conversation_textview.py ===================================== --- a/src/conversation_textview.py +++ b/src/conversation_textview.py @@ -238,8 +238,8 @@ class ConversationTextview(GObject.GObject): self.change_cursor = False self.last_time_printout = 0 - font = Pango.FontDescription(gajim.config.get('conversation_font')) - self.tv.override_font(font) + style = self.tv.get_style_context() + style.add_class('font_custom') buffer_ = self.tv.get_buffer() end_iter = buffer_.get_end_iter() buffer_.create_mark('end', end_iter, False) ===================================== src/dialogs.py ===================================== --- a/src/dialogs.py +++ b/src/dialogs.py @@ -3379,10 +3379,6 @@ class XMLConsoleWindow: self.enabled = True self.xml.get_object('enable_checkbutton').set_active(True) - col = Gdk.RGBA() - Gdk.RGBA.parse(col, color) - self.input_textview.override_color(Gtk.StateType.NORMAL, col) - if len(gajim.connections) > 1: title = _('XML Console for %s') % self.account else: ===================================== src/disco.py ===================================== --- a/src/disco.py +++ b/src/disco.py @@ -561,7 +561,6 @@ _('Without a connection, you can not browse available services')) self.banner_eventbox = self.xml.get_object('banner_agent_eventbox') self.style_event_id = 0 self.banner.realize() - self.paint_banner() self.action_buttonbox = self.xml.get_object('action_buttonbox') # Address combobox @@ -660,63 +659,6 @@ _('Without a connection, you can not browse available services')) (markup, font.to_string(), text_after) self.banner.set_markup(markup) - def paint_banner(self): - """ - Repaint the banner with theme color - """ - theme = gajim.config.get('roster_theme') - bgcolor = gajim.config.get_per('themes', theme, 'bannerbgcolor') - textcolor = gajim.config.get_per('themes', theme, 'bannertextcolor') - self.disconnect_style_event() - if bgcolor: - color = Gdk.RGBA() - Gdk.RGBA.parse(color, bgcolor) - self.banner_eventbox.override_background_color(Gtk.StateType.NORMAL, - color) - default_bg = False - else: - default_bg = True - - if textcolor: - color = Gdk.RGBA() - Gdk.RGBA.parse(color, textcolor) - self.banner.override_color(Gtk.StateType.NORMAL, color) - default_fg = False - else: - default_fg = True - if default_fg or default_bg: - self._on_style_set_event(self.banner, None, default_fg, default_bg) - if self.browser: - self.browser.update_theme() - - def disconnect_style_event(self): - if self.style_event_id: - self.banner.disconnect(self.style_event_id) - self.style_event_id = 0 - - def connect_style_event(self, set_fg = False, set_bg = False): - self.disconnect_style_event() - self.style_event_id = self.banner.connect('style-set', - self._on_style_set_event, set_fg, set_bg) - - def _on_style_set_event(self, widget, style, *opts): - """ - Set style of widget from style class *.Frame.Eventbox - opts[0] == True -> set fg color - opts[1] == True -> set bg color - """ - self.disconnect_style_event() - context = widget.get_style_context() - if opts[1]: - bg_color = context.get_background_color(Gtk.StateFlags.SELECTED) - self.banner_eventbox.override_background_color(Gtk.StateType.NORMAL, - bg_color) - if opts[0]: - fg_color = context.get_color(Gtk.StateFlags.SELECTED) - self.banner.override_color(Gtk.StateType.NORMAL, fg_color) - self.banner.ensure_style() - self.connect_style_event(opts[0], opts[1]) - def destroy(self, chain = False): """ Close the browser. This can optionally close its children and propagate ===================================== src/gajim.py ===================================== --- a/src/gajim.py +++ b/src/gajim.py @@ -245,7 +245,9 @@ class GajimApplication(Gtk.Application): def do_activate(self): Gtk.Application.do_activate(self) from gui_interface import Interface + import gtkgui_helpers self.interface = Interface() + gtkgui_helpers.load_css() self.interface.run(self) self.add_actions() import gui_menu_builder ===================================== src/groupchat_control.py ===================================== --- a/src/groupchat_control.py +++ b/src/groupchat_control.py @@ -709,29 +709,17 @@ class GroupchatControl(ChatControlBase): has_focus = self.parent_win.window.get_property('has-toplevel-focus') current_tab = self.parent_win.get_active_control() == self - color_name = None color = None - theme = gajim.config.get('roster_theme') - context = self.parent_win.notebook.get_style_context() if chatstate == 'attention' and (not has_focus or not current_tab): self.attention_flag = True - color_name = gajim.config.get_per('themes', theme, - 'state_muc_directed_msg_color') - elif chatstate: - if chatstate == 'active' or (current_tab and has_focus): - self.attention_flag = False - # get active color from gtk - color = context.get_color(Gtk.StateFlags.ACTIVE) - elif chatstate == 'newmsg' and (not has_focus or not current_tab) \ - and not self.attention_flag: - color_name = gajim.config.get_per('themes', theme, - 'state_muc_msg_color') - if color_name: - color = Gdk.RGBA() - ok = Gdk.RGBA.parse(color, color_name) - if not ok: - del color - color = context.get_color(Gtk.StateFlags.ACTIVE) + color = 'state_muc_directed_msg_color' + elif chatstate == 'active' or (current_tab and has_focus): + self.attention_flag = False + # get active color from gtk + color = 'active' + elif chatstate == 'newmsg' and (not has_focus or not current_tab) \ + and not self.attention_flag: + color = 'state_muc_msg_color' if self.is_continued: # if this is a continued conversation @@ -1996,8 +1984,8 @@ class GroupchatControl(ChatControlBase): self.last_sent_msg = msg if self.correcting: self.correcting = False - self.msg_textview.override_background_color( - Gtk.StateType.NORMAL, self.old_message_tv_color) + gtkgui_helpers.remove_css_class( + self.msg_textview, 'msgcorrectingcolor') if self.correcting and self.last_sent_msg: correction_msg = self.last_sent_msg ===================================== src/gtkgui_helpers.py ===================================== --- a/src/gtkgui_helpers.py +++ b/src/gtkgui_helpers.py @@ -48,6 +48,7 @@ log = logging.getLogger('gajim.gtkgui_helpers') from common import i18n from common import gajim from common import pep +from common import configpaths gtk_icon_theme = Gtk.IconTheme.get_default() gtk_icon_theme.append_search_path(gajim.ICONS_DIR) @@ -1088,3 +1089,91 @@ def __label_size_allocate(widget, allocation): def get_action(action): return gajim.app.lookup_action(action) + +def load_css(): + path = os.path.join(configpaths.get('DATA'), 'style', 'gajim.css') + try: + with open(path, "r") as f: + css = f.read() + except Exception as exc: + print('Error loading css: %s', exc) + return + + provider = Gtk.CssProvider() + css = "\n".join((css, convert_config_to_css())) + provider.load_from_data(bytes(css.encode())) + Gtk.StyleContext.add_provider_for_screen( + Gdk.Screen.get_default(), + provider, + Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION) + +def convert_config_to_css(): + css = '' + themed_widgets = { + 'ChatControl-BannerEventBox': ('bannerbgcolor', 'background'), + 'ChatControl-BannerNameLabel': ('bannertextcolor', 'color'), + 'ChatControl-BannerLabel': ('bannertextcolor', 'color'), + 'Discovery-BannerEventBox': ('bannerbgcolor', 'background'), + 'Discovery-BannerLabel': ('bannertextcolor', 'color')} + + classes = {'state_composing_color': ('', 'color'), + 'state_inactive_color': ('', 'color'), + 'state_gone_color': ('', 'color'), + 'state_paused_color': ('', 'color'), + 'msgcorrectingcolor': ('text', 'background'), + 'state_muc_directed_msg_color': ('', 'color'), + 'state_muc_msg_color': ('', 'color')} + + + theme = gajim.config.get('roster_theme') + for key, values in themed_widgets.items(): + config, attr = values + css += '#{} {{'.format(key) + value = gajim.config.get_per('themes', theme, config) + if value: + css += '{attr}: {color};\n'.format(attr=attr, color=value) + css += '}\n' + + for key, values in classes.items(): + node, attr = values + value = gajim.config.get_per('themes', theme, key) + if value: + css += '.theme_{cls} {node} {{ {attr}: {color}; }}\n'.format( + cls=key, node=node, attr=attr, color=value) + + css += add_css_font() + + return css + +def add_css_class(widget, class_name): + style = widget.get_style_context() + for css_cls in style.list_classes(): + if css_cls.startswith('theme_'): + style.remove_class(css_cls) + if class_name: + style.add_class('theme_' + class_name) + +def remove_css_class(widget, class_name): + style = widget.get_style_context() + style.remove_class('theme_' + class_name) + +def add_css_font(): + conversation_font = gajim.config.get('conversation_font') + if not conversation_font: + return '' + font = Pango.FontDescription(conversation_font) + unit = "pt" if Gtk.check_version(3, 22, 0) is None else "px" + css = """ + .font_custom {{ + font-family: {family}; + font-size: {size}{unit}; + font-weight: {weight}; + }}""".format( + family=font.get_family(), + size=int(round(font.get_size() / Pango.SCALE)), + unit=unit, + weight=int(font.get_weight())) + css = css.replace("font-size: 0{unit};".format(unit=unit), "") + css = css.replace("font-weight: 0;", "") + css = "\n".join(filter(lambda x: x.strip(), css.splitlines())) + return css ===================================== src/message_window.py ===================================== --- a/src/message_window.py +++ b/src/message_window.py @@ -39,6 +39,7 @@ import gtkgui_helpers import message_control import dialogs from chat_control_base import ChatControlBase +from chat_control import ChatControl from common import gajim from gtkgui_helpers import get_action @@ -636,7 +637,7 @@ class MessageWindow(object): window_mode == MessageWindowMgr.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER self.notebook.set_show_tabs(show_tabs_if_one_tab) - def redraw_tab(self, ctrl, chatstate = None): + def redraw_tab(self, ctrl, chatstate=None): tab = self.notebook.get_tab_label(ctrl.widget) if not tab: return @@ -653,11 +654,20 @@ class MessageWindow(object): # Update nick nick_label.set_max_width_chars(10) - (tab_label_str, tab_label_color) = ctrl.get_tab_label(chatstate) + if isinstance(ctrl, ChatControl): + tab_label_str = ctrl.get_tab_label() + # Set Label Color + class_name = 'state_{}_color'.format(chatstate) + gtkgui_helpers.add_css_class(nick_label, class_name) + else: + tab_label_str, color = ctrl.get_tab_label(chatstate) + # Set Label Color + if color == 'active': + gtkgui_helpers.add_css_class(nick_label, None) + elif color is not None: + gtkgui_helpers.add_css_class(nick_label, color) + nick_label.set_markup(tab_label_str) - if tab_label_color: - nick_label.override_color(Gtk.StateFlags.NORMAL, tab_label_color) - nick_label.override_color(Gtk.StateFlags.ACTIVE, tab_label_color) tab_img = ctrl.get_tab_image() if tab_img: ===================================== src/roster_window.py ===================================== --- a/src/roster_window.py +++ b/src/roster_window.py @@ -4800,8 +4800,6 @@ class RosterWindow: for win in gajim.interface.msg_win_mgr.windows(): win.repaint_themed_widgets() for account in gajim.connections: - for addr in gajim.interface.instances[account]['disco']: - gajim.interface.instances[account]['disco'][addr].paint_banner() for ctrl in list(gajim.interface.minimized_controls[account].values()): ctrl.repaint_themed_widgets() View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/840cb365e857bd36afe93042f664486d8…

1 0

[Git][gajim/gajim][master] 2 commits: Add commandline option to show warnings
by Philipp Hörist 03 Mar '17

03 Mar '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: b5c98864 by Philipp Hörist at 2017-03-04T00:19:04+01:00 Add commandline option to show warnings - - - - - 840cb365 by Philipp Hörist at 2017-03-04T00:19:35+01:00 Use unicode path for plugins non-unicode path is marked as deprecated - - - - - 2 changed files: - src/gajim.py - src/plugins/gajimplugin.py Changes: ===================================== src/gajim.py ===================================== --- a/src/gajim.py +++ b/src/gajim.py @@ -94,6 +94,9 @@ class GajimApplication(Gtk.Application): self.add_main_option('loglevel', ord('l'), GLib.OptionFlags.NONE, GLib.OptionArg.STRING, _('Configure logging system'), 'LEVEL') + self.add_main_option('warnings', ord('w'), GLib.OptionFlags.NONE, + GLib.OptionArg.NONE, + _('Show all warnings')) self.profile = '' self.config_path = None @@ -286,6 +289,8 @@ class GajimApplication(Gtk.Application): if options.contains('loglevel'): loglevel = options.lookup_value('loglevel').get_string() logging_helpers.set_loglevels(loglevel) + if options.contains('warnings'): + self.show_warnings() return -1 def do_command_line(self, command_line: Gio.ApplicationCommandLine) -> int: @@ -294,6 +299,19 @@ class GajimApplication(Gtk.Application): self.activate() return 0 + def show_warnings(self): + import traceback + import warnings + + def warn_with_traceback(message, category, filename, lineno, + file=None, line=None): + traceback.print_stack(file=sys.stderr) + sys.stderr.write(warnings.formatwarning(message, category, + filename, lineno, line)) + + warnings.showwarning = warn_with_traceback + warnings.filterwarnings(action="always") + def frozen_logging(self, path): import warnings if not os.path.exists(path): ===================================== src/plugins/gajimplugin.py ===================================== --- a/src/plugins/gajimplugin.py +++ b/src/plugins/gajimplugin.py @@ -202,8 +202,8 @@ class GajimPluginConfig(): @log_calls('GajimPluginConfig') def __init__(self, plugin): self.plugin = plugin - self.FILE_PATH = os.path.join(gajim.PLUGINS_CONFIG_DIR, - self.plugin.short_name).encode(locale.getpreferredencoding()) + self.FILE_PATH = os.path.join( + gajim.PLUGINS_CONFIG_DIR, self.plugin.short_name) self.data = {} @log_calls('GajimPluginConfig') View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/1b975172d60e734d9c390ef75795ef8e7…

1 0

[Git][gajim/gajim][master] 7 commits: Simplify appending new line in history window
by Philipp Hörist 03 Mar '17

03 Mar '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2e026335 by Markus Böhme at 2017-02-22T12:56:31+01:00 Simplify appending new line in history window ConversationTextview provides an abstraction for adding text with tags. Use it instead of directly accessing its backing text buffer. - - - - - d9a22515 by Markus Böhme at 2017-02-22T12:56:31+01:00 Highlight all paragraphs of a search result in the history window A single message may span multiple paragraphs. Highlight all paragraphs of a search result because a keyword could be in any of them. Every message already has the 'eol' tag on its newline character. Highlight from the start of a search match up to the next 'eol' tag. - - - - - 65c6a1e7 by Markus Böhme at 2017-02-22T12:56:31+01:00 Remove unnecessary code in message highlighting in the history window The message to be highlighted is searched via an already formatted timestamp, and the match contains the whole timestamp with any preceding characters (like "["). Therefore, calling backward_char on the start iterator of the match just goes back to the previous line and is not needed. - - - - - 66589886 by Markus Böhme at 2017-02-22T14:55:44+01:00 Remove dead code in logger.py method get_search_results_for_query The method get_search_results_for_query provides a means to search via a passed in SQL query. This feature has been unused and dead since its initial commit back in 2005 (commit e542fff69f56), so just remove it. - - - - - d75ebd95 by Markus Böhme at 2017-03-02T23:55:18+01:00 Rework message highlighting in the history window to not use timestamps Search results in the history window to are scrolled to and highlighted once the user clicks on one of them. Messages are searched by text in the log database, but then looked up in the history text buffer via a visible or invisible timestamp obtained from the database record. Timestamps in the history text buffer, depending on user configuration, may only have a coarse granularity. Philipp Hörist discovered that this may lead to the highlighting of the wrong line in the history text view and proposed an alternative solution that is implemented in this patch. Timestamps are abolished as a means of searching messages. Instead, add a mark with the unique message id (log line id) at the start of every message in the history text buffer when the conversation is loaded. After fetching the search results from the database this id can be used to unambiguously find the corresponding message in the history text buffer. - - - - - deebe384 by Markus Böhme at 2017-03-03T17:29:05+01:00 Prevent unnecessary reloading of conversations in the history window Do not reload the conversation in the history window when the user selects another search result from the same day. Just clearing the previous highlighting is enough. This prevents flickering and provides a much more pleasant user experience. - - - - - 1b975172 by Philipp Hörist at 2017-03-03T23:45:06+01:00 Merge branch 'history-highlighting' into 'master' Highlight all paragraphs of a message in the history window See merge request !46 - - - - - 3 changed files: - src/common/logger.py - src/history_window.py - src/htmltextview.py Changes: ===================================== src/common/logger.py ===================================== --- a/src/common/logger.py +++ b/src/common/logger.py @@ -628,7 +628,7 @@ class Logger: def get_conversation_for_date(self, jid, year, month, day, account): """ - Return contact_name, time, kind, show, message, subject + Return contact_name, time, kind, show, message, subject, additional_data, log_line_id For each row in a list of tupples, returns list with empty tupple if we found nothing to meet our demands @@ -645,7 +645,9 @@ class Logger: last_second_of_day = start_of_day + seconds_in_a_day - 1 self.cur.execute(''' - SELECT contact_name, time, kind, show, message, subject, additional_data FROM logs + SELECT contact_name, time, kind, show, message, subject, + additional_data, log_line_id + FROM logs WHERE (%s) AND time BETWEEN %d AND %d ORDER BY time @@ -660,7 +662,7 @@ class Logger: def get_search_results_for_query(self, jid, query, account, year=False, month=False, day=False): """ - Returns contact_name, time, kind, show, message + Returns contact_name, time, kind, show, message, subject, log_line_id For each row in a list of tupples, returns list with empty tupple if we found nothing to meet our demands @@ -671,33 +673,25 @@ class Logger: # Error trying to create a new jid_id. This means there is no log return [] - if False: # query.startswith('SELECT '): # it's SQL query (FIXME) - try: - self.cur.execute(query) - except sqlite.OperationalError as e: - results = [('', '', '', '', str(e))] - return results - - else: # user just typed something, we search in message column - where_sql, jid_tuple = self._build_contact_where(account, jid) - like_sql = '%' + query.replace("'", "''") + '%' - if year: - start_of_day = self.get_unix_time_from_date(year, month, day) - seconds_in_a_day = 86400 # 60 * 60 * 24 - last_second_of_day = start_of_day + seconds_in_a_day - 1 - self.cur.execute(''' - SELECT contact_name, time, kind, show, message, subject FROM logs - WHERE (%s) AND message LIKE '%s' - AND time BETWEEN %d AND %d - ORDER BY time - ''' % (where_sql, like_sql, start_of_day, last_second_of_day), - jid_tuple) - else: - self.cur.execute(''' - SELECT contact_name, time, kind, show, message, subject FROM logs - WHERE (%s) AND message LIKE '%s' - ORDER BY time - ''' % (where_sql, like_sql), jid_tuple) + where_sql, jid_tuple = self._build_contact_where(account, jid) + like_sql = '%' + query.replace("'", "''") + '%' + if year: + start_of_day = self.get_unix_time_from_date(year, month, day) + seconds_in_a_day = 86400 # 60 * 60 * 24 + last_second_of_day = start_of_day + seconds_in_a_day - 1 + self.cur.execute(''' + SELECT contact_name, time, kind, show, message, subject, log_line_id FROM logs + WHERE (%s) AND message LIKE '%s' + AND time BETWEEN %d AND %d + ORDER BY time + ''' % (where_sql, like_sql, start_of_day, last_second_of_day), + jid_tuple) + else: + self.cur.execute(''' + SELECT contact_name, time, kind, show, message, subject, log_line_id FROM logs + WHERE (%s) AND message LIKE '%s' + ORDER BY time + ''' % (where_sql, like_sql), jid_tuple) results = self.cur.fetchall() return results ===================================== src/history_window.py ===================================== --- a/src/history_window.py +++ b/src/history_window.py @@ -56,6 +56,7 @@ class Column(IntEnum): UNIXTIME = 2 MESSAGE = 3 TIME = 4 + LOG_LINE_ID = 5 class HistoryWindow: """ @@ -85,8 +86,8 @@ class HistoryWindow: self.results_window = xml.get_object('results_scrolledwindow') self.search_in_date = xml.get_object('search_in_date') - # contact_name, date, message, time - model = Gtk.ListStore(str, str, str, str, str) + # jid, contact_name, date, message, time, log_line_id + model = Gtk.ListStore(str, str, str, str, str, int) self.results_treeview.set_model(model) col = Gtk.TreeViewColumn(_('Name')) self.results_treeview.append_column(col) @@ -393,28 +394,31 @@ class HistoryWindow: show_status = self.show_status_checkbutton.get_active() lines = gajim.logger.get_conversation_for_date(self.jid, year, month, day, self.account) - # lines holds list with tupples that have: - # contact_name, time, kind, show, message for line in lines: # line[0] is contact_name, line[1] is time of message # line[2] is kind, line[3] is show, line[4] is message, line[5] is subject - # line[6] is additional_data + # line[6] is additional_data, line[7] is log_line_id if not show_status and line[2] in (KindConstant.GCSTATUS, KindConstant.STATUS): continue self._add_new_line(line[0], line[1], line[2], line[3], line[4], - line[5], line[6]) + line[5], line[6], line[7]) - def _add_new_line(self, contact_name, tim, kind, show, message, subject, additional_data): + def _add_new_line(self, contact_name, tim, kind, show, message, subject, + additional_data, log_line_id): """ Add a new line in textbuffer """ if not message and kind not in (KindConstant.STATUS, KindConstant.GCSTATUS): return + buf = self.history_buffer end_iter = buf.get_end_iter() + # Make the beginning of every message searchable by its log_line_id + buf.create_mark(str(log_line_id), end_iter, left_gravity=True) + if gajim.config.get('print_time') == 'always': timestamp_str = gajim.config.get('time_stamp') timestamp_str = helpers.from_one_line(timestamp_str) @@ -429,12 +433,6 @@ class HistoryWindow: tim = time.strftime('%X ', time.localtime(float(tim))) buf.insert_with_tags_by_name(end_iter, tim + '\n', 'time_sometimes') - else: # don't print time. So we print it as invisible to be able to - # search for it - timestamp_str = gajim.config.get('time_stamp') - timestamp_str = helpers.from_one_line(timestamp_str) - tim = time.strftime(timestamp_str, time.localtime(float(tim))) - buf.insert_with_tags_by_name(end_iter, tim, 'invisible') tag_name = '' tag_msg = '' @@ -512,9 +510,7 @@ class HistoryWindow: else: self.history_textview.print_real_text(message, name=contact_name, xhtml=xhtml, additional_data=additional_data) - buffer_ = self.history_textview.tv.get_buffer() - eob = buffer_.get_end_iter() - buffer_.insert_with_tags_by_name(eob, '\n', 'eol') + self.history_textview.print_real_text('\n', text_tags=['eol']) def on_search_entry_activate(self, widget): text = self.search_entry.get_text() @@ -563,12 +559,13 @@ class HistoryWindow: contact_name = self.completion_dict[jid][InfoColumn.NAME] tim = row[1] message = row[4] + log_line_id = row[6] local_time = time.localtime(tim) date = time.strftime('%Y-%m-%d', local_time) # jid (to which log is assigned to), name, date, message, # time (full unix time) - model.append((jid, contact_name, date, message, str(tim))) + model.append((jid, contact_name, date, message, str(tim), log_line_id)) def on_results_treeview_row_activated(self, widget, path, column): """ @@ -576,7 +573,7 @@ class HistoryWindow: which results to showing conversation logs for that date """ # get currently selected date - cur_year, cur_month = self.calendar.get_date()[0:2] + cur_year, cur_month, cur_day = self.calendar.get_date() cur_month = gtkgui_helpers.make_gtk_month_python_month(cur_month) model = widget.get_model() # make it a tupple (Y, M, D, 0, 0, 0...) @@ -595,33 +592,41 @@ class HistoryWindow: if year != cur_year or gtk_month != cur_month: self.calendar.select_month(month, year) - self.calendar.select_day(day) - unix_time = model[path][Column.TIME] - self._scroll_to_result(unix_time) - #FIXME: one day do not search just for unix_time but the whole and user - # specific format of the textbuffer line [time] nick: message - # and highlight all that + if year != cur_year or gtk_month != cur_month or day != cur_day: + self.calendar.select_day(day) + + self._scroll_to_message_and_highlight(model[path][Column.LOG_LINE_ID]) - def _scroll_to_result(self, unix_time): + def _scroll_to_message_and_highlight(self, log_line_id): """ - Scroll to the result using unix_time and highlight line + Scroll to a message and highlight it """ - start_iter = self.history_buffer.get_start_iter() - local_time = time.localtime(float(unix_time)) - timestamp_str = gajim.config.get('time_stamp') - timestamp_str = helpers.from_one_line(timestamp_str) - tim = time.strftime(timestamp_str, local_time) - result = start_iter.forward_search(tim, Gtk.TextSearchFlags.TEXT_ONLY, - None) - if result is not None: - match_start_iter, match_end_iter = result - match_start_iter.backward_char() # include '[' or other character before time - match_end_iter.forward_line() # highlight all message not just time - self.history_buffer.apply_tag_by_name('highlight', match_start_iter, - match_end_iter) - mark = self.history_buffer.create_mark('match', match_start_iter, True) - GLib.idle_add(self.history_textview.tv.scroll_to_mark, mark, - 0, True, 0.0, 0.5) + + def iterator_has_mark(iterator, mark_name): + for mark in iterator.get_marks(): + if mark.get_name() == mark_name: + return True + return False + + # Clear previous search result by removing the highlighting. The scroll + # mark is automatically removed when the new one is set. + start = self.history_buffer.get_start_iter() + end = self.history_buffer.get_end_iter() + self.history_buffer.remove_tag_by_name('highlight', start, end) + + log_line_id = str(log_line_id) + line = start + while not iterator_has_mark(line, log_line_id): + if not line.forward_line(): + return + + match_start = line + match_end = match_start.copy() + match_end.forward_to_tag_toggle(self.history_buffer.eol_tag) + + self.history_buffer.apply_tag_by_name('highlight', match_start, match_end) + mark = self.history_buffer.create_mark('match', match_start, True) + GLib.idle_add(self.history_textview.tv.scroll_to_mark, mark, 0, True, 0.0, 0.5) def on_log_history_checkbutton_toggled(self, widget): # log conversation history? ===================================== src/htmltextview.py ===================================== --- a/src/htmltextview.py +++ b/src/htmltextview.py @@ -850,7 +850,7 @@ class HtmlTextView(Gtk.TextView): self.connect('copy-clipboard', self.on_html_text_view_copy_clipboard) self.id_ = self.connect('button-release-event', self.on_left_mouse_button_release) - self.get_buffer().create_tag('eol') + self.get_buffer().eol_tag = self.get_buffer().create_tag('eol') self.tooltip = tooltips.BaseTooltip() self.config = gajim.config self.interface = gajim.interface View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/8157cb38eca26ed48aa1a157c148eb115…

1 0

[Git][gajim/gajim][gajim_0.16] Close IBB stream with correct SID. See #8555
by Yann Leboulanger 01 Mar '17

01 Mar '17

Yann Leboulanger pushed to branch gajim_0.16 at gajim / gajim Commits: 85f8e91b by Yann Leboulanger at 2017-03-01T22:10:30+01:00 Close IBB stream with correct SID. See #8555 - - - - - 1 changed file: - src/common/protocol/bytestream.py Changes: ===================================== src/common/protocol/bytestream.py ===================================== --- a/src/common/protocol/bytestream.py +++ b/src/common/protocol/bytestream.py @@ -819,7 +819,7 @@ class ConnectionIBBytestream(ConnectionBytestream): self.connection.send(nbxmpp.Protocol('iq', file_props.direction[1:], 'set', payload=[nbxmpp.Node(nbxmpp.NS_IBB + ' close', - {'sid':file_props.sid})])) + {'sid':file_props.transport_sid})])) if file_props.session_type == 'jingle': peerjid = \ file_props.receiver if file_props.type_ == 's' else file_props.sender View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/85f8e91bf7de86044708b49b4977dfd556…

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2017