Commits May 2021

commits@gajim.org

1 participants
67 discussions

[Git][gajim/gajim][mainwindow] ChatStack: Add placeholder page
by Daniel Brötzmann 02 May '21

02 May '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: a9c0725d by wurstsalat at 2021-05-02T11:22:13+02:00 ChatStack: Add placeholder page - - - - - 1 changed file: - gajim/gtk/chat_stack.py Changes: ===================================== gajim/gtk/chat_stack.py ===================================== @@ -17,6 +17,7 @@ from gi.repository import Gtk from gajim.common import ged +from gajim.common.i18n import _ from gajim.gui.controls.chat import ChatControl from gajim.gui.controls.groupchat import GroupchatControl @@ -35,7 +36,7 @@ def __init__(self): self.set_vexpand(True) self.set_hexpand(True) - self.add_named(Gtk.Box(), 'empty') + self.add_named(ChatPlaceholderBox(), 'empty') self.register_events([ ('account-enabled', ged.GUI2, self._on_account_changed), @@ -110,3 +111,21 @@ def remove_chats_for_account(self, account): def _on_account_changed(self, *args): for control in self._controls.values(): control.update_account_badge() + + +class ChatPlaceholderBox(Gtk.Box): + def __init__(self): + Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL, + spacing=18) + self.set_valign(Gtk.Align.CENTER) + pixbuf = Gtk.IconTheme.load_icon_for_scale( + Gtk.IconTheme.get_default(), + 'org.gajim.Gajim-symbolic', + 100, + self.get_scale_factor(), + 0) + self.add(Gtk.Image.new_from_pixbuf(pixbuf)) + + label = Gtk.Label(label=_('Start a Chat')) + label.get_style_context().add_class('dim-label') + self.add(label) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a9c0725d008d5ce7dcb3d022aaa94e0d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a9c0725d008d5ce7dcb3d022aaa94e0d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Remove minimize_on_* MUC settings
by Daniel Brötzmann 02 May '21

02 May '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: a8edc3bb by wurstsalat at 2021-05-02T11:07:24+02:00 Remove minimize_on_* MUC settings - - - - - 3 changed files: - gajim/common/config.py - gajim/common/setting_values.py - gajim/gtk/groupchat_settings.py Changes: ===================================== gajim/common/config.py ===================================== @@ -337,8 +337,6 @@ class Config: 'notify_on_all_messages': [opt_bool, False, _('If enabled, a notification is created for every message in this group chat.')], 'print_status': [opt_bool, False, _('Show a status message for all status changes (away, dnd, etc.) of users in a group chat.')], 'print_join_left': [opt_bool, False, _('Show a status message for every join or leave in a group chat.')], - 'minimize_on_autojoin': [opt_bool, True, _('If enabled, the group chat is minimized into the contact list when joining automatically.')], - 'minimize_on_close': [opt_bool, True, _('If enabled, the group chat is minimized into the contact list when closing it.')], 'send_chatstate': [opt_str, 'composing_only', _('Chat state notifications that are sent to the group chat. Possible values: \'all\', \'composing_only\' or \'disabled\'.')], }, {}), 'plugins': ({ ===================================== gajim/common/setting_values.py ===================================== @@ -274,8 +274,6 @@ class _ACCOUNT_DEFAULT: 'notify_on_all_messages': HAS_APP_DEFAULT, 'print_status': HAS_APP_DEFAULT, 'print_join_left': HAS_APP_DEFAULT, - 'minimize_on_autojoin': True, - 'minimize_on_close': True, 'send_chatstate': HAS_ACCOUNT_DEFAULT, 'send_marker': HAS_ACCOUNT_DEFAULT, 'encryption': '', ===================================== gajim/gtk/groupchat_settings.py ===================================== @@ -54,16 +54,6 @@ def __init__(self, account, jid): SettingType.GROUP_CHAT, 'notify_on_all_messages'), - Setting(SettingKind.SWITCH, - _('Minimize on Close'), - SettingType.GROUP_CHAT, - 'minimize_on_close'), - - Setting(SettingKind.SWITCH, - _('Minimize When Joining Automatically'), - SettingType.GROUP_CHAT, - 'minimize_on_autojoin'), - Setting(SettingKind.POPOVER, _('Send Chat State'), SettingType.GROUP_CHAT, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a8edc3bb7725e20fb2ed78ad7396de85… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a8edc3bb7725e20fb2ed78ad7396de85… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: SearchView: Simplify adding results
by Daniel Brötzmann 02 May '21

02 May '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 898f4bdb by wurstsalat at 2021-05-02T10:16:50+02:00 SearchView: Simplify adding results - - - - - b1da0485 by wurstsalat at 2021-05-02T10:56:48+02:00 CodeWidget: Add margins - - - - - 2 changed files: - gajim/gtk/conversation/code_widget.py - gajim/gtk/search_view.py Changes: ===================================== gajim/gtk/conversation/code_widget.py ===================================== @@ -91,6 +91,8 @@ def __init__(self): self.set_editable(False) self.set_cursor_visible(False) self.set_wrap_mode(Gtk.WrapMode.WORD_CHAR) + self.set_top_margin(2) + self.set_bottom_margin(2) self._source_manager = GtkSource.LanguageManager.get_default() ===================================== gajim/gtk/search_view.py ===================================== @@ -101,14 +101,12 @@ def _on_search(self, entry): if not context or everywhere: self._scope = 'everywhere' self._results = app.storage.archive.search_all_logs(text) - self._add_counter() - self._add_results() else: self._scope = 'contact' self._results = app.storage.archive.search_log( self._account, self._jid, text) - self._add_counter() - self._add_results() + self._add_counter() + self._add_results() def _add_counter(self): results_count = len(self._results) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/882aeb58bddc7d7f50ea2e7d712c28c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/882aeb58bddc7d7f50ea2e7d712c28c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Fix message Quote and Copy
by Daniel Brötzmann 01 May '21

01 May '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 882aeb58 by wurstsalat at 2021-05-02T00:16:17+02:00 Fix message Quote and Copy - - - - - 1 changed file: - gajim/gtk/conversation/rows/message.py Changes: ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -144,11 +144,11 @@ def is_mergeable(self, message): def on_copy_message(self, _widget): timestamp = self.timestamp.strftime('%x, %X') clip = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) - clip.set_text( - f'{timestamp} - {self.name}: {self.textview.get_text()}', -1) + text = self._message_widget.get_content().text + clip.set_text(f'{timestamp} - {self.name}: {text}', -1) def on_quote_message(self, _widget): - self.get_parent().on_quote(self.textview.get_text()) + self.get_parent().on_quote(self._message_widget.get_content().text) def _get_encryption_image(self, additional_data, encryption_enabled=None): details = self._get_encryption_details(additional_data) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/882aeb58bddc7d7f50ea2e7d712c28c7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/882aeb58bddc7d7f50ea2e7d712c28c7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Remove history remnants
by Daniel Brötzmann 01 May '21

01 May '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 3f674575 by wurstsalat at 2021-05-01T23:53:38+02:00 Remove history remnants - - - - - 4 changed files: - gajim/app_actions.py - gajim/application.py - gajim/data/gui/application_menu.ui - gajim/gui_menu_builder.py Changes: ===================================== gajim/app_actions.py ===================================== @@ -234,10 +234,6 @@ def on_file_transfers(_action, _param): interface.instances['file_transfers'].window.show_all() -def on_history(action, param): - on_browse_history(action, param) - - def on_open_event(_action, param): dict_ = param.unpack() app.interface.handle_event( ===================================== gajim/application.py ===================================== @@ -405,7 +405,6 @@ def add_actions(self): ('plugins', app_actions.on_plugins), ('xml-console', app_actions.on_xml_console), ('file-transfer', app_actions.on_file_transfers), - ('history', app_actions.on_history), ('shortcuts', app_actions.on_keyboard_shortcuts), ('features', app_actions.on_features), ('content', app_actions.on_contents), ===================================== gajim/data/gui/application_menu.ui ===================================== @@ -64,10 +64,6 @@ <attribute name="label" translatable="yes">_File Transfer</attribute> <attribute name="action">app.file-transfer</attribute> </item> - <item> - <attribute name="label" translatable="yes">_History</attribute> - <attribute name="action">app.history</attribute> - </item> </section> </submenu> <submenu> ===================================== gajim/gui_menu_builder.py ===================================== @@ -524,7 +524,6 @@ def get_singlechat_menu(control_id, account, jid, type_): ('win.block-contact-', _('Block Contact…')), ('win.start-call-', _('Start Call…')), ('win.information-', _('Information')), - ('app.browse-history', _('History')), ('win.search-history', _('Search…')), ] @@ -590,7 +589,6 @@ def get_groupchat_menu(control_id, account, jid): ('win.change-nickname-', _('Change Nickname…')), ('win.request-voice-', _('Request Voice')), ('win.execute-command-', _('Execute Command…')), - ('app.browse-history', _('History')), ('win.search-history', _('Search…')), ] View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3f674575d756b66b9df62e8d4abe6ae8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3f674575d756b66b9df62e8d4abe6ae8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] SearchView: Improve result display performance
by Daniel Brötzmann 01 May '21

01 May '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: f3cb5dda by wurstsalat at 2021-05-01T21:04:01+02:00 SearchView: Improve result display performance - - - - - 1 changed file: - gajim/gtk/search_view.py Changes: ===================================== gajim/gtk/search_view.py ===================================== @@ -46,6 +46,8 @@ def __init__(self): self._account = None self._jid = None + self._results = [] + self._scope = None self._ui = get_builder('search_view.ui') self._ui.results_listbox.set_header_func(self._header_func) @@ -93,31 +95,49 @@ def _on_search(self, entry): if text == '': return - accounts = self._get_accounts() everywhere = self._ui.search_checkbutton.get_active() context = self._account is not None and self._jid is not None if not context or everywhere: - # Global search - results = app.storage.archive.search_all_logs(text) - results_count = len(results) - if results_count: - self._ui.results_listbox.add(CounterRow(results_count)) - for msg in results: + self._scope = 'everywhere' + self._results = app.storage.archive.search_all_logs(text) + self._add_counter() + self._add_results() + else: + self._scope = 'contact' + self._results = app.storage.archive.search_log( + self._account, self._jid, text) + self._add_counter() + self._add_results() + + def _add_counter(self): + results_count = len(self._results) + if results_count: + self._ui.results_listbox.add(CounterRow(results_count)) + + def _add_results(self): + accounts = self._get_accounts() + count = 1 + for msg in self._results: + if count == 25: + return + if self._scope == 'everywhere': result_row = ResultRow( msg, accounts.get(msg.account_id), app.storage.archive.get_jid_from_id(msg.jid_id).jid) - self._ui.results_listbox.add(result_row) - else: - results = app.storage.archive.search_log( - self._account, self._jid, text) - results_count = len(results) - if results_count: - self._ui.results_listbox.add(CounterRow(results_count)) - for msg in results: + else: result_row = ResultRow(msg, self._account, self._jid) - self._ui.results_listbox.add(result_row) + + self._ui.results_listbox.add(result_row) + self._results.pop(0) + count += 1 + + def _on_edge_reached(self, _scrolledwin, pos): + if pos != Gtk.PositionType.BOTTOM: + return + + self._add_results() @staticmethod def _get_accounts(): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f3cb5dda65d5c63dc51741bfe92ac568… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f3cb5dda65d5c63dc51741bfe92ac568… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: GroupchatState: Improve layout
by Daniel Brötzmann 01 May '21

01 May '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: a8033bcb by wurstsalat at 2021-05-01T15:51:13+02:00 GroupchatState: Improve layout - - - - - 4fe81319 by wurstsalat at 2021-05-01T16:34:30+02:00 ChatRow: Fix newlines in last message - - - - - 2 changed files: - gajim/data/gui/groupchat_state.ui - gajim/gtk/chat_list.py Changes: ===================================== gajim/data/gui/groupchat_state.ui ===================================== @@ -40,6 +40,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> + <property name="pack-type">end</property> <property name="position">2</property> </packing> </child> @@ -89,6 +90,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> + <property name="pack-type">end</property> <property name="position">2</property> </packing> </child> ===================================== gajim/gtk/chat_list.py ===================================== @@ -484,7 +484,7 @@ def reset_unread(self): self.unread_count = 0 def set_last_message_text(self, nickname, text): - self._ui.message_label.set_text(text) + self._ui.message_label.set_text(text.replace('\n', ' ')) self._ui.nick_label.set_visible(bool(nickname)) self._ui.nick_label.set_text(nickname) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a01126c2b2345d1bd99519d7ca8b550… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a01126c2b2345d1bd99519d7ca8b550… 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 May 2021