Commits August 2019

commits@gajim.org

1 participants
78 discussions

[Git][gajim/gajim][master] 3 commits: Reorder some account menu items
by Philipp Hörist 10 Aug '19

10 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: e48f6887 by Philipp Hörist at 2019-08-10T19:04:51Z Reorder some account menu items - - - - - 7c375a2b by Philipp Hörist at 2019-08-10T19:08:38Z Groupchat: Only allow nickname/subject change on groupchat page - - - - - 0b117343 by Philipp Hörist at 2019-08-10T21:05:03Z MessageWindow: Bring back switching tab via <Alt>1-9 - - - - - 4 changed files: - gajim/data/gui/shortcuts_window.ui - gajim/groupchat_control.py - gajim/gui_menu_builder.py - gajim/message_window.py Changes: ===================================== gajim/data/gui/shortcuts_window.ui ===================================== @@ -120,6 +120,13 @@ <property name="title" translatable="yes">Switch to the next tab</property> </object> </child> + <child> + <object class="GtkShortcutsShortcut"> + <property name="visible">1</property> + <property name="accelerator"><Alt>1...9</property> + <property name="title" translatable="yes">Switch to the first - ninth tab</property> + </object> + </child> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> ===================================== gajim/groupchat_control.py ===================================== @@ -2898,7 +2898,7 @@ class GroupchatControl(ChatControlBase): self.xml.close_button.grab_default() def _on_change_nick(self, _action, _param): - if self._get_current_page() == 'nickname': + if self._get_current_page() != 'groupchat': return self.xml.nickname_entry.set_text(self.nick) self.xml.nickname_entry.grab_focus() @@ -2924,7 +2924,7 @@ class GroupchatControl(ChatControlBase): self._show_page('groupchat') def _on_change_subject(self, _action, _param): - if self._get_current_page() == 'subject': + if self._get_current_page() != 'groupchat': return self.xml.subject_textview.get_buffer().set_text(self.subject) self.xml.subject_textview.grab_focus() ===================================== gajim/gui_menu_builder.py ===================================== @@ -671,8 +671,9 @@ def get_account_menu(account): account_menu = [ ('-add-contact', _('Add Contact…')), ('-profile', _('Profile')), - ('-services', _('Discover Services')), ('-start-single-chat', _('Send Single Message…')), + ('-services', _('Discover Services')), + ('-server-info', _('Server Info')), (_('Advanced'), [ ('-archive', _('Archiving Preferences')), ('-blocking', _('Blocking List')), @@ -680,7 +681,7 @@ def get_account_menu(account): ('-pep-config', _('PEP Configuration')), ('-sync-history', _('Synchronise History')), ('-privacylists', _('Privacy Lists')), - ('-server-info', _('Server Info')), + ('-xml-console', _('XML Console')) ]), (_('Admin'), [ ===================================== gajim/message_window.py ===================================== @@ -173,6 +173,15 @@ class MessageWindow: '<Control>Page_Down']), ('switch-next-unread-tab-left', ['<Control>ISO_Left_Tab', '<Control>Page_Up']), + ('switch-tab-1', ['<Alt>1', '<Alt>KP_1']), + ('switch-tab-2', ['<Alt>2', '<Alt>KP_2']), + ('switch-tab-3', ['<Alt>3', '<Alt>KP_3']), + ('switch-tab-4', ['<Alt>4', '<Alt>KP_4']), + ('switch-tab-5', ['<Alt>5', '<Alt>KP_5']), + ('switch-tab-6', ['<Alt>6', '<Alt>KP_6']), + ('switch-tab-7', ['<Alt>7', '<Alt>KP_7']), + ('switch-tab-8', ['<Alt>8', '<Alt>KP_8']), + ('switch-tab-9', ['<Alt>9', '<Alt>KP_9']), ] disabled_for_emacs = ( @@ -254,6 +263,11 @@ class MessageWindow: self.move_to_next_unread_tab(False) return + if action.startswith('switch-tab-'): + number = int(action[-1]) + self.notebook.set_current_page(number - 1) + return + def change_account_name(self, old_name, new_name): if old_name in self._controls: self._controls[new_name] = self._controls[old_name] View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/922b11484bcddc548e7ba304b392c86df… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/922b11484bcddc548e7ba304b392c86df… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Move PEP configuration into accounts menu
by Philipp Hörist 10 Aug '19

10 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 922b1148 by Philipp Hörist at 2019-08-10T18:03:03Z Move PEP configuration into accounts menu - - - - - 4 changed files: - gajim/app_actions.py - gajim/application.py - gajim/gui_menu_builder.py - gajim/roster_window.py Changes: ===================================== gajim/app_actions.py ===================================== @@ -46,6 +46,7 @@ from gajim.gtk.discovery import ServiceDiscoveryWindow from gajim.gtk.blocking import BlockingList from gajim.gtk.xml_console import XMLConsoleWindow from gajim.gtk.groupchat_join import GroupchatJoin +from gajim.gtk.pep_config import ManagePEPServicesWindow # General Actions @@ -190,8 +191,17 @@ def on_import_contacts(action, param): app.interface.instances['import_contacts'] = \ dialogs.SynchroniseSelectAccountDialog(account) + # Advanced Actions +def on_pep_config(action, param): + account = param.get_string() + window = app.get_app_window(ManagePEPServicesWindow, account=account) + if window is None: + ManagePEPServicesWindow(account) + else: + window.present() + def on_mam_preferences(action, param): account = param.get_string() ===================================== gajim/application.py ===================================== @@ -510,6 +510,7 @@ class GajimApplication(Gtk.Application): ('-xml-console', a.on_xml_console, 'always', 's'), ('-server-info', a.on_server_info, 'online', 's'), ('-archive', a.on_mam_preferences, 'feature', 's'), + ('-pep-config', a.on_pep_config, 'online', 's'), ('-sync-history', a.on_history_sync, 'online', 's'), ('-privacylists', a.on_privacy_lists, 'feature', 's'), ('-blocking', a.on_blocking_list, 'feature', 's'), ===================================== gajim/gui_menu_builder.py ===================================== @@ -677,6 +677,7 @@ def get_account_menu(account): ('-archive', _('Archiving Preferences')), ('-blocking', _('Blocking List')), ('-bookmarks', _('Bookmarks')), + ('-pep-config', _('PEP Configuration')), ('-sync-history', _('Synchronise History')), ('-privacylists', _('Privacy Lists')), ('-server-info', _('Server Info')), ===================================== gajim/roster_window.py ===================================== @@ -76,7 +76,6 @@ from gajim.gtk.dialogs import CertificateDialog from gajim.gtk.dialogs import InvitationReceivedDialog from gajim.gtk.single_message import SingleMessageWindow from gajim.gtk.add_contact import AddNewContactWindow -from gajim.gtk.pep_config import ManagePEPServicesWindow from gajim.gtk.account_wizard import AccountCreationWizard from gajim.gtk.service_registration import ServiceRegistration from gajim.gtk.discovery import ServiceDiscoveryWindow @@ -3498,13 +3497,6 @@ class RosterWindow: helpers.update_optional_features(account) - def _on_pep_services_menuitem_activate(self, widget, account): - window = app.get_app_window(ManagePEPServicesWindow, account) - if window is None: - ManagePEPServicesWindow(account) - else: - window.present() - def on_add_new_contact(self, widget, account): AddNewContactWindow(account) @@ -4822,15 +4814,6 @@ class RosterWindow: item.connect('toggled', self.on_publish_location_toggled, account) - pep_config = Gtk.MenuItem.new_with_label( - _('Configure Services…')) - item = Gtk.SeparatorMenuItem.new() - pep_submenu.append(item) - pep_config.set_sensitive(True) - pep_submenu.append(pep_config) - pep_config.connect('activate', - self._on_pep_services_menuitem_activate, account) - else: pep_menuitem.set_sensitive(False) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/922b11484bcddc548e7ba304b392c86dfe… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/922b11484bcddc548e7ba304b392c86dfe… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix return value
by Philipp Hörist 10 Aug '19

10 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 211ed18e by Philipp Hörist at 2019-08-10T17:16:04Z Fix return value - - - - - 1 changed file: - gajim/common/modules/bookmarks.py Changes: ===================================== gajim/common/modules/bookmarks.py ===================================== @@ -225,7 +225,7 @@ class Bookmarks(BaseModule): def get_name_from_bookmark(self, jid: str) -> str: bookmark = self.get_bookmark_from_jid(jid) if bookmark is None: - return + return '' return bookmark.name def is_bookmark(self, jid: str) -> bool: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/211ed18e47c6cd34edfcea14ffa5a85fbf… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/211ed18e47c6cd34edfcea14ffa5a85fbf… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: PrivateChatControl: Access config value with correct key
by Philipp Hörist 10 Aug '19

10 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8146f01d by Philipp Hörist at 2019-08-09T13:49:11Z PrivateChatControl: Access config value with correct key - - - - - 89d1e307 by Philipp Hörist at 2019-08-09T14:09:49Z PrivateChatControl: Make room_name a property - - - - - b291d573 by Philipp Hörist at 2019-08-10T15:28:42Z Groupchat: Display groupchat names in banner Name is determined in the following way: 1. Bookmark name 2. Disco info muc#roomconfig_roomname value 3. localpart of the JID - - - - - f091cd0a by Philipp Hörist at 2019-08-10T17:11:51Z Rework Manage Bookmark dialog - Make it single account - Use a Treeview - Move it to advanced sub menu Manage Bookmarks should serve in the future as dialog for advanced users. During normal usage of Gajim there should be no need anymore to access this dialog. - - - - - 13 changed files: - gajim/app_actions.py - gajim/application.py - gajim/common/contacts.py - gajim/common/modules/bookmarks.py - gajim/data/gui/application_menu.ui - + gajim/data/gui/bookmarks.ui - − gajim/data/gui/manage_bookmarks_window.ui - gajim/data/style/gajim.css - gajim/groupchat_control.py - gajim/gtk/bookmarks.py - gajim/gui_menu_builder.py - gajim/privatechat_control.py - gajim/roster_window.py Changes: ===================================== gajim/app_actions.py ===================================== @@ -36,7 +36,7 @@ from gajim.gtk.add_contact import AddNewContactWindow from gajim.gtk.single_message import SingleMessageWindow from gajim.gtk.about import AboutDialog from gajim.gtk.privacy_list import PrivacyListsWindow -from gajim.gtk.bookmarks import ManageBookmarksWindow +from gajim.gtk.bookmarks import Bookmarks from gajim.gtk.features import FeaturesDialog from gajim.gtk.account_wizard import AccountCreationWizard from gajim.gtk.history import HistoryWindow @@ -87,8 +87,13 @@ def on_history_manager(action, param): HistoryManager() -def on_manage_bookmarks(action, param): - ManageBookmarksWindow() +def on_bookmarks(action, param): + account = param.get_string() + window = app.get_app_window(Bookmarks, account=account) + if window is None: + window = Bookmarks(account) + else: + window.present() def on_quit(action, param): ===================================== gajim/application.py ===================================== @@ -428,7 +428,6 @@ class GajimApplication(Gtk.Application): ('quit', app_actions.on_quit), ('add-account', app_actions.on_add_account), ('manage-proxies', app_actions.on_manage_proxies), - ('bookmarks', app_actions.on_manage_bookmarks), ('history-manager', app_actions.on_history_manager), ('preferences', app_actions.on_preferences), ('plugins', app_actions.on_plugins), @@ -502,6 +501,7 @@ class GajimApplication(Gtk.Application): ] return [ + ('-bookmarks', a.on_bookmarks, 'online', 's'), ('-start-single-chat', a.on_single_message, 'online', 's'), ('-start-chat', a.start_chat, 'online', 'as'), ('-add-contact', a.on_add_contact, 'online', 'as'), ===================================== gajim/common/contacts.py ===================================== @@ -173,12 +173,28 @@ class Contact(CommonContact): return self.jid def get_shown_name(self): + if self._is_groupchat: + return self._get_groupchat_name() if self.name: return self.name if self.contact_name: return self.contact_name return self.jid.split('@')[0] + def _get_groupchat_name(self): + from gajim.common import app + con = app.connections[self.account.name] + name = con.get_module('Bookmarks').get_name_from_bookmark(self.jid) + if name: + return name + + cache = caps_cache.muc_caps_cache.cache + if self.jid in cache: + name = cache[self.jid].muc_room_name + if name: + return name + return self.jid.split('@')[0] + def get_shown_groups(self): if self.is_observer(): return [_('Observers')] ===================================== gajim/common/modules/bookmarks.py ===================================== @@ -18,8 +18,6 @@ from typing import Any from typing import List from typing import Optional -import copy - import nbxmpp from nbxmpp.protocol import JID from nbxmpp.util import is_error_result @@ -122,27 +120,6 @@ class Bookmarks(BaseModule): if bookmark.jid == jid: return bookmark - def get_sorted_bookmarks(self, short_name=False): - # This returns a sorted by name copy of the bookmarks - sorted_bookmarks = [] - for bookmark in self._bookmarks: - bookmark_copy = copy.deepcopy(bookmark) - if not bookmark_copy.name: - # No name was given for this bookmark - # Use the first part of JID instead - name = bookmark_copy.jid.getNode() - bookmark_copy = bookmark_copy._replace(name=name) - - if short_name: - name = bookmark_copy.name - name = (name[:42] + '..') if len(name) > 42 else name - bookmark_copy = bookmark_copy._replace(name=name) - - sorted_bookmarks.append(bookmark_copy) - - sorted_bookmarks.sort(key=lambda x: x.name.lower()) - return sorted_bookmarks - def _pubsub_support(self) -> bool: return (self._con.get_module('PEP').supported and self._con.get_module('PubSub').publish_options) @@ -246,11 +223,10 @@ class Bookmarks(BaseModule): self.store_bookmarks() def get_name_from_bookmark(self, jid: str) -> str: - fallback = jid.split('@')[0] bookmark = self.get_bookmark_from_jid(jid) if bookmark is None: - return fallback - return bookmark.name or fallback + return + return bookmark.name def is_bookmark(self, jid: str) -> bool: return self.get_bookmark_from_jid(jid) is not None ===================================== gajim/data/gui/application_menu.ui ===================================== @@ -79,11 +79,6 @@ <attribute name="accel"><Primary>G</attribute> <attribute name="target"></attribute> </item> - <item> - <attribute name="label" translatable="yes">Bookmarks</attribute> - <attribute name="action">app.bookmarks</attribute> - <attribute name="accel"><Primary>B</attribute> - </item> <item> <attribute name="label" translatable="yes">History Manager</attribute> <attribute name="action">app.history-manager</attribute> ===================================== gajim/data/gui/bookmarks.ui ===================================== @@ -0,0 +1,235 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<interface> + <requires lib="gtk+" version="3.20"/> + <object class="GtkListStore" id="bookmarks_store"> + <columns> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gboolean"/> + </columns> + </object> + <object class="GtkGrid" id="bookmarks_grid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">6</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="spacing">6</property> + <child> + <object class="GtkButton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">start</property> + <signal name="clicked" handler="_on_add_clicked" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">list-add-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="remove_button"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">start</property> + <signal name="clicked" handler="_on_remove_clicked" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">list-remove-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="hscrollbar_policy">never</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTreeView" id="bookmarks_view"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="model">bookmarks_store</property> + <property name="search_column">0</property> + <property name="enable_grid_lines">horizontal</property> + <child internal-child="selection"> + <object class="GtkTreeSelection"> + <signal name="changed" handler="_on_selection_changed" swapped="no"/> + </object> + </child> + <child> + <object class="GtkTreeViewColumn"> + <property name="resizable">True</property> + <property name="title" translatable="yes">XMPP Address</property> + <property name="expand">True</property> + <property name="sort_indicator">True</property> + <property name="sort_column_id">0</property> + <child> + <object class="GtkCellRendererText" id="jid"> + <property name="editable">True</property> + <property name="ellipsize">end</property> + <property name="placeholder_text">chat(a)conference.example.org</property> + <signal name="edited" handler="_on_address_edited" swapped="no"/> + </object> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn"> + <property name="resizable">True</property> + <property name="min_width">100</property> + <property name="title" translatable="yes">Name</property> + <property name="sort_indicator">True</property> + <property name="sort_column_id">1</property> + <child> + <object class="GtkCellRendererText" id="name"> + <property name="editable">True</property> + <property name="ellipsize">end</property> + <signal name="edited" handler="_on_name_edited" swapped="no"/> + </object> + <attributes> + <attribute name="text">1</attribute> + </attributes> + </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn"> + <property name="resizable">True</property> + <property name="title" translatable="yes">Nickname</property> + <property name="sort_indicator">True</property> + <property name="sort_column_id">2</property> + <child> + <object class="GtkCellRendererText" id="nick"> + <property name="editable">True</property> + <property name="ellipsize">end</property> + <signal name="edited" handler="_on_nick_edited" swapped="no"/> + </object> + <attributes> + <attribute name="text">2</attribute> + </attributes> + </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn"> + <property name="resizable">True</property> + <property name="title" translatable="yes">Password</property> + <property name="sort_indicator">True</property> + <property name="sort_column_id">3</property> + <child> + <object class="GtkCellRendererText" id="password"> + <property name="editable">True</property> + <property name="ellipsize">end</property> + <signal name="edited" handler="_on_password_edited" swapped="no"/> + </object> + <attributes> + <attribute name="text">3</attribute> + </attributes> + </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn"> + <property name="sizing">fixed</property> + <property name="title" translatable="yes">Autojoin</property> + <property name="alignment">0.5</property> + <property name="sort_indicator">True</property> + <property name="sort_column_id">4</property> + <child> + <object class="GtkCellRendererToggle" id="autojoin"> + <signal name="toggled" handler="_on_autojoin_toggled" swapped="no"/> + </object> + <attributes> + <attribute name="active">4</attribute> + </attributes> + </child> + </object> + </child> + <style> + <class name="gajim-treeview"/> + </style> + </object> + </child> + <style> + <class name="gajim-scrolled"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_Apply</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">end</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_apply_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <style> + <class name="padding-18"/> + </style> + </object> +</interface> ===================================== gajim/data/gui/manage_bookmarks_window.ui deleted ===================================== @@ -1,404 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<interface> - <requires lib="gtk+" version="3.20"/> - <object class="GtkListStore" id="liststore1"> - <columns> -  - <column type="gchararray"/> - </columns> - </object> - <object class="GtkWindow" id="manage_bookmarks_window"> - <property name="can_focus">False</property> - <property name="title" translatable="yes">Group Chat Bookmarks</property> - <property name="default_width">550</property> - <property name="default_height">300</property> - <property name="type_hint">dialog</property> - <signal name="key-press-event" handler="on_key_press_event" swapped="no"/> - <child type="titlebar"> - <placeholder/> - </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">18</property> - <property name="spacing">18</property> - <child> - <object class="GtkBox"> - <property name="width_request">220</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkScrolledWindow"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkTreeView" id="bookmarks_treeview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="headers_visible">False</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection1"/> - </child> - <style> - <class name="space"/> - </style> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkToolbar"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="show_arrow">False</property> - <property name="icon_size">1</property> - <child> - <object class="GtkToolButton" id="add_bookmark_button"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">Add Bookmark</property> - <property name="use_underline">True</property> - <property name="icon_name">list-add-symbolic</property> - <signal name="clicked" handler="on_add_bookmark_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="remove_bookmark_button"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">Remove Bookmark</property> - <property name="use_underline">True</property> - <property name="icon_name">list-remove-symbolic</property> - <signal name="clicked" handler="on_remove_bookmark_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <style> - <class name="inline-toolbar"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">18</property> - <child> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">N_ame</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">title_entry</property> - <property name="xalign">0</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="title_entry"> - <property name="width_request">230</property> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Bookmark Name</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="margin_top">12</property> - <property name="label" translatable="yes">_Server</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">server_entry</property> - <property name="xalign">0</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="server_entry"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="margin_top">12</property> - <property name="activates_default">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="margin_top">12</property> - <property name="label" translatable="yes">_Nickname</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">nick_entry</property> - <property name="xalign">0</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="nick_entry"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="margin_top">12</property> - <property name="activates_default">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">4</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">Roo_m</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">room_entry</property> - <property name="xalign">0</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="room_entry"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">_Password</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">pass_entry</property> - <property name="xalign">0</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="pass_entry"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="visibility">False</property> - <property name="activates_default">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkListBox" id="settings_box"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="selection_mode">none</property> - <child> - <object class="GtkListBoxRow"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">Join chat when connected</property> - <property name="valign">center</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">_Join Automatically</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">autojoin_checkbutton</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSwitch" id="autojoin_checkbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="halign">end</property> - <signal name="state-set" handler="on_autojoin_checkbutton_toggled" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">end</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - </child> - <style> - <class name="settings"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButtonBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">end</property> - <property name="vexpand">True</property> - <property name="spacing">12</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="cancel_button"> - <property name="label">Cancel</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <signal name="clicked" handler="on_cancel_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="ok_button"> - <property name="label">OK</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="receives_default">False</property> - <signal name="clicked" handler="on_ok_button_clicked" swapped="no"/> - <style> - <class name="suggested-action"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> -</interface> ===================================== gajim/data/style/gajim.css ===================================== @@ -227,6 +227,7 @@ list.settings > row > box { .margin-top12 { margin-top: 12px; } .margin-12 { margin: 12px; } .margin-18 { margin: 18px; } +.padding-18 { margin: 18px; } /* Treeview */ treeview.space { padding: 6px; } @@ -266,5 +267,9 @@ button.flat.link { padding: 0; border: 0; } .search-treeview { padding: 5px; } .search-scrolled { border: 1px solid; border-color:@unfocused_borders; } +.gajim-treeview { padding: 4px; } +.gajim-treeview check { padding: 0px; } +.gajim-scrolled { border: 1px solid; border-color:@unfocused_borders; } + #GroupchatJoin > box {padding: 18px; } \ No newline at end of file ===================================== gajim/groupchat_control.py ===================================== @@ -110,7 +110,6 @@ class GroupchatControl(ChatControlBase): def __init__(self, parent_win, contact, muc_data, acct, is_continued=False): ChatControlBase.__init__(self, self.TYPE_ID, parent_win, 'groupchat_control', contact, acct) - self.force_non_minimizable = False self.is_continued = is_continued self.is_anonymous = True @@ -170,11 +169,6 @@ class GroupchatControl(ChatControlBase): self.room_jid = self.contact.jid self._muc_data = muc_data - bm_module = app.connections[self.account].get_module('Bookmarks') - self.name = bm_module.get_name_from_bookmark(self.room_jid) - - self.contact.name = self.name - self.widget_set_visible(self.xml.get_object('banner_eventbox'), app.config.get('hide_groupchat_banner')) @@ -370,6 +364,10 @@ class GroupchatControl(ChatControlBase): return '' return self._subject_data.subject + @property + def room_name(self): + return self.contact.get_shown_name() + def add_actions(self): super().add_actions() actions = [ @@ -998,7 +996,7 @@ class GroupchatControl(ChatControlBase): # if this is a continued conversation label_str = self.get_continued_conversation_name() else: - label_str = self.name + label_str = self.room_name label_str = GLib.markup_escape_text(label_str) # count waiting highlighted messages @@ -1106,12 +1104,7 @@ class GroupchatControl(ChatControlBase): room jid """ self.name_label.set_ellipsize(Pango.EllipsizeMode.END) - if self.is_continued: - name = self.get_continued_conversation_name() - else: - name = self.room_jid - - self.name_label.set_text(name) + self.name_label.set_text(self.room_name) def _nec_update_avatar(self, obj): if obj.contact.room_jid != self.room_jid: @@ -2221,7 +2214,7 @@ class GroupchatControl(ChatControlBase): _('Leave Group Chat'), _('Are you sure you want to leave this group chat?'), _('If you close this window, you will leave ' - '\'%s\'.') % self.name, + '\'%s\'.') % self.room_name, _('_Do not ask me again'), [DialogButton.make('Cancel', callback=on_cancel), ===================================== gajim/gtk/bookmarks.py ===================================== @@ -12,357 +12,148 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +import logging from enum import IntEnum from gi.repository import Gtk from gi.repository import Gdk from nbxmpp.structs import BookmarkData +from nbxmpp.protocol import validate_resourcepart from gajim.common import app -from gajim.common import helpers +from gajim.common.helpers import validate_jid from gajim.common.i18n import _ -from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.util import get_builder -class Row(IntEnum): - ACCOUNT_JID = 0 - ROOM_NAME = 1 - ROOM_JID = 2 - AUTOJOIN = 3 - PASSWORD = 4 - NICK = 5 - LABEL = 6 - - -class ManageBookmarksWindow: - def __init__(self): - self._ui = get_builder('manage_bookmarks_window.ui') - self._ui.manage_bookmarks_window.set_transient_for( - app.interface.roster.window) - - self.ignore_events = False - - # Account-JID, RoomName, Room-JID, Autojoin, Password, Nick, Name - self.treestore = Gtk.TreeStore(str, str, str, bool, str, str, str) - self.treestore.set_sort_column_id(1, Gtk.SortType.ASCENDING) - - # Store bookmarks in treeview. - for account, account_label in app.get_enabled_accounts_with_labels( - connected_only=True, private_storage_only=True): - iter_ = self.treestore.append(None, [ - None, account, None, None, - None, None, account_label]) - - con = app.connections[account] - bookmarks = con.get_module('Bookmarks').get_sorted_bookmarks() - - for bookmark in bookmarks: - self.treestore.append(iter_, [account, - bookmark.name, - str(bookmark.jid), - bookmark.autojoin, - bookmark.password, - bookmark.nick, - bookmark.name]) - - self._ui.bookmarks_treeview.set_model(self.treestore) - self._ui.bookmarks_treeview.expand_all() - - renderer = Gtk.CellRendererText() - column = Gtk.TreeViewColumn('Bookmarks', renderer, text=Row.LABEL) - self._ui.bookmarks_treeview.append_column(column) - - self.selection = self._ui.bookmarks_treeview.get_selection() - self.selection.connect('changed', self.bookmark_selected) - - # Prepare input fields - self._ui.title_entry.connect('changed', self.on_title_entry_changed) - self._ui.nick_entry.connect('changed', self.on_nick_entry_changed) - self._ui.server_entry.connect( - 'focus-out-event', self.on_server_entry_focus_out) - self.room_entry_changed_id = self._ui.room_entry.connect( - 'changed', self.on_room_entry_changed) - self._ui.pass_entry.connect('changed', self.on_pass_entry_changed) +log = logging.getLogger('gajim.gtk.bookmarks') - self._ui.connect_signals(self) - self._ui.manage_bookmarks_window.show_all() - # select root iter - first_iter = self.treestore.get_iter_first() - if first_iter: - self.selection.select_iter(first_iter) - def on_key_press_event(self, widget, event): - if event.keyval == Gdk.KEY_Escape: - self._ui.manage_bookmarks_window.destroy() - - def on_add_bookmark_button_clicked(self, widget): - """ - Add a new bookmark - """ - # Get the account that is currently used - # (the parent of the currently selected item) - (model, iter_) = self.selection.get_selected() - if not iter_: # Nothing selected, do nothing - return +class Column(IntEnum): + ADDRESS = 0 + NAME = 1 + NICK = 2 + PASSWORD = 3 + AUTOJOIN = 4 - parent = model.iter_parent(iter_) - - if parent: - # We got a bookmark selected, so we add_to the parent - add_to = parent - else: - # No parent, so we got an account -> add to this. - add_to = iter_ - - account = model[add_to][1] - nick = app.nicks[account] - label = _('New Group Chat') - iter_ = self.treestore.append(add_to, [ - account, label, '@', False, '', nick, label]) - - self._ui.bookmarks_treeview.expand_row(model.get_path(add_to), True) - self._ui.bookmarks_treeview.set_cursor(model.get_path(iter_)) - - def on_remove_bookmark_button_clicked(self, widget): - """ - Remove selected bookmark - """ - (model, iter_) = self.selection.get_selected() - if not iter_: # Nothing selected - return - if not model.iter_parent(iter_): - # Don't remove account iters - return +class Bookmarks(Gtk.ApplicationWindow): + def __init__(self, account): + Gtk.ApplicationWindow.__init__(self) + self.set_application(app.app) + self.set_position(Gtk.WindowPosition.CENTER) + self.set_show_menubar(False) + self.set_title(_('Bookmarks for %s' % app.get_account_label(account))) + self.set_default_size(700, 500) - self.ignore_events = True - model.remove(iter_) - self.clear_fields() - self.ignore_events = False - self.bookmark_selected(self.selection) + self.account = account - def check_valid_bookmark(self): - """ - Check if all necessary fields are entered correctly - """ - (model, iter_) = self.selection.get_selected() + self._ui = get_builder('bookmarks.ui') + self.add(self._ui.bookmarks_grid) - if not model.iter_parent(iter_): - # Account data can't be changed - return + con = app.connections[account] + for bookmark in con.get_module('Bookmarks').bookmarks: + self._ui.bookmarks_store.append([str(bookmark.jid), + bookmark.name, + bookmark.nick, + bookmark.password, + bookmark.autojoin]) - server = self._ui.server_entry.get_text() - room = self._ui.room_entry.get_text() + self._ui.bookmarks_view.set_search_equal_func(self._search_func) - if server == '' or room == '': - ErrorDialog( - _('This bookmark has invalid data'), - _('Please be sure to fill out server and group chat fields ' - 'or remove this bookmark.')) - return False + self._ui.connect_signals(self) + self.connect('key-press-event', self._on_key_press) - return True + self.show_all() - def on_ok_button_clicked(self, widget): - """ - Parse the treestore data into our new bookmarks array, then send the - new bookmarks to the server. - """ + def _on_key_press(self, _widget, event): + if event.keyval == Gdk.KEY_Escape: + self.destroy() - (model, iter_) = self.selection.get_selected() - if iter_ and model.iter_parent(iter_): - # bookmark selected, check it - if not self.check_valid_bookmark(): - return + def _on_selection_changed(self, selection): + _, iter_ = selection.get_selected() + self._ui.remove_button.set_sensitive(iter_ is not None) - for account in self.treestore: - acct = account[1] - con = app.connections[acct] - - bookmarks = [] - for bm in account.iterchildren(): - # create the bookmark-dict - bookmark = BookmarkData(jid=bm[Row.ROOM_JID], - name=bm[Row.ROOM_NAME], - autojoin=bm[Row.AUTOJOIN], - password=bm[Row.PASSWORD], - nick=bm[Row.NICK]) - bookmarks.append(bookmark) - con.get_module('Bookmarks').bookmarks = bookmarks - con.get_module('Bookmarks').store_bookmarks() - self._ui.manage_bookmarks_window.destroy() - - def on_cancel_button_clicked(self, widget): - self._ui.manage_bookmarks_window.destroy() - - def bookmark_selected(self, selection): - """ - Fill in the bookmark's data into the fields. - """ - (model, iter_) = selection.get_selected() - - if not iter_: - # After removing the last bookmark for one account - # this will be None, so we will just: + def _on_address_edited(self, _renderer, path, new_value): + iter_ = self._ui.bookmarks_store.get_iter(path) + if not new_value: return - if model.iter_parent(iter_): - # make the fields sensitive - self.set_sensitive_all(True) - else: - # Top-level has no data (it's the account fields) - # clear fields & make them insensitive - self.clear_fields() - self.set_sensitive_all(False) + try: + jid = validate_jid(new_value) + except ValueError as error: + log.warning('Invalid JID: %s (%s)', error, new_value) return - # Fill in the data for childs - self._ui.title_entry.set_text(model[iter_][Row.ROOM_NAME]) - room_jid = model[iter_][Row.ROOM_JID] - room_jid_s = room_jid.split('@') - if len(room_jid_s) == 1: - room = '' - server = room_jid - else: - (room, server) = room_jid_s - self._ui.room_entry.handler_block(self.room_entry_changed_id) - self._ui.room_entry.set_text(room) - self._ui.room_entry.handler_unblock(self.room_entry_changed_id) - self._ui.server_entry.set_text(server) - - self._ui.autojoin_checkbutton.set_active(model[iter_][Row.AUTOJOIN]) - # sensitive only if auto join is checked - - if model[iter_][Row.PASSWORD] is not None: - password = model[iter_][Row.PASSWORD] - else: - password = None - - if password: - self._ui.pass_entry.set_text(password) - else: - self._ui.pass_entry.set_text('') - nick = model[iter_][Row.NICK] - if nick: - self._ui.nick_entry.set_text(nick) - else: - self._ui.nick_entry.set_text('') - - def on_title_entry_changed(self, widget): - if self.ignore_events: - return - (model, iter_) = self.selection.get_selected() - if iter_: # After removing a bookmark, we got nothing selected - if model.iter_parent(iter_): - # Don't clear the title field for account nodes - model[iter_][Row.ROOM_NAME] = self._ui.title_entry.get_text() - - def on_nick_entry_changed(self, widget): - if self.ignore_events: + if not jid.isBare: + log.warning('Invalid JID: only bare JIDs allowed (%s)', jid) return - (model, iter_) = self.selection.get_selected() - if iter_: - nick = self._ui.nick_entry.get_text() + + self._ui.bookmarks_store.set_value(iter_, + Column.ADDRESS, + new_value or None) + + def _on_name_edited(self, _renderer, path, new_value): + iter_ = self._ui.bookmarks_store.get_iter(path) + self._ui.bookmarks_store.set_value(iter_, + Column.NAME, + new_value or None) + + def _on_nick_edited(self, _renderer, path, new_value): + iter_ = self._ui.bookmarks_store.get_iter(path) + + if new_value: try: - nick = helpers.parse_resource(nick) - except helpers.InvalidFormat: - ErrorDialog( - _('Invalid nickname'), - _('Character not allowed'), - transient_for=self._ui.manage_bookmarks_window) - self._ui.nick_entry.set_text(model[iter_][Row.NICK]) - return True - model[iter_][Row.NICK] = nick - - def on_server_entry_focus_out(self, widget, event): - if self.ignore_events: - return - (model, iter_) = self.selection.get_selected() - if not iter_: - return - server = widget.get_text() - if not server: - return - if '@' in server: - ErrorDialog( - _('Invalid server'), - _('Character not allowed'), - transient_for=self._ui.manage_bookmarks_window) - widget.set_text(server.replace('@', '')) - - room = self._ui.room_entry.get_text().strip() - if not room: - return - room_jid = room + '@' + server.strip() - try: - room_jid = helpers.parse_jid(room_jid) - except helpers.InvalidFormat: - ErrorDialog( - _('Invalid server'), - _('Character not allowed'), - transient_for=self._ui.manage_bookmarks_window) - self._ui.server_entry.set_text( - model[iter_][Row.ROOM_JID].split('@')[1]) - return True - model[iter_][Row.ROOM_JID] = room_jid - - def on_room_entry_changed(self, widget): - if self.ignore_events: - return - (model, iter_) = self.selection.get_selected() - if not iter_: - return - room = widget.get_text() - if not room: - return - if '@' in room: - room, server = room.split('@', 1) - widget.set_text(room) - if server: - self._ui.server_entry.set_text(server) - self._ui.server_entry.grab_focus() - server = self._ui.server_entry.get_text().strip() - if not server: - return - room_jid = room.strip() + '@' + server - try: - room_jid = helpers.parse_jid(room_jid) - except helpers.InvalidFormat: - ErrorDialog( - _('Invalid Group Chat'), - _('Character not allowed'), - transient_for=self._ui.manage_bookmarks_window) - return True - model[iter_][Row.ROOM_JID] = room_jid - - def on_pass_entry_changed(self, widget): - if self.ignore_events: - return - (model, iter_) = self.selection.get_selected() - if iter_: - model[iter_][Row.PASSWORD] = self._ui.pass_entry.get_text() + validate_resourcepart(new_value) + except ValueError as error: + log.warning('Invalid nickname: %s', error) + return - def on_autojoin_checkbutton_toggled(self, widget, *args): - if self.ignore_events: - return - (model, iter_) = self.selection.get_selected() - if iter_: - model[iter_][Row.AUTOJOIN] = self._ui.autojoin_checkbutton.get_active() - - def clear_fields(self): - widgets = [ - self._ui.title_entry, self._ui.nick_entry, self._ui.room_entry, - self._ui.server_entry, self._ui.pass_entry] - for field in widgets: - field.set_text('') - self._ui.autojoin_checkbutton.set_active(False) - - def set_sensitive_all(self, sensitive): - widgets = [ - self._ui.title_entry, self._ui.nick_entry, self._ui.room_entry, - self._ui.server_entry, self._ui.pass_entry, self._ui.settings_box, - self._ui.remove_bookmark_button] - for field in widgets: - field.set_sensitive(sensitive) + self._ui.bookmarks_store.set_value(iter_, + Column.NICK, + new_value or None) + + def _on_password_edited(self, _renderer, path, new_value): + iter_ = self._ui.bookmarks_store.get_iter(path) + self._ui.bookmarks_store.set_value(iter_, + Column.PASSWORD, + new_value or None) + + def _on_autojoin_toggled(self, _renderer, path): + iter_ = self._ui.bookmarks_store.get_iter(path) + new_value = not self._ui.bookmarks_store[iter_][Column.AUTOJOIN] + self._ui.bookmarks_store.set_value(iter_, Column.AUTOJOIN, new_value) + + def _on_add_clicked(self, _button): + iter_ = self._ui.bookmarks_store.append([None, None, None, None, False]) + self._ui.bookmarks_view.get_selection().select_iter(iter_) + path = self._ui.bookmarks_store.get_path(iter_) + self._ui.bookmarks_view.scroll_to_cell(path, None, False) + + def _on_remove_clicked(self, _button): + mod, paths = self._ui.bookmarks_view.get_selection().get_selected_rows() + for path in paths: + iter_ = mod.get_iter(path) + self._ui.bookmarks_store.remove(iter_) + + def _on_apply_clicked(self, _button): + bookmarks = [] + for row in self._ui.bookmarks_store: + if not row[Column.ADDRESS]: + continue + bookmark = BookmarkData(jid=row[Column.ADDRESS], + name=row[Column.NAME], + autojoin=row[Column.AUTOJOIN], + password=row[Column.PASSWORD], + nick=row[Column.NICK]) + bookmarks.append(bookmark) + + con = app.connections[self.account] + con.get_module('Bookmarks').bookmarks = bookmarks + con.get_module('Bookmarks').store_bookmarks() + self.destroy() + + @staticmethod + def _search_func(model, _column, search_text, iter_): + return search_text.lower() not in model[iter_][0].lower() ===================================== gajim/gui_menu_builder.py ===================================== @@ -676,6 +676,7 @@ def get_account_menu(account): (_('Advanced'), [ ('-archive', _('Archiving Preferences')), ('-blocking', _('Blocking List')), + ('-bookmarks', _('Bookmarks')), ('-sync-history', _('Synchronise History')), ('-privacylists', _('Privacy Lists')), ('-server-info', _('Server Info')), ===================================== gajim/privatechat_control.py ===================================== @@ -54,10 +54,7 @@ class PrivateChatControl(ChatControl): room_jid, account) if room_jid in app.interface.minimized_controls[account]: self.room_ctrl = app.interface.minimized_controls[account][room_jid] - if self.room_ctrl: - self.room_name = self.room_ctrl.name - else: - self.room_name = room_jid + self.gc_contact = gc_contact ChatControl.__init__(self, parent_win, contact, account, session) self.TYPE_ID = 'pm' @@ -86,6 +83,12 @@ class PrivateChatControl(ChatControl): # TODO: remove all code that sets the contact here return + @property + def room_name(self): + if self.room_ctrl is not None: + return self.room_ctrl.room_name + return self.gc_contact.room_jid + def get_our_nick(self): return self.room_ctrl.nick @@ -142,7 +145,7 @@ class PrivateChatControl(ChatControl): status=status) self.add_status_message(message) - elif app.config.get_per('rooms', self.room_name, + elif app.config.get_per('rooms', self.gc_contact.room_jid, 'print_status', status_default): message = _('{nick} is now {show}{status}').format(nick=nick, show=show, ===================================== gajim/roster_window.py ===================================== @@ -77,7 +77,6 @@ from gajim.gtk.dialogs import InvitationReceivedDialog from gajim.gtk.single_message import SingleMessageWindow from gajim.gtk.add_contact import AddNewContactWindow from gajim.gtk.pep_config import ManagePEPServicesWindow -from gajim.gtk.bookmarks import ManageBookmarksWindow from gajim.gtk.account_wizard import AccountCreationWizard from gajim.gtk.service_registration import ServiceRegistration from gajim.gtk.discovery import ServiceDiscoveryWindow @@ -3521,9 +3520,6 @@ class RosterWindow: action.set_state(param) self.refilter_shown_roster_items() - def on_manage_bookmarks_menuitem_activate(self, widget): - ManageBookmarksWindow() - def on_execute_command(self, widget, contact, account, resource=None): """ Execute command. Full JID needed; if it is other contact, resource is View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/61679239434380e1db657725ece35aa8e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/61679239434380e1db657725ece35aa8e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] DiscoInfo: Add muc_room_name property
by Philipp Hörist 08 Aug '19

08 Aug '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: ecfed11e by Philipp Hörist at 2019-08-08T20:57:23Z DiscoInfo: Add muc_room_name property - - - - - 1 changed file: - nbxmpp/structs.py Changes: ===================================== nbxmpp/structs.py ===================================== @@ -183,6 +183,10 @@ class DiscoInfo(namedtuple('DiscoInfo', 'jid node identities features dataforms' if identity.category == 'conference': return identity.name + @property + def muc_room_name(self): + return self._get_form_value(NS_MUC_INFO, 'muc#roomconfig_roomname') + @property def muc_description(self): return self._get_form_value(NS_MUC_INFO, 'muc#roominfo_description') View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/ecfed11e600c6e9d9be64ffd7b… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/ecfed11e600c6e9d9be64ffd7b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Groupchat: Remove subject popover code
by Philipp Hörist 08 Aug '19

08 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 61679239 by Philipp Hörist at 2019-08-08T15:10:25Z Groupchat: Remove subject popover code - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== @@ -57,7 +57,6 @@ from gajim.common.caps_cache import muc_caps_cache from gajim.common import events from gajim.common import app from gajim.common import helpers -from gajim.common.helpers import open_uri from gajim.common.helpers import event_filter from gajim.common import ged from gajim.common.i18n import _ @@ -88,7 +87,6 @@ from gajim.gtk.util import NickCompletionGenerator from gajim.gtk.util import get_icon_name from gajim.gtk.util import get_affiliation_surface from gajim.gtk.util import get_builder -from gajim.gtk.util import make_href_markup log = logging.getLogger('gajim.groupchat_control') @@ -193,8 +191,6 @@ class GroupchatControl(ChatControlBase): self._nick_completion = NickCompletionGenerator(muc_data.nick) self.last_key_tabs = False - self.subject = '' - self.name_label = self.xml.get_object('banner_name_label') self.event_box = self.xml.get_object('banner_eventbox') @@ -292,13 +288,7 @@ class GroupchatControl(ChatControlBase): 'go-next-symbolic', Gtk.IconSize.MENU) self.hide_roster_button.connect('clicked', lambda *args: self.show_roster()) - self.subject_button = Gtk.MenuButton() - self.subject_button.set_image(Gtk.Image.new_from_icon_name( - 'go-down-symbolic', Gtk.IconSize.MENU)) - self.subject_button.set_popover(SubjectPopover()) - self.subject_button.set_no_show_all(True) self.banner_actionbar.pack_end(self.hide_roster_button) - self.banner_actionbar.pack_start(self.subject_button) # Holds CaptchaRequest widget self._captcha_request = None @@ -374,6 +364,12 @@ class GroupchatControl(ChatControlBase): def nick(self): return self._muc_data.nick + @property + def subject(self): + if self._subject_data is None: + return '' + return self._subject_data.subject + def add_actions(self): super().add_actions() actions = [ @@ -1107,7 +1103,7 @@ class GroupchatControl(ChatControlBase): def draw_banner_text(self): """ Draw the text in the fat line at the top of the window that houses the - room jid, subject + room jid """ self.name_label.set_ellipsize(Pango.EllipsizeMode.END) if self.is_continued: @@ -1117,11 +1113,6 @@ class GroupchatControl(ChatControlBase): self.name_label.set_text(name) - if self.subject: - subject = GLib.markup_escape_text(self.subject) - subject_text = make_href_markup(subject) - self.subject_button.get_popover().set_text(subject_text) - def _nec_update_avatar(self, obj): if obj.contact.room_jid != self.room_jid: return @@ -1362,16 +1353,14 @@ class GroupchatControl(ChatControlBase): found_here = text.find(special_word, start) return False - def set_subject(self, subject): - self.subject = subject - self.draw_banner_text() - @event_filter(['account', 'room_jid']) def _on_subject(self, event): if self.subject == event.subject or event.is_fake: # Probably a rejoin, we already showed that subject return - self.set_subject(event.subject) + + self._subject_data = event + text = _('%(nick)s has set the subject to %(subject)s') % { 'nick': event.nickname, 'subject': event.subject} @@ -1384,13 +1373,6 @@ class GroupchatControl(ChatControlBase): self._muc_data.state != MUCJoinedState.JOINED): self.add_info_message(text) - if not event.subject: - self.subject_button.hide() - else: - self.subject_button.show() - - self._subject_data = event - @event_filter(['account', 'room_jid']) def _on_config_changed(self, event): # http://www.xmpp.org/extensions/xep-0045.html#roomconfig-notify @@ -3038,48 +3020,3 @@ class GroupchatControl(ChatControlBase): def _on_abort_button_clicked(self, _button): self.parent_win.window.lookup_action( 'disconnect-%s' % self.control_id).activate() - - -class SubjectPopover(Gtk.Popover): - def __init__(self): - Gtk.Popover.__init__(self) - self.set_name('SubjectPopover') - - scrolledwindow = Gtk.ScrolledWindow() - scrolledwindow.set_max_content_height(250) - scrolledwindow.set_propagate_natural_height(True) - scrolledwindow.set_propagate_natural_width(True) - scrolledwindow.set_policy(Gtk.PolicyType.NEVER, - Gtk.PolicyType.AUTOMATIC) - - self.label = Gtk.Label() - self.label.set_line_wrap(True) - self.label.set_line_wrap_mode(Pango.WrapMode.WORD_CHAR) - self.label.set_max_width_chars(80) - self.label.connect('activate-link', self._on_activate_link) - - scrolledwindow.add(self.label) - - box = Gtk.Box() - box.add(scrolledwindow) - box.show_all() - self.add(box) - - self.connect_after('show', self._after_show) - - def set_text(self, text): - self.label.set_markup(text) - - def _after_show(self, *args): - # Gtk Bug: If we set selectable True, on show - # everything inside the Label is selected. - # So we switch after show to False and again to True - self.label.set_selectable(False) - self.label.set_selectable(True) - - @staticmethod - def _on_activate_link(_label, uri): - # We have to use this, because the default GTK handler - # is not cross-platform compatible - open_uri(uri) - return Gdk.EVENT_STOP View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/61679239434380e1db657725ece35aa8e6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/61679239434380e1db657725ece35aa8e6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 5 commits: GroupchatInfo: Improve some things
by Philipp Hörist 08 Aug '19

08 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: d1bc33e7 by Philipp Hörist at 2019-08-08T11:53:50Z GroupchatInfo: Improve some things - Allow the width to be passed as option - Fix some fields when the Widget is filled with data multiple times - Simplify code - - - - - 25828b1c by Philipp Hörist at 2019-08-08T13:52:55Z Groupchat: Add info page - - - - - 629f07c4 by Philipp Hörist at 2019-08-08T14:31:18Z Refactor making href pango markup - - - - - f6df6ec5 by Philipp Hörist at 2019-08-08T14:39:42Z GroupchatInfo: Convert URIs to markup links - - - - - 4dcc79c1 by Philipp Hörist at 2019-08-08T14:44:18Z GroupchatInfo: Use open_uri() for subject links - - - - - 9 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/helpers.py - gajim/data/gui/groupchat_control.ui - gajim/data/gui/groupchat_info_scrolled.ui - gajim/groupchat_control.py - gajim/gtk/groupchat_info.py - gajim/gtk/util.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -68,6 +68,7 @@ from gajim.gtk.util import format_activity from gajim.gtk.util import format_tune from gajim.gtk.util import format_location from gajim.gtk.util import get_activity_icon_name +from gajim.gtk.util import make_href_markup from gajim.command_system.implementation.hosts import ChatCommands from gajim.command_system.framework import CommandHost # pylint: disable=unused-import @@ -760,7 +761,7 @@ class ChatControl(ChatControlBase): label_tooltip = '%s%s' % (name, acct_info) if status_escaped: - status_text = self.urlfinder.sub(self.make_href, status_escaped) + status_text = make_href_markup(status_escaped) status_text = '<span size="x-small" weight="light">%s</span>' % status_text self.banner_status_label.set_tooltip_text(status) self.banner_status_label.set_no_show_all(False) ===================================== gajim/chat_control_base.py ===================================== @@ -24,7 +24,6 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. import os -import re import time from tempfile import TemporaryDirectory @@ -42,7 +41,6 @@ from gajim.common.i18n import _ from gajim.common.helpers import AdditionalDataDict from gajim.common.contacts import GC_Contact from gajim.common.connection_handlers_events import MessageOutgoingEvent -from gajim.common.const import StyleAttr from gajim.common.const import Chatstate from gajim import gtkgui_helpers @@ -56,7 +54,6 @@ from gajim.gtk.dialogs import DialogButton from gajim.gtk.dialogs import NewConfirmationDialog from gajim.gtk.dialogs import NewConfirmationCheckDialog from gajim.gtk import util -from gajim.gtk.util import convert_rgb_to_hex from gajim.gtk.util import at_the_end from gajim.gtk.util import get_show_in_roster from gajim.gtk.util import get_show_in_systray @@ -93,15 +90,6 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): # Multiple hardware keycodes can trigger a keyval like Gdk.KEY_c. keycodes_c = get_hardware_key_codes(Gdk.KEY_c) - def make_href(self, match): - url_color = app.css_config.get_value('.gajim-url', StyleAttr.COLOR) - color = convert_rgb_to_hex(url_color) - url = match.group() - if '://' not in url: - url = 'https://' + url - return '<a href="%s"><span foreground="%s">%s</span></a>' % ( - url, color, match.group()) - def get_nb_unread(self): jid = self.contact.jid if self.resource: @@ -234,9 +222,6 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): self._on_banner_eventbox_button_press_event) self.handlers[id_] = widget - self.urlfinder = re.compile( - r"(www\.(?!\.)|[a-z][a-z0-9+.-]*://)[^\s<>'\"]+[^!,\.\s<>\)'\"\]]") - self.banner_status_label = self.xml.get_object('banner_label') if self.banner_status_label is not None: id_ = self.banner_status_label.connect('populate_popup', ===================================== gajim/common/helpers.py ===================================== @@ -85,6 +85,9 @@ log = logging.getLogger('gajim.c.helpers') special_groups = (_('Transports'), _('Not in contact list'), _('Observers'), _('Group chats')) +URL_REGEX = re.compile( + r"(www\.(?!\.)|[a-z][a-z0-9+.-]*://)[^\s<>'\"]+[^!,\.\s<>\)'\"\]]") + class InvalidFormat(Exception): pass ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -1131,6 +1131,68 @@ <property name="position">7</property> </packing> </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkGrid" id="info_grid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <property name="row_spacing">12</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="homogeneous">True</property> + <child> + <object class="GtkButton" id="info_close_button"> + <property name="label" translatable="yes">_Close</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">True</property> + <property name="halign">center</property> + <property name="valign">start</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_page_cancel_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <style> + <class name="margin-18"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="name">muc-info</property> + <property name="position">8</property> + </packing> + </child> </object> <packing> <property name="expand">True</property> ===================================== gajim/data/gui/groupchat_info_scrolled.ui ===================================== @@ -298,6 +298,7 @@ <property name="wrap_mode">word-char</property> <property name="selectable">True</property> <property name="xalign">0</property> + <signal name="activate-link" handler="_on_activate_subject_link" swapped="no"/> </object> <packing> <property name="left_attach">1</property> ===================================== gajim/groupchat_control.py ===================================== @@ -83,10 +83,12 @@ from gajim.gtk.tooltips import GCTooltip from gajim.gtk.groupchat_config import GroupchatConfig from gajim.gtk.adhoc import AdHocCommand from gajim.gtk.dataform import DataFormWidget +from gajim.gtk.groupchat_info import GroupChatInfoScrolled from gajim.gtk.util import NickCompletionGenerator from gajim.gtk.util import get_icon_name from gajim.gtk.util import get_affiliation_surface from gajim.gtk.util import get_builder +from gajim.gtk.util import make_href_markup log = logging.getLogger('gajim.groupchat_control') @@ -301,6 +303,11 @@ class GroupchatControl(ChatControlBase): # Holds CaptchaRequest widget self._captcha_request = None + # MUC Info + self._subject_data = None + self._muc_info_box = GroupChatInfoScrolled(self.account, {'width': 600}) + self.xml.info_grid.attach(self._muc_info_box, 0, 0, 1, 1) + # GC Roster tooltip self.gc_tooltip = GCTooltip() @@ -378,6 +385,7 @@ class GroupchatControl(ChatControlBase): ('request-voice-', self._on_request_voice), ('execute-command-', self._on_execute_command), ('upload-avatar-', self._on_upload_avatar), + ('information-', self._on_information), ] for action in actions: @@ -633,6 +641,15 @@ class GroupchatControl(ChatControlBase): def _on_disconnect(self, action, param): self.leave() + def _on_information(self, action, param): + disco_info = muc_caps_cache.cache[self.contact.jid] + self._muc_info_box.set_from_disco_info(disco_info) + if self._subject_data is not None: + self._muc_info_box.set_subject(self._subject_data.subject) + self._muc_info_box.set_author(self._subject_data.nickname, + self._subject_data.user_timestamp) + self._show_page('muc-info') + def _on_destroy_room(self, action, param): def _on_confirm(reason, jid): if jid: @@ -1102,7 +1119,7 @@ class GroupchatControl(ChatControlBase): if self.subject: subject = GLib.markup_escape_text(self.subject) - subject_text = self.urlfinder.sub(self.make_href, subject) + subject_text = make_href_markup(subject) self.subject_button.get_popover().set_text(subject_text) def _nec_update_avatar(self, obj): @@ -1372,6 +1389,8 @@ class GroupchatControl(ChatControlBase): else: self.subject_button.show() + self._subject_data = event + @event_filter(['account', 'room_jid']) def _on_config_changed(self, event): # http://www.xmpp.org/extensions/xep-0045.html#roomconfig-notify @@ -2428,6 +2447,8 @@ class GroupchatControl(ChatControlBase): self._on_password_cancel_clicked() elif self._get_current_page() == 'captcha': self._on_captcha_cancel_clicked() + elif self._get_current_page() == 'muc-info': + self._on_page_cancel_clicked() elif self._get_current_page() in ('error', 'captcha-error'): self._on_page_close_clicked() else: @@ -2888,6 +2909,8 @@ class GroupchatControl(ChatControlBase): self.xml.progress_spinner.stop() elif page_name == 'progress': self.xml.progress_spinner.start() + elif page_name == 'muc-info': + self.xml.info_close_button.grab_default() elif page_name == 'password': self.xml.password_entry.set_text('') self.xml.password_entry.grab_focus() @@ -3006,7 +3029,7 @@ class GroupchatControl(ChatControlBase): app.connections[self.account].get_module('MUC').join(self._muc_data) self._show_page('progress') - def _on_page_cancel_clicked(self, _button): + def _on_page_cancel_clicked(self, _button=None): self._show_page('groupchat') def _on_page_close_clicked(self, _button=None): ===================================== gajim/gtk/groupchat_info.py ===================================== @@ -15,6 +15,7 @@ import time from gi.repository import Gdk +from gi.repository import GLib from gi.repository import Gtk from nbxmpp.protocol import NS_MAM_1 @@ -26,6 +27,7 @@ from gajim.common.helpers import open_uri from gajim.common.const import RFC5646_LANGUAGE_TAGS from gajim.gtk.util import get_builder +from gajim.gtk.util import make_href_markup MUC_FEATURES = { @@ -93,9 +95,11 @@ MUC_FEATURES = { class GroupChatInfoScrolled(Gtk.ScrolledWindow): - def __init__(self, account=None): + def __init__(self, account=None, options=None): Gtk.ScrolledWindow.__init__(self) - self.set_size_request(400, -1) + if options is None: + options = {} + self.set_size_request(options.get('width', 400), -1) self.set_vexpand(True) self.set_min_content_height(400) self.set_policy(Gtk.PolicyType.NEVER, @@ -117,23 +121,21 @@ class GroupChatInfoScrolled(Gtk.ScrolledWindow): return self._info.jid def set_author(self, author, epoch_timestamp=None): - if not author: - return - - if epoch_timestamp is not None: + has_author = bool(author) + if has_author and epoch_timestamp is not None: time_ = time.strftime('%c', time.localtime(epoch_timestamp)) author = '{} - {}'.format(author, time_) - self._ui.author.set_text(author) - self._ui.author.set_visible(True) - self._ui.author_label.set_visible(True) + self._ui.author.set_text(author or '') + self._ui.author.set_visible(has_author) + self._ui.author_label.set_visible(has_author) def set_subject(self, subject): - if not subject: - return - self._ui.subject.set_text(subject) - self._ui.subject.set_visible(True) - self._ui.subject_label.set_visible(True) + has_subject = bool(subject) + subject = GLib.markup_escape_text(subject or '') + self._ui.subject.set_markup(make_href_markup(subject)) + self._ui.subject.set_visible(has_subject) + self._ui.subject_label.set_visible(has_subject) def set_from_disco_info(self, info): self._info = info @@ -150,10 +152,7 @@ class GroupChatInfoScrolled(Gtk.ScrolledWindow): self._ui.description_label.set_visible(has_desc) # Set subject - has_subject = bool(info.muc_subject) - self._ui.subject.set_text(info.muc_subject or '') - self._ui.subject.set_visible(has_subject) - self._ui.subject_label.set_visible(has_subject) + self.set_subject(info.muc_subject) # Set user has_users = info.muc_users is not None @@ -165,6 +164,7 @@ class GroupChatInfoScrolled(Gtk.ScrolledWindow): self._ui.address.set_text(str(info.jid)) # Set contacts + self._ui.contact_box.foreach(self._ui.contact_box.remove) has_contacts = bool(info.muc_contacts) if has_contacts: for contact in info.muc_contacts: @@ -223,6 +223,13 @@ class GroupChatInfoScrolled(Gtk.ScrolledWindow): open_uri('xmpp:%s?message' % button.get_uri(), account=self._account) return Gdk.EVENT_STOP + @staticmethod + def _on_activate_subject_link(_label, uri): + # We have to use this, because the default GTK handler + # is not cross-platform compatible + open_uri(uri) + return Gdk.EVENT_STOP + @staticmethod def _get_feature_icon(icon, tooltip): image = Gtk.Image.new_from_icon_name(icon, Gtk.IconSize.MENU) ===================================== gajim/gtk/util.py ===================================== @@ -45,10 +45,12 @@ from gajim.common import app from gajim.common import configpaths from gajim.common import i18n from gajim.common.i18n import _ +from gajim.common.helpers import URL_REGEX from gajim.common.const import MOODS from gajim.common.const import ACTIVITIES from gajim.common.const import LOCATION_DATA from gajim.common.const import Display +from gajim.common.const import StyleAttr from gajim.gtk.const import GajimIconSet @@ -698,3 +700,17 @@ def load_pixbuf(path, size=None): height, GdkPixbuf.InterpType.BILINEAR) return pixbuf + + +def make_href_markup(string): + url_color = app.css_config.get_value('.gajim-url', StyleAttr.COLOR) + color = convert_rgb_to_hex(url_color) + + def _to_href(match): + url = match.group() + if '://' not in url: + url = 'https://' + url + return '<a href="%s"><span foreground="%s">%s</span></a>' % ( + url, color, match.group()) + + return URL_REGEX.sub(_to_href, string) ===================================== gajim/gui_menu_builder.py ===================================== @@ -579,6 +579,7 @@ def get_singlechat_menu(control_id, account, jid): def get_groupchat_menu(control_id, account, jid): groupchat_menu = [ + ('win.information-', _('Information')), (_('Manage Group Chat'), [ ('win.change-subject-', _('Change Subject')), ('win.configure-', _('Configure Group Chat')), View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/6b789e162d88fe8d5cd4298cb39465e2f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/6b789e162d88fe8d5cd4298cb39465e2f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: MAM: Minor code simplification
by Philipp Hörist 07 Aug '19

07 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 36805577 by Philipp Hörist at 2019-08-06T20:32:11Z MAM: Minor code simplification - - - - - 6b789e16 by Philipp Hörist at 2019-08-07T16:11:25Z Groupchat: Update roster status icon on join/leave - - - - - 2 changed files: - gajim/common/modules/mam.py - gajim/groupchat_control.py Changes: ===================================== gajim/common/modules/mam.py ===================================== @@ -123,7 +123,7 @@ class MAM(BaseModule): else: archive_jid = self._con.get_own_jid().getBare() - namespace = self._con.get_module('MAM').archiving_namespace + namespace = self.archiving_namespace timestamp = None if properties.stanza_id is None or namespace != nbxmpp.NS_MAM_2: @@ -132,8 +132,7 @@ class MAM(BaseModule): if not archive_jid == properties.stanza_id.by: return - if not self._con.get_module('MAM').is_catch_up_finished( - archive_jid): + if not self.is_catch_up_finished(archive_jid): return app.logger.set_archive_infos(archive_jid, ===================================== gajim/groupchat_control.py ===================================== @@ -1496,6 +1496,9 @@ class GroupchatControl(ChatControlBase): if self.parent_win: self.parent_win.redraw_tab(self) + # Update Roster + app.interface.roster.draw_contact(self.room_jid, self.account) + formattings_button = self.xml.get_object('formattings_button') formattings_button.set_sensitive(True) @@ -1524,10 +1527,8 @@ class GroupchatControl(ChatControlBase): con = app.connections[self.account] con.get_module('Chatstate').remove_delay_timeout(self.contact) - contact = app.contacts.get_groupchat_contact(self.account, - self.room_jid) - if contact is not None: - app.interface.roster.draw_contact(self.room_jid, self.account) + # Update Roster + app.interface.roster.draw_contact(self.room_jid, self.account) # We don't redraw the whole banner here, because only icon change self._update_banner_state_image() View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/a6b4d993bd9b08b2686165bec72678b72… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/a6b4d993bd9b08b2686165bec72678b72… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Simplify module import
by Philipp Hörist 05 Aug '19

05 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: a6b4d993 by Philipp Hörist at 2019-08-05T22:03:59Z Simplify module import - - - - - 1 changed file: - gajim/common/modules/message.py Changes: ===================================== gajim/common/modules/message.py ===================================== @@ -21,7 +21,6 @@ from nbxmpp.structs import StanzaHandler from nbxmpp.const import MessageType from gajim.common import app -from gajim.common import caps_cache from gajim.common.i18n import _ from gajim.common.nec import NetworkIncomingEvent from gajim.common.nec import NetworkEvent @@ -294,7 +293,7 @@ class Message(BaseModule): message_id=event.message_id) def _check_for_mam_compliance(self, room_jid, stanza_id): - namespace = caps_cache.muc_caps_cache.get_mam_namespace(room_jid) + namespace = muc_caps_cache.get_mam_namespace(room_jid) if stanza_id is None and namespace == nbxmpp.NS_MAM_2: self._log.warning('%s announces mam:2 without stanza-id', room_jid) @@ -307,7 +306,7 @@ class Message(BaseModule): return None, None if properties.type.is_groupchat: - namespace = caps_cache.muc_caps_cache.get_mam_namespace( + namespace = muc_caps_cache.get_mam_namespace( properties.jid.getBare()) archive = properties.jid else: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a6b4d993bd9b08b2686165bec72678b727… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a6b4d993bd9b08b2686165bec72678b727… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: MUC: Add log message when requesting MUC history
by Philipp Hörist 05 Aug '19

05 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 922fa4f1 by Philipp Hörist at 2019-08-05T20:49:00Z MUC: Add log message when requesting MUC history - timestamp() makes it necessary to use timezone aware datetime objects - - - - - dce96b5f by Philipp Hörist at 2019-08-05T21:05:30Z Logger: Improve log message - - - - - ca1b2091 by Philipp Hörist at 2019-08-05T21:58:16Z MAM: Improve MAM efficiency This looks at all messages incoming and saves the stanza-id if there is one. Previously this was only done for messages of type=chat, which left out muc invites and captcha messages, leading to fetching these messages later again. - - - - - 5 changed files: - gajim/common/logger.py - gajim/common/modules/mam.py - gajim/common/modules/message.py - gajim/common/modules/muc.py - gajim/session.py Changes: ===================================== gajim/common/logger.py ===================================== @@ -1463,5 +1463,5 @@ class Logger: sql = '''UPDATE last_archive_message SET {} WHERE jid_id = ?'''.format(args) self._con.execute(sql, tuple(kwargs.values()) + (jid_id,)) - log.info('Save archive infos: %s', kwargs) + log.info('Set message archive info: %s %s', jid, kwargs) self._timeout_commit() ===================================== gajim/common/modules/mam.py ===================================== @@ -40,6 +40,9 @@ class MAM(BaseModule): BaseModule.__init__(self, con) self.handlers = [ + StanzaHandler(name='message', + callback=self._set_message_archive_info, + priority=41), StanzaHandler(name='message', callback=self._mam_message_received, priority=51), @@ -101,6 +104,42 @@ class MAM(BaseModule): # A message we received return properties.mam.id, None + def _set_message_archive_info(self, _con, _stanza, properties): + if (properties.is_mam_message or + properties.is_pubsub or + properties.is_muc_subject): + return + + if properties.type.is_groupchat: + archive_jid = properties.jid.getBare() + namespace = muc_caps_cache.get_mam_namespace(archive_jid) + timestamp = properties.timestamp + if namespace is None: + # MUC History + app.logger.set_archive_infos( + archive_jid, + last_muc_timestamp=timestamp) + return + + else: + archive_jid = self._con.get_own_jid().getBare() + namespace = self._con.get_module('MAM').archiving_namespace + timestamp = None + + if properties.stanza_id is None or namespace != nbxmpp.NS_MAM_2: + return + + if not archive_jid == properties.stanza_id.by: + return + + if not self._con.get_module('MAM').is_catch_up_finished( + archive_jid): + return + + app.logger.set_archive_infos(archive_jid, + last_mam_id=properties.stanza_id.id, + last_muc_timestamp=timestamp) + def _mam_message_received(self, _con, stanza, properties): if not properties.is_mam_message: return ===================================== gajim/common/modules/message.py ===================================== @@ -293,16 +293,6 @@ class Message(BaseModule): stanza_id=event.stanza_id, message_id=event.message_id) - if muc_caps_cache.has_mam(event.room_jid): - finished = self._con.get_module('MAM').is_catch_up_finished( - event.room_jid) - if not finished: - return - - app.logger.set_archive_infos(event.room_jid, - last_mam_id=event.stanza_id, - last_muc_timestamp=event.timestamp) - def _check_for_mam_compliance(self, room_jid, stanza_id): namespace = caps_cache.muc_caps_cache.get_mam_namespace(room_jid) if stanza_id is None and namespace == nbxmpp.NS_MAM_2: ===================================== gajim/common/modules/muc.py ===================================== @@ -19,6 +19,7 @@ import time import logging from datetime import datetime from datetime import timedelta +from datetime import timezone from functools import partial import nbxmpp @@ -302,13 +303,16 @@ class MUC(BaseModule): if archive is not None and archive.last_muc_timestamp is not None: since_epoch = float(archive.last_muc_timestamp) - since_date = datetime.utcfromtimestamp(since_epoch) + since_date = datetime.fromtimestamp(since_epoch, timezone.utc) if threshold != SyncThreshold.NO_THRESHOLD: - threshold_date = datetime.utcnow() - timedelta(days=threshold) + now = datetime.now(timezone.utc) + threshold_date = now - timedelta(days=threshold) since_date = max(threshold_date, since_date) date_string = since_date.strftime('%Y-%m-%dT%H:%M:%SZ') muc_x.setTag('history', {'since': date_string}) + self._log.info('Request MUC history since: %s (%s)', + date_string, since_date.timestamp()) self._log.info('Threshold for %s: %s', room_jid, threshold) def _on_error_presence(self, _con, _stanza, properties): ===================================== gajim/session.py ===================================== @@ -139,12 +139,6 @@ class ChatControlSession: stanza_id=obj.unique_id, message_id=obj.message_id) - jid = self.conn.get_own_jid().getStripped() - if self.conn.get_module('MAM').is_catch_up_finished(jid): - app.logger.set_archive_infos(jid, - last_mam_id=obj.stanza_id, - last_muc_timestamp=obj.timestamp) - if obj.muc_pm and not obj.gc_control: # This is a carbon of a PM from a MUC we are not currently # joined. We log it silently without notification. View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/66fc682605b7812d4b4c7a3b4833f7d1f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/66fc682605b7812d4b4c7a3b4833f7d1f… 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 August 2019