Commits July 2021

commits@gajim.org

1 participants
34 discussions

[Git][gajim/gajim][mainwindow] MUCSubject: Don’t escape subject text
by Daniel Brötzmann (＠wurstsalat) 04 Jul '21

04 Jul '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 118db89a by wurstsalat at 2021-07-04T22:30:09+02:00 MUCSubject: Don’t escape subject text - - - - - 1 changed file: - gajim/gtk/conversation/rows/muc_subject.py Changes: ===================================== gajim/gtk/conversation/rows/muc_subject.py ===================================== @@ -37,8 +37,6 @@ def __init__(self, account, text, nick, date): self.timestamp = datetime.fromtimestamp(timestamp) self.db_timestamp = timestamp - text = GLib.markup_escape_text(text) - avatar_placeholder = Gtk.Box() avatar_placeholder.set_size_request(AvatarSize.ROSTER, -1) self.grid.attach(avatar_placeholder, 0, 0, 1, 2) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/118db89a1c52190c8a7cc883d618fb96… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/118db89a1c52190c8a7cc883d618fb96… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] ChatControl: Scroll to end when sending a message
by Daniel Brötzmann (＠wurstsalat) 04 Jul '21

04 Jul '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: c740a39a by wurstsalat at 2021-07-04T22:06:08+02:00 ChatControl: Scroll to end when sending a message - - - - - 1 changed file: - gajim/gtk/controls/base.py Changes: ===================================== gajim/gtk/controls/base.py ===================================== @@ -1102,8 +1102,11 @@ def add_message(self, log_line_id=msg_log_id, additional_data=additional_data) - if not self._scrolled_view.get_autoscroll() and kind != 'outgoing': - self._jump_to_end_button.add_unread_count() + if not self._scrolled_view.get_autoscroll(): + if kind == 'outgoing': + self.scroll_to_end() + else: + self._jump_to_end_button.add_unread_count() else: self._jump_to_end_button.add_unread_count() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c740a39a6bfb5ce89eb951f16c78d330… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c740a39a6bfb5ce89eb951f16c78d330… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Improve conversation scrolling and jump to end button
by Daniel Brötzmann (＠wurstsalat) 04 Jul '21

04 Jul '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 6276f2cd by wurstsalat at 2021-07-04T18:22:22+02:00 Improve conversation scrolling and jump to end button - - - - - 5 changed files: - gajim/data/gui/chat_control.ui - gajim/data/gui/groupchat_control.ui - gajim/gtk/controls/base.py - + gajim/gtk/conversation/jump_to_end_button.py - gajim/gtk/conversation/scrolled.py Changes: ===================================== gajim/data/gui/chat_control.ui ===================================== @@ -1231,26 +1231,4 @@ audio-volume-high-symbolic</property> </packing> </child> </object> - <object class="GtkButton" id="jump_to_end_button"> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="no-show-all">True</property> - <property name="halign">end</property> - <property name="valign">end</property> - <property name="margin-end">6</property> - <property name="margin-bottom">12</property> - <signal name="clicked" handler="_on_jump_to_end" swapped="no"/> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="margin-start">4</property> - <property name="margin-end">4</property> - <property name="icon-name">go-bottom-symbolic</property> - </object> - </child> - <style> - <class name="circular"/> - </style> - </object> </interface> ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -2302,26 +2302,4 @@ </packing> </child> </object> - <object class="GtkButton" id="jump_to_end_button"> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="no-show-all">True</property> - <property name="halign">end</property> - <property name="valign">end</property> - <property name="margin-end">6</property> - <property name="margin-bottom">12</property> - <signal name="clicked" handler="_on_jump_to_end" swapped="no"/> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="margin-start">4</property> - <property name="margin-end">4</property> - <property name="icon-name">go-bottom-symbolic</property> - </object> - </child> - <style> - <class name="circular"/> - </style> - </object> </interface> ===================================== gajim/gtk/controls/base.py ===================================== @@ -50,6 +50,7 @@ from gajim.gui.conversation.view import ConversationView from gajim.gui.conversation.scrolled import ScrolledView +from gajim.gui.conversation.jump_to_end_button import JumpToEndButton from gajim.gui.dialogs import DialogButton from gajim.gui.dialogs import ConfirmationDialog from gajim.gui.dialogs import PastePreviewDialog @@ -171,7 +172,10 @@ def __init__(self, widget_name, account, jid): self._scrolled_view.set_focus_vadjustment(Gtk.Adjustment()) self.xml.conv_view_overlay.add(self._scrolled_view) - self.xml.conv_view_overlay.add_overlay(self.xml.jump_to_end_button) + + self._jump_to_end_button = JumpToEndButton() + self._jump_to_end_button.connect('clicked', self._on_jump_to_end) + self.xml.conv_view_overlay.add_overlay(self._jump_to_end_button) self._scrolled_view.connect('autoscroll-changed', self._on_autoscroll_changed) @@ -912,10 +916,11 @@ def _on_message_textview_key_press_event(self, textview, event): return False def _on_autoscroll_changed(self, _widget, autoscroll): - self.xml.jump_to_end_button.set_visible(not autoscroll) + self._jump_to_end_button.toggle(not autoscroll) def _on_jump_to_end(self, _button): self.scroll_to_end(force=True) + self._jump_to_end_button.reset_unread_count() def _on_drag_data_received(self, widget, context, x, y, selection, target_type, timestamp): @@ -1085,16 +1090,22 @@ def add_message(self, if additional_data is None: additional_data = AdditionalDataDict() - self.conversation_view.add_message( - text, - kind, - name, - tim, - display_marking=displaymarking, - message_id=message_id, - correct_id=correct_id, - log_line_id=msg_log_id, - additional_data=additional_data) + if self._scrolled_view.get_lower_complete(): + self.conversation_view.add_message( + text, + kind, + name, + tim, + display_marking=displaymarking, + message_id=message_id, + correct_id=correct_id, + log_line_id=msg_log_id, + additional_data=additional_data) + + if not self._scrolled_view.get_autoscroll() and kind != 'outgoing': + self._jump_to_end_button.add_unread_count() + else: + self._jump_to_end_button.add_unread_count() if message_id: if self._type.is_groupchat: @@ -1268,13 +1279,10 @@ def set_control_active(self, state): self.contact, Chatstate.INACTIVE) def scroll_to_end(self, force=False): - if self._scrolled_view.get_lower_complete(): - self.conversation_view.scroll_to_end(force) - else: - # Clear view and reload conversation - self.conversation_view.clear() - self._scrolled_view.reset() - self.conversation_view.scroll_to_end(force) + # Clear view and reload conversation + self.conversation_view.clear() + self._scrolled_view.reset() + self.conversation_view.scroll_to_end(force) def scroll_to_message(self, log_line_id, timestamp): row = self.conversation_view.get_row_by_log_line_id(log_line_id) @@ -1328,8 +1336,10 @@ def fetch_n_lines_history(self, _scrolled, before, n_lines): return self.add_messages(messages) - if self.conversation_view.reduce_message_count(not before): - self._scrolled_view.set_history_complete(not before, False) + + if self._scrolled_view.get_autoscroll(): + if self.conversation_view.reduce_message_count(before): + self._scrolled_view.set_history_complete(before, False) self.conversation_view.unlock() ===================================== gajim/gtk/conversation/jump_to_end_button.py ===================================== @@ -0,0 +1,81 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from gi.repository import GObject +from gi.repository import Gtk + + +class JumpToEndButton(Gtk.Overlay): + + __gsignals__ = { + 'clicked': ( + GObject.SignalFlags.RUN_LAST, + None, + ()), + } + + def __init__(self): + Gtk.Overlay.__init__(self) + + self.set_halign(Gtk.Align.END) + self.set_valign(Gtk.Align.END) + self.set_margin_end(6) + self.set_margin_bottom(12) + + icon = Gtk.Image.new_from_icon_name( + 'go-bottom-symbolic', Gtk.IconSize.BUTTON) + icon.set_margin_start(4) + icon.set_margin_end(4) + + button = Gtk.Button() + button.set_margin_top(6) + button.set_margin_end(6) + button.get_style_context().add_class('circular') + button.add(icon) + button.connect('clicked', self._on_jump_clicked) + self.add(button) + + self._unread_label = Gtk.Label() + self._unread_label.get_style_context().add_class( + 'unread-counter') + self._unread_label.set_no_show_all(True) + self._unread_label.set_halign(Gtk.Align.END) + self._unread_label.set_valign(Gtk.Align.START) + self.add_overlay(self._unread_label) + + self.show_all() + + self._count = 0 + + def _on_jump_clicked(self, _button): + self.emit('clicked') + + def toggle(self, visible): + if visible: + self.show_all() + else: + self.hide() + self.reset_unread_count() + + def reset_unread_count(self): + self._count = 0 + self._unread_label.hide() + + def add_unread_count(self): + self._count += 1 + if self._count > 0: + self._unread_label.set_text(str(self._count)) + self._unread_label.show() + else: + self._unread_label.hide() ===================================== gajim/gtk/conversation/scrolled.py ===================================== @@ -131,7 +131,7 @@ def _on_adj_value_changed(self, adj, *args): self._request_history_at_upper = None - distance = adj.get_page_size() + distance = adj.get_page_size() * 2 if adj.get_value() < distance: # Load messages when we are near the top if self._upper_complete: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6276f2cd11691f078b30930bebabd909… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6276f2cd11691f078b30930bebabd909… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Profile: Don’t fail when adding a note property
by Philipp Hörist (＠lovetox) 02 Jul '21

02 Jul '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: d28358d1 by lovetox at 2021-07-02T22:27:54+02:00 Profile: Don’t fail when adding a note property Fixes #10598 - - - - - 1 changed file: - gajim/gtk/vcard_grid.py Changes: ===================================== gajim/gtk/vcard_grid.py ===================================== @@ -79,7 +79,7 @@ 'role': {'value': ''}, 'url': {'value': ''}, 'key': {'value': '', 'value_type': 'text'}, - 'note': {'value': '', 'value_type': 'text'}, + 'note': {'value': ''}, } View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d28358d197ef10a3872dffa3b678156b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d28358d197ef10a3872dffa3b678156b… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2021