Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][gajim_0.16] Fix return value and negativ timeout values
by Philipp Hörist 13 Mar '17

13 Mar '17

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: d603a30f by Philipp Hörist at 2017-03-14T00:03:56+01:00 Fix return value and negativ timeout values Fixes #8533 - - - - - 1 changed file: - src/common/logger.py Changes: ===================================== src/common/logger.py ===================================== --- a/src/common/logger.py +++ b/src/common/logger.py @@ -598,11 +598,11 @@ class Logger: # How many lines to restore and when to time them out restore_how_many = gajim.config.get('restore_lines') if restore_how_many <= 0: - return + return [] timeout = gajim.config.get('restore_timeout') # in minutes now = int(float(time.time())) - if timeout != 0: + if timeout > 0: timeout = now - (timeout * 60) # before that they are too old # so if we ask last 5 lines and we have 2 pending we get # 3 - 8 (we avoid the last 2 lines but we still return 5 asked) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d603a30f3a06319d5eecfb983615b50b6e…

1 0

[Git][gajim/gajim][gajim_0.16] Dont treat MAM results as unread messages
by Philipp Hörist 13 Mar '17

13 Mar '17

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: 09542bd0 by Philipp Hörist at 2017-03-13T23:28:55+01:00 Dont treat MAM results as unread messages Fixes #8544 - - - - - 1 changed file: - src/common/logger.py Changes: ===================================== src/common/logger.py ===================================== --- a/src/common/logger.py +++ b/src/common/logger.py @@ -495,7 +495,8 @@ class Logger: all_messages.append(results[0] + (shown,)) return all_messages - def write(self, kind, jid, message=None, show=None, tim=None, subject=None): + def write(self, kind, jid, message=None, show=None, tim=None, subject=None, + mam_query=False): """ Write a row (status, gcstatus, message etc) to logs database @@ -568,7 +569,7 @@ class Logger: except exceptions.PysqliteOperationalError, e: raise exceptions.PysqliteOperationalError(str(e)) if kind == 'chat_msg_recv': - if not self.jid_is_from_pm(jid): + if not self.jid_is_from_pm(jid) and not mam_query: # Save in unread table only if it's not a pm write_unread = True @@ -1148,7 +1149,7 @@ class Logger: log.debug('Log already in DB, ignoring it') return log.debug('New log received from server archives, storing it') - self.write(type_, with_, message=msg, tim=tim) + self.write(type_, with_, message=msg, tim=tim, mam_query=True) def _nec_gc_message_received(self, obj): tim_f = float(time.mktime(obj.timestamp)) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/09542bd0b017926bd5f9c7dae92617c34e…

1 0

[Git][gajim/gajim][master] Dont treat MAM results as unread messages
by Philipp Hörist 13 Mar '17

13 Mar '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 69022ab1 by Philipp Hörist at 2017-03-13T23:21:33+01:00 Dont treat MAM results as unread messages Fixes #8544 - - - - - 1 changed file: - src/common/logger.py Changes: ===================================== src/common/logger.py ===================================== --- a/src/common/logger.py +++ b/src/common/logger.py @@ -490,7 +490,8 @@ class Logger: all_messages.append(results[0]) return all_messages - def write(self, kind, jid, message=None, show=None, tim=None, subject=None, additional_data=None): + def write(self, kind, jid, message=None, show=None, tim=None, subject=None, + additional_data=None, mam_query=False): """ Write a row (status, gcstatus, message etc) to logs database @@ -566,7 +567,7 @@ class Logger: except exceptions.PysqliteOperationalError as e: raise exceptions.PysqliteOperationalError(str(e)) if kind == 'chat_msg_recv': - if not self.jid_is_from_pm(jid): + if not self.jid_is_from_pm(jid) and not mam_query: # Save in unread table only if it's not a pm write_unread = True @@ -1143,7 +1144,8 @@ class Logger: log.debug('Log already in DB, ignoring it') return log.debug('New log received from server archives, storing it') - self.write(type_, with_, message=msg, tim=tim, additional_data=additional_data) + self.write(type_, with_, message=msg, tim=tim, + additional_data=additional_data, mam_query=True) def _nec_gc_message_received(self, obj): tim_f = float(obj.timestamp) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/69022ab100dc65839c1d9f1e920fe1cdb2…

1 0

[Git][gajim/gajim][master] 2 commits: Add new Columns to Logs.db
by Philipp Hörist 13 Mar '17

13 Mar '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: c75c45bc by Philipp Hörist at 2017-03-13T19:33:16+01:00 Add new Columns to Logs.db - - - - - d874676e by Philipp Hörist at 2017-03-13T21:18:28+01:00 Merge branch 'sql' into 'master' Add new Columns to Logs.db See merge request !66 - - - - - 3 changed files: - src/common/check_paths.py - src/common/defs.py - src/common/optparser.py Changes: ===================================== src/common/check_paths.py ===================================== --- a/src/common/check_paths.py +++ b/src/common/check_paths.py @@ -72,7 +72,12 @@ def create_log_db(): show INTEGER, message TEXT, subject TEXT, - additional_data TEXT DEFAULT '{}' + additional_data TEXT DEFAULT '{}', + stanza_id TEXT, + mam_id TEXT, + encryption TEXT, + encryption_state TEXT, + marker INTEGER ); CREATE INDEX idx_logs_jid_id_time ON logs (jid_id, time DESC); ===================================== src/common/defs.py ===================================== --- a/src/common/defs.py +++ b/src/common/defs.py @@ -30,7 +30,7 @@ import os.path docdir = '../' basedir = '../' localedir = '../po' -version = '0.16.10.2' +version = '0.16.10.3' try: node = subprocess.Popen('git rev-parse --short=12 HEAD', shell=True, ===================================== src/common/optparser.py ===================================== --- a/src/common/optparser.py +++ b/src/common/optparser.py @@ -234,6 +234,8 @@ class OptionsParser: self.update_config_to_016101() if old < [0, 16, 10, 2] and new >= [0, 16, 10, 2]: self.update_config_to_016102() + if old < [0, 16, 10, 3] and new >= [0, 16, 10, 3]: + self.update_config_to_016103() gajim.logger.init_vars() gajim.logger.attach_cache_database() @@ -975,3 +977,25 @@ class OptionsParser: con.close() gajim.config.set('version', '0.16.10.2') + + def update_config_to_016103(self): + back = os.getcwd() + os.chdir(logger.LOG_DB_FOLDER) + con = sqlite.connect(logger.LOG_DB_FILE) + os.chdir(back) + cur = con.cursor() + try: + cur.executescript( + ''' + ALTER TABLE logs ADD COLUMN 'stanza_id' TEXT; + ALTER TABLE logs ADD COLUMN 'mam_id' TEXT; + ALTER TABLE logs ADD COLUMN 'encryption' TEXT; + ALTER TABLE logs ADD COLUMN 'encryption_state' TEXT; + ALTER TABLE logs ADD COLUMN 'marker' INTEGER; + ''' + ) + con.commit() + except sqlite.OperationalError: + pass + con.close() + gajim.config.set('version', '0.16.10.3') View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/55561b3dd0df0cb8e49aa6be32d7846ba…

1 0

[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

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits