Commits June 2019

commits@gajim.org

1 participants
70 discussions

[Git][gajim/gajim][master] Fix rejecting file transfer
by Philipp Hörist 20 Jun '19

20 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 328ceedd by Philipp Hörist at 2019-06-20T11:08:15Z Fix rejecting file transfer - - - - - 3 changed files: - gajim/common/jingle_session.py - gajim/common/modules/bytestream.py - gajim/common/modules/jingle.py Changes: ===================================== gajim/common/jingle_session.py ===================================== @@ -538,7 +538,7 @@ class JingleSession: # If we are not receiving a file # Check if there's already a session with this user: if contents[0].media != 'file': - for session in self.connection.get_module('Jingle').iter_jingle_sessions(self.peerjid): + for session in self.connection.get_module('Jingle').get_jingle_sessions(self.peerjid): if session is not self: reason = nbxmpp.Node('reason') alternative_session = reason.setTag('alternative-session') ===================================== gajim/common/modules/bytestream.py ===================================== @@ -179,10 +179,9 @@ class Bytestream(BaseModule): if not app.account_is_connected(self._account): return - if file_props.sid in self._sessions: - jingle = self._sessions[file_props.sid] - jingle.cancel_session() - return + for session in self._con.get_module('Jingle').get_jingle_sessions( + None, file_props.sid): + session.cancel_session() def send_success_connect_reply(self, streamhost): """ ===================================== gajim/common/modules/jingle.py ===================================== @@ -230,16 +230,16 @@ class Jingle(BaseModule): return 'sha-256' return None - def iter_jingle_sessions(self, jid, sid=None, media=None): + def get_jingle_sessions(self, jid, sid=None, media=None): if sid: - return (session for session in self._sessions.values() if \ - session.sid == sid) - sessions = (session for session in self._sessions.values() if \ - session.peerjid == jid) + return [session for session in self._sessions.values() if \ + session.sid == sid] + sessions = [session for session in self._sessions.values() if \ + session.peerjid == jid] if media: if media not in ('audio', 'video', 'file'): - return tuple() - return (session for session in sessions if session.get_content(media)) + return [] + return [session for session in sessions if session.get_content(media)] return sessions def set_file_info(self, file_): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/328ceedd2fe32eae9f0d97ce45fcc31074… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/328ceedd2fe32eae9f0d97ce45fcc31074… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] DiscoWindow: Some code-cleanup
by Philipp Hörist 20 Jun '19

20 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 200428c0 by Daniel Brötzmann at 2019-06-20T09:51:53Z DiscoWindow: Some code-cleanup - - - - - 3 changed files: - gajim/data/gui/groups_post_window.ui - gajim/data/gui/service_discovery_window.ui - gajim/gtk/discovery.py Changes: ===================================== gajim/data/gui/groups_post_window.ui ===================================== @@ -1,32 +1,40 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.12"/> + <requires lib="gtk+" version="3.20"/> <object class="GtkTextBuffer" id="textbuffer1"/> <object class="GtkWindow" id="groups_post_window"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="title" translatable="yes">Create new post</property> <property name="type_hint">dialog</property> + <signal name="key-press-event" handler="_on_key_press_event" swapped="no"/> <child> - <object class="GtkBox" id="vbox1"> + <placeholder/> + </child> + <child> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">6</property> + <property name="border_width">18</property> <property name="orientation">vertical</property> - <property name="spacing">4</property> + <property name="spacing">6</property> <child> - <object class="GtkGrid" id="grid1"> + <object class="GtkGrid"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="row_spacing">6</property> - <property name="column_spacing">6</property> + <property name="column_spacing">12</property> <child> - <object class="GtkLabel" id="label1"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">From</property> <property name="xalign">0</property> - <property name="label" translatable="yes">From:</property> + <style> + <class name="dim-label"/> + </style> </object> <packing> <property name="left_attach">0</property> @@ -34,11 +42,15 @@ </packing> </child> <child> - <object class="GtkLabel" id="label2"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Subject</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Subject:</property> + <style> + <class name="dim-label"/> + </style> </object> <packing> <property name="left_attach">0</property> @@ -60,7 +72,6 @@ <object class="GtkEntry" id="subject_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="hexpand">True</property> </object> <packing> <property name="left_attach">1</property> @@ -75,7 +86,7 @@ </packing> </child> <child> - <object class="GtkScrolledWindow" id="scrolledwindow1"> + <object class="GtkScrolledWindow"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="shadow_type">in</property> @@ -83,53 +94,32 @@ <object class="GtkTextView" id="contents_textview"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="left_margin">6</property> + <property name="right_margin">6</property> + <property name="top_margin">6</property> + <property name="bottom_margin">6</property> <property name="buffer">textbuffer1</property> </object> </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> - <object class="GtkBox" id="hbox1"> + <object class="GtkButton" id="send_button"> + <property name="label">_Forward</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkButton" id="cancel_button"> - <property name="label">gtk-cancel</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</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> - <placeholder/> - </child> - <child> - <object class="GtkButton" id="send_button"> - <property name="label">gtk-go-forward</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_send_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">end</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_send_button_clicked" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> </object> <packing> <property name="expand">False</property> ===================================== gajim/data/gui/service_discovery_window.ui ===================================== @@ -1,61 +1,83 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.12"/> - <object class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-jump-to</property> + <requires lib="gtk+" version="3.20"/> + <object class="GtkListStore" id="liststore1"> + <columns> +  + <column type="gchararray"/> + </columns> </object> <object class="GtkWindow" id="service_discovery_window"> <property name="can_focus">False</property> - <property name="border_width">6</property> <property name="role">Service Discovery</property> + <property name="window_position">center-always</property> <property name="default_width">550</property> - <property name="default_height">420</property> - <property name="type_hint">dialog</property> - <signal name="destroy" handler="on_service_discovery_window_destroy" swapped="no"/> - <signal name="key-press-event" handler="on_key_press_event" swapped="no"/> + <property name="default_height">550</property> + <signal name="destroy" handler="_on_service_discovery_window_destroy" swapped="no"/> + <signal name="key-press-event" handler="_on_key_press_event" swapped="no"/> <child> - <object class="GtkBox" id="vbox11"> + <placeholder/> + </child> + <child> + <object class="GtkBox" id="service_discovery"> + <property name="width_request">400</property> + <property name="height_request">400</property> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="border_width">18</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkEventBox" id="banner_agent_eventbox"> - <property name="name">Discovery-BannerEventBox</property> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkImage" id="banner_agent_icon"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-missing-image</property> + <property name="icon_size">6</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> <child> - <object class="GtkBox" id="banner_agent_hbox"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">6</property> + <property name="orientation">vertical</property> <child> - <object class="GtkLabel" id="banner_agent_label"> - <property name="name">Discovery-BannerLabel</property> + <object class="GtkLabel" id="banner_agent_header"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="ypad">6</property> - <property name="label"><span weight="heavy" size="large">Agent name</span> -Agent JID - node</property> - <property name="use_markup">True</property> - <property name="xalign">0.05000000074505806</property> + <property name="halign">start</property> + <property name="label">Agent name</property> + <property name="ellipsize">end</property> + <property name="xalign">0</property> + <style> + <class name="large-header"/> + </style> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkImage" id="banner_agent_icon"> + <object class="GtkLabel" id="banner_agent_subheader"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xpad">6</property> - <property name="ypad">6</property> - <property name="stock">gtk-missing-image</property> + <property name="no_show_all">True</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Agent JID - node</property> + <property name="ellipsize">end</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> @@ -64,28 +86,34 @@ Agent JID - node</property> </packing> </child> </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> - <style> - <class name="gajim-banner"/> - </style> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkBox" id="address_table"> + <object class="GtkBox" id="address_box"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">6</property> + <property name="spacing">12</property> <child> - <object class="GtkLabel" id="label224"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Address:</property> + <property name="label" translatable="yes">_Address</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">address_comboboxtext_entry</property> + <style> + <class name="dim-label"/> + </style> </object> <packing> <property name="expand">False</property> @@ -99,8 +127,9 @@ Agent JID - node</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="has_entry">True</property> + <signal name="changed" handler="_on_address_comboboxtext_changed" swapped="no"/> <child internal-child="entry"> - <object class="GtkEntry" id="address_entry"> + <object class="GtkEntry" id="address_comboboxtext_entry"> <property name="can_focus">True</property> <property name="has_focus">True</property> <signal name="key-press-event" handler="_on_entry_key_press_event" swapped="no"/> @@ -115,15 +144,24 @@ Agent JID - node</property> </child> <child> <object class="GtkButton" id="browse_button"> - <property name="label" translatable="yes">G_o</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> - <property name="image">image1</property> + <property name="tooltip_text" translatable="yes">Go</property> <property name="use_underline">True</property> - <signal name="clicked" handler="on_go_button_clicked" swapped="no"/> + <signal name="clicked" handler="_on_go_button_clicked" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">go-next-symbolic</property> + </object> + </child> + <style> + <class name="suggested-action"/> + </style> </object> <packing> <property name="expand">False</property> @@ -138,6 +176,20 @@ Agent JID - node</property> <property name="position">1</property> </packing> </child> + <child> + <object class="GtkProgressBar" id="services_progressbar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="halign">center</property> + <property name="show_text">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> <child> <object class="GtkScrolledWindow" id="services_scrollwin"> <property name="visible">True</property> @@ -148,7 +200,6 @@ Agent JID - node</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="headers_visible">False</property> - <signal name="row-activated" handler="on_services_treeview_row_activated" swapped="no"/> <child internal-child="selection"> <object class="GtkTreeSelection" id="treeview-selection1"/> </child> @@ -158,83 +209,26 @@ Agent JID - node</property> <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <child> - <object class="GtkBox" id="hbox2994"> + <object class="GtkBox" id="action_buttonbox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">12</property> <child> - <object class="GtkProgressBar" id="services_progressbar"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="pulse_step">0.10000000149</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label363"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkBox" id="action_buttonbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkButton" id="close_button"> - <property name="label">gtk-close</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="has_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_close_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack_type">end</property> - <property name="position">0</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> + <placeholder/> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="padding">2</property> - <property name="position">3</property> + <property name="pack_type">end</property> + <property name="position">4</property> </packing> </child> </object> </child> </object> - <object class="GtkListStore" id="liststore1"> - <columns> -  - <column type="gchararray"/> - </columns> - </object> </interface> ===================================== gajim/gtk/discovery.py ===================================== @@ -37,8 +37,8 @@ # - def _update_error(self, iter_, jid, node) # # * Should call the super class for this method. -# All others do not have to call back to the super class. (but can if they want -# the functionality) +# All others do not have to call back to the super class (but can if they want +# the functionality). # There are more methods, of course, but this is a basic set. import types @@ -46,33 +46,36 @@ import weakref import uuid import nbxmpp + from gi.repository import GLib from gi.repository import Gtk from gi.repository import Gdk from gajim.common import app -from gajim.common.i18n import _ from gajim.common import helpers +from gajim.common.i18n import _ from gajim.common.const import StyleAttr +from gajim.gtk.adhoc import AdHocCommand from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import InformationDialog -from gajim.gtk.service_registration import ServiceRegistration from gajim.gtk.search import Search -from gajim.gtk.adhoc import AdHocCommand +from gajim.gtk.service_registration import ServiceRegistration from gajim.gtk.util import icon_exists from gajim.gtk.util import get_builder LABELS = { 1: _('This service has not yet responded with detailed information'), 2: _('This service could not respond with detailed information.\n' - 'It is most likely legacy or broken'), + 'It is most likely a legacy service or broken.'), } # Dictionary mapping category, type pairs to browser class, image pairs. # This is a function, so we can call it after the classes are declared. # For the browser class, None means that the service will only be browsable # when it advertises disco as it's feature, False means it's never browsable. + + def _gen_agent_type_info(): return { # Defaults @@ -93,7 +96,7 @@ def _gen_agent_type_info(): ('directory', 'user'): (None, 'jud'), ('pubsub', 'generic'): (PubSubBrowser, 'pubsub'), ('pubsub', 'service'): (PubSubBrowser, 'pubsub'), - ('proxy', 'bytestreams'): (None, 'bytestreams'), # Socks5 FT proxy + ('proxy', 'bytestreams'): (None, 'bytestreams'), # Socks5 FT proxy ('headline', 'newmail'): (ToplevelAgentBrowser, 'mail'), # Transports @@ -116,13 +119,14 @@ def _gen_agent_type_info(): ('gateway', 'twitter'): (False, 'twitter'), } + # Category type to "human-readable" description string +# Conference is a category for listing mostly groupchats in service discovery _cat_to_descr = { - 'other': _('Others'), - 'gateway': _('Transports'), - '_jid': _('Transports'), - #conference is a category for listing mostly groupchats in service discovery - 'conference': _('Conference'), + 'other': _('Others'), + 'gateway': _('Transports'), + '_jid': _('Transports'), + 'conference': _('Conference'), } @@ -172,7 +176,8 @@ class CacheDictionary: if item.source: GLib.source_remove(item.source) if self.lifetime: - source = GLib.timeout_add_seconds(int(self.lifetime/1000), self._expire_timeout, key) + source = GLib.timeout_add_seconds( + int(self.lifetime / 1000), self._expire_timeout, key) item.source = source def __getitem__(self, key): @@ -195,8 +200,10 @@ class CacheDictionary: def __contains__(self, key): return key in self.cache + _icon_cache = CacheDictionary(15) + def get_agent_address(jid, node=None): """ Get an agent's address for displaying in the GUI @@ -205,6 +212,7 @@ def get_agent_address(jid, node=None): return '%s@%s' % (node, str(jid)) return str(jid) + class Closure: """ A weak reference to a callback with arguments as an object @@ -318,7 +326,7 @@ class ServicesCache: if browser and browser == ToplevelAgentBrowser: return browser - # second pass, we haven't found a ToplevelAgentBrowser + # Second pass, we haven't found a ToplevelAgentBrowser for identity in identities: try: cat, type_ = identity['category'], identity['type'] @@ -353,7 +361,7 @@ class ServicesCache: # Create a closure object cbkey = ('info', addr) cb = Closure(cb, userargs=args, remove=self._clean_closure, - removeargs=cbkey) + removeargs=cbkey) # Are we already fetching this? if cbkey in self._cbs: self._cbs[cbkey].append(cb) @@ -471,9 +479,8 @@ class ServiceDiscoveryWindow: """ Class that represents the Services Discovery window """ - def __init__(self, account, jid='', node='', address_entry=False, - parent=None, initial_identities=None): + parent=None, initial_identities=None): self._account = account self.parent = parent if not jid: @@ -490,7 +497,8 @@ class ServiceDiscoveryWindow: # Check connection if not app.account_is_connected(account): ErrorDialog(_('You are not connected to the server'), -_('Without a connection, you can not browse available services')) + _('Without a connection, you can not browse ' + 'available services')) raise RuntimeError('You must be connected to browse services') # Get a ServicesCache object. @@ -502,31 +510,28 @@ _('Without a connection, you can not browse available services')) if initial_identities: self.cache._on_agent_info(jid, node, initial_identities, [], None) - self.xml = get_builder('service_discovery_window.ui') - self.window = self.xml.get_object('service_discovery_window') - self.services_treeview = self.xml.get_object('services_treeview') + self._ui = get_builder('service_discovery_window.ui') + self.window = self._ui.service_discovery_window + self.services_treeview = self._ui.services_treeview self.model = None # This is more reliable than the cursor-changed signal. selection = self.services_treeview.get_selection() - selection.connect_after('changed', - self.on_services_treeview_selection_changed) - self.services_scrollwin = self.xml.get_object('services_scrollwin') - self.progressbar = self.xml.get_object('services_progressbar') - self.banner = self.xml.get_object('banner_agent_label') - self.banner_icon = self.xml.get_object('banner_agent_icon') - self.banner_eventbox = self.xml.get_object('banner_agent_eventbox') + selection.connect_after( + 'changed', self._on_services_treeview_selection_changed) + self.services_treeview.connect( + 'row-activated', self._on_services_treeview_row_activated) + self.services_scrollwin = self._ui.services_scrollwin + self.progressbar = self._ui.services_progressbar + self.banner_header = self._ui.banner_agent_header + self.banner_subheader = self._ui.banner_agent_subheader + self.banner_icon = self._ui.banner_agent_icon self.style_event_id = 0 - self.banner.realize() - self.action_buttonbox = self.xml.get_object('action_buttonbox') + self.action_buttonbox = self._ui.action_buttonbox # Address combobox self.address_comboboxtext = None - address_table = self.xml.get_object('address_table') if address_entry: - self.address_comboboxtext = self.xml.get_object( - 'address_comboboxtext') - self.address_comboboxtext_entry = self.xml.get_object( - 'address_entry') + self.address_comboboxtext = self._ui.address_comboboxtext self.latest_addresses = app.config.get( 'latest_disco_addresses').split() @@ -540,17 +545,17 @@ _('Without a connection, you can not browse available services')) self.address_comboboxtext.get_child().set_text(jid) else: # Don't show it at all if we didn't ask for it - address_table.set_no_show_all(True) - address_table.hide() + self._ui.address_box.set_no_show_all(True) + self._ui.address_box.hide() accel_group = Gtk.AccelGroup() keyval, mod = Gtk.accelerator_parse('<Control>r') accel_group.connect(keyval, mod, Gtk.AccelFlags.VISIBLE, - self.accel_group_func) + self.accel_group_func) self.window.add_accel_group(accel_group) self._initial_state() - self.xml.connect_signals(self) + self._ui.connect_signals(self) self.travel(jid, node) self.window.show_all() @@ -565,7 +570,7 @@ _('Without a connection, you can not browse available services')) if self.browser: self.browser.account = value - def on_key_press_event(self, widget, event): + def _on_key_press_event(self, widget, event): if event.keyval == Gdk.KEY_Escape: self.window.destroy() @@ -583,15 +588,17 @@ _('Without a connection, you can not browse available services')) self.window.set_title(title_text) self._set_window_banner_text(_('Service Discovery')) self.banner_icon.clear() - self.banner_icon.hide() # Just clearing it doesn't work + self.banner_icon.hide() # Just clearing it doesn't work def _set_window_banner_text(self, text, text_after=None): - markup = '<span>%s</span>' % (text) + self.banner_header.set_text(text) if text_after is not None: - markup += '\n<span size="x-small">%s</span>' % text_after - self.banner.set_markup(markup) + self.banner_subheader.show() + self.banner_subheader.set_text(text_after) + else: + self.banner_subheader.hide() - def destroy(self, chain=False): + def _destroy(self, chain=False): """ Close the browser. This can optionally close its children and propagate to the parent. This should happen on actions like register, or join to @@ -660,7 +667,7 @@ _('Without a connection, you can not browse available services')) if not identities: if not self.address_comboboxtext: # We can't travel anywhere else. - self.destroy() + self._destroy() ErrorDialog( _('The service could not be found'), _('There is no service at the address you entered, or it is ' @@ -686,8 +693,8 @@ _('Without a connection, you can not browse available services')) Open an agent. By default, this happens in a new window """ try: - win = app.interface.instances[self.account]['disco']\ - [get_agent_address(jid, node)] + win = app.interface.instances[ + self.account]['disco'][get_agent_address(jid, node)] win.window.present() return except KeyError: @@ -699,34 +706,30 @@ _('Without a connection, you can not browse available services')) return self.children.append(win) - def on_service_discovery_window_destroy(self, widget): - self.destroy() + def _on_service_discovery_window_destroy(self, widget): + self._destroy() - def on_close_button_clicked(self, widget): - self.destroy() - - def on_address_comboboxtext_changed(self, widget): + def _on_address_comboboxtext_changed(self, widget): if self.address_comboboxtext.get_active() != -1: - # user selected one of the entries so do auto-visit - jid = self.address_comboboxtext_entry.get_text() + # User selected one of the entries so do auto-visit + jid = self._ui.address_comboboxtext_entry.get_text() try: jid = helpers.parse_jid(jid) except helpers.InvalidFormat as s: - pritext = _('Invalid Server Name') - ErrorDialog(pritext, str(s)) + ErrorDialog(_('Invalid Server Name'), str(s)) return self.travel(jid, '') - def on_go_button_clicked(self, widget): - jid = self.address_comboboxtext_entry.get_text() + def _on_go_button_clicked(self, widget): + jid = self._ui.address_comboboxtext_entry.get_text() try: jid = helpers.parse_jid(jid) except helpers.InvalidFormat as s: - pritext = _('Invalid Server Name') - ErrorDialog(pritext, str(s), - transient_for=self.window) + ErrorDialog(_('Invalid Server Name'), + str(s), + transient_for=self.window) return - if jid == self.jid: # jid has not changed + if jid == self.jid: # jid has not changed return if jid in self.latest_addresses: self.latest_addresses.remove(jid) @@ -737,20 +740,20 @@ _('Without a connection, you can not browse available services')) for j in self.latest_addresses: self.address_comboboxtext.append_text(j) app.config.set('latest_disco_addresses', - ' '.join(self.latest_addresses)) + ' '.join(self.latest_addresses)) self.travel(jid, '') - def on_services_treeview_row_activated(self, widget, path, col=0): + def _on_services_treeview_row_activated(self, widget, path, col=0): if self.browser: self.browser.default_action() - def on_services_treeview_selection_changed(self, widget): + def _on_services_treeview_selection_changed(self, widget): if self.browser: self.browser.update_actions() def _on_entry_key_press_event(self, widget, event): if event.keyval == Gdk.KEY_Return or event.keyval == Gdk.KEY_KP_Enter: - self.on_go_button_clicked(widget) + self._on_go_button_clicked(widget) class AgentBrowser: @@ -780,8 +783,9 @@ class AgentBrowser: """ Set the initial window title based on agent address """ - self.window.window.set_title(_('Browsing %(address)s using account ' - '%(account)s') % {'address': self._get_agent_address(), + self.window.window.set_title( + _('Browsing %(address)s using account %(account)s') % { + 'address': self._get_agent_address(), 'account': self.account}) self.window._set_window_banner_text(self._get_agent_address()) @@ -825,10 +829,7 @@ class AgentBrowser: self.browse_button = Gtk.Button() self.browse_button.connect('clicked', self.on_browse_button_clicked) self.window.action_buttonbox.add(self.browse_button) - image = Gtk.Image.new_from_icon_name("document-open", Gtk.IconSize.BUTTON) - self.browse_button.set_image(image) - label = _('Browse') - self.browse_button.set_label(label) + self.browse_button.set_label(_('Browse')) self.browse_button.show_all() def _clean_actions(self): @@ -860,7 +861,8 @@ class AgentBrowser: # Add an icon to the banner. icon_name = self.cache.get_icon(identities, addr=self._get_agent_address()) - self.window.banner_icon.set_from_icon_name(icon_name, Gtk.IconSize.DND) + self.window.banner_icon.set_from_icon_name(icon_name, + Gtk.IconSize.DIALOG) self.window.banner_icon.show() def _clean_title(self): @@ -880,13 +882,6 @@ class AgentBrowser: self._create_treemodel() self._add_actions() - # This is a hack. The buttonbox apparently doesn't care about pack_start - # or pack_end, so we repack the close button here to make sure it's last - close_button = self.window.xml.get_object('close_button') - self.window.action_buttonbox.remove(close_button) - self.window.action_buttonbox.pack_end(close_button, True, True, 0) - close_button.show_all() - self.update_actions() self.active = True @@ -914,7 +909,8 @@ class AgentBrowser: When we want to browse an agent: open a new services window with a browser for the agent type """ - model, iter_ = self.window.services_treeview.get_selection().get_selected() + model, iter_ = \ + self.window.services_treeview.get_selection().get_selected() if not iter_: return jid = model[iter_][0] @@ -928,7 +924,8 @@ class AgentBrowser: """ if self.browse_button: self.browse_button.set_sensitive(False) - model, iter_ = self.window.services_treeview.get_selection().get_selected() + model, iter_ = \ + self.window.services_treeview.get_selection().get_selected() if not iter_: return jid = model[iter_][0] @@ -951,7 +948,8 @@ class AgentBrowser: When we double-click a row: perform the default action on the selected item """ - model, iter_ = self.window.services_treeview.get_selection().get_selected() + model, iter_ = \ + self.window.services_treeview.get_selection().get_selected() if not iter_: return jid = model[iter_][0] @@ -978,7 +976,7 @@ class AgentBrowser: self.window.progressbar.show() self._pulse_timeout = GLib.timeout_add(250, self._pulse_timeout_cb) self.cache.get_items(self.jid, self.node, self._agent_items, - force=force, args=(force,)) + force=force, args=(force,)) def _pulse_timeout_cb(self, *args): """ @@ -1023,9 +1021,11 @@ class AgentBrowser: # We can't travel anywhere else. self.window.destroy() ErrorDialog(_('The service is not browsable'), - _('This service does not contain any items to browse.'), - transient_for=self.window.window) + _('This service does not contain any items ' + 'to browse.'), + transient_for=self.window.window) return + # We got a list of items def fill_partial_rows(items): '''Generator to fill the listmodel of a treeview progressively.''' @@ -1045,7 +1045,7 @@ class AgentBrowser: yield True self.window.services_treeview.freeze_child_notify() self.window.services_treeview.thaw_child_notify() - #stop idle_add() + # Stop idle_add() yield False loader = fill_partial_rows(items) GLib.idle_add(next, loader) @@ -1072,7 +1072,7 @@ class AgentBrowser: disco#items query """ self.model.append((jid, node, item.get('name', ''), - get_agent_address(jid, node))) + get_agent_address(jid, node))) self.cache.get_info(jid, node, self._agent_info, force=force) def _update_item(self, iter_, jid, node, item): @@ -1117,11 +1117,11 @@ class ToplevelAgentBrowser(AgentBrowser): def add_self_line(self): addr = get_agent_address(self.jid, self.node) - descr = "<b>%s</b>" % addr + descr = '<b>%s</b>' % addr # Guess which kind of service this is identities = [] type_ = app.get_transport_name_from_jid(self.jid, - use_config_setting=False) + use_config_setting=False) if type_: identity = {'category': '_jid', 'type': type_} identities.append(identity) @@ -1161,7 +1161,8 @@ class ToplevelAgentBrowser(AgentBrowser): # Normal/success cell.set_property('foreground_set', False) else: - bgcolor = app.css_config.get_value('.gajim-group-row', StyleAttr.BACKGROUND) + bgcolor = app.css_config.get_value('.gajim-group-row', + StyleAttr.BACKGROUND) if bgcolor: cell.set_property('cell_background_set', True) cell.set_property('foreground_set', False) @@ -1230,35 +1231,35 @@ class ToplevelAgentBrowser(AgentBrowser): def _add_actions(self): AgentBrowser._add_actions(self) - self.execute_button = Gtk.Button() - self.execute_button.connect('clicked', self.on_execute_button_clicked) - self.window.action_buttonbox.add(self.execute_button) - image = Gtk.Image.new_from_icon_name("system-run", Gtk.IconSize.BUTTON) + self.execute_button = Gtk.Button(label=_('_Command'), + use_underline=True) + self.execute_button.connect('clicked', self._on_execute_button_clicked) + image = Gtk.Image.new_from_icon_name( + 'utilities-terminal-symbolic', Gtk.IconSize.BUTTON) self.execute_button.set_image(image) - label = _('Execute Command') - self.execute_button.set_label(label) + self.window.action_buttonbox.add(self.execute_button) self.execute_button.show_all() - self.register_button = Gtk.Button(label=_("Re_gister"), - use_underline=True) - self.register_button.connect('clicked', self.on_register_button_clicked) + self.register_button = Gtk.Button(label=_('Re_gister'), + use_underline=True) + self.register_button.connect( + 'clicked', self._on_register_button_clicked) self.window.action_buttonbox.add(self.register_button) self.register_button.show_all() - self.join_button = Gtk.Button() - self.join_button.connect('clicked', self.on_join_button_clicked) + self.join_button = Gtk.Button(label=_('Join'), + use_underline=True) + self.join_button.connect('clicked', self._on_join_button_clicked) self.window.action_buttonbox.add(self.join_button) - label = _('Join') - self.join_button.set_label(label) self.join_button.show_all() - self.search_button = Gtk.Button() + self.search_button = Gtk.Button(label=_('_Search'), + use_underline=True) self.search_button.connect('clicked', self.on_search_button_clicked) - self.window.action_buttonbox.add(self.search_button) - image = Gtk.Image.new_from_icon_name("edit-find", Gtk.IconSize.BUTTON) + image = Gtk.Image.new_from_icon_name('edit-find-symbolic', + Gtk.IconSize.BUTTON) self.search_button.set_image(image) - label = _('Search') - self.search_button.set_label(label) + self.window.action_buttonbox.add(self.search_button) self.search_button.show_all() def _clean_actions(self): @@ -1280,7 +1281,8 @@ class ToplevelAgentBrowser(AgentBrowser): """ When we want to search something: open search window """ - model, iter_ = self.window.services_treeview.get_selection().get_selected() + model, iter_ = \ + self.window.services_treeview.get_selection().get_selected() if not iter_: return service = model[iter_][0] @@ -1290,27 +1292,30 @@ class ToplevelAgentBrowser(AgentBrowser): AgentBrowser.cleanup(self) def update_theme(self): - bgcolor = app.css_config.get_value('.gajim-group-row', StyleAttr.BACKGROUND) + bgcolor = app.css_config.get_value('.gajim-group-row', + StyleAttr.BACKGROUND) if bgcolor: self._renderer.set_property('cell-background', bgcolor) self.window.services_treeview.queue_draw() - def on_execute_button_clicked(self, widget=None): + def _on_execute_button_clicked(self, widget=None): """ When we want to execute a command: open adhoc command window """ - model, iter_ = self.window.services_treeview.get_selection().get_selected() + model, iter_ = \ + self.window.services_treeview.get_selection().get_selected() if not iter_: return service = model[iter_][0] AdHocCommand(self.account, service) - def on_register_button_clicked(self, widget=None): + def _on_register_button_clicked(self, widget=None): """ When we want to register an agent: request information about registering with the agent and close the window """ - model, iter_ = self.window.services_treeview.get_selection().get_selected() + model, iter_ = \ + self.window.services_treeview.get_selection().get_selected() if not iter_: return jid = model[iter_][0] @@ -1318,17 +1323,18 @@ class ToplevelAgentBrowser(AgentBrowser): ServiceRegistration(self.account, jid) self.window.destroy(chain=True) - def on_join_button_clicked(self, widget): + def _on_join_button_clicked(self, widget): """ When we want to join an IRC room or create a new MUC room: Opens the join_groupchat_window """ - model, iter_ = self.window.services_treeview.get_selection().get_selected() + model, iter_ = \ + self.window.services_treeview.get_selection().get_selected() if not iter_: return service = model[iter_][0] app.interface.join_gc_minimal(self.account, service, - transient_for=self.window.window) + transient_for=self.window.window) def update_actions(self): if self.execute_button: @@ -1341,7 +1347,8 @@ class ToplevelAgentBrowser(AgentBrowser): self.join_button.set_sensitive(False) if self.search_button: self.search_button.set_sensitive(False) - model, iter_ = self.window.services_treeview.get_selection().get_selected() + model, iter_ = \ + self.window.services_treeview.get_selection().get_selected() if not iter_: return if not model[iter_][0]: @@ -1349,7 +1356,8 @@ class ToplevelAgentBrowser(AgentBrowser): return if model[iter_][4] is not None: # We don't have the info (yet) - # It's either unknown or a transport, register button should be active + # It's either unknown or a transport: + # Register button should be active if self.register_button: self.register_button.set_sensitive(True) # Guess what kind of service we're dealing with @@ -1370,7 +1378,8 @@ class ToplevelAgentBrowser(AgentBrowser): AgentBrowser.update_actions(self) def _update_actions(self, jid, node, identities, features, data): - AgentBrowser._update_actions(self, jid, node, identities, features, data) + AgentBrowser._update_actions( + self, jid, node, identities, features, data) if self.execute_button and nbxmpp.NS_COMMANDS in features: self.execute_button.set_sensitive(True) if self.search_button and nbxmpp.NS_SEARCH in features: @@ -1383,7 +1392,7 @@ class ToplevelAgentBrowser(AgentBrowser): jid_list = app.contacts.get_jid_list(self.account) for jid_ in jid_list: contact = app.contacts.get_first_contact_from_jid( - self.account, jid_) + self.account, jid_) if _('Transports') in contact.groups: registered_transports.append(jid_) registered_transports.append(self.jid) @@ -1396,11 +1405,12 @@ class ToplevelAgentBrowser(AgentBrowser): self.join_button.set_sensitive(True) def _default_action(self, jid, node, identities, features, data): - if AgentBrowser._default_action(self, jid, node, identities, features, data): + if AgentBrowser._default_action(self, jid, node, identities, + features, data): return True if nbxmpp.NS_REGISTER in features: # Register if we can't browse - self.on_register_button_clicked() + self._on_register_button_clicked() return True return False @@ -1412,13 +1422,6 @@ class ToplevelAgentBrowser(AgentBrowser): """ Expand all items in the treeview """ - # GTK apparently screws up here occasionally. :/ - #def expand_all(*args): - # self.window.services_treeview.expand_all() - # self.expanding = False - # return False - #self.expanding = True - #GLib.idle_add(expand_all) self.window.services_treeview.expand_all() def _update_progressbar(self): @@ -1431,8 +1434,10 @@ class ToplevelAgentBrowser(AgentBrowser): fraction = 0 if self._total_items: - self.window.progressbar.set_text(_("Scanning %(current)d / %(total)d.." - ) % {'current': self._progress, 'total': self._total_items}) + self.window.progressbar.set_text( + _('Scanning %(current)d / %(total)d ...') % { + 'current': self._progress, + 'total': self._total_items + 1}) fraction = float(self._progress) / float(self._total_items) if self._progress >= self._total_items: # We show the progressbar for just a bit before hiding it. @@ -1664,7 +1669,7 @@ class MucBrowser(AgentBrowser): self.vadj_cbid = self.vadj.connect('value-changed', self.on_scroll) # And to size changes self.size_cbid = self.window.services_scrollwin.connect( - 'size-allocate', self.on_scroll) + 'size-allocate', self.on_scroll) def _clean_treemodel(self): if self.size_cbid: @@ -1676,12 +1681,17 @@ class MucBrowser(AgentBrowser): AgentBrowser._clean_treemodel(self) def _add_actions(self): - self.bookmark_button = Gtk.Button(label=_('_Bookmark'), use_underline=True) - self.bookmark_button.connect('clicked', self.on_bookmark_button_clicked) + self.bookmark_button = Gtk.Button(label=_('_Bookmark'), + use_underline=True) + self.bookmark_button.connect( + 'clicked', self._on_bookmark_button_clicked) + image = Gtk.Image.new_from_icon_name( + 'bookmark-new-symbolic', Gtk.IconSize.BUTTON) + self.bookmark_button.set_image(image) self.window.action_buttonbox.add(self.bookmark_button) self.bookmark_button.show_all() self.join_button = Gtk.Button(label=_('_Join'), use_underline=True) - self.join_button.connect('clicked', self.on_join_button_clicked) + self.join_button.connect('clicked', self._on_join_button_clicked) self.window.action_buttonbox.add(self.join_button) self.join_button.show_all() @@ -1693,9 +1703,10 @@ class MucBrowser(AgentBrowser): self.join_button.destroy() self.join_button = None - def on_bookmark_button_clicked(self, *args): + def _on_bookmark_button_clicked(self, *args): con = app.connections[self.account] - model, iter_ = self.window.services_treeview.get_selection().get_selected() + model, iter_ = \ + self.window.services_treeview.get_selection().get_selected() if not iter_: return @@ -1703,7 +1714,7 @@ class MucBrowser(AgentBrowser): if con.get_module('Bookmarks').is_bookmark(room_jid): ErrorDialog( _('Bookmark already set'), - _('Group Chat "%s" is already in your bookmarks.') % room_jid, + _('Group Chat \'%s\' is already in your bookmarks.') % room_jid, transient_for=self.window.window) return @@ -1715,15 +1726,17 @@ class MucBrowser(AgentBrowser): InformationDialog( _('Bookmark has been added successfully'), - _('You can manage your bookmarks via Actions menu in your roster.'), + _('You can manage your bookmarks by clicking the Bookmarks menu ' + 'item in your contact list.'), transient_for=self.window.window) - def on_join_button_clicked(self, *args): + def _on_join_button_clicked(self, *args): """ When we want to join a conference: ask specific informations about the selected agent and close the window """ - model, iter_ = self.window.services_treeview.get_selection().get_selected() + model, iter_ = \ + self.window.services_treeview.get_selection().get_selected() if not iter_: return service = model[iter_][0] @@ -1736,14 +1749,15 @@ class MucBrowser(AgentBrowser): self.window.destroy() def update_actions(self): - sens = self.window.services_treeview.get_selection().count_selected_rows() + sens = \ + self.window.services_treeview.get_selection().count_selected_rows() if self.bookmark_button: self.bookmark_button.set_sensitive(sens > 0) if self.join_button: self.join_button.set_sensitive(sens > 0) def default_action(self): - self.on_join_button_clicked() + self._on_join_button_clicked() def _start_info_query(self): """ @@ -1791,8 +1805,9 @@ class MucBrowser(AgentBrowser): def _channel_altinfo(self, jid, node, items, name=None): """ - Callback for the alternate disco#items query. We try to at least get the - amount of users in the room if the service does not support MUC dataforms + Callback for the alternate disco#items query. We try to at least get + the amount of users in the room if the service does not support MUC + dataforms """ if items == 0: # The server returned an error @@ -1812,8 +1827,8 @@ class MucBrowser(AgentBrowser): if iter_: if name: self.model[iter_][2] = name - self.model[iter_][3] = len(items) # The number of users - self.model[iter_][4] = str(len(items)) # The number of users + self.model[iter_][3] = len(items) # The number of users + self.model[iter_][4] = str(len(items)) # The number of users self.model[iter_][6] = True self._fetch_source = None self._query_visible() @@ -1852,19 +1867,21 @@ class MucBrowser(AgentBrowser): self._query_visible() def _update_error(self, iter_, jid, node): - # switch to alternate query mode + # Switch to alternate query mode self.cache.get_items(jid, node, self._channel_altinfo) + def PubSubBrowser(account, jid, node): """ Return an AgentBrowser subclass that will display service discovery for particular pubsub service. Different pubsub services may need to present different data during browsing """ - # for now, only discussion groups are supported... + # For now, only discussion groups are supported... # TODO: check if it has appropriate features to be such kind of service return DiscussionGroupsBrowser(account, jid, node) + class DiscussionGroupsBrowser(AgentBrowser): """ For browsing pubsub-based discussion groups service @@ -1873,11 +1890,11 @@ class DiscussionGroupsBrowser(AgentBrowser): def __init__(self, account, jid, node): AgentBrowser.__init__(self, account, jid, node) - # this will become set object when we get subscriptions; None means + # This will become set object when we get subscriptions; None means # we don't know yet which groups are subscribed self.subscriptions = None - # this will become our action widgets when we create them; None means + # This will become our action widgets when we create them; None means # we don't have them yet (needed for check in callback) self.subscribe_button = None self.unsubscribe_button = None @@ -1890,9 +1907,10 @@ class DiscussionGroupsBrowser(AgentBrowser): """ Create treemodel for the window """ - # JID, node, name (with description) - pango markup, don't have info?, subscribed? + # JID, node, name (with description) - pango markup, + # don't have info?, subscribed? self.model = Gtk.TreeStore(str, str, str, bool, bool) - # sort by name + # Sort by name self.model.set_sort_column_id(2, Gtk.SortType.ASCENDING) self.window.services_treeview.set_model(self.model) @@ -1977,6 +1995,7 @@ class DiscussionGroupsBrowser(AgentBrowser): def _get_iter(self, node): ''' Look for an iter with the given node ''' self.found_iter = None + def is_node(model, path, iter_, node): if model[iter_][1] == node: self.found_iter = iter_ @@ -1985,21 +2004,28 @@ class DiscussionGroupsBrowser(AgentBrowser): return self.found_iter def _add_actions(self): - self.post_button = Gtk.Button(label=_('New post'), use_underline=True) + self.post_button = Gtk.Button(label=_('_New post'), use_underline=True) self.post_button.set_sensitive(False) - self.post_button.connect('clicked', self.on_post_button_clicked) + self.post_button.connect('clicked', self._on_post_button_clicked) + image = Gtk.Image.new_from_icon_name( + 'mail-message-new-symbolic', Gtk.IconSize.BUTTON) + self.post_button.set_image(image) self.window.action_buttonbox.add(self.post_button) self.post_button.show_all() - self.subscribe_button = Gtk.Button(label=_('_Subscribe'), use_underline=True) + self.subscribe_button = Gtk.Button(label=_('_Subscribe'), + use_underline=True) self.subscribe_button.set_sensitive(False) - self.subscribe_button.connect('clicked', self.on_subscribe_button_clicked) + self.subscribe_button.connect( + 'clicked', self._on_subscribe_button_clicked) self.window.action_buttonbox.add(self.subscribe_button) self.subscribe_button.show_all() - self.unsubscribe_button = Gtk.Button(label=_('_Unsubscribe'), use_underline=True) + self.unsubscribe_button = Gtk.Button(label=_('_Unsubscribe'), + use_underline=True) self.unsubscribe_button.set_sensitive(False) - self.unsubscribe_button.connect('clicked', self.on_unsubscribe_button_clicked) + self.unsubscribe_button.connect( + 'clicked', self._on_unsubscribe_button_clicked) self.window.action_buttonbox.add(self.unsubscribe_button) self.unsubscribe_button.show_all() @@ -2021,27 +2047,30 @@ class DiscussionGroupsBrowser(AgentBrowser): Called when user selected a row. Make subscribe/unsubscribe buttons sensitive appropriately """ - # we have nothing to do if we don't have buttons... + # We have nothing to do if we don't have buttons... if self.subscribe_button is None: return - model, iter_ = self.window.services_treeview.get_selection().get_selected() + model, iter_ = \ + self.window.services_treeview.get_selection().get_selected() if not iter_ or self.subscriptions is None: - # no item selected or no subscriptions info, all buttons are insensitive + # No item selected or no subscriptions info, all buttons are + # insensitive self.post_button.set_sensitive(False) self.subscribe_button.set_sensitive(False) self.unsubscribe_button.set_sensitive(False) else: - subscribed = model.get_value(iter_, 4) # 4 = subscribed? + subscribed = model.get_value(iter_, 4) # 4 = subscribed? self.post_button.set_sensitive(subscribed) self.subscribe_button.set_sensitive(not subscribed) self.unsubscribe_button.set_sensitive(subscribed) - def on_post_button_clicked(self, widget): + def _on_post_button_clicked(self, widget): """ Called when 'post' button is pressed. Open window to create post """ - model, iter_ = self.window.services_treeview.get_selection().get_selected() + model, iter_ = \ + self.window.services_treeview.get_selection().get_selected() if iter_ is None: return @@ -2049,11 +2078,12 @@ class DiscussionGroupsBrowser(AgentBrowser): GroupsPostWindow(self.account, self.jid, groupnode) - def on_subscribe_button_clicked(self, widget): + def _on_subscribe_button_clicked(self, widget): """ Called when 'subscribe' button is pressed. Send subscribtion request """ - model, iter_ = self.window.services_treeview.get_selection().get_selected() + model, iter_ = \ + self.window.services_treeview.get_selection().get_selected() if iter_ is None: return @@ -2063,15 +2093,16 @@ class DiscussionGroupsBrowser(AgentBrowser): con.get_module('PubSub').send_pb_subscribe( self.jid, node, self._on_pep_subscribe, groupnode=node) - def on_unsubscribe_button_clicked(self, widget): + def _on_unsubscribe_button_clicked(self, widget): """ Called when 'unsubscribe' button is pressed. Send unsubscription request """ - model, iter_ = self.window.services_treeview.get_selection().get_selected() + model, iter_ = \ + self.window.services_treeview.get_selection().get_selected() if iter_ is None: return - node = model.get_value(iter_, 1) # 1 = groupnode + node = model.get_value(iter_, 1) # 1 = groupnode con = app.connections[self.account] con.get_module('PubSub').send_pb_unsubscribe( @@ -2093,7 +2124,7 @@ class DiscussionGroupsBrowser(AgentBrowser): self.subscriptions = groups_ - # try to setup existing items in model + # Try to setup existing items in model model = self.window.services_treeview.get_model() for row in model: # 1 = group node @@ -2114,7 +2145,7 @@ class DiscussionGroupsBrowser(AgentBrowser): model = self.window.services_treeview.get_model() for row in model: - if row[1] == groupnode: # 1 = groupnode + if row[1] == groupnode: # 1 = groupnode row[4] = True break @@ -2128,12 +2159,13 @@ class DiscussionGroupsBrowser(AgentBrowser): model = self.window.services_treeview.get_model() for row in model: - if row[1] == groupnode: # 1 = groupnode + if row[1] == groupnode: # 1 = groupnode row[4] = False break self.update_actions() + # Fill the global agent type info dictionary _agent_type_info = _gen_agent_type_info() @@ -2141,8 +2173,8 @@ _agent_type_info = _gen_agent_type_info() class GroupsPostWindow: def __init__(self, account, servicejid, groupid): """ - Open new 'create post' window to create message for groupid on servicejid - service + Open new 'create post' window to create message for groupid on + servicejid service """ assert isinstance(servicejid, str) assert isinstance(groupid, str) @@ -2151,38 +2183,38 @@ class GroupsPostWindow: self.servicejid = servicejid self.groupid = groupid - self.xml = get_builder('groups_post_window.ui') - self.window = self.xml.get_object('groups_post_window') - for name in ('from_entry', 'subject_entry', 'contents_textview'): - self.__dict__[name] = self.xml.get_object(name) + self._ui = get_builder('groups_post_window.ui') + self.window = self._ui.groups_post_window - self.xml.connect_signals(self) + self._ui.connect_signals(self) self.window.show_all() - def on_cancel_button_clicked(self, w): - """ - Close window - """ - self.window.destroy() + def _on_key_press_event(self, widget, event): + if event.keyval == Gdk.KEY_Escape: + self.window.destroy() - def on_send_button_clicked(self, w): + def _on_send_button_clicked(self, w): """ Gather info from widgets and send it as a message """ - # constructing item to publish... that's atom:entry element - item = nbxmpp.Node('entry', {'xmlns':'http://www.w3.org/2005/Atom'}) + # Constructing item to publish... that's atom:entry element + item = nbxmpp.Node('entry', {'xmlns': 'http://www.w3.org/2005/Atom'}) author = item.addChild('author') - author.addChild('name', {}, [self.from_entry.get_text()]) + author.addChild('name', {}, [self._ui.from_entry.get_text()]) item.addChild('generator', {}, ['Gajim']) - item.addChild('title', {}, [self.subject_entry.get_text()]) + item.addChild('title', {}, [self._ui.subject_entry.get_text()]) - buf = self.contents_textview.get_buffer() - item.addChild('content', {}, [buf.get_text(buf.get_start_iter(), buf.get_end_iter(), True)]) + buf = self._ui.contents_textview.get_buffer() + item.addChild('content', + {}, + [buf.get_text(buf.get_start_iter(), + buf.get_end_iter(), + True)]) - # publish it to node + # Publish it to node con = app.connections[self.account] con.get_module('PubSub').send_pb_publish( self.servicejid, self.groupid, item, str(uuid.uuid4())) - # close the window + # Close the window self.window.destroy() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/200428c0cf3e3702d377fdb713e53d5bb2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/200428c0cf3e3702d377fdb713e53d5bb2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Make use of NewConfirmationDialog
by Philipp Hörist 20 Jun '19

20 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0411d8fe by Daniel Brötzmann at 2019-06-20T09:37:57Z Make use of NewConfirmationDialog This replaces ConfirmationDialog by NewConfirmationDialog and ConfirmationDialogCheck by NewConfirmationCheckDialog in most places. - - - - - 9 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/dialogs.py - gajim/groupchat_control.py - gajim/gtk/accounts.py - gajim/gtk/themes.py - gajim/gtkgui_helpers.py - gajim/history_manager.py - gajim/roster_window.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -56,8 +56,8 @@ from gajim import gui_menu_builder from gajim import message_control from gajim import dialogs -from gajim.gtk.dialogs import NewConfirmationDialog from gajim.gtk.dialogs import DialogButton +from gajim.gtk.dialogs import NewConfirmationDialog from gajim.gtk.add_contact import AddNewContactWindow from gajim.gtk.util import get_icon_name from gajim.gtk.util import get_cursor @@ -1155,15 +1155,15 @@ class ChatControl(ChatControlBase): time_ = app.last_message_time[self.account][self.get_full_jid()] if time.time() - time_ < 2: # 2 seconds - NewConfirmationDialog( _('Close'), - _('You just received a new message from %s') % self.contact.jid, - _('If you close this tab and you have history disabled, ' + _('You just received a new message ' + 'from %s') % self.contact.jid, + _('If you close this tab while having chat history disabled, ' 'this message will be lost.'), [DialogButton.make('Cancel', callback=lambda: on_no(self)), - DialogButton.make('OK', + DialogButton.make('Remove', text=_('Close'), callback=lambda: on_yes(self))], transient_for=self.parent_win.window).show() ===================================== gajim/chat_control_base.py ===================================== @@ -52,8 +52,9 @@ from gajim.message_control import MessageControl from gajim.conversation_textview import ConversationTextview from gajim.message_textview import MessageTextView -from gajim.gtk.dialogs import NewConfirmationDialog 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 @@ -606,23 +607,27 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): image = clipboard.wait_for_image() if image is not None: if not app.config.get('confirm_paste_image'): - self._paste_event_confirmed(image) + self._paste_event_confirmed(True, image) return - NewConfirmationDialog( - _('Warning'), + NewConfirmationCheckDialog( + _('Paste Image'), _('You are trying to paste an image'), _('Are you sure you want to paste your ' - 'clipboard image in the chat?'), + 'clipboard\'s image into the chat window?'), + _('_Do not ask me again'), [DialogButton.make('Cancel'), DialogButton.make('OK', - callback=lambda: self._paste_event_confirmed(image))], - ).show() + text=_('_Paste'), + callback=self._paste_event_confirmed, + args=[image])]).show() - def _paste_event_confirmed(self, image): + def _paste_event_confirmed(self, is_checked, image): + if is_checked: + app.config.set('confirm_paste_image', False) tmp_dir = TemporaryDirectory() dir_ = tmp_dir.name - # get file transfer preference + # Get file transfer preference ft_pref = app.config.get_per('accounts', self.account, 'filetransfer_preference') path = os.path.join(dir_, '0.png') ===================================== gajim/dialogs.py ===================================== @@ -47,8 +47,9 @@ from gajim.common import app from gajim.common import helpers from gajim.common.exceptions import GajimGeneralException +from gajim.gtk.dialogs import DialogButton +from gajim.gtk.dialogs import NewConfirmationDialog from gajim.gtk.dialogs import ErrorDialog -from gajim.gtk.dialogs import ConfirmationDialog from gajim.gtk.dialogs import InputDialog from gajim.gtk.dialogs import AspellDictError from gajim.gtk.util import get_icon_name @@ -675,7 +676,7 @@ class ChangeStatusMessageDialog(TimeoutDialog): if not msg_name: # msg_name was '' msg_name = msg_text_1l - def on_ok2(): + def _on_ok2(): self.preset_messages_dict[msg_name] = [ msg_text, self.pep_dict.get('activity'), self.pep_dict.get('subactivity'), @@ -694,12 +695,19 @@ class ChangeStatusMessageDialog(TimeoutDialog): app.config.set_per('statusmsg', msg_name, 'mood_text', self.pep_dict.get('mood_text')) if msg_name in self.preset_messages_dict: - ConfirmationDialog(_('Overwrite Status Message?'), - _('This name is already used. Do you want to overwrite this ' - 'status message?'), on_response_ok=on_ok2, transient_for=self.dialog) + NewConfirmationDialog( + _('Overwrite'), + _('Overwrite Status Message?'), + _('Preset name is already in use. ' + 'Do you want to overwrite this preset?'), + [DialogButton.make('Cancel'), + DialogButton.make('Remove', + text=_('_Overwrite'), + callback=_on_ok2)], + transient_for=self.dialog).show() return app.config.add_per('statusmsg', msg_name) - on_ok2() + _on_ok2() iter_ = self.message_liststore.append((msg_name,)) # select in combobox the one we just saved self.message_combobox.set_active_iter(iter_) ===================================== gajim/groupchat_control.py ===================================== @@ -67,9 +67,10 @@ from gajim.chat_control_base import ChatControlBase from gajim.command_system.implementation.hosts import GroupChatCommands from gajim.common.connection_handlers_events import GcMessageOutgoingEvent +from gajim.gtk.dialogs import DialogButton +from gajim.gtk.dialogs import NewConfirmationCheckDialog from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import InputTextDialog -from gajim.gtk.dialogs import ConfirmationDialogCheck from gajim.gtk.dialogs import DestroyMucDialog from gajim.gtk.dialogs import InputDialog from gajim.gtk.dialogs import ChangeNickDialog @@ -2352,27 +2353,30 @@ class GroupchatControl(ChatControlBase): and self.is_connected and self.room_jid \ not in excludes: - def on_ok(clicked): - if clicked: - # user does not want to be asked again + def on_ok(is_checked): + if is_checked: + # User does not want to be asked again app.config.set('confirm_close_muc', False) on_yes(self) - def on_cancel(clicked): - if clicked: - # user does not want to be asked again + def on_cancel(is_checked): + if is_checked: + # User does not want to be asked again app.config.set('confirm_close_muc', False) on_no(self) - pritext = _('Are you sure you want to leave group chat "%s"?')\ - % self.name - sectext = _('If you close this window, you will be disconnected ' - 'from this group chat.') - - ConfirmationDialogCheck(pritext, sectext, - _('_Do not ask me again'), on_response_ok=on_ok, - on_response_cancel=on_cancel, - transient_for=self.parent_win.window) + NewConfirmationCheckDialog( + _('Leave Group Chat'), + _('Are you sure you want to leave this group chat?'), + _('If you close this window, you will be disconnected ' + 'from \'%s\'.') % self.name, + _('_Do not ask me again'), + [DialogButton.make('Cancel', + callback=on_cancel), + DialogButton.make('OK', + text=_('_Leave'), + callback=on_ok)], + transient_for=self.parent_win.window).show() return on_yes(self) ===================================== gajim/gtk/accounts.py ===================================== @@ -32,19 +32,18 @@ from gajim.common.zeroconf.connection_zeroconf import ConnectionZeroconf from gajim import gui_menu_builder -from gajim.gtk.settings import SettingsDialog -from gajim.gtk.settings import SettingsBox -from gajim.gtk.dialogs import ConfirmationDialog +from gajim.gtk.dialogs import DialogButton +from gajim.gtk.dialogs import NewConfirmationDialog from gajim.gtk.dialogs import ConfirmationDialogDoubleRadio from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import PassphraseDialog from gajim.gtk.dialogs import YesNoDialog -from gajim.gtk.dialogs import DialogButton -from gajim.gtk.dialogs import NewConfirmationDialog -from gajim.gtk.util import get_builder from gajim.gtk.const import Setting from gajim.gtk.const import SettingKind from gajim.gtk.const import SettingType +from gajim.gtk.settings import SettingsDialog +from gajim.gtk.settings import SettingsBox +from gajim.gtk.util import get_builder log = logging.getLogger('gajim.gtk.accounts') @@ -180,7 +179,7 @@ class AccountsWindow(Gtk.ApplicationWindow): # Detect if we have opened windows for this account - def remove(account): + def remove(): if (account in app.interface.instances and 'remove_account' in app.interface.instances[account]): dialog = app.interface.instances[account]['remove_account'] @@ -191,14 +190,17 @@ class AccountsWindow(Gtk.ApplicationWindow): app.interface.instances[account]['remove_account'] = \ RemoveAccountWindow(account) if win_opened: - ConfirmationDialog( - _('You have opened chat in account %s') % account, - _('All chat and groupchat windows will be closed. ' + NewConfirmationDialog( + _('Remove Account'), + _('You still have open chats in your account %s') % account, + _('All chat and group chat windows will be closed.\n' 'Do you want to continue?'), - on_response_ok=(remove, account), - transient_for=self) + [DialogButton.make('Cancel'), + DialogButton.make('Remove', + callback=remove)], + transient_for=self).show() else: - remove(account) + remove() def remove_account(self, account): del self._need_relogin[account] @@ -649,7 +651,7 @@ class AccountRow(Gtk.ListBoxRow): [DialogButton.make('Cancel', callback=lambda: switch.set_active(True)), DialogButton.make('Remove', - text=_('Disable Account'), + text=_('_Disable Account'), callback=_disable)], transient_for=self.get_toplevel()).show() return Gdk.EVENT_STOP @@ -1047,11 +1049,15 @@ class RemoveAccountWindow: if self.account in app.connections and \ app.connections[self.account].connected: - ConfirmationDialog( - _('Account "%s" is connected to the server') % self.account, + NewConfirmationDialog( + _('Remove Account'), + _('Account \'%s\' is still connected to the ' + 'server') % self.account, _('If you remove it, the connection will be lost.'), - on_response_ok=remove, - transient_for=self._ui.remove_account_window) + [DialogButton.make('Cancel'), + DialogButton.make('Remove', + callback=remove)], + transient_for=self._ui.remove_account_window).show() else: remove() ===================================== gajim/gtk/themes.py ===================================== @@ -320,7 +320,8 @@ class Themes(Gtk.ApplicationWindow): _('Delete Theme'), _('Do you want to permanently delete this theme?'), [DialogButton.make('Cancel'), - DialogButton.make('Delete', callback=_remove_theme)], + DialogButton.make('Delete', + callback=_remove_theme)], transient_for=self).show() @staticmethod ===================================== gajim/gtkgui_helpers.py ===================================== @@ -147,11 +147,14 @@ def scale_pixbuf_from_data(data, size): pixbuf = get_pixbuf_from_data(data) return scale_pixbuf(pixbuf, size) + def on_avatar_save_as_menuitem_activate(widget, avatar, default_name=''): + from gajim.gtk.dialogs import DialogButton from gajim.gtk.dialogs import ErrorDialog - from gajim.gtk.dialogs import ConfirmationDialog + from gajim.gtk.dialogs import NewConfirmationDialog from gajim.gtk.dialogs import FTOverwriteConfirmationDialog from gajim.gtk.filechoosers import AvatarSaveDialog + def on_continue(response, file_path): if response < 0: return @@ -169,7 +172,7 @@ def on_avatar_save_as_menuitem_activate(widget, avatar, default_name=''): image_format = 'png' file_path += '.png' else: - image_format = extension[1:] # remove leading dot + image_format = extension[1:] # remove leading dot # Save image try: @@ -179,13 +182,23 @@ def on_avatar_save_as_menuitem_activate(widget, avatar, default_name=''): if os.path.exists(file_path): os.remove(file_path) new_file_path = '.'.join(file_path.split('.')[:-1]) + '.png' - def on_ok(file_path, pixbuf): + + def _on_ok(file_path, pixbuf): pixbuf.savev(file_path, 'png', [], []) - ConfirmationDialog(_('Extension not supported'), - _('Image cannot be saved in %(type)s format. Save as ' - '%(new_filename)s?') % {'type': image_format, - 'new_filename': new_file_path}, - on_response_ok=(on_ok, new_file_path, pixbuf)) + + NewConfirmationDialog( + _('Error While Saving'), + _('Extension not supported'), + _('Image cannot be saved in %(type)s format.\n' + 'Save as %(new_filename)s?') % { + 'type': image_format, + 'new_filename': new_file_path}, + [DialogButton.make('Cancel'), + DialogButton.make('OK', + text=_('_Save'), + callback=_on_ok, + args=[new_file_path, + pixbuf])]).show() def on_ok(file_path): if os.path.exists(file_path): ===================================== gajim/history_manager.py ===================================== @@ -568,11 +568,12 @@ class HistoryManager: _('Delete'), ngettext('Delete Conversation', 'Delete Conversations', paths_len), ngettext('Do you want to permanently delete this ' - 'conversation with <b>%s</b>', - 'Do you want to permanently delete these Conversations', + 'conversation with <b>%s</b>?', + 'Do you want to permanently delete these conversations?', paths_len, liststore[list_of_paths[0]][0]), [DialogButton.make('Cancel'), - DialogButton.make('Delete', callback=on_ok)], + DialogButton.make('Delete', + callback=on_ok)], transient_for=self._ui.history_manager_window).show() def _delete_logs(self, liststore, list_of_paths): @@ -609,7 +610,8 @@ class HistoryManager: 'Do you want to permanently delete these messages', paths_len), [DialogButton.make('Cancel'), - DialogButton.make('Delete', callback=on_ok)], + DialogButton.make('Delete', + callback=on_ok)], transient_for=self._ui.history_manager_window).show() def on_search_db_button_clicked(self, widget): ===================================== gajim/roster_window.py ===================================== @@ -64,15 +64,14 @@ from gajim.common.dbus import location from gajim.common import ged from gajim.message_window import MessageWindowMgr -from gajim.gtk.dialogs import ConfirmationDialog -from gajim.gtk.dialogs import ConfirmationDialogCheck +from gajim.gtk.dialogs import DialogButton +from gajim.gtk.dialogs import NewConfirmationDialog +from gajim.gtk.dialogs import NewConfirmationCheckDialog from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import InputDialog from gajim.gtk.dialogs import WarningDialog from gajim.gtk.dialogs import InformationDialog from gajim.gtk.dialogs import NonModalConfirmationDialog -from gajim.gtk.dialogs import NewConfirmationCheckDialog -from gajim.gtk.dialogs import DialogButton from gajim.gtk.dialogs import InvitationReceivedDialog from gajim.gtk.join_groupchat import JoinGroupchatWindow from gajim.gtk.single_message import SingleMessageWindow @@ -2249,7 +2248,7 @@ class RosterWindow: dlg.dialog.present() # show it on current workspace def change_status(self, widget, account, status): - def change(account, status): + def _change(account, status): def on_response(message, pep_dict): if message is None: # user pressed Cancel to change status message dialog @@ -2259,13 +2258,20 @@ class RosterWindow: self.get_status_message(status, on_response) if status == 'invisible' and self.connected_rooms(account): - ConfirmationDialog( + NewConfirmationDialog( + _('Disconnect for Invisibility'), _('You are participating in one or more group chats'), _('Changing your status to invisible will result in ' - 'disconnection from those group chats. Are you sure you want ' - 'to go invisible?'), on_response_ok=(change, account, status)) + 'disconnection from those group chats.\n' + 'Are you sure you want to go invisible?'), + [DialogButton.make('Cancel'), + DialogButton.make('Remove', + text=_('_Disconnect'), + callback=_change, + args=[account, + status])]).show() else: - change(account, status) + _change(account, status) def update_status_combobox(self): # table to change index in connection.connected to index in combobox @@ -2351,14 +2357,20 @@ class RosterWindow: elif app.config.get('quit_on_roster_x_button'): self.on_quit_request() else: - def on_ok(checked): - if checked: + def _on_ok(is_checked): + if is_checked: app.config.set('quit_on_roster_x_button', True) self.on_quit_request() - ConfirmationDialogCheck(_('Really quit Gajim?'), - _('Are you sure you want to quit Gajim?'), - _('Always close Gajim'), on_response_ok=on_ok) - return True # do NOT destroy the window + NewConfirmationCheckDialog( + _('Quit Gajim'), + _('You are about to quit Gajim'), + _('Are you sure you want to quit Gajim?'), + _('_Always quit when closing Gajim'), + [DialogButton.make('Cancel'), + DialogButton.make('Remove', + text=_('_Quit'), + callback=_on_ok)]).show() + return True # Do NOT destroy the window def prepare_quit(self): if self.save_done: @@ -2444,10 +2456,18 @@ class RosterWindow: break if transfer_active: - ConfirmationDialog(_('You have running file transfers'), - _('If you quit now, the file(s) being transferred will ' - 'be stopped. Do you still want to quit?'), - on_response_ok=(on_continue3, message, pep_dict)) + NewConfirmationDialog( + _('Stop File Transfers'), + _('You still have running file transfers'), + _('If you quit now, the file(s) being transferred will ' + 'be lost.\n' + 'Do you still want to quit?'), + [DialogButton.make('Cancel'), + DialogButton.make('Remove', + text=_('_Quit'), + callback=on_continue3, + args=[message, + pep_dict])]).show() return on_continue3(message, pep_dict) @@ -2476,11 +2496,18 @@ class RosterWindow: break if unread or recent: - ConfirmationDialog(_('You have unread messages'), + NewConfirmationDialog( + _('Unread Messages'), + _('You still have unread messages'), _('Messages will only be available for reading them later ' - 'if you have history enabled and contact is in your ' - 'roster.'), on_response_ok=(on_continue2, - message, pep_dict)) + 'if storing chat history is enabled and if the contact ' + 'is in your contact list.'), + [DialogButton.make('Cancel'), + DialogButton.make('Remove', + text=_('_Quit'), + callback=on_continue2, + args=[message, + pep_dict])]).show() return on_continue2(message, pep_dict) @@ -2726,7 +2753,7 @@ class RosterWindow: self.remove_contact(contact.jid, account, backend=True) return - def remove(list_): + def remove(): for (contact, account) in list_: full_jid = contact.get_full_jid() app.connections[account].get_module('Gateway').unsubscribe(full_jid) @@ -2741,13 +2768,14 @@ class RosterWindow: has_unread_events = True break if has_unread_events: - ErrorDialog(_('You have unread messages'), - _('You must read them before removing this transport.')) + ErrorDialog( + _('You have unread messages'), + _('You must read them before removing this transport.')) return if len(list_) == 1: - pritext = _('Transport "%s" will be removed') % list_[0][0].jid + pritext = _('Transport \'%s\' will be removed') % list_[0][0].jid sectext = _('You will no longer be able to send and receive ' - 'messages from contacts using this transport.') + 'messages from and to contacts using this transport.') else: pritext = _('Transports will be removed') jids = '' @@ -2755,9 +2783,16 @@ class RosterWindow: jids += '\n ' + contact.get_shown_name() + ',' jids = jids[:-1] + '.' sectext = _('You will no longer be able to send and receive ' - 'messages to contacts from these transports: %s') % jids - ConfirmationDialog(pritext, sectext, - on_response_ok=(remove, list_), transient_for=self.window) + 'messages from and to contacts using these ' + 'transports:\n%s') % jids + NewConfirmationDialog( + _('Remove Transport'), + pritext, + sectext, + [DialogButton.make('Cancel'), + DialogButton.make('Remove', + callback=remove)], + transient_for=self.window).show() def _nec_blocking(self, obj): for jid in obj.changed: @@ -2817,17 +2852,17 @@ class RosterWindow: if confirm_block == 'no': _block_it() return - NewConfirmationCheckDialog(_('Block Contact'), - _('Really block this contact?'), - _('This contact will see you offline and ' - 'you will not receive messages sent to ' - 'you by this contact.'), - _('_Do not ask me again'), - [DialogButton.make('Cancel'), - DialogButton.make('Remove', - text=_('Block Contact'), - callback=_block_it)], - modal=False).show() + NewConfirmationCheckDialog( + _('Block Contact'), + _('Really block this contact?'), + _('This contact will see you offline and you will not receive ' + 'any messages sent to you by this contact.'), + _('_Do not ask me again'), + [DialogButton.make('Cancel'), + DialogButton.make('Remove', + text=_('_Block Contact'), + callback=_block_it)], + modal=False).show() def on_unblock(self, widget, list_, group=None): """ @@ -2915,20 +2950,25 @@ class RosterWindow: old_text), on_canceled, transient_for=self.window) def on_remove_group_item_activated(self, widget, group, account): - def on_ok(checked): + def _on_ok(is_checked): for contact in app.contacts.get_contacts_from_group(account, group): - if not checked: + if not is_checked: self.remove_contact_from_groups(contact.jid, account, [group]) else: - app.connections[account].get_module('Presence').unsubscribe(contact.jid) + app.connections[account].get_module( + 'Presence').unsubscribe(contact.jid) self.remove_contact(contact.jid, account, backend=True) - ConfirmationDialogCheck(_('Remove Group'), - _('Do you want to remove group %s from the roster?') % group, - _('Also remove all contacts in this group from your roster'), - on_response_ok=on_ok) + NewConfirmationCheckDialog( + _('Remove Group'), + _('Remove Group'), + _('Do you want to remove %s from the contact list?') % group, + _('_Also remove all contacts of this group from contact list'), + [DialogButton.make('Cancel'), + DialogButton.make('Remove', + callback=_on_ok)]).show() def on_edit_groups(self, widget, list_): dialogs.EditGroupsDialog(list_) @@ -3322,42 +3362,62 @@ class RosterWindow: if len(list_) == 1: contact = list_[0][0] - pritext = _('Contact "%s" will be removed from your roster') % \ - contact.get_shown_name() - sectext = _('You are about to remove "%(name)s" (%(jid)s) from ' - 'your roster.\n') % {'name': contact.get_shown_name(), - 'jid': contact.jid} + title = _('Remove Contact') + pritext = _('Remove contact from contact list') + sectext = _('You are about to remove \'%(name)s\' (%(jid)s) from ' + 'your contact list.\n') % { + 'name': contact.get_shown_name(), + 'jid': contact.jid} if contact.sub == 'to': - ConfirmationDialog(pritext, sectext + \ - _('By removing this contact you also remove authorization ' - 'resulting in them always seeing you as offline.'), - on_response_ok=on_ok2) + NewConfirmationDialog( + title, + pritext, + sectext + \ + _('By removing this contact you also remove authorization. ' + 'This means the contact will see you as offline.'), + [DialogButton.make('Cancel'), + DialogButton.make('Remove', + callback=on_ok2)]).show() elif _('Not in Roster') in contact.get_shown_groups(): # Contact is not in roster - ConfirmationDialog(pritext, sectext + \ - _('Do you want to continue?'), on_response_ok=on_ok2) + NewConfirmationDialog( + title, + pritext, + sectext + \ + _('Do you want to continue?'), + [DialogButton.make('Cancel'), + DialogButton.make('Remove', + callback=on_ok2)]).show() else: NewConfirmationCheckDialog( - _('Remove'), - pritext, sectext + \ - _('By removing this contact you also by default remove ' - 'authorization resulting in them always seeing you as' - ' offline.'), + title, + pritext, + sectext + \ + _('By removing this contact you also remove authorization. ' + 'This means the contact will see you as offline.'), _('_I want this contact to know my status after removal'), [DialogButton.make('Cancel'), - DialogButton.make('Remove', callback=on_ok)], - modal=False).show() + DialogButton.make('Remove', + callback=on_ok)], + modal=False).show() else: # several contact to remove at the same time - pritext = _('Contacts will be removed from your roster') + pritext = _('Remove contacts from contact list') jids = '' for contact, _account in list_: - jids += '\n ' + contact.get_shown_name() + ' (%s)' % \ - contact.jid + ',' - sectext = _('By removing these contacts:%s\nyou also remove ' - 'authorization resulting in them always seeing you as ' - 'offline.') % jids - ConfirmationDialog(pritext, sectext, on_response_ok=on_ok2) + jids += '%(name)s (%(jid)s)\n' % { + 'name': contact.get_shown_name(), + 'jid': contact.jid} + sectext = _('By removing the following contacts, you will also ' + 'remove authorization. This means they will see you ' + 'as offline:\n\n%s') % jids + NewConfirmationDialog( + _('Remove Contacts'), + pritext, + sectext, + [DialogButton.make('Cancel'), + DialogButton.make('Remove', + callback=on_ok2)]).show() def on_status_combobox_changed(self, widget): """ @@ -3452,12 +3512,17 @@ class RosterWindow: def on_cancel(): self.update_status_combobox() - ConfirmationDialog( + NewConfirmationDialog( + _('Disconnect for Invisibility'), _('You are participating in one or more group chats'), _('Changing your status to invisible will result in ' - 'disconnection from those group chats. Are you sure you ' - 'want to go invisible?'), on_response_ok=on_ok, - on_response_cancel=on_cancel) + 'disconnection from those group chats.\n' + 'Are you sure you want to go invisible?'), + [DialogButton.make('Cancel', + callback=on_cancel), + DialogButton.make('Remove', + text=_('_Disconnect'), + callback=on_ok)]).show() return self.get_status_message(status, on_continue) @@ -4103,15 +4168,19 @@ class RosterWindow: if confirm_metacontacts == 'no' or dest_family == source_family: merge_contacts() return - pritext = _('You are about to create a metacontact. Are you sure you ' - 'want to continue?') - sectext = _('Metacontacts are a way to regroup several contacts in one ' - 'line. Generally it is used when the same person has several ' - 'XMPP- or transport -accounts.') - dlg = ConfirmationDialogCheck(pritext, sectext, - _('_Do not ask me again'), on_response_ok=merge_contacts) - if not confirm_metacontacts: # First time we see this window - dlg.checkbutton.set_active(True) + pritext = _('You are about to create a metacontact') + sectext = _('Metacontacts are a way to regroup several contacts in ' + 'one single contact. Generally it is used when the same ' + 'person has several XMPP- or Transport-Accounts.') + NewConfirmationCheckDialog( + _('Create Metacontact'), + pritext, + sectext, + _('_Do not ask me again'), + [DialogButton.make('Cancel'), + DialogButton.make('OK', + text=_('_Create'), + callback=merge_contacts)]).show() def on_drop_in_group(self, widget, account, c_source, grp_dest, is_big_brother, context, etime, grp_source=None): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0411d8fe34cf17b234eb1eebd07cc0a014… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0411d8fe34cf17b234eb1eebd07cc0a014… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ManagePEPServices: Rework window
by Philipp Hörist 19 Jun '19

19 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 407f65fd by Daniel Brötzmann at 2019-06-19T21:57:05Z ManagePEPServices: Rework window - - - - - 3 changed files: - gajim/data/gui/manage_pep_services_window.ui - gajim/gtk/pep_config.py - gajim/roster_window.py Changes: ===================================== gajim/data/gui/manage_pep_services_window.ui ===================================== @@ -1,111 +1,91 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.12"/> - <object class="GtkImage" id="image1"> + <requires lib="gtk+" version="3.20"/> + <object class="GtkBox" id="manage_pep_services"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-preferences</property> - </object> - <object class="GtkWindow" id="manage_pep_services_window"> - <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="title" translatable="yes">PEP Service Configuration</property> - <property name="default_width">350</property> - <property name="default_height">150</property> - <property name="type_hint">dialog</property> - <signal name="destroy" handler="on_manage_pep_services_window_destroy" swapped="no"/> + <property name="border_width">18</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkBox" id="vbox1"> + <object class="GtkScrolledWindow"> + <property name="width_request">350</property> + <property name="height_request">250</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTreeView" id="services_treeview"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection1"/> + </child> + </object> + </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="halign">end</property> + <property name="spacing">12</property> <child> - <object class="GtkScrolledWindow" id="scrolledwindow1"> + <object class="GtkButton" id="configure_button"> <property name="visible">True</property> + <property name="sensitive">False</property> <property name="can_focus">True</property> - <property name="shadow_type">in</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Configure</property> + <property name="halign">center</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_configure_button_clicked" swapped="no"/> <child> - <object class="GtkTreeView" id="services_treeview"> + <object class="GtkImage" id="image1"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection1"/> - </child> + <property name="can_focus">False</property> + <property name="icon_name">preferences-system-symbolic</property> </object> </child> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkButtonBox" id="hbuttonbox1"> + <object class="GtkButton" id="delete_button"> + <property name="label">_Delete</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="delete_button"> - <property name="label">gtk-delete</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_delete_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="configure_button"> - <property name="label" translatable="yes">_Configure</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="image">image1</property> - <property name="use_underline">True</property> - <signal name="clicked" handler="on_configure_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="close_button"> - <property name="label">gtk-close</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_close_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">3</property> - </packing> - </child> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_delete_button_clicked" swapped="no"/> + <style> + <class name="destructive-action"/> + </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="padding">6</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> </interface> ===================================== gajim/gtk/pep_config.py ===================================== @@ -12,6 +12,7 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from gi.repository import Gdk from gi.repository import Gtk from gajim.common import app @@ -24,46 +25,57 @@ from gajim.gtk.dataform import DataFormDialog from gajim.gtk.util import get_builder -class ManagePEPServicesWindow: +class ManagePEPServicesWindow(Gtk.ApplicationWindow): def __init__(self, account): - self.xml = get_builder('manage_pep_services_window.ui') - self.window = self.xml.get_object('manage_pep_services_window') - self.window.set_transient_for(app.interface.roster.window) - self.xml.get_object('configure_button').set_sensitive(False) - self.xml.get_object('delete_button').set_sensitive(False) - self.xml.connect_signals(self) + Gtk.ApplicationWindow.__init__(self) + self.set_application(app.app) + self.set_position(Gtk.WindowPosition.CENTER) + self.set_show_menubar(False) + self.set_name('ManagePEPServicesWindow') + self.set_default_size(300, 350) + self.set_resizable(True) + self.set_transient_for(app.interface.roster.window) + + self._ui = get_builder('manage_pep_services_window.ui') + self.add(self._ui.manage_pep_services) + self.account = account + self.set_title(_('PEP Service Configuration (%s)') % self.account) self._con = app.connections[self.account] - self.init_services() - self.xml.get_object('services_treeview').get_selection().connect( - 'changed', self.on_services_selection_changed) + self._init_services() + self._ui.services_treeview.get_selection().connect( + 'changed', self._on_services_selection_changed) app.ged.register_event_handler( 'pubsub-config-received', ged.GUI1, self._nec_pep_config_received) - self.window.show_all() + self.show_all() + self.connect('key-press-event', self._on_key_press_event) + self.connect('destroy', self._on_destroy) + self._ui.connect_signals(self) + + def _on_key_press_event(self, widget, event): + if event.keyval == Gdk.KEY_Escape: + self.destroy() - def on_manage_pep_services_window_destroy(self, widget): - del app.interface.instances[self.account]['pep_services'] + def _on_destroy(self, *args): app.ged.remove_event_handler( 'pubsub-config-received', ged.GUI1, self._nec_pep_config_received) - def on_close_button_clicked(self, widget): - self.window.destroy() - - def on_services_selection_changed(self, sel): - self.xml.get_object('configure_button').set_sensitive(True) - self.xml.get_object('delete_button').set_sensitive(True) + def _on_services_selection_changed(self, sel): + self._ui.configure_button.set_sensitive(True) + self._ui.delete_button.set_sensitive(True) - def init_services(self): - self.treeview = self.xml.get_object('services_treeview') + def _init_services(self): # service, access_model, group self.treestore = Gtk.ListStore(str) - self.treeview.set_model(self.treestore) + self.treestore.set_sort_column_id(0, Gtk.SortType.ASCENDING) + self._ui.services_treeview.set_model(self.treestore) - col = Gtk.TreeViewColumn('Service') - self.treeview.append_column(col) + col = Gtk.TreeViewColumn(_('Service')) + col.set_sort_column_id(0) + self._ui.services_treeview.append_column(col) cellrenderer_text = Gtk.CellRendererText() col.pack_start(cellrenderer_text, True) @@ -71,7 +83,9 @@ class ManagePEPServicesWindow: jid = self._con.get_own_jid().getStripped() self._con.get_module('Discovery').disco_items( - jid, success_cb=self._items_received, error_cb=self._items_error) + jid, + success_cb=self._items_received, + error_cb=self._items_error) def _items_received(self, from_, node, items): jid = self._con.get_own_jid().getStripped() @@ -82,10 +96,10 @@ class ManagePEPServicesWindow: def _items_error(self, from_, error): ErrorDialog('Error', error) - def node_removed(self, jid, node): + def _node_removed(self, jid, node): if jid != app.get_jid_from_account(self.account): return - model = self.treeview.get_model() + model = self._ui.services_treeview.get_model() iter_ = model.get_iter_first() while iter_: if model[iter_][0] == node: @@ -93,16 +107,16 @@ class ManagePEPServicesWindow: break iter_ = model.iter_next(iter_) - def node_not_removed(self, jid, node, msg): + def _node_not_removed(self, jid, node, msg): if jid != app.get_jid_from_account(self.account): return WarningDialog( _('PEP node was not removed'), - _('PEP node %(node)s was not removed: %(message)s') % { + _('PEP node %(node)s was not removed:\n%(message)s') % { 'node': node, 'message': msg}) - def on_delete_button_clicked(self, widget): - selection = self.treeview.get_selection() + def _on_delete_button_clicked(self, widget): + selection = self._ui.services_treeview.get_selection() if not selection: return model, iter_ = selection.get_selected() @@ -110,11 +124,11 @@ class ManagePEPServicesWindow: our_jid = app.get_jid_from_account(self.account) con = app.connections[self.account] con.get_module('PubSub').send_pb_delete(our_jid, node, - on_ok=self.node_removed, - on_fail=self.node_not_removed) + on_ok=self._node_removed, + on_fail=self._node_not_removed) - def on_configure_button_clicked(self, widget): - selection = self.treeview.get_selection() + def _on_configure_button_clicked(self, widget): + selection = self._ui.services_treeview.get_selection() if not selection: return model, iter_ = selection.get_selected() @@ -130,7 +144,7 @@ class ManagePEPServicesWindow: def _nec_pep_config_received(self, obj): DataFormDialog(_('Configure %s') % obj.node, - self.window, + self, obj.form, obj.node, self._on_config_submit) ===================================== gajim/roster_window.py ===================================== @@ -3488,12 +3488,12 @@ class RosterWindow: helpers.update_optional_features(account) - def on_pep_services_menuitem_activate(self, widget, account): - if 'pep_services' in app.interface.instances[account]: - app.interface.instances[account]['pep_services'].window.present() + def _on_pep_services_menuitem_activate(self, widget, account): + window = app.get_app_window(ManagePEPServicesWindow, account) + if window is None: + ManagePEPServicesWindow(account) else: - app.interface.instances[account]['pep_services'] = \ - ManagePEPServicesWindow(account) + window.present() def on_add_new_contact(self, widget, account): AddNewContactWindow(account) @@ -4814,7 +4814,7 @@ class RosterWindow: pep_config.set_sensitive(True) pep_submenu.append(pep_config) pep_config.connect('activate', - self.on_pep_services_menuitem_activate, account) + self._on_pep_services_menuitem_activate, account) else: pep_menuitem.set_sensitive(False) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/407f65fd08c6a9fb720cd75fbe63c72e4f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/407f65fd08c6a9fb720cd75fbe63c72e4f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: RosterWindow: Enable invite on drop to group chat
by Philipp Hörist 19 Jun '19

19 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: d0029580 by Daniel Brötzmann at 2019-06-19T21:42:41Z RosterWindow: Enable invite on drop to group chat - - - - - a59679f5 by Daniel Brötzmann at 2019-06-19T21:42:41Z Roster build_invite_submenu: Enable MUC invite menu for offline contacts - - - - - 2 changed files: - gajim/gui_menu_builder.py - gajim/roster_window.py Changes: ===================================== gajim/gui_menu_builder.py ===================================== @@ -97,7 +97,7 @@ show_bookmarked=False, force_resource=False): if len(contact_list) > 1: # several resources invite_to_new_room_menuitem.set_submenu(build_resources_submenu( contact_list, account, roster.on_invite_to_new_room, cap=NS_MUC)) - elif len(list_) == 1 and contact.supports(NS_MUC): + elif len(list_) == 1: invite_menuitem.set_sensitive(True) # use resource if it's self contact if contact.jid == app.get_jid_from_account(account) or force_resource: ===================================== gajim/roster_window.py ===================================== @@ -4271,8 +4271,12 @@ class RosterWindow: return if type_dest == 'groupchat': - # drop on a minimized groupchat - # TODO: Invite to groupchat if type_dest = contact + # Drop on a minimized groupchat + if type_source != 'contact': + return + contact_jid = data + con = app.connections[account_dest] + con.get_module('MUC').invite(jid_dest, contact_jid) return if type_source == 'group': @@ -4287,6 +4291,9 @@ class RosterWindow: new_grp = grp_source_list[-1] elif type_dest == 'group': grp_dest = model[iter_dest][Column.JID] + # Don't allow to drop on e.g. Groupchats group + if grp_dest in helpers.special_groups: + return grp_dest_list = grp_dest.split(delimiter) # Do not allow to drop on a subgroup of source group if grp_source_list[0] != grp_dest_list[0]: View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/4e47062a6daeaf0cf088d12a7a5785ec9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/4e47062a6daeaf0cf088d12a7a5785ec9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 7 commits: Contacts: Make is_groupchat a property
by Philipp Hörist 19 Jun '19

19 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 668048c3 by Philipp Hörist at 2019-06-19T21:39:53Z Contacts: Make is_groupchat a property - - - - - a11ce9da by Philipp Hörist at 2019-06-19T21:39:53Z MUC: Move join into MUC module - - - - - a87a4699 by Philipp Hörist at 2019-06-19T21:39:53Z Windows: Fix appveyor build - - - - - 99cf0c7b by Philipp Hörist at 2019-06-19T21:39:53Z MUC: Add MUCState This will help to better track the various states a MUC is in and to act on it - - - - - 3626505e by Philipp Hörist at 2019-06-19T21:39:53Z MUC: Resolve nickname conflicts automatically - - - - - 501b993b by Philipp Hörist at 2019-06-19T21:39:53Z MUC: Add dedicated leave() method - - - - - 4e47062a by Philipp Hörist at 2019-06-19T21:39:53Z MUC: Refactor sending status presence - - - - - 13 changed files: - appveyor.yml - gajim/command_system/implementation/standard.py - gajim/common/connection.py - gajim/common/const.py - gajim/common/contacts.py - gajim/common/modules/chatstates.py - gajim/common/modules/muc.py - gajim/common/structs.py - gajim/groupchat_control.py - gajim/gtk/dialogs.py - gajim/gtk/single_message.py - gajim/gui_interface.py - gajim/roster_window.py Changes: ===================================== appveyor.yml ===================================== @@ -20,6 +20,10 @@ clone_depth: 1 build_script: - del C:\Windows\System32\libssl-*.dll C:\Windows\system32\libcrypto-*.dll - del C:\Windows\SysWOW64\libssl-*.dll C:\Windows\SysWOW64\libcrypto-*.dll + # Temporary fix until appveyor updates its msys build https://github.com/msys2/MINGW-packages/issues/5437 + - C:\msys64\usr\bin\pacman -Rdd mingw-w64-i686-ncurses mingw-w64-i686-termcap mingw-w64-i686-gcc-ada mingw-w64-i686-gcc-objc --noconfirm --noprogressbar + - C:\msys64\usr\bin\pacman -Rdd mingw-w64-x86_64-ncurses mingw-w64-x86_64-termcap mingw-w64-x86_64-gcc-ada mingw-w64-x86_64-gcc-objc --noconfirm --noprogressbar + - C:\msys64\usr\bin\pacman -Syuu --needed --noconfirm --noprogressbar --overwrite \\* - ps: | $env:TIME_STRING=(get-date -UFormat "%Y-%m-%d").ToString() ===================================== gajim/command_system/implementation/standard.py ===================================== @@ -258,7 +258,9 @@ class StandardGroupChatCommands(CommandContainer): new_nick = helpers.parse_resource(new_nick) except Exception: raise CommandError(_("Invalid nickname")) - self.connection.join_gc(new_nick, self.room_jid, None, change_nick=True) + # FIXME: Check state of MUC + self.connection.get_module('MUC').change_nick( + self.room_jid, new_nick) self.new_nick = new_nick @command('query', raw=True) ===================================== gajim/common/connection.py ===================================== @@ -1638,35 +1638,6 @@ class Connection(CommonConnection, ConnectionHandlers): show=show, caps=ptype != 'unavailable') - def join_gc(self, nick, room_jid, password, change_nick=False, - rejoin=False): - # FIXME: This room JID needs to be normalized; see #1364 - if not app.account_is_connected(self.name): - return - show = helpers.get_xmpp_show(app.SHOW_LIST[self.connected]) - if show == 'invisible': - # Never join a room when invisible - return - - self.get_module('Discovery').disco_muc( - room_jid, partial(self._join_gc, nick, show, room_jid, - password, change_nick, rejoin)) - - def _join_gc(self, nick, show, room_jid, password, change_nick, rejoin): - if change_nick: - self.get_module('Presence').send_presence( - '%s/%s' % (room_jid, nick), - show=show, - status=self.status) - else: - self.get_module('MUC').send_muc_join_presence( - '%s/%s' % (room_jid, nick), - show=show, - status=self.status, - room_jid=room_jid, - password=password, - rejoin=rejoin) - def _nec_gc_message_outgoing(self, obj): if obj.account != self.name: return @@ -1719,30 +1690,6 @@ class Connection(CommonConnection, ConnectionHandlers): automatic_message=obj.automatic_message, stanza_id=obj.stanza_id, additional_data=obj.additional_data)) - def send_gc_status(self, nick, jid, show, status, auto=False): - if not app.account_is_connected(self.name): - return - if show == 'invisible': - show = 'offline' - ptype = None - if show == 'offline': - ptype = 'unavailable' - xmpp_show = helpers.get_xmpp_show(show) - - idle_time = None - if auto and app.is_installed('IDLE') and app.config.get('autoaway'): - idle_sec = idle.Monitor.get_idle_sec() - idle_time = time.strftime('%Y-%m-%dT%H:%M:%SZ', - time.gmtime(time.time() - idle_sec)) - - self.get_module('Presence').send_presence( - '%s/%s' % (jid, nick), - typ=ptype, - show=xmpp_show, - status=status, - caps=ptype != 'unavailable', - idle_time=idle_time) - def unregister_account(self, on_remove_success): self._unregister_account = True self._unregister_account_cb = on_remove_success ===================================== gajim/common/const.py ===================================== @@ -200,6 +200,15 @@ class URIAction(Enum): SUBSCRIBE = 'subscribe' +class MUCJoinedState(Enum): + JOINED = 'joined' + NOT_JOINED = 'not joined' + JOINING = 'joining' + + def __str__(self): + return self.name + + EME_MESSAGES = { 'urn:xmpp:otr:0': _('This message was encrypted with OTR ' ===================================== gajim/common/contacts.py ===================================== @@ -108,6 +108,10 @@ class CommonContact(XMPPEntity): def is_pm_contact(self): return self._is_pm_contact + @property + def is_groupchat(self): + return False + def get_full_jid(self): raise NotImplementedError @@ -178,7 +182,7 @@ class Contact(CommonContact): def get_shown_groups(self): if self.is_observer(): return [_('Observers')] - if self.is_groupchat(): + if self.is_groupchat: return [_('Groupchats')] if self.is_transport(): return [_('Transports')] @@ -211,6 +215,7 @@ class Contact(CommonContact): is_observer = True return is_observer + @property def is_groupchat(self): return self._is_groupchat @@ -524,7 +529,7 @@ class Contacts(): self._contacts = {} def add_contact(self, contact): - if contact.jid not in self._contacts or contact.is_groupchat(): + if contact.jid not in self._contacts or contact.is_groupchat: self._contacts[contact.jid] = [contact] return contacts = self._contacts[contact.jid] @@ -591,7 +596,7 @@ class Contacts(): def get_groupchat_contact(self, jid): if jid in self._contacts: contacts = self._contacts[jid] - if contacts[0].is_groupchat(): + if contacts[0].is_groupchat: return contacts[0] def get_avatar(self, jid, size, scale): @@ -630,7 +635,7 @@ class Contacts(): def get_contacts_jid_list(self): return [jid for jid, contact in self._contacts.items() if not - contact[0].is_groupchat()] + contact[0].is_groupchat] def get_contact_from_full_jid(self, fjid): """ ===================================== gajim/common/modules/chatstates.py ===================================== @@ -229,7 +229,7 @@ class Chatstate(BaseModule): if self._get_chatstate_setting(contact) == 'disabled': return None - if not contact.is_groupchat(): + if not contact.is_groupchat: # Dont send chatstates to ourself if self._con.get_own_jid().bareMatch(contact.jid): return None @@ -283,7 +283,7 @@ class Chatstate(BaseModule): 'jid': contact.jid, 'chatstate': str(State.ACTIVE)} - if contact.is_groupchat(): + if contact.is_groupchat: if contact.is_connected: app.nec.push_outgoing_event( GcMessageOutgoingEvent(None, **event_attrs)) @@ -296,7 +296,7 @@ class Chatstate(BaseModule): self._last_keyboard_activity.pop(contact.jid, None) return - if not contact.is_groupchat(): + if not contact.is_groupchat: # Dont leak presence to contacts # which are not allowed to see our status if not contact.is_pm_contact: @@ -328,7 +328,7 @@ class Chatstate(BaseModule): 'jid': contact.jid, 'chatstate': str(state)} - if contact.is_groupchat(): + if contact.is_groupchat: if contact.is_connected: app.nec.push_outgoing_event( GcMessageOutgoingEvent(None, **event_attrs)) @@ -355,7 +355,7 @@ class Chatstate(BaseModule): @staticmethod def _get_chatstate_setting(contact): - if contact.is_groupchat(): + if contact.is_groupchat: default = app.config.get('send_chatstate_muc_default') return app.config.get_per( 'rooms', contact.jid, 'send_chatstate', default) ===================================== gajim/common/modules/muc.py ===================================== @@ -17,17 +17,22 @@ import time import logging +from functools import partial import nbxmpp from nbxmpp.const import InviteType from nbxmpp.const import PresenceType +from nbxmpp.const import Error from nbxmpp.structs import StanzaHandler from nbxmpp.util import is_error_result from gajim.common import app from gajim.common import helpers from gajim.common.const import KindConstant +from gajim.common.const import MUCJoinedState +from gajim.common.structs import MUCData from gajim.common.helpers import AdditionalDataDict +from gajim.common import idle from gajim.common.caps_cache import muc_caps_cache from gajim.common.nec import NetworkEvent from gajim.common.modules.bits_of_binary import store_bob_data @@ -65,6 +70,7 @@ class MUC(BaseModule): priority=49), StanzaHandler(name='presence', callback=self._on_muc_presence, + typ='error', ns=nbxmpp.NS_MUC, priority=49), StanzaHandler(name='message', @@ -96,6 +102,8 @@ class MUC(BaseModule): self._register_callback('request_config', self._config_received) + self._muc_data = {} + def pass_disco(self, from_, identities, features, _data, _node): for identity in identities: if identity.get('category') != 'conference': @@ -108,24 +116,91 @@ class MUC(BaseModule): self._con.muc_jid['jabber'] = from_ raise nbxmpp.NodeProcessed - def send_muc_join_presence(self, *args, room_jid=None, password=None, - rejoin=False, **kwargs): + def _get_muc_data(self, room_jid): + return self._muc_data[room_jid] + + def _set_muc_state(self, room_jid, state): + if self._muc_data[room_jid].state == state: + return + self._log.info('Set MUC state: %s %s', room_jid, state) + self._muc_data[room_jid].state = state + + def _get_muc_state(self, room_jid): + return self._muc_data[room_jid].state + + def join(self, room_jid, nick, password, rejoin=False): if not app.account_is_connected(self._account): return + + self._muc_data[room_jid] = MUCData(room_jid, nick, password, rejoin) + + self._con.get_module('Discovery').disco_muc( + room_jid, partial(self._join, room_jid)) + + def _join(self, room_jid): + show = helpers.get_xmpp_show(app.SHOW_LIST[self._con.connected]) + muc = self._get_muc_data(room_jid) + presence = self._con.get_module('Presence').get_presence( - *args, **kwargs) + '%s/%s' % (room_jid, muc.nick), + show=show, + status=self._con.status) muc_x = presence.setTag(nbxmpp.NS_MUC + ' x') if room_jid is not None: - self._add_history_query(muc_x, room_jid, rejoin) + self._add_history_query(muc_x, room_jid, muc.rejoin) - if password is not None: - muc_x.setTagData('password', password) - - self._log.debug('Send MUC join presence:\n%s', presence) + if muc.password is not None: + muc_x.setTagData('password', muc.password) + self._log.info('Join MUC: %s', room_jid) + self._set_muc_state(room_jid, MUCJoinedState.JOINING) self._con.connection.send(presence) + def leave(self, room_jid): + self._log.info('Leave MUC: %s', room_jid) + self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) + muc = self._get_muc_data(room_jid) + self._con.get_module('Presence').send_presence( + '%s/%s' % (room_jid, muc.nick), + typ='unavailable') + + def send_muc_presence(self, room_jid, auto=False): + show = app.SHOW_LIST[self._con.connected] + if show in ('invisible', 'offline'): + # FIXME: Check if this + return + + muc = self._get_muc_data(room_jid) + status = self._con.status + + xmpp_show = helpers.get_xmpp_show(show) + + idle_time = None + if auto and app.is_installed('IDLE') and app.config.get('autoaway'): + idle_sec = idle.Monitor.get_idle_sec() + idle_time = time.strftime('%Y-%m-%dT%H:%M:%SZ', + time.gmtime(time.time() - idle_sec)) + + full_jid = '%s/%s' % (room_jid, muc.nick) + + self._log.info('Send presence: %s, show: %s, status: %s, idle_time: %s', + full_jid, xmpp_show, status, idle_time) + + self._con.get_module('Presence').send_presence( + full_jid, + show=xmpp_show, + status=status, + caps=True, + idle_time=idle_time) + + def change_nick(self, room_jid, new_nick): + show = helpers.get_xmpp_show(app.SHOW_LIST[self._con.connected]) + self._con.get_module('Presence').send_presence( + '%s/%s' % (room_jid, new_nick), + show=show, + status=self._con.status) + def _add_history_query(self, muc_x, room_jid, rejoin): last_date = app.logger.get_room_last_message_time( self._account, room_jid) @@ -159,19 +234,32 @@ class MUC(BaseModule): muc_x.setTag('history', tags) def _on_muc_presence(self, _con, _stanza, properties): - if properties.type == PresenceType.ERROR: - self._raise_muc_event('muc-presence-error', properties) + muc = self._get_muc_data(properties.jid.getBare()) + if (properties.error.type == Error.CONFLICT and + muc.state == MUCJoinedState.JOINING): + muc.nick += '_' + self._log.info('Nickname conflict: %s change to %s', + muc.jid, muc.nick) + self._join(muc.jid) return + self._raise_muc_event('muc-presence-error', properties) - def _on_muc_user_presence(self, _con, _stanza, properties): + def _on_muc_user_presence(self, _con, stanza, properties): if properties.type == PresenceType.ERROR: return + room_jid = properties.jid.getBare() + if room_jid not in self._muc_data: + self._log.warning('Presence from unknown MUC') + self._log.warning(stanza) + return + if properties.is_muc_destroyed: for contact in app.contacts.get_gc_contact_list( - self._account, properties.jid.getBare()): + self._account, room_jid): contact.presence = PresenceType.UNAVAILABLE - self._log.info('MUC destroyed: %s', properties.jid.getBare()) + self._log.info('MUC destroyed: %s', room_jid) + self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) self._raise_muc_event('muc-destroyed', properties) return @@ -186,6 +274,7 @@ class MUC(BaseModule): self._log.info('Nickname changed: %s to %s', properties.jid, properties.muc_user.nick) + self._get_muc_data(room_jid).nick = properties.muc_user.nick self._raise_muc_event('muc-nickname-changed', properties) return @@ -200,6 +289,7 @@ class MUC(BaseModule): return if properties.is_muc_self_presence and properties.is_kicked: + self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) self._raise_muc_event('muc-self-kicked', properties) return @@ -337,6 +427,10 @@ class MUC(BaseModule): subject=properties.subject, nickname=properties.muc_nickname, user_timestamp=properties.user_timestamp)) + + if self._get_muc_state(jid) == MUCJoinedState.JOINING: + self._set_muc_state(jid, MUCJoinedState.JOINED) + raise nbxmpp.NodeProcessed def _on_voice_request(self, _con, _stanza, properties): ===================================== gajim/common/structs.py ===================================== @@ -14,5 +14,48 @@ from collections import namedtuple +from gajim.common.const import MUCJoinedState + URI = namedtuple('URI', 'type action data') URI.__new__.__defaults__ = (None, None) # type: ignore + + +class MUCData: + def __init__(self, room_jid, nick, password, rejoin): + self._room_jid = room_jid + self._nick = nick + self._password = password + self._rejoin = rejoin + self._state = MUCJoinedState.NOT_JOINED + + @property + def jid(self): + return self._room_jid + + @property + def nick(self): + return self._nick + + @nick.setter + def nick(self, value): + self._nick = value + + @property + def password(self): + return self._password + + @property + def state(self): + return self._state + + @state.setter + def state(self, value): + self._state = value + + @property + def rejoin(self): + return self._rejoin + + @rejoin.setter + def rejoin(self, value): + self._rejoin = value ===================================== gajim/groupchat_control.py ===================================== @@ -1123,9 +1123,8 @@ class GroupchatControl(ChatControlBase): def _nec_vcard_published(self, obj): if obj.conn.name != self.account: return - show = app.SHOW_LIST[obj.conn.connected] - status = obj.conn.status - obj.conn.send_gc_status(self.nick, self.room_jid, show, status) + + obj.conn.get_module('MUC').send_muc_presence(self.room_jid) def _nec_update_avatar(self, obj): if obj.contact.room_jid != self.room_jid: @@ -1474,7 +1473,8 @@ class GroupchatControl(ChatControlBase): if obj.conn.name != self.account: return password = app.gc_passwords.get(self.room_jid, '') - obj.conn.join_gc(self.nick, self.room_jid, password, rejoin=True) + obj.conn.get_module('MUC').join(self.room_jid, self.nick, password, + rejoin=True) def _nec_decrypted_message_received(self, obj): if obj.conn.name != self.account: @@ -1610,8 +1610,8 @@ class GroupchatControl(ChatControlBase): if not self.autorejoin: return False password = app.gc_passwords.get(self.room_jid, '') - app.connections[self.account].join_gc(self.nick, self.room_jid, - password, rejoin=True) + app.connections[self.account].get_module('MUC').join( + self.room_jid, self.nick, password, rejoin=True) return True def draw_roster(self): @@ -2077,11 +2077,6 @@ class GroupchatControl(ChatControlBase): _('You are not in the members ' 'list in groupchat %s.') % self.room_jid) - elif error_type == Error.CONFLICT: - win = None if self.parent_win is None else self.parent_win.window - app.interface.handle_ask_new_nick( - self.account, self.room_jid, win) - else: self.add_info_message( 'Error %s: %s' % (error_type.value, error_message)) @@ -2297,8 +2292,7 @@ class GroupchatControl(ChatControlBase): app.ged.remove_event_handler(*handler) if self.is_connected: - app.connections[self.account].send_gc_status(self.nick, - self.room_jid, show='offline', status=status) + app.connections[self.account].get_module('MUC').leave(self.room_jid) nick_list = app.contacts.get_nick_list(self.account, self.room_jid) for nick in nick_list: ===================================== gajim/gtk/dialogs.py ===================================== @@ -771,8 +771,8 @@ class ChangeNickDialog(InputDialogCheck): self.on_ok(nick, self.is_checked()) def on_ok(self, nick, is_checked): - app.connections[self.account].join_gc(nick, self.room_jid, None, - change_nick=self.change_nick) + app.connections[self.account].get_module('MUC').change_nick( + self.room_jid, nick) if app.gc_connected[self.account][self.room_jid]: # We are changing nick, we will change self.nick when we receive # presence that inform that it works ===================================== gajim/gtk/single_message.py ===================================== @@ -145,7 +145,7 @@ class SingleMessageWindow(Gtk.ApplicationWindow): if not c: # Groupchat is maybe already destroyed return - if c.is_groupchat() and self.from_whom not in \ + if c.is_groupchat and self.from_whom not in \ app.interface.minimized_controls[self.account] and self.action == \ 'receive' and app.events.get_nb_roster_events(self.account, self.from_whom, types=['chat', 'normal']) == 0: ===================================== gajim/gui_interface.py ===================================== @@ -103,7 +103,6 @@ from gajim.gtk.dialogs import YesNoDialog from gajim.gtk.dialogs import PassphraseDialog from gajim.gtk.dialogs import PlainConnectionDialog from gajim.gtk.dialogs import SSLErrorDialog -from gajim.gtk.dialogs import ChangeNickDialog from gajim.gtk.dialogs import InvitationReceivedDialog from gajim.gtk.profile import ProfileWindow from gajim.gtk.join_groupchat import JoinGroupchatWindow @@ -160,19 +159,6 @@ class Interface: def raise_dialog(name, *args, **kwargs): get_dialog(name, *args, **kwargs) - def handle_ask_new_nick(self, account, room_jid, parent_win): - title = _('Unable to join group chat') - prompt = _('Your desired nickname in group chat\n' - '<b>%s</b>\n' - 'is in use or registered by another occupant.\n' - 'Please specify another nickname below:') % room_jid - if 'change_nick_dialog' in self.instances: - self.instances['change_nick_dialog'].add_room( - account, room_jid, prompt) - else: - self.instances['change_nick_dialog'] = ChangeNickDialog( - account, room_jid, title, prompt, transient_for=parent_win) - @staticmethod def handle_event_http_auth(obj): #('HTTP_AUTH', account, (method, url, transaction_id, iq_obj, msg)) @@ -270,7 +256,8 @@ class Interface: def handle_gc_password_required(self, account, room_jid, nick): def on_ok(text): - app.connections[account].join_gc(nick, room_jid, text) + app.connections[account].get_module('MUC').join( + room_jid, nick, text) app.gc_passwords[room_jid] = text gc_control.error_dialog = None @@ -1591,7 +1578,7 @@ class Interface: """ if app.contacts.get_contact(account, room_jid) and \ - not app.contacts.get_contact(account, room_jid).is_groupchat(): + not app.contacts.get_contact(account, room_jid).is_groupchat: ErrorDialog( _('This is not a group chat'), _('%(room_jid)s is already in your roster. Please check ' @@ -1644,7 +1631,8 @@ class Interface: gc_control.parent_win.set_active_tab(gc_control) # Connect - app.connections[account].join_gc(nick, room_jid, password) + app.connections[account].get_module('MUC').join( + room_jid, nick, password) if password: app.gc_passwords[room_jid] = password ===================================== gajim/roster_window.py ===================================== @@ -424,7 +424,7 @@ class RosterWindow: if contact.is_transport(): typestr = 'agent' - elif contact.is_groupchat(): + elif contact.is_groupchat: typestr = 'groupchat' else: typestr = 'contact' @@ -836,7 +836,7 @@ class RosterWindow: Remove groupchat from roster and redraw account and group """ contact = app.contacts.get_contact_with_highest_priority(account, jid) - if contact.is_groupchat(): + if contact.is_groupchat: if jid in app.interface.minimized_controls[account]: del app.interface.minimized_controls[account][jid] self.remove_contact(jid, account, force=True, backend=True, maximize=maximize) @@ -2120,9 +2120,8 @@ class RosterWindow: list(app.interface.minimized_controls[account].values()): if gc_control.account == account: if app.gc_connected[account][gc_control.room_jid]: - app.connections[account].send_gc_status( - gc_control.nick, gc_control.room_jid, status, txt, - auto=auto) + app.connections[account].get_module('MUC').send_muc_presence( + gc_control.room_jid, auto=auto) if was_invisible and status != 'offline': # We come back from invisible, join bookmarks con = app.connections[account] @@ -2179,7 +2178,7 @@ class RosterWindow: keep_pep = any(c.show not in ('error', 'offline') for c in contact_instances) if not keep_pep and contact.jid != app.get_jid_from_account(account) \ - and not contact.is_groupchat(): + and not contact.is_groupchat: self.delete_pep(contact.jid, account) # Redraw everything and select the sender @@ -3622,7 +3621,7 @@ class RosterWindow: resource = None contact = app.contacts.get_contact_with_highest_priority(account, jid) titer = model.get_iter(path) - if contact.is_groupchat(): + if contact.is_groupchat: first_ev = app.events.get_first_event(account, jid) if first_ev and self.open_event(account, jid, first_ev): # We are invited to a GC View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/f828118f2af25c2fa8d3d2c5054a00c84… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/f828118f2af25c2fa8d3d2c5054a00c84… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] FileChooser: Fix deprecation warnings
by Philipp Hörist 18 Jun '19

18 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: f828118f by Daniel Brötzmann at 2019-06-18T10:40:23Z FileChooser: Fix deprecation warnings Fixes PyGIDeprecationWarning: GObject.GError is deprecated and button initialization, see: https://wiki.gnome.org/action/show/Projects/PyGObject/ InitializerDeprecations?action=show&redirect=PyGObject%2FInitializerDeprecations - - - - - 1 changed file: - gajim/gtk/filechoosers.py Changes: ===================================== gajim/gtk/filechoosers.py ===================================== @@ -21,7 +21,7 @@ from pathlib import Path from gi.repository import Gtk from gi.repository import GdkPixbuf -from gi.repository import GObject +from gi.repository import GLib from gajim.common import app from gajim.common.i18n import _ @@ -76,7 +76,7 @@ class BaseFileChooser: try: pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size( path_to_file, *self._preivew_size) - except GObject.GError: + except GLib.GError: preview.clear() return filechooser.get_preview_widget().set_from_pixbuf(pixbuf) @@ -173,10 +173,12 @@ class GtkFileChooserDialog(Gtk.FileChooserDialog, BaseFileChooser): self, title=self._title, action=self._action, - buttons=[Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, - Gtk.STOCK_OPEN, Gtk.ResponseType.ACCEPT], transient_for=transient_for) + self.add_button(_('_Cancel'), Gtk.ResponseType.CANCEL) + open_button = self.add_button(_('_Open'), Gtk.ResponseType.ACCEPT) + open_button.get_style_context().add_class('suggested-action') + self.set_current_folder(path or str(Path.home())) if file_name is not None: self.set_current_name(file_name) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f828118f2af25c2fa8d3d2c5054a00c840… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f828118f2af25c2fa8d3d2c5054a00c840… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove log message
by Philipp Hörist 16 Jun '19

16 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 835cf86c by Philipp Hörist at 2019-06-16T09:45:55Z Remove log message - - - - - 1 changed file: - gajim/gtk/util.py Changes: ===================================== gajim/gtk/util.py ===================================== @@ -678,8 +678,6 @@ def load_pixbuf(path, size=None): return GdkPixbuf.Pixbuf.new_from_file_at_scale(path, size, size, True) except GLib.GError: - log.warning('loading pixbuf failed. Try to convert ' - 'image with pillow: %s', path) try: with open(path, 'rb') as im_handle: img = Image.open(im_handle) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/835cf86ca8e6bec61318b3a0fac721dbe1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/835cf86ca8e6bec61318b3a0fac721dbe1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 6 commits: GajimRemote: Remove change_avatar command
by Philipp Hörist 15 Jun '19

15 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 26c441dc by Philipp Hörist at 2019-06-15T23:20:21Z GajimRemote: Remove change_avatar command - - - - - b2aa7352 by Philipp Hörist at 2019-06-15T23:20:22Z Refactor avatar storage code - - - - - 78b06833 by Philipp Hörist at 2019-06-15T23:20:22Z Notifications: Detect DE and set icons accordingly - - - - - 3a845eb0 by Philipp Hörist at 2019-06-15T23:20:22Z DataFormDialog: Limit ComboBox width - - - - - 44229636 by Philipp Hörist at 2019-06-15T23:20:22Z Remove duplicated code ellipsize is set in MaxWidthComboBoxText - - - - - a2c36d7a by Philipp Hörist at 2019-06-15T23:20:22Z Update .pylintrc Relax refactor warnings - - - - - 16 changed files: - data/gajim-remote.1 - gajim/common/app.py - gajim/common/config.py - gajim/common/contacts.py - gajim/gajim_remote.py - gajim/groupchat_control.py - + gajim/gtk/avatar.py - gajim/gtk/dataform.py - gajim/gtk/notification.py - gajim/gtk/profile.py - gajim/gtk/settings.py - gajim/gtk/util.py - gajim/gtkgui_helpers.py - gajim/gui_interface.py - gajim/remote_control.py - pylintrc Changes: ===================================== data/gajim-remote.1 ===================================== @@ -19,8 +19,6 @@ by D-Bus. .El .Ss account_info Aq account Gets detailed info on a account -.Ss change_avatar Ao picture Ac Bq account -Change the avatar .Ss change_status Bo status Bc Bo message Bc Bq account Changes the status of account or accounts .Ss check_gajim_running ===================================== gajim/common/app.py ===================================== @@ -314,6 +314,20 @@ def detect_dependencies(): log('gajim').info('Used language: %s', LANG) +def detect_desktop_env(): + if sys.platform in ('win32', 'darwin'): + return sys.platform + + desktop = os.environ.get('XDG_CURRENT_DESKTOP') + if desktop is None: + return None + + if 'gnome' in desktop.lower(): + return 'gnome' + return desktop + +desktop_env = detect_desktop_env() + def get_an_id(): return str(uuid.uuid4()) ===================================== gajim/common/config.py ===================================== @@ -294,7 +294,6 @@ class Config: 'show_chatstate_in_banner': [opt_bool, True, _('Shows a text in the banner that describes the current chatstate of the contact')], 'send_chatstate_default': [opt_str, 'composing_only', _('Chat state notifications that are sent to contacts. Possible values: all, composing_only, disabled')], 'send_chatstate_muc_default': [opt_str, 'composing_only', _('Chat state notifications that are sent to the group chat. Possible values: all, composing_only, disabled')], - 'avatar_clipping': [opt_str, 'rounded_corners', _('How to display avatars:\n\'rounded_corners\' - Display avatars with cropped corners.\n\'circle\' - Display round avatars.\n\'no_clipping\' - Display avatar as-is.')], }, {}) # type: Tuple[Dict[str, List[Any]], Dict[Any, Any]] __options_per_key = { ===================================== gajim/common/contacts.py ===================================== @@ -594,7 +594,7 @@ class Contacts(): if contacts[0].is_groupchat(): return contacts[0] - def get_avatar(self, jid, size=None, scale=None): + def get_avatar(self, jid, size, scale): if jid not in self._contacts: return None ===================================== gajim/gajim_remote.py ===================================== @@ -224,15 +224,6 @@ class GajimRemote: False) ] ], - 'change_avatar': [ - _('Change the avatar'), - [ - ('picture', _('Picture to use'), True), - ('account', _('Account in which the avatar will be set; ' - 'if not specified, the avatar will be set for all accounts'), - False) - ] - ], 'check_gajim_running': [ _('Check if Gajim is running'), ===================================== gajim/groupchat_control.py ===================================== @@ -740,15 +740,15 @@ class GroupchatControl(ChatControlBase): def _on_upload_avatar(self, action, param): def _on_accept(filename): - sha = app.interface.save_avatar(filename, publish=True) + data, sha = app.interface.avatar_storage.prepare_for_publish( + filename) if sha is None: ErrorDialog( _('Could not load image'), transient_for=self.parent_win.window) return - publish = app.interface.get_avatar_from_storage(sha, publish=True) - avatar = base64.b64encode(publish).decode('utf-8') + avatar = base64.b64encode(data).decode('utf-8') con = app.connections[self.account] con.get_module('VCardTemp').upload_room_avatar( self.room_jid, avatar) ===================================== gajim/gtk/avatar.py ===================================== @@ -0,0 +1,242 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +import os +import logging +import hashlib +from math import pi +from functools import lru_cache +from collections import defaultdict + +from gi.repository import Gdk +from gi.repository import GdkPixbuf +import cairo + +from gajim.common import configpaths +from gajim.common.helpers import Singleton +from gajim.common.const import AvatarSize + +from gajim.gtk.util import load_pixbuf +from gajim.gtk.util import text_to_color +from gajim.gtk.util import scale_with_ratio + + +log = logging.getLogger('gajim.gtk.avatar') + + +@lru_cache(maxsize=1024) +def generate_avatar(letters, color, size, scale): + # Get color for nickname with XEP-0392 + color_r, color_g, color_b = color + + # Set up colors and size + if scale is not None: + size = size * scale + + width = size + height = size + font_size = size * 0.5 + + # Set up surface + surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, width, height) + context = cairo.Context(surface) + + context.set_source_rgb(color_r, color_g, color_b) + context.rectangle(0, 0, width, height) + context.fill() + + # Draw letters + context.select_font_face('sans-serif', + cairo.FONT_SLANT_NORMAL, + cairo.FONT_WEIGHT_NORMAL) + context.set_font_size(font_size) + extends = context.text_extents(letters) + if isinstance(extends, tuple): + # For cairo < 1.15 + x_bearing, y_bearing, ex_width, ex_height = extends[0:4] + else: + x_bearing = extends.x_bearing + y_bearing = extends.y_bearing + ex_width = extends.width + ex_height = extends.height + + x_pos = width / 2 - (ex_width / 2 + x_bearing) + y_pos = height / 2 - (ex_height / 2 + y_bearing) + context.move_to(x_pos, y_pos) + context.set_source_rgb(0.95, 0.95, 0.95) + # use cairo.OPERATOR_OVER legacy constant because its + # compatible with cairo < 1.13 + context.set_operator(cairo.OPERATOR_OVER) + context.show_text(letters) + + return context.get_target() + + +def clip_circle(surface): + new_surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, + surface.get_width(), + surface.get_height()) + context = cairo.Context(new_surface) + context.set_source_surface(surface, 0, 0) + + width = surface.get_width() + height = surface.get_height() + radius = width / 2 + + context.arc(width / 2, height / 2, radius, 0, 2 * pi) + + context.clip() + context.paint() + + return context.get_target() + + +class AvatarStorage(metaclass=Singleton): + def __init__(self): + self._cache = defaultdict(dict) + + def invalidate_cache(self, jid): + self._cache.pop(jid, None) + + def get_pixbuf(self, contact, size, scale): + surface = self.get_surface(contact, size, scale) + return Gdk.pixbuf_get_from_surface(surface, 0, 0, size, size) + + def get_surface(self, contact, size, scale): + jid = contact.jid + if contact.is_gc_contact: + jid = contact.get_full_jid() + + surface = self._cache[jid].get((size, scale)) + if surface is not None: + return surface + + surface = self._get_avatar_from_storage(contact, size, scale) + if surface is not None: + self._cache[jid][(size, scale)] = surface + return surface + + surface = self._generate_default_avatar(contact, size, scale) + self._cache[jid][(size, scale)] = surface + return surface + + def prepare_for_publish(self, path): + success, data = self._load_for_publish(path) + if not success: + return None, None + + sha = self.save_avatar(data) + if sha is None: + return None, None + return data, sha + + @staticmethod + def _load_for_publish(path): + pixbuf = load_pixbuf(path) + if pixbuf is None: + return None + + width = pixbuf.get_width() + height = pixbuf.get_height() + if width > AvatarSize.PUBLISH or height > AvatarSize.PUBLISH: + # Scale only down, never up + width, height = scale_with_ratio(AvatarSize.PUBLISH, width, height) + pixbuf = pixbuf.scale_simple(width, + height, + GdkPixbuf.InterpType.BILINEAR) + + return pixbuf.save_to_bufferv('png', [], []) + + @staticmethod + def save_avatar(data): + """ + Save an avatar to the harddisk + + :param data: bytes + + returns SHA1 value of the avatar or None on error + """ + if data is None: + return None + + sha = hashlib.sha1(data).hexdigest() + path = os.path.join(configpaths.get('AVATAR'), sha) + try: + with open(path, 'wb') as output_file: + output_file.write(data) + except Exception: + log.error('Storing avatar failed', exc_info=True) + return None + return sha + + @staticmethod + def get_avatar_path(filename): + path = os.path.join(configpaths.get('AVATAR'), filename) + if not os.path.isfile(path): + return None + return path + + def pixbuf_from_filename(self, filename): + path = self.get_avatar_path(filename) + if path is None: + return None + return load_pixbuf(path) + + def surface_from_filename(self, filename, size, scale): + size = size * scale + path = self.get_avatar_path(filename) + if path is None: + return None + + pixbuf = load_pixbuf(path, size) + if pixbuf is None: + return None + + return Gdk.cairo_surface_create_from_pixbuf(pixbuf, scale) + + def _load_surface_from_storage(self, contact, size, scale): + filename = contact.avatar_sha + size = size * scale + path = self.get_avatar_path(filename) + if path is None: + return None + + pixbuf = load_pixbuf(path, size) + if pixbuf is None: + return None + return Gdk.cairo_surface_create_from_pixbuf(pixbuf, scale) + + def _get_avatar_from_storage(self, contact, size, scale): + if contact.avatar_sha is None: + return None + + surface = self._load_surface_from_storage(contact, size, scale) + if surface is None: + return None + return clip_circle(surface) + + @staticmethod + def _generate_default_avatar(contact, size, scale): + # Get initial from name + name = contact.get_shown_name() + letter = name[0].capitalize() + + # Use nickname for group chats and bare JID for single contacts + if contact.is_gc_contact: + color_string = contact.name + else: + color_string = contact.jid + color = text_to_color(color_string) + surface = generate_avatar(letter, color, size, scale) + return clip_circle(surface) ===================================== gajim/gtk/dataform.py ===================================== @@ -25,6 +25,7 @@ from gajim.common.helpers import open_uri from gajim.common.modules.dataforms import extend_form from gajim.gtk.util import MultiLineLabel +from gajim.gtk.util import MaxWidthComboBoxText class DataFormWidget(Gtk.ScrolledWindow): @@ -318,7 +319,7 @@ class ListSingleField(Field): def __init__(self, field, form_grid, options): Field.__init__(self, field, form_grid, options) - self._widget = Gtk.ComboBoxText() + self._widget = MaxWidthComboBoxText() self._widget.set_valign(Gtk.Align.CENTER) for value, label in field.iter_options(): if not label: ===================================== gajim/gtk/notification.py ===================================== @@ -42,7 +42,6 @@ from gajim.gtk.util import get_builder from gajim.gtk.util import get_icon_name from gajim.gtk.util import get_monitor_scale_factor from gajim.gtk.util import get_total_screen_geometry -from gajim.gtk.util import load_icon log = logging.getLogger('gajim.gtk.notification') @@ -142,7 +141,7 @@ class Notification: """ if icon_name is None: - icon_name = 'gajim-chat_msg_recv' + icon_name = 'mail-message-new' if timeout < 0: timeout = app.config.get('notification_timeout') @@ -158,8 +157,7 @@ class Notification: if not self._dbus_available: return - scale = get_monitor_scale_factor() - icon_pixbuf = load_icon(icon_name, size=48, pixbuf=True, scale=scale) + icon = Gio.ThemedIcon.new(icon_name) notification = Gio.Notification() if title is not None: @@ -202,16 +200,23 @@ class Notification: _('New Single Message'), _('New Private Message'), _('New Group Chat Message')): - avatar = app.contacts.get_avatar(account, jid) - if avatar: - icon_pixbuf = avatar + if app.desktop_env == 'gnome': + icon = self._get_avatar_for_notification(account, jid) notif_id = self._make_id('new-message', account, jid) - notification.set_icon(icon_pixbuf) + notification.set_icon(icon) notification.set_priority(Gio.NotificationPriority.NORMAL) app.app.send_notification(notif_id, notification) + @staticmethod + def _get_avatar_for_notification(account, jid): + scale = get_monitor_scale_factor() + contact = app.contacts.get_contact(account, jid) + if contact is None: + return None + return app.interface.get_avatar(contact, 16, scale, pixbuf=True) + def _on_popup_destroy(self, *args): self._win32_active_popup = None ===================================== gajim/gtk/profile.py ===================================== @@ -128,14 +128,16 @@ class ProfileWindow(Gtk.ApplicationWindow): def on_set_avatar_button_clicked(self, widget): def on_ok(path_to_file): - sha = app.interface.save_avatar(path_to_file, publish=True) + data, sha = app.interface.avatar_storage.prepare_for_publish( + path_to_file) if sha is None: ErrorDialog( _('Could not load image'), transient_for=self) return scale = self.get_scale_factor() - surface = app.interface.get_avatar_from_storage(sha, AvatarSize.VCARD, scale) + surface = app.interface.avatar_storage.surface_from_filename( + sha, AvatarSize.VCARD, scale) button = self.xml.get_object('PHOTO_button') image = self.xml.get_object('PHOTO_image') @@ -145,8 +147,7 @@ class ProfileWindow(Gtk.ApplicationWindow): text_button.hide() self.avatar_sha = sha - publish = app.interface.get_avatar_from_storage(sha, publish=True) - self.avatar_encoded = base64.b64encode(publish).decode('utf-8') + self.avatar_encoded = base64.b64encode(data).decode('utf-8') self.avatar_mime_type = 'image/png' AvatarChooserDialog(on_ok, transient_for=self) @@ -212,7 +213,7 @@ class ProfileWindow(Gtk.ApplicationWindow): self.avatar_mime_type = vcard_[i]['TYPE'] scale = self.get_scale_factor() - surface = app.interface.get_avatar_from_storage( + surface = app.interface.avatar_storage.surface_from_filename( self.avatar_sha, AvatarSize.VCARD, scale) if surface is None: pixbuf = gtkgui_helpers.scale_pixbuf_from_data( ===================================== gajim/gtk/settings.py ===================================== @@ -523,8 +523,7 @@ class ComboSetting(GenericSetting): self.combo = MaxWidthComboBoxText() self.combo.set_valign(Gtk.Align.CENTER) - text_renderer = self.combo.get_cells()[0] - text_renderer.set_property('ellipsize', Pango.EllipsizeMode.END) + for index, value in enumerate(combo_items): if isinstance(value, tuple): value, label = value @@ -563,8 +562,6 @@ class ProxyComboSetting(GenericSetting): self.combo = MaxWidthComboBoxText() self.combo.set_valign(Gtk.Align.CENTER) - text_renderer = self.combo.get_cells()[0] - text_renderer.set_property('ellipsize', Pango.EllipsizeMode.END) self._signal_id = None self.update_values() ===================================== gajim/gtk/util.py ===================================== @@ -26,14 +26,18 @@ import logging import textwrap import xml.etree.ElementTree as ET from pathlib import Path -from functools import lru_cache from functools import wraps -from math import pi + +try: + from PIL import Image +except Exception: + pass from gi.repository import Gdk from gi.repository import Gtk from gi.repository import GLib from gi.repository import Pango +from gi.repository import GdkPixbuf import nbxmpp import cairo @@ -620,98 +624,6 @@ def find_widget(name, container): return find_widget(name, child) -@lru_cache(maxsize=1024) -def generate_avatar(letters, color, size, scale): - # Get color for nickname with XEP-0392 - color_r, color_g, color_b = color - - # Set up colors and size - if scale is not None: - size = size * scale - - width = size - height = size - font_size = size * 0.5 - - # Set up surface - surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, width, height) - context = cairo.Context(surface) - - context.set_source_rgb(color_r, color_g, color_b) - context.rectangle(0, 0, width, height) - context.fill() - - # Draw letters - context.select_font_face('sans-serif', - cairo.FONT_SLANT_NORMAL, - cairo.FONT_WEIGHT_NORMAL) - context.set_font_size(font_size) - extends = context.text_extents(letters) - if isinstance(extends, tuple): - # For cairo < 1.15 - x_bearing, y_bearing, ex_width, ex_height = extends[0:4] - else: - x_bearing = extends.x_bearing - y_bearing = extends.y_bearing - ex_width = extends.width - ex_height = extends.height - - x_pos = width / 2 - (ex_width / 2 + x_bearing) - y_pos = height / 2 - (ex_height / 2 + y_bearing) - context.move_to(x_pos, y_pos) - context.set_source_rgb(0.95, 0.95, 0.95) - # use cairo.OPERATOR_OVER legacy constant because its - # compatible with cairo < 1.13 - context.set_operator(cairo.OPERATOR_OVER) - context.show_text(letters) - - return context.get_target() - - -def clip_circle(surface): - new_surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, - surface.get_width(), - surface.get_height()) - context = cairo.Context(new_surface) - context.set_source_surface(surface, 0, 0) - - width = surface.get_width() - height = surface.get_height() - radius = width / 2 - - context.arc(width / 2, height / 2, radius, 0, 2 * pi) - - context.clip() - context.paint() - - return context.get_target() - - -def clip_rounded_corners(surface): - new_surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, - surface.get_width(), - surface.get_height()) - context = cairo.Context(new_surface) - context.set_source_surface(surface, 0, 0) - - width = surface.get_width() - height = surface.get_height() - radius = width * 0.1 - deg = pi / 180.0 - - context.new_sub_path() - context.arc(width - radius, radius, radius, -90 * deg, 0) - context.arc(width - radius, height - radius, radius, 0, 90 * deg) - context.arc(radius, height - radius, radius, 90 * deg, 180 * deg) - context.arc(radius, radius, radius, 180 * deg, 270 * deg) - context.close_path() - - context.clip() - context.paint() - - return context.get_target() - - class MultiLineLabel(Gtk.Label): def __init__(self, *args, **kwargs): Gtk.Label.__init__(self, *args, **kwargs) @@ -724,6 +636,8 @@ class MaxWidthComboBoxText(Gtk.ComboBoxText): def __init__(self, *args, **kwargs): Gtk.ComboBoxText.__init__(self, *args, **kwargs) self._max_width = 100 + text_renderer = self.get_cells()[0] + text_renderer.set_property('ellipsize', Pango.EllipsizeMode.END) def set_max_size(self, size): self._max_width = size @@ -744,3 +658,45 @@ def text_to_color(text): else: background = (1, 1, 1) # RGB (255, 255, 255) white return nbxmpp.util.text_to_color(text, background) + + +def scale_with_ratio(size, width, height): + if height == width: + return size, size + if height > width: + ratio = height / float(width) + return int(size / ratio), size + + ratio = width / float(height) + return size, int(size / ratio) + + +def load_pixbuf(path, size=None): + try: + if size is None: + return GdkPixbuf.Pixbuf.new_from_file(path) + return GdkPixbuf.Pixbuf.new_from_file_at_scale(path, size, size, True) + + except GLib.GError: + log.warning('loading pixbuf failed. Try to convert ' + 'image with pillow: %s', path) + try: + with open(path, 'rb') as im_handle: + img = Image.open(im_handle) + avatar = img.convert("RGBA") + except (NameError, OSError): + log.warning('Pillow convert failed: %s', path) + log.debug('Error', exc_info=True) + return None + + array = GLib.Bytes.new(avatar.tobytes()) + width, height = avatar.size + pixbuf = GdkPixbuf.Pixbuf.new_from_bytes( + array, GdkPixbuf.Colorspace.RGB, True, + 8, width, height, width * 4) + if size is not None: + width, height = scale_with_ratio(size, width, height) + return pixbuf.scale_simple(width, + height, + GdkPixbuf.InterpType.BILINEAR) + return pixbuf ===================================== gajim/gtkgui_helpers.py ===================================== @@ -159,7 +159,7 @@ def on_avatar_save_as_menuitem_activate(widget, avatar, default_name=''): app.config.set('last_save_dir', os.path.dirname(file_path)) if isinstance(avatar, str): # We got a SHA - pixbuf = app.interface.get_avatar_from_storage(avatar) + pixbuf = app.interface.avatar_storage.pixbuf_from_filename(avatar) else: # We got a pixbuf pixbuf = avatar ===================================== gajim/gui_interface.py ===================================== @@ -35,26 +35,18 @@ import os import sys import re import time -import hashlib import logging from functools import partial from threading import Thread from gi.repository import Gtk -from gi.repository import GdkPixbuf from gi.repository import GLib from gi.repository import Gio -from gi.repository import Gdk from nbxmpp import idlequeue from nbxmpp import Hashes2 from nbxmpp.structs import TuneData import OpenSSL -try: - from PIL import Image -except Exception: - pass - from gajim.common import app from gajim.common import events from gajim.common.dbus import screensaver @@ -62,7 +54,6 @@ from gajim.common.dbus import location from gajim.common.dbus import music_track from gajim.common.dbus import logind -from gajim import gtkgui_helpers from gajim import gui_menu_builder from gajim import dialogs from gajim import message_control @@ -94,7 +85,6 @@ from gajim.common.connection_handlers_events import ( from gajim.common.modules.httpupload import HTTPUploadProgressEvent from gajim.common.connection import Connection from gajim.common.file_props import FilesProp -from gajim.common.const import AvatarSize from gajim.common.const import SSLError from gajim import roster_window @@ -103,6 +93,7 @@ from gajim.common.caps_cache import muc_caps_cache from gajim.common import configpaths from gajim.common import optparser +from gajim.gtk.avatar import AvatarStorage from gajim.gtk.notification import Notification from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import WarningDialog @@ -125,10 +116,6 @@ from gajim.gtk.roster_item_exchange import RosterItemExchangeWindow from gajim.gtk.subscription_request import SubscriptionRequestWindow from gajim.gtk.util import get_show_in_roster from gajim.gtk.util import get_show_in_systray -from gajim.gtk.util import generate_avatar -from gajim.gtk.util import clip_circle -from gajim.gtk.util import clip_rounded_corners -from gajim.gtk.util import text_to_color parser = optparser.OptionsParser(configpaths.get('CONFIG_FILE')) @@ -1988,8 +1975,9 @@ class Interface: _('Could not save your settings and preferences')) error_dialog.run() - @staticmethod - def update_avatar(account=None, jid=None, contact=None, room_avatar=False): + def update_avatar(self, account=None, jid=None, + contact=None, room_avatar=False): + self.avatar_storage.invalidate_cache(jid or contact.jid) if room_avatar: app.nec.push_incoming_event( NetworkEvent('update-room-avatar', account=account, jid=jid)) @@ -2000,157 +1988,16 @@ class Interface: app.nec.push_incoming_event( NetworkEvent('update-gc-avatar', contact=contact)) - def save_avatar(self, data, publish=False): - """ - Save an avatar to the harddisk - - :param data: publish=False data must be bytes - publish=True data must be a path to a file - - :param publish: If publish is True, the method scales the file - to AvatarSize.PUBLISH size before saving - - returns SHA1 value of the avatar or None on error - """ - if data is None: - return - - if publish: - with open(data, 'rb') as file: - data = file.read() - pixbuf = gtkgui_helpers.get_pixbuf_from_data(data) - if pixbuf is None: - return + def save_avatar(self, data): + return self.avatar_storage.save_avatar(data) - width = pixbuf.get_width() - height = pixbuf.get_height() - if width > AvatarSize.PUBLISH or height > AvatarSize.PUBLISH: - # Scale only down, never up - width, height = gtkgui_helpers.scale_with_ratio( - AvatarSize.PUBLISH, width, height) - pixbuf = pixbuf.scale_simple(width, - height, - GdkPixbuf.InterpType.BILINEAR) - publish_path = os.path.join( - configpaths.get('AVATAR'), 'temp_publish') - pixbuf.savev(publish_path, 'png', [], []) - with open(publish_path, 'rb') as file: - data = file.read() - return self.save_avatar(data) - - sha = hashlib.sha1(data).hexdigest() - path = os.path.join(configpaths.get('AVATAR'), sha) - try: - with open(path, "wb") as output_file: - output_file.write(data) - except Exception: - app.log('avatar').error('Saving avatar failed', exc_info=True) - return - - return sha - - def get_avatar(self, contact, size=None, scale=None, publish=False): - surface = self.get_avatar_from_storage(contact.avatar_sha, - size, - scale, - publish) - - if surface is None: - # No avatar found, generate one - - # Get initial from name - name = contact.get_shown_name() - letter = name[0].capitalize() - - # Use nickname for group chats and bare JID for single contacts - if contact.is_gc_contact: - color_string = contact.name - else: - color_string = contact.jid - color = text_to_color(color_string) - surface = generate_avatar(letter, color, size, scale) + def get_avatar(self, contact, size, scale, pixbuf=False): + if pixbuf: + return self.avatar_storage.get_pixbuf(contact, size, scale) + return self.avatar_storage.get_surface(contact, size, scale) - # Clip avatar - clip_setting = app.config.get('avatar_clipping') - if clip_setting == 'circle': - return clip_circle(surface) - if clip_setting == 'rounded_corners': - return clip_rounded_corners(surface) - - return surface - - def get_avatar_from_storage(self, filename, size=None, scale=None, publish=False): - if filename is None or '': - return - - if size is None and scale is not None: - raise ValueError - - if scale is not None: - size = size * scale - - if publish: - path = os.path.join(configpaths.get('AVATAR'), filename) - with open(path, 'rb') as file: - data = file.read() - return data - - try: - pixbuf = app.avatar_cache[filename][size] - if scale is None: - return pixbuf - return Gdk.cairo_surface_create_from_pixbuf(pixbuf, scale) - except KeyError: - pass - - path = os.path.join(configpaths.get('AVATAR'), filename) - if not os.path.isfile(path): - return - - pixbuf = None - try: - if size is not None: - pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_scale( - path, size, size, True) - else: - pixbuf = GdkPixbuf.Pixbuf.new_from_file(path) - except GLib.GError: - app.log('avatar').info( - 'loading avatar %s failed. Try to convert ' - 'avatar image using pillow', filename) - try: - with open(path, 'rb') as im_handle: - img = Image.open(im_handle) - avatar = img.convert("RGBA") - except (NameError, OSError): - app.log('avatar').warning('Pillow convert failed: %s', filename) - app.log('avatar').debug('Error', exc_info=True) - return - array = GLib.Bytes.new(avatar.tobytes()) - width, height = avatar.size - pixbuf = GdkPixbuf.Pixbuf.new_from_bytes( - array, GdkPixbuf.Colorspace.RGB, True, - 8, width, height, width * 4) - if size: - width, height = gtkgui_helpers.scale_with_ratio( - size, width, height) - pixbuf = pixbuf.scale_simple( - width, height, GdkPixbuf.InterpType.BILINEAR) - - if filename not in app.avatar_cache: - app.avatar_cache[filename] = {} - app.avatar_cache[filename][size] = pixbuf - - if scale is None: - return pixbuf - return Gdk.cairo_surface_create_from_pixbuf(pixbuf, scale) - - @staticmethod - def avatar_exists(filename): - path = os.path.join(configpaths.get('AVATAR'), filename) - if not os.path.isfile(path): - return False - return True + def avatar_exists(self, filename): + return self.avatar_storage.get_avatar_path(filename) is not None # does JID exist only within a groupchat? def is_pm_contact(self, fjid, account): @@ -2311,6 +2158,8 @@ class Interface: self.emot_and_basic = None self.sth_at_sth_dot_sth = None + self.avatar_storage = AvatarStorage() + cfg_was_read = parser.read() if not cfg_was_read: ===================================== gajim/remote_control.py ===================================== @@ -23,8 +23,6 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. import os -import base64 -import mimetypes import logging from gi.repository import GLib @@ -132,10 +130,6 @@ class GajimRemote(Server): <arg name='account' type='s' /> <arg direction='out' type='b' /> </method> - <method name='change_avatar'> - <arg name='picture' type='s' /> - <arg name='account' type='s' /> - </method> <method name='change_status'> <arg name='status' type='s' /> <arg name='message' type='s' /> @@ -904,35 +898,6 @@ class GajimRemote(Server): for acc in app.contacts.get_accounts(): app.connections[acc].send_stanza(str(xml)) - def change_avatar(self, picture, account): - filesize = os.path.getsize(picture) - invalid_file = False - if os.path.isfile(picture): - stat = os.stat(picture) - if stat[6] == 0: - invalid_file = True - else: - invalid_file = True - if not invalid_file and filesize < 16384: - sha = app.interface.save_avatar(picture, publish=True) - if sha is None: - return - app.config.set_per('accounts', self.name, 'avatar_sha', sha) - data = app.interface.get_avatar_from_storage(sha, publish=True) - avatar = base64.b64encode(data).decode('utf-8') - avatar_mime_type = mimetypes.guess_type(picture)[0] - vcard = {} - vcard['PHOTO'] = {'BINVAL': avatar} - if avatar_mime_type: - vcard['PHOTO']['TYPE'] = avatar_mime_type - if account: - app.connections[account].get_module('VCardTemp').send_vcard( - vcard, sha) - else: - for acc in app.connections: - app.connections[acc].get_module('VCardTemp').send_vcard( - vcard, sha) - def join_room(self, room_jid, nick, password, account): if not account: # get the first connected account ===================================== pylintrc ===================================== @@ -225,7 +225,7 @@ indent-string=' ' max-line-length=80 # Maximum number of lines in a module -max-module-lines=1000 +max-module-lines=3000 # List of optional constructs for which whitespace checking is disabled. `dict- # separator` is used to allow tabulation in dicts, etc.: {1 : 1,\n222: 2}. @@ -368,22 +368,22 @@ max-attributes=9999 max-bool-expr=5 # Maximum number of branch for function / method body -max-branches=12 +max-branches=20 # Maximum number of locals for function / method body -max-locals=15 +max-locals=50 # Maximum number of parents for a class (see R0901). max-parents=7 # Maximum number of public methods for a class (see R0904). -max-public-methods=20 +max-public-methods=50 # Maximum number of return / yield for function / method body max-returns=100 # Maximum number of statements in function / method body -max-statements=50 +max-statements=100 # Minimum number of public methods for a class (see R0903). min-public-methods=0 View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/51e73a2eedc49691850dea023abc88448… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/51e73a2eedc49691850dea023abc88448… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] MucCapsCache: Add more queries
by Philipp Hörist 15 Jun '19

15 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 51e73a2e by Daniel Brötzmann at 2019-06-14T22:44:26Z MucCapsCache: Add more queries This adds the following queries for room infos: is_open, is_password_protected, and is_persistent - - - - - 1 changed file: - gajim/common/caps_cache.py Changes: ===================================== gajim/common/caps_cache.py ===================================== @@ -505,9 +505,18 @@ class MucCapsCache: pass return allowed + def is_open(self, jid): + return 'muc_membersonly' not in self.cache[jid].features + + def is_password_protected(self, jid): + return 'muc_unsecured' not in self.cache[jid].features + def is_anonymous(self, jid): return 'muc_nonanonymous' not in self.cache[jid].features + def is_persistent(self, jid): + return 'muc_temporary' not in self.cache[jid].features + def get_room_infos(self, jid): room_info = {} if jid in self.cache: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/51e73a2eedc49691850dea023abc88448b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/51e73a2eedc49691850dea023abc88448b… 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 June 2019