Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Fix TextView scrolling
by Philipp Hörist 21 Mar '18

21 Mar '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: abdca0ea by Philipp Hörist at 2018-03-20T22:19:30+01:00 Fix TextView scrolling Fixes #8813 - - - - - 8 changed files: - gajim/chat_control_base.py - gajim/conversation_textview.py - gajim/data/gui/chat_control.ui - gajim/data/gui/groupchat_control.ui - gajim/groupchat_control.py - gajim/gui_interface.py - gajim/message_window.py - gajim/roster_window.py Changes: ===================================== gajim/chat_control_base.py ===================================== --- a/gajim/chat_control_base.py +++ b/gajim/chat_control_base.py @@ -305,13 +305,9 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): 'conversation_scrolledwindow') self.conv_scrolledwindow.add(self.conv_textview.tv) widget = self.conv_scrolledwindow.get_vadjustment() - id_ = widget.connect('value-changed', - self.on_conversation_vadjustment_value_changed) - self.handlers[id_] = widget id_ = widget.connect('changed', self.on_conversation_vadjustment_changed) self.handlers[id_] = widget - self.was_at_the_end = True self.correcting = False self.last_sent_msg = None @@ -965,7 +961,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): full_jid = self.get_full_jid() textview = self.conv_textview end = False - if self.was_at_the_end or kind == 'outgoing': + if self.conv_textview.autoscroll or kind == 'outgoing': end = True if other_tags_for_name is None: @@ -1201,7 +1197,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): if state: self.set_emoticon_popover() jid = self.contact.jid - if self.was_at_the_end: + if self.conv_textview.autoscroll: # we are at the end type_ = ['printed_' + self.type_id] if self.type_id == message_control.TYPE_GC: @@ -1221,21 +1217,14 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): else: self.send_chatstate('inactive', self.contact) - def scroll_to_end_iter(self): - self.conv_textview.scroll_to_end_iter() - return False + def scroll_to_end(self, force=False): + self.conv_textview.scroll_to_end(force) - def on_conversation_vadjustment_changed(self, adjustment): - # used to stay at the end of the textview when we shrink conversation - # textview. - if self.was_at_the_end: - 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): - self.was_at_the_end = (adjustment.get_upper() - adjustment.get_value() \ - - adjustment.get_page_size()) < 18 + def _on_edge_reached(self, scrolledwindow, pos): + if pos != Gtk.PositionType.BOTTOM: + return + # Remove all events and set autoscroll True + self.conv_textview.autoscroll = True if self.resource: jid = self.contact.get_full_jid() else: @@ -1252,8 +1241,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): return if not self.parent_win: return - if self.conv_textview.at_the_end() and \ - self.parent_win.get_active_control() == self and \ + if self.parent_win.get_active_control() == self and \ self.parent_win.window.is_active(): # we are at the end if self.type_id == message_control.TYPE_GC: @@ -1264,6 +1252,18 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): # There were events to remove self.redraw_after_event_removed(jid) + def _on_scroll(self, widget, event): + # On scrolliung UP disable autoscroll + has_direction, direction = event.get_scroll_direction() + if has_direction and direction == Gdk.ScrollDirection.UP: + # Check if we have a Scrollbar + adjustment = self.conv_scrolledwindow.get_vadjustment() + if adjustment.get_upper() != adjustment.get_page_size(): + self.conv_textview.autoscroll = False + + def on_conversation_vadjustment_changed(self, adjustment): + self.scroll_to_end() + def redraw_after_event_removed(self, jid): """ We just removed a 'printed_*' event, redraw contact in roster or @@ -1344,7 +1344,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): """ # make the last message visible, when changing to "full view" if not state: - GLib.idle_add(self.conv_textview.scroll_to_end_iter) + self.scroll_to_end() widget.set_no_show_all(state) if state: ===================================== gajim/conversation_textview.py ===================================== --- a/gajim/conversation_textview.py +++ b/gajim/conversation_textview.py @@ -206,7 +206,7 @@ class ConversationTextview(GObject.GObject): self.last_sent_message_id = None # last_received_message_id[name] = (msg_stanza_id, line_start_mark) self.last_received_message_id = {} - + self.autoscroll = True # connect signals id_ = self.tv.connect('populate_popup', self.on_textview_populate_popup) self.handlers[id_] = self.tv @@ -370,16 +370,9 @@ class ConversationTextview(GObject.GObject): self.tv.tagXMPP.set_property('foreground', color) self.tv.tagSthAtSth.set_property('foreground', color) - def at_the_end(self): - return gtkgui_helpers.at_the_end(self.tv.get_parent()) - - def scroll_to_end_iter(self): - buffer_ = self.tv.get_buffer() - end_iter = buffer_.get_end_iter() - if not end_iter: - return False - self.tv.scroll_to_iter(end_iter, 0, False, 1, 1) - return False # when called in an idle_add, just do it once + def scroll_to_end(self, force=False): + if self.autoscroll or force: + gtkgui_helpers.scroll_to_end(self.tv.get_parent()) def correct_message(self, correct_id, kind, name): allowed = True @@ -449,7 +442,7 @@ class ConversationTextview(GObject.GObject): buffer_.end_user_action() del self.xep0184_marks[id_] - def show_focus_out_line(self, scroll=True): + def show_focus_out_line(self): if not self.allow_focus_out_line: # if room did not receive focus-in from the last time we added # --- line then do not readd @@ -505,11 +498,7 @@ class ConversationTextview(GObject.GObject): buffer_.get_end_iter(), left_gravity=True) buffer_.end_user_action() - - if scroll: - # scroll to the end (via idle in case the scrollbar has - # appeared) - GLib.idle_add(self.scroll_to_end_iter) + self.scroll_to_end() def clear(self, tv = None): """ @@ -1231,9 +1220,9 @@ class ConversationTextview(GObject.GObject): self.last_sent_message_id = (msg_stanza_id, new_mark) if not insert_mark: - if self.at_the_end() or kind == 'outgoing': + if self.autoscroll or kind == 'outgoing': # we are at the end or we are sending something - GLib.idle_add(self.scroll_to_end_iter) + self.scroll_to_end(force=True) self.just_cleared = False buffer_.end_user_action() ===================================== gajim/data/gui/chat_control.ui ===================================== --- a/gajim/data/gui/chat_control.ui +++ b/gajim/data/gui/chat_control.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.20"/> <object class="GtkAdjustment" id="adjustment1"> @@ -594,6 +594,8 @@ <property name="can_focus">True</property> <property name="shadow_type">in</property> <property name="overlay_scrolling">False</property> + <signal name="edge-reached" handler="_on_edge_reached" swapped="no"/> + <signal name="scroll-event" handler="_on_scroll" swapped="no"/> <child> <placeholder/> </child> ===================================== gajim/data/gui/groupchat_control.ui ===================================== --- a/gajim/data/gui/groupchat_control.ui +++ b/gajim/data/gui/groupchat_control.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.20"/> <object class="GtkMenu" id="formattings_menu"> @@ -187,6 +187,8 @@ <property name="can_focus">True</property> <property name="shadow_type">in</property> <property name="overlay_scrolling">False</property> + <signal name="edge-reached" handler="_on_edge_reached" swapped="no"/> + <signal name="scroll-event" handler="_on_scroll" swapped="no"/> <child> <placeholder/> </child> ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -1380,8 +1380,7 @@ class GroupchatControl(ChatControlBase): # we have full focus (we are reading it!) return - at_the_end = self.conv_textview.at_the_end() - self.conv_textview.show_focus_out_line(scroll=at_the_end) + self.conv_textview.show_focus_out_line() def needs_visual_notification(self, text): """ ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -1814,8 +1814,8 @@ class Interface: w.window.present() # Using isinstance here because we want to catch all derived types if isinstance(ctrl, ChatControlBase): - tv = ctrl.conv_textview - tv.scroll_to_end_iter() + ctrl.scroll_to_end() + def join_gc_minimal(self, account, room_jid, password=None): if account is not None: ===================================== gajim/message_window.py ===================================== --- a/gajim/message_window.py +++ b/gajim/message_window.py @@ -292,16 +292,10 @@ class MessageWindow(object): self._controls[control.account][fjid] = control if self.get_num_controls() == 2: - # is first conversation_textview scrolled down ? - scrolled = False first_widget = self.notebook.get_nth_page(0) ctrl = self._widget_to_control(first_widget) - conv_textview = ctrl.conv_textview - if conv_textview.at_the_end(): - scrolled = True self.notebook.set_show_tabs(True) - if scrolled: - GLib.idle_add(conv_textview.scroll_to_end_iter) + ctrl.scroll_to_end() # Add notebook page and connect up to the tab's close button xml = gtkgui_helpers.get_gtk_builder('message_window.ui', 'chat_tab_ebox') ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -2723,7 +2723,7 @@ class RosterWindow: xep0184_id=xep0184_id, additional_data=obj.additional_data) if obj.msg_log_id: pw = obj.session.control.parent_win - end = obj.session.control.was_at_the_end + end = obj.session.control.conv_textview.autoscroll if not pw or (pw.get_active_control() and obj.session.control \ == pw.get_active_control() and pw.is_active() and end): app.logger.set_read_messages([obj.msg_log_id]) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/abdca0eaac1c943b377619953b7aa72292… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/abdca0eaac1c943b377619953b7aa72292… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Windows Build: Move ssl libs to correct dir
by Philipp Hörist 20 Mar '18

20 Mar '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 25e123a3 by Philipp Hörist at 2018-03-20T18:25:04+01:00 Windows Build: Move ssl libs to correct dir Python searches in lib-dynload and if not found it searches in C:/Windows/system32 which can contain dlls with an invalid version Fixes #8905 - - - - - 2 changed files: - win/_base.sh - win/build.sh Changes: ===================================== win/_base.sh ===================================== --- a/win/_base.sh +++ b/win/_base.sh @@ -293,6 +293,14 @@ function cleanup_install { } +function move_ssl_libs { + # Pythons ssl module searches in that path for these dlls, if they are not there + # C:/Windows/system32 is searcherd and potentially wrong versioned dlls are found there + cp "${MINGW_ROOT}"/bin/libeay32.dll "${MINGW_ROOT}"/lib/python3.6/lib-dynload/libeay32.dll + cp "${MINGW_ROOT}"/bin/ssleay32.dll "${MINGW_ROOT}"/lib/python3.6/lib-dynload/ssleay32.dll + +} + function build_installer { (cd "$BUILD_ROOT" && makensis -NOCD -DVERSION="$QL_VERSION_DESC" "${MISC}"/gajim.nsi) (cd "$BUILD_ROOT" && makensis -NOCD -DVERSION="$QL_VERSION_DESC" "${MISC}"/gajim-portable.nsi) ===================================== win/build.sh ===================================== --- a/win/build.sh +++ b/win/build.sh @@ -17,6 +17,7 @@ function main { install_deps install_gajim "$GIT_TAG" cleanup_install + move_ssl_libs build_installer } View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/25e123a379040209cef56e2adda390205d… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/25e123a379040209cef56e2adda390205d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update ChangeLog
by Philipp Hörist 20 Mar '18

20 Mar '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9c295e62 by Philipp Hörist at 2018-03-20T09:34:59+01:00 Update ChangeLog - - - - - 1 changed file: - ChangeLog Changes: ===================================== ChangeLog ===================================== --- a/ChangeLog +++ b/ChangeLog @@ -33,6 +33,7 @@ Gajim 1.0.0 (17 March 2018) - Meta Contacts: Filtering the roster could lead to a crash in some circumstances. Use CTRL + N for starting new chats as a workaround - Audio/Video support is currently not maintained and most likely not working + - Windows: Translation is not working currently Gajim 0.16.9 (30 November 2017) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9c295e62c631dfffcfa0a468ac187164fd… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9c295e62c631dfffcfa0a468ac187164fd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove unused code
by Philipp Hörist 19 Mar '18

19 Mar '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 83f57d49 by Philipp Hörist at 2018-03-19T20:25:25+01:00 Remove unused code - - - - - 1 changed file: - gajim/conversation_textview.py Changes: ===================================== gajim/conversation_textview.py ===================================== --- a/gajim/conversation_textview.py +++ b/gajim/conversation_textview.py @@ -171,10 +171,6 @@ class ConversationTextview(GObject.GObject): MESSAGE_ENCRYPTED_PIXBUF = gtkgui_helpers.get_icon_pixmap( 'channel-secure-croped-symbolic') - # smooth scroll constants - MAX_SCROLL_TIME = 0.4 # seconds - SCROLL_DELAY = 33 # milliseconds - def __init__(self, account, used_in_history_window = False): """ If used_in_history_window is True, then we do not show Clear menuitem in View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/83f57d49cba0bc80c3dfc2be51fbf0ff14… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/83f57d49cba0bc80c3dfc2be51fbf0ff14… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Limit width of entrys in StartChat Dialog
by Philipp Hörist 19 Mar '18

19 Mar '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: b7e9fb70 by Philipp Hörist at 2018-03-19T20:04:51+01:00 Limit width of entrys in StartChat Dialog - - - - - 1 changed file: - gajim/dialogs.py Changes: ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -34,6 +34,7 @@ from gi.repository import Gdk from gi.repository import GdkPixbuf from gi.repository import GObject from gi.repository import GLib +from gi.repository import Pango import os import nbxmpp @@ -3023,6 +3024,9 @@ class ContactRow(Gtk.Grid): self.name = _('New Contact') self.name_label = Gtk.Label(self.name) + self.name_label.set_ellipsize(Pango.EllipsizeMode.END) + self.name_label.set_xalign(0) + self.name_label.set_width_chars(25) self.name_label.set_halign(Gtk.Align.START) self.name_label.get_style_context().add_class('bold16') @@ -3033,6 +3037,9 @@ class ContactRow(Gtk.Grid): middle_box.add(self.name_label) self.jid_label = Gtk.Label(jid) + self.jid_label.set_ellipsize(Pango.EllipsizeMode.END) + self.jid_label.set_xalign(0) + self.jid_label.set_width_chars(25) self.jid_label.set_halign(Gtk.Align.START) middle_box.add(self.jid_label) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b7e9fb70e306dbcef43e1bc83da13e22e1… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b7e9fb70e306dbcef43e1bc83da13e22e1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.0] Update Flatpak build
by Philipp Hörist 19 Mar '18

19 Mar '18

Philipp Hörist pushed to branch gajim_1.0 at gajim / gajim Commits: 08525402 by Philipp Hörist at 2018-03-19T20:04:23+01:00 Update Flatpak build - - - - - 1 changed file: - org.gajim.Gajim.json Changes: ===================================== org.gajim.Gajim.json ===================================== --- a/org.gajim.Gajim.json +++ b/org.gajim.Gajim.json @@ -340,7 +340,7 @@ { "type": "git", "url": "https://dev.gajim.org/gajim/python-nbxmpp.git", - "branch": "nbxmpp-0.6.3" + "branch": "nbxmpp-0.6.4" } ] }, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/08525402f25afd3b1294b1981dffd9da15… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/08525402f25afd3b1294b1981dffd9da15… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update Flatpak build
by Philipp Hörist 19 Mar '18

19 Mar '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: dc5121bf by Philipp Hörist at 2018-03-19T19:41:48+01:00 Update Flatpak build - - - - - 1 changed file: - org.gajim.Gajim.json Changes: ===================================== org.gajim.Gajim.json ===================================== --- a/org.gajim.Gajim.json +++ b/org.gajim.Gajim.json @@ -342,7 +342,7 @@ { "type": "git", "url": "https://dev.gajim.org/gajim/python-nbxmpp.git", - "branch": "nbxmpp-0.6.3" + "branch": "nbxmpp-0.6.4" } ] }, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/dc5121bfedd068c8091e6d2f76cce66b49… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/dc5121bfedd068c8091e6d2f76cce66b49… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.0] Limit width of entrys in StartChat Dialog
by Philipp Hörist 19 Mar '18

19 Mar '18

Philipp Hörist pushed to branch gajim_1.0 at gajim / gajim Commits: 6e98b89e by Philipp Hörist at 2018-03-19T19:40:16+01:00 Limit width of entrys in StartChat Dialog - - - - - 1 changed file: - gajim/dialogs.py Changes: ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -34,6 +34,7 @@ from gi.repository import Gdk from gi.repository import GdkPixbuf from gi.repository import GObject from gi.repository import GLib +from gi.repository import Pango import os import nbxmpp @@ -3023,6 +3024,9 @@ class ContactRow(Gtk.Grid): self.name = _('New Contact') self.name_label = Gtk.Label(self.name) + self.name_label.set_ellipsize(Pango.EllipsizeMode.END) + self.name_label.set_xalign(0) + self.name_label.set_width_chars(25) self.name_label.set_halign(Gtk.Align.START) self.name_label.get_style_context().add_class('bold16') @@ -3033,6 +3037,9 @@ class ContactRow(Gtk.Grid): middle_box.add(self.name_label) self.jid_label = Gtk.Label(jid) + self.jid_label.set_ellipsize(Pango.EllipsizeMode.END) + self.jid_label.set_xalign(0) + self.jid_label.set_width_chars(25) self.jid_label.set_halign(Gtk.Align.START) middle_box.add(self.jid_label) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6e98b89e9fdfebff3785bf2d49b3624ffa… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6e98b89e9fdfebff3785bf2d49b3624ffa… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.0] Only handle event if it belongs to the control
by Philipp Hörist 19 Mar '18

19 Mar '18

Philipp Hörist pushed to branch gajim_1.0 at gajim / gajim Commits: 2c7202eb by Philipp Hörist at 2018-03-19T19:24:27+01:00 Only handle event if it belongs to the control - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -2023,6 +2023,10 @@ class GroupchatControl(ChatControlBase): def _message_sent(self, obj): if not obj.message: return + if obj.account != self.account: + return + if obj.jid != self.room_jid: + return # we'll save sent message text when we'll receive it in # _nec_gc_message_received self.last_sent_msg = obj.stanza_id View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2c7202ebaa74a36bf94b994aa591282181… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2c7202ebaa74a36bf94b994aa591282181… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Only handle event if it belongs to the control
by Philipp Hörist 19 Mar '18

19 Mar '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 945b7baa by Philipp Hörist at 2018-03-19T01:34:38+01:00 Only handle event if it belongs to the control - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -2020,6 +2020,10 @@ class GroupchatControl(ChatControlBase): def _message_sent(self, obj): if not obj.message: return + if obj.account != self.account: + return + if obj.jid != self.room_jid: + return # we'll save sent message text when we'll receive it in # _nec_gc_message_received self.last_sent_msg = obj.stanza_id View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/945b7baafbbef11dd2e8c042376fa0f9a0… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/945b7baafbbef11dd2e8c042376fa0f9a0… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits