Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Remove anotation
by Philipp Hörist 20 Mar '20

20 Mar '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: d83013e1 by lovetox at 2020-03-20T18:09:38+01:00 Remove anotation GStreamer is an optional package, we can't depend on it beeing imported - - - - - 1 changed file: - gajim/gtk/gstreamer.py Changes: ===================================== gajim/gtk/gstreamer.py ===================================== @@ -1,17 +1,10 @@ -from typing import Tuple, Optional - -from gi.repository import Gtk - try: from gi.repository import Gst except Exception: pass -def create_gtk_widget() -> Tuple[Optional[Gst.Element], - Optional[Gtk.Widget], - Optional[str]]: - +def create_gtk_widget(): gtkglsink = Gst.ElementFactory.make('gtkglsink', None) if gtkglsink is not None: glsinkbin = Gst.ElementFactory.make('glsinkbin', None) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d83013e1e3f9c61ade6ac9e6a52a9252… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d83013e1e3f9c61ade6ac9e6a52a9252… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Fix pylint errors
by Philipp Hörist 20 Mar '20

20 Mar '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: e1890a26 by lovetox at 2020-03-20T16:18:18+01:00 Fix pylint errors - - - - - 636ba000 by lovetox at 2020-03-20T16:19:30+01:00 Update .pylintrc - - - - - 2 changed files: - .pylintrc - nbxmpp/websocket.py Changes: ===================================== .pylintrc ===================================== @@ -377,7 +377,7 @@ max-locals=50 max-parents=7 # Maximum number of public methods for a class (see R0904). -max-public-methods=50 +max-public-methods=100 # Maximum number of return / yield for function / method body max-returns=100 ===================================== nbxmpp/websocket.py ===================================== @@ -116,16 +116,14 @@ class WebsocketConnection(Connection): self.notify('data-received', data) - @staticmethod - def _on_websocket_pong(_websocket, _message): + def _on_websocket_pong(self, _websocket, _message): self._log.info('Pong received') def _on_websocket_closed(self, websocket): self._log.info('Closed %s', get_websocket_close_string(websocket)) self._finalize('disconnected') - @staticmethod - def _on_websocket_closing(_websocket): + def _on_websocket_closing(self, _websocket): self._log.info('Closing') def _on_websocket_error(self, _websocket, error): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/ceb541462ed855c6a389a96… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/ceb541462ed855c6a389a96… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Logging: Simplify passing context
by Philipp Hörist 20 Mar '20

20 Mar '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: ceb54146 by lovetox at 2020-03-20T16:15:11+01:00 Logging: Simplify passing context - - - - - 4 changed files: - nbxmpp/auth.py - nbxmpp/client.py - nbxmpp/dispatcher.py - nbxmpp/smacks.py Changes: ===================================== nbxmpp/auth.py ===================================== @@ -46,7 +46,7 @@ class SASL: """ Implements SASL authentication. """ - def __init__(self, client, log_context): + def __init__(self, client): self._client = client self._password = None @@ -56,7 +56,7 @@ class SASL: self._method = None self._error = None - self._log = LogAdapter(log, {'context': log_context}) + self._log = LogAdapter(log, {'context': client.log_context}) @property def error(self): ===================================== nbxmpp/client.py ===================================== @@ -117,13 +117,13 @@ class Client(Observable): self._ping_source_id = None - self._dispatcher = StanzaDispatcher(self, self._log_context) + self._dispatcher = StanzaDispatcher(self) self._dispatcher.subscribe('before-dispatch', self._on_before_dispatch) self._dispatcher.subscribe('parsing-error', self._on_parsing_error) self._dispatcher.subscribe('stream-end', self._on_stream_end) - self._smacks = Smacks(self, self._log_context) - self._sasl = SASL(self, self._log_context) + self._smacks = Smacks(self) + self._sasl = SASL(self) self._state = StreamState.DISCONNECTED ===================================== nbxmpp/dispatcher.py ===================================== @@ -101,14 +101,14 @@ class StanzaDispatcher(Observable): """ - def __init__(self, client, log_context): + def __init__(self, client): Observable.__init__(self, log) self._client = client self._modules = {} self._parser = None self._websocket_stream_error = None - self._log = LogAdapter(log, {'context': log_context}) + self._log = LogAdapter(log, {'context': client.log_context}) self._handlers = {} ===================================== nbxmpp/smacks.py ===================================== @@ -37,7 +37,7 @@ class Smacks: number of handled stanzas """ - def __init__(self, client, log_context): + def __init__(self, client): self._client = client self._out_h = 0 # Outgoing stanzas handled self._in_h = 0 # Incoming stanzas handled @@ -59,7 +59,7 @@ class Smacks: self._session_id = None self._location = None - self._log = LogAdapter(log, {'context': log_context}) + self._log = LogAdapter(log, {'context': client.log_context}) self.register_handlers() View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/ceb541462ed855c6a389a96d… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/ceb541462ed855c6a389a96d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Logging: Pass context to nbxmpp.Client
by Philipp Hörist 20 Mar '20

20 Mar '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 944c5874 by lovetox at 2020-03-20T16:11:50+01:00 Logging: Pass context to nbxmpp.Client - - - - - 382725a2 by lovetox at 2020-03-20T16:11:50+01:00 Logging: Change log format - - - - - 2 changed files: - gajim/common/client.py - gajim/common/logging_helpers.py Changes: ===================================== gajim/common/client.py ===================================== @@ -112,7 +112,7 @@ class Client(ConnectionHandlers): def _create_client(self): log.info('Create new nbxmpp client') - self._client = NBXMPPClient() + self._client = NBXMPPClient(log_context=self._account) self.connection = self._client self._client.set_domain(self._hostname) self._client.set_username(self._user) ===================================== gajim/common/logging_helpers.py ===================================== @@ -143,7 +143,7 @@ def init(): consoleloghandler = logging.StreamHandler() consoleloghandler.setFormatter( FancyFormatter( - '%(asctime)s %(levelname)s %(name)s %(message)s', + '%(asctime)s %(levelname)s %(name)-35s %(message)s', '%x %H:%M:%S', use_color ) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/eebc393f6ded9a9ccae9416209d3126… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/eebc393f6ded9a9ccae9416209d3126… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Logging: Change log message
by Philipp Hörist 20 Mar '20

20 Mar '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 847e21a4 by lovetox at 2020-03-20T16:09:36+01:00 Logging: Change log message - - - - - 1 changed file: - nbxmpp/connection.py Changes: ===================================== nbxmpp/connection.py ===================================== @@ -118,10 +118,7 @@ class Connection(Observable): def _log_stanza(self, data, received=True): direction = 'RECEIVED' if received else 'SENT' - message = ('::::: DATA %s ::::' - '\n_____________\n' - '%s' - '\n_____________') + message = ('::::: DATA %s ::::\n\n%s\n') self._log.info(message, direction, data) def start_tls_negotiation(self): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/847e21a4b26868363413ad43… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/847e21a4b26868363413ad43… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Logging: Add context to logging output
by Philipp Hörist 20 Mar '20

20 Mar '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 5cc8dca3 by lovetox at 2020-03-20T15:51:17+01:00 Logging: Add context to logging output - - - - - 30 changed files: - nbxmpp/auth.py - nbxmpp/client.py - nbxmpp/connection.py - nbxmpp/dispatcher.py - nbxmpp/examples/client.py - nbxmpp/modules/activity.py - nbxmpp/modules/adhoc.py - nbxmpp/modules/annotations.py - nbxmpp/modules/attention.py - + nbxmpp/modules/base.py - nbxmpp/modules/blocking.py - nbxmpp/modules/bookmarks.py - nbxmpp/modules/captcha.py - nbxmpp/modules/chat_markers.py - nbxmpp/modules/chatstates.py - nbxmpp/modules/correction.py - nbxmpp/modules/delay.py - nbxmpp/modules/discovery.py - nbxmpp/modules/eme.py - nbxmpp/modules/entity_caps.py - nbxmpp/modules/http_auth.py - nbxmpp/modules/http_upload.py - nbxmpp/modules/ibb.py - nbxmpp/modules/idle.py - nbxmpp/modules/iq.py - nbxmpp/modules/location.py - nbxmpp/modules/message.py - nbxmpp/modules/mood.py - nbxmpp/modules/muc.py - nbxmpp/modules/muclumbus.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/5cc8dca3126365ac2dd22960… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/5cc8dca3126365ac2dd22960… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Don't fail hard if we cannot get icon
by Philipp Hörist 19 Mar '20

19 Mar '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: eebc393f by Daniel Brötzmann at 2020-03-19T21:58:07+01:00 Don't fail hard if we cannot get icon - - - - - 1 changed file: - gajim/gtk/util.py Changes: ===================================== gajim/gtk/util.py ===================================== @@ -222,6 +222,9 @@ def load_icon(icon_name, widget=None, size=16, pixbuf=False, try: iconinfo = _icon_theme.lookup_icon_for_scale( icon_name, size, scale, flags) + if iconinfo is None: + log.info('No icon found for %s', icon_name) + return if pixbuf: return iconinfo.load_icon() return iconinfo.load_surface(None) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/eebc393f6ded9a9ccae9416209d3126a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/eebc393f6ded9a9ccae9416209d3126a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Preferences: Add infobar for missing A/V dependencies
by Philipp Hörist 19 Mar '20

19 Mar '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1bc90e22 by Daniel Brötzmann at 2020-03-19T21:07:35+01:00 Preferences: Add infobar for missing A/V dependencies - - - - - 2 changed files: - gajim/data/gui/preferences_window.ui - gajim/gtk/preferences.py Changes: ===================================== gajim/data/gui/preferences_window.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.20"/> <object class="GtkAdjustment" id="adjustment_status_auto_away"> @@ -2092,305 +2092,393 @@ $T will be replaced by auto-not-available timeout.</property> </packing> </child> <child> - <object class="GtkBox" id="audio_video_tab"> + <object class="GtkBox"> <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="GtkGrid"> + <object class="GtkInfoBar" id="av_dependencies_infobar"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel"> - <property name="width_request">-1</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">A_udio output device</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">audio_output_combobox</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="audio_output_combobox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <signal name="changed" handler="on_audio_output_combobox_changed" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="audio_input_combobox"> - <property name="width_request">200</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <signal name="changed" handler="on_audio_input_combobox_changed" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="width_request">-1</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">_Audio input device</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">audio_input_combobox</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">Audio</property> - <property name="use_markup">True</property> - <style> - <class name="bold"/> - <class name="margin-top6"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">Video</property> - <property name="use_markup">True</property> - <style> - <class name="bold"/> - <class name="margin-top6"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">_Video input device</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">video_input_combobox</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="video_input_combobox"> - <property name="visible">True</property> + <property name="message_type">warning</property> + <child internal-child="action_area"> + <object class="GtkButtonBox"> <property name="can_focus">False</property> - <signal name="changed" handler="on_video_input_combobox_changed" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">4</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">Video output</property> - <property name="mnemonic_widget">selected_video_output</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">5</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="selected_video_output"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">5</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="margin_top">12</property> - <property name="label" translatable="yes">Video _framerate</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">video_framerate_combobox</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">6</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="video_framerate_combobox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">12</property> - <signal name="changed" handler="on_video_framerate_combobox_changed" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">6</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">Video si_ze</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">video_size_combobox</property> - <style> - <class name="dim-label"/> - </style> + <property name="spacing">6</property> + <property name="layout_style">end</property> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <object class="GtkButton" id="features_button"> + <property name="label" translatable="yes">Show _Features</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_features_button_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">7</property> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> </packing> </child> - <child> - <object class="GtkComboBox" id="video_size_combobox"> - <property name="visible">True</property> + <child internal-child="content_area"> + <object class="GtkBox"> <property name="can_focus">False</property> - <signal name="changed" handler="on_video_size_combobox_changed" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">7</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="video_see_self_checkbutton"> - <property name="label" translatable="yes">Vi_ew own video source</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">start</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_video_see_self_checkbutton_toggled" swapped="no"/> + <property name="spacing">16</property> + <child> + <object class="GtkLabel" id="av_dependencies_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="ellipsize">end</property> + <property name="single_line_mode">True</property> + <property name="max_width_chars">50</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">8</property> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="audio_video_tab"> + <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="GtkLabel"> + <object class="GtkGrid"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">Connection</property> - <property name="use_markup">True</property> - <style> - <class name="bold"/> - <class name="margin-top6"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">9</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="stun_checkbutton"> - <property name="label" translatable="yes">STU_N server</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">end</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_stun_checkbutton_toggled" swapped="no"/> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">10</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="stun_server_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">STUN server hostname. If no hostname was given, Gajim will try + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkLabel"> + <property name="width_request">-1</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">A_udio output device</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">audio_output_combobox</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="audio_output_combobox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <signal name="changed" handler="on_audio_output_combobox_changed" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="audio_input_combobox"> + <property name="width_request">200</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <signal name="changed" handler="on_audio_input_combobox_changed" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="width_request">-1</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">_Audio input device</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">audio_input_combobox</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Audio</property> + <property name="use_markup">True</property> + <style> + <class name="bold"/> + <class name="margin-top6"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Video</property> + <property name="use_markup">True</property> + <style> + <class name="bold"/> + <class name="margin-top6"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">_Video input device</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">video_input_combobox</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="video_input_combobox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <signal name="changed" handler="on_video_input_combobox_changed" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Video output</property> + <property name="mnemonic_widget">selected_video_output</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">5</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="selected_video_output"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">5</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="margin_top">12</property> + <property name="label" translatable="yes">Video _framerate</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">video_framerate_combobox</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">6</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="video_framerate_combobox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">12</property> + <signal name="changed" handler="on_video_framerate_combobox_changed" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">6</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Video si_ze</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">video_size_combobox</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">7</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="video_size_combobox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <signal name="changed" handler="on_video_size_combobox_changed" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">7</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="video_see_self_checkbutton"> + <property name="label" translatable="yes">Vi_ew own video source</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">start</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_video_see_self_checkbutton_toggled" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">8</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Connection</property> + <property name="use_markup">True</property> + <style> + <class name="bold"/> + <class name="margin-top6"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">9</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="stun_checkbutton"> + <property name="label" translatable="yes">STU_N server</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">end</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_stun_checkbutton_toggled" swapped="no"/> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">10</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="stun_server_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip_text" translatable="yes">STUN server hostname. If no hostname was given, Gajim will try to discover one from the server. (Example: stun.iptel.org)</property> - <property name="invisible_char">●</property> - <signal name="changed" handler="stun_server_entry_changed" swapped="no"/> + <property name="invisible_char">●</property> + <signal name="changed" handler="stun_server_entry_changed" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">10</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">10</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> </object> ===================================== gajim/gtk/preferences.py ===================================== @@ -13,6 +13,7 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. import logging +import os from gi.repository import GLib from gi.repository import Gtk @@ -358,7 +359,17 @@ class Preferences(Gtk.ApplicationWindow): if config == value: combobox.set_active(index) + if os.name == 'nt': + self._ui.av_dependencies_label.set_text( + _('Feature not available under Windows')) + else: + self._ui.av_dependencies_label.set_text( + _('Missing dependencies for Audio/Video')) + if app.is_installed('AV'): + self._ui.av_dependencies_infobar.set_no_show_all(True) + self._ui.av_dependencies_infobar.hide() + create_av_combobox('audio_input', AudioInputManager().get_devices()) create_av_combobox('audio_output', AudioOutputManager().get_devices()) create_av_combobox('video_input', VideoInputManager().get_devices()) @@ -961,6 +972,9 @@ class Preferences(Gtk.ApplicationWindow): self.on_checkbutton_toggled(widget, 'use_transports_iconsets') ### Audio/Video tab ### + def _on_features_button_clicked(self, _button): + open_window('Features') + def on_av_combobox_changed(self, combobox, config_name): model = combobox.get_model() active = combobox.get_active() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1bc90e224d63a0d8926fb4753a9a5e07… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1bc90e224d63a0d8926fb4753a9a5e07… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Features: Add gsound and geoclue detection
by Philipp Hörist 19 Mar '20

19 Mar '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 432f6d6b by Daniel Brötzmann at 2020-03-19T20:44:40+01:00 Features: Add gsound and geoclue detection - - - - - fab86bfc by Daniel Brötzmann at 2020-03-19T20:44:40+01:00 FeaturesDialog: Convert to Gtk.ApplicationWindow - - - - - 4 changed files: - gajim/app_actions.py - gajim/data/style/gajim.css - gajim/gtk/const.py - gajim/gtk/features.py Changes: ===================================== gajim/app_actions.py ===================================== @@ -27,7 +27,6 @@ from gajim.gtk.dialogs import ShortcutsWindow from gajim.gtk.single_message import SingleMessageWindow from gajim.gtk.about import AboutDialog from gajim.gtk.privacy_list import PrivacyListsWindow -from gajim.gtk.features import FeaturesDialog from gajim.gtk.history import HistoryWindow from gajim.gtk.discovery import ServiceDiscoveryWindow from gajim.gtk.util import open_window @@ -231,7 +230,7 @@ def on_keyboard_shortcuts(_action, _param): def on_features(_action, _param): - FeaturesDialog() + open_window('Features') def on_about(_action, _param): ===================================== gajim/data/style/gajim.css ===================================== @@ -63,6 +63,7 @@ popover#EmoticonPopover { padding: 5px; background-color: @theme_unfocused_base_ #ServerInfo > row.activatable:active { box-shadow: none; } /* Features Info */ +#FeaturesInfoGrid { padding: 6px; } #FeaturesInfoGrid > list { border: 1px solid; border-color: @borders; } #FeaturesInfoGrid > list > row:first-child { border-top: 1px solid; border-color: @borders; } #FeaturesInfoGrid > list > row { padding: 10px 20px 10px 10px; } ===================================== gajim/gtk/const.py ===================================== @@ -132,4 +132,5 @@ WINDOW_MODULES = { 'RemoveAccount': 'gajim.gtk.remove_account', 'ChangePassword': 'gajim.gtk.change_password', 'PluginsWindow': 'gajim.plugins.gui', + 'Features': 'gajim.gtk.features', } ===================================== gajim/gtk/features.py ===================================== @@ -20,23 +20,27 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. import os +import sys from collections import namedtuple import gi from gi.repository import Gtk +from gi.repository import Gdk from gajim.common import app from gajim.common.i18n import _ -class FeaturesDialog(Gtk.Dialog): +class Features(Gtk.ApplicationWindow): def __init__(self): - super().__init__(title=_('Features'), - transient_for=None, - destroy_with_parent=True) - - self.set_transient_for(app.interface.roster.window) + Gtk.ApplicationWindow.__init__(self) + self.set_application(app.app) + self.set_position(Gtk.WindowPosition.CENTER) + self.set_show_menubar(False) + self.set_name('Features') + self.set_title(_('Features')) self.set_resizable(False) + self.set_transient_for(app.interface.roster.window) grid = Gtk.Grid() grid.set_name('FeaturesInfoGrid') @@ -45,24 +49,25 @@ class FeaturesDialog(Gtk.Dialog): self.feature_listbox = Gtk.ListBox() self.feature_listbox.set_selection_mode(Gtk.SelectionMode.NONE) - self.feature_listbox.set_header_func(self.header_func, _('Features')) + self.feature_listbox.set_header_func(self._header_func, _('Features')) grid.attach(self.feature_listbox, 0, 0, 1, 1) - box = self.get_content_area() + box = Gtk.Box() box.pack_start(grid, True, True, 0) box.set_property('margin', 12) box.set_spacing(18) + self.add(box) - self.connect('response', self.on_response) + self.connect('key-press-event', self._on_key_press) - for feature in self.get_features(): - self.add_feature(feature) + for feature in self._get_features(): + self._add_feature(feature) self.show_all() @staticmethod - def header_func(row, before, user_data): + def _header_func(row, before, user_data): if before: row.set_header(None) else: @@ -70,20 +75,23 @@ class FeaturesDialog(Gtk.Dialog): label.set_halign(Gtk.Align.START) row.set_header(label) - def on_response(self, _dialog, response): - if response == Gtk.ResponseType.OK: + def _on_key_press(self, _widget, event): + if event.keyval == Gdk.KEY_Escape: self.destroy() - def add_feature(self, feature): + def _add_feature(self, feature): item = FeatureItem(feature) self.feature_listbox.add(item) item.get_parent().set_tooltip_text(item.tooltip) - def get_features(self): + def _get_features(self): Feature = namedtuple('Feature', ['name', 'available', 'tooltip', 'dependency_u', 'dependency_w', 'enabled']) + notification_sounds_available = ( + app.is_installed('GSOUND') or sys.platform in ('win32', 'darwin')) + notification_sounds_enabled = app.config.get('sounds_on') spell_check_enabled = app.config.get('use_speller') auto_status = [app.config.get('autoaway'), app.config.get('autoxa')] @@ -98,7 +106,7 @@ class FeaturesDialog(Gtk.Dialog): _('Feature not available under Windows'), None), Feature(_('Automatic Status'), - self.idle_available(), + self._idle_available(), _('Enables Gajim to measure your computer\'s idle time in ' 'order to set your Status automatically'), _('Requires: libxss'), @@ -112,8 +120,21 @@ class FeaturesDialog(Gtk.Dialog): _('Requires: pybonjour and bonjour SDK running (%(url)s)') % {'url': 'https://developer.apple.com/opensource/)'}, None), + Feature(_('Location detection'), + app.is_installed('GEOCLUE'), + _('Enables Gajim to be location-aware, if the user decides ' + 'to publish the device’s location'), + _('Requires: geoclue'), + _('Feature is not available under Windows'), + None), + Feature(_('Notification Sounds'), + notification_sounds_available, + _('Enables Gajim to play sounds for various notifications'), + _('Requires: gsound'), + _('No additional requirements'), + notification_sounds_enabled), Feature(_('Secure Password Storage'), - self.some_keyring_available(), + self._some_keyring_available(), _('Enables Gajim to store Passwords securely instead of ' 'storing them in plaintext'), _('Requires: libsecret and a provider (such as GNOME ' @@ -138,7 +159,7 @@ class FeaturesDialog(Gtk.Dialog): ] @staticmethod - def some_keyring_available(): + def _some_keyring_available(): if os.name == 'nt': return True try: @@ -149,7 +170,7 @@ class FeaturesDialog(Gtk.Dialog): return True @staticmethod - def idle_available(): + def _idle_available(): from gajim.common import idle return idle.Monitor.is_available() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ad3e2103a8c3e6fd8e2e0270b676200… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ad3e2103a8c3e6fd8e2e0270b676200… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Fix pylint error
by Philipp Hörist 19 Mar '20

19 Mar '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 21a9088e by lovetox at 2020-03-19T20:25:42+01:00 Fix pylint error - - - - - ad3e2103 by lovetox at 2020-03-19T20:25:55+01:00 Refactor A/V dependency imports - - - - - 9 changed files: - gajim/common/app.py - gajim/common/helpers.py - gajim/common/jingle_rtp.py - gajim/common/modules/jingle.py - gajim/common/multimedia_helpers.py - gajim/dev/ipython_view.py - gajim/gtk/features.py - gajim/gtk/gstreamer.py - gajim/gtk/preferences.py Changes: ===================================== gajim/common/app.py ===================================== @@ -198,6 +198,8 @@ _dependencies = { 'AVAHI': False, 'PYBONJOUR': False, 'FARSTREAM': False, + 'GST': False, + 'AV': False, 'GEOCLUE': False, 'UPNP': False, 'PYCURL': False, @@ -248,28 +250,28 @@ def detect_dependencies(): except Exception: pass - # FARSTREAM try: - if os.name == 'nt': - root_path = Path(sys.executable).parents[1] - fs_plugin_path = str(root_path / 'lib' / 'farstream-0.2') - gst_plugin_path = str(root_path / 'lib' / 'gstreamer-1.0') - os.environ['FS_PLUGIN_PATH'] = fs_plugin_path - os.environ['GST_PLUGIN_PATH'] = gst_plugin_path - gi.require_version('Farstream', '0.2') - from gi.repository import Farstream gi.require_version('Gst', '1.0') from gi.repository import Gst - try: - Gst.init(None) - conference = Gst.ElementFactory.make('fsrtpconference', None) - conference.new_session(Farstream.MediaType.AUDIO) - except Exception as error: - log('gajim').info(error) + _dependencies['GST'] = True + except Exception: + pass + + try: + gi.require_version('Farstream', '0.2') + from gi.repository import Farstream _dependencies['FARSTREAM'] = True - except (ImportError, ValueError): + except Exception: pass + try: + Gst.init(None) + conference = Gst.ElementFactory.make('fsrtpconference', None) + conference.new_session(Farstream.MediaType.AUDIO) + _dependencies['AV'] = True + except Exception as error: + log('gajim').info(error) + # GEOCLUE try: gi.require_version('Geoclue', '2.0') ===================================== gajim/common/helpers.py ===================================== @@ -1048,7 +1048,7 @@ def update_optional_features(account=None): features.append(nbxmpp.NS_BOOKMARKS_2 + '+notify') elif app.connections[account_].get_module('Bookmarks').using_bookmark_1: features.append(nbxmpp.NS_BOOKMARKS + '+notify') - if app.is_installed('FARSTREAM'): + if app.is_installed('AV'): features.append(nbxmpp.NS_JINGLE_RTP) features.append(nbxmpp.NS_JINGLE_RTP_AUDIO) features.append(nbxmpp.NS_JINGLE_RTP_VIDEO) ===================================== gajim/common/jingle_rtp.py ===================================== @@ -21,10 +21,15 @@ import socket from collections import deque import nbxmpp -from gi.repository import Farstream -from gi.repository import Gst + from gi.repository import GLib +try: + from gi.repository import Farstream + from gi.repository import Gst +except Exception: + pass + from gajim.common import app from gajim.common.i18n import _ from gajim.common.jingle_transport import JingleTransportICEUDP ===================================== gajim/common/modules/jingle.py ===================================== @@ -43,8 +43,7 @@ from gajim.common.jingle_session import JingleStates from gajim.common.jingle_ft import JingleFileTransfer from gajim.common.jingle_transport import JingleTransportSocks5 from gajim.common.jingle_transport import JingleTransportIBB -if app.is_installed('FARSTREAM'): - from gajim.common.jingle_rtp import JingleAudio, JingleVideo +from gajim.common.jingle_rtp import JingleAudio, JingleVideo logger = logging.getLogger('gajim.c.m.jingle') ===================================== gajim/common/multimedia_helpers.py ===================================== @@ -16,11 +16,12 @@ import logging -import gi -gi.require_version('Gst', '1.0') -from gi.repository import Gst # pylint: disable=wrong-import-position +try: + from gi.repository import Gst +except Exception: + pass -from gajim.common.i18n import _ # pylint: disable=wrong-import-position +from gajim.common.i18n import _ log = logging.getLogger('gajim.c.multimedia_helpers') ===================================== gajim/dev/ipython_view.py ===================================== @@ -69,13 +69,12 @@ from gi.repository import GObject from gi.repository import GLib from gi.repository import Pango -import IPython - from pygments.token import Token -# pylint: disable=ungrouped-imports + +import IPython from IPython.core.displayhook import DisplayHook from IPython.core.display_trap import DisplayTrap -# pylint: enable=ungrouped-imports + class MyPromptDisplayHook(DisplayHook): ===================================== gajim/gtk/features.py ===================================== @@ -91,7 +91,7 @@ class FeaturesDialog(Gtk.Dialog): return [ Feature(_('Audio / Video'), - app.is_installed('FARSTREAM'), + app.is_installed('AV'), _('Enables Gajim to provide Audio and Video chats'), _('Requires: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, ' 'gstreamer1.0-libav, gstreamer1.0-plugins-ugly'), ===================================== gajim/gtk/gstreamer.py ===================================== @@ -1,9 +1,17 @@ from typing import Tuple, Optional -from gi.repository import Gst from gi.repository import Gtk -def create_gtk_widget() -> Tuple[Optional[Gst.Element], Optional[Gtk.Widget], Optional[str]]: +try: + from gi.repository import Gst +except Exception: + pass + + +def create_gtk_widget() -> Tuple[Optional[Gst.Element], + Optional[Gtk.Widget], + Optional[str]]: + gtkglsink = Gst.ElementFactory.make('gtkglsink', None) if gtkglsink is not None: glsinkbin = Gst.ElementFactory.make('glsinkbin', None) ===================================== gajim/gtk/preferences.py ===================================== @@ -19,6 +19,11 @@ from gi.repository import Gtk from gi.repository import Gdk from gi.repository import Pango +try: + from gi.repository import Gst +except Exception: + pass + from gajim.common import app from gajim.common import configpaths from gajim.common import helpers @@ -28,6 +33,9 @@ from gajim.common.nec import NetworkEvent from gajim.common.i18n import _ from gajim.common.i18n import ngettext from gajim.common.helpers import open_file +from gajim.common.multimedia_helpers import AudioInputManager +from gajim.common.multimedia_helpers import AudioOutputManager +from gajim.common.multimedia_helpers import VideoInputManager from gajim.chat_control_base import ChatControlBase @@ -40,14 +48,6 @@ from gajim.gtk.sounds import ManageSounds from gajim.gtk.const import ControlType from gajim.gtk import gstreamer -try: - from gajim.common.multimedia_helpers import AudioInputManager, AudioOutputManager - from gajim.common.multimedia_helpers import VideoInputManager - from gi.repository import Gst # pylint: disable=ungrouped-imports - HAS_GST = True -except (ImportError, ValueError): - HAS_GST = False - if app.is_installed('GSPELL'): from gi.repository import Gspell # pylint: disable=ungrouped-imports @@ -358,7 +358,7 @@ class Preferences(Gtk.ApplicationWindow): if config == value: combobox.set_active(index) - if HAS_GST and app.is_installed('FARSTREAM'): + if app.is_installed('AV'): create_av_combobox('audio_input', AudioInputManager().get_devices()) create_av_combobox('audio_output', AudioOutputManager().get_devices()) create_av_combobox('video_input', VideoInputManager().get_devices()) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ff739a0ca05f76db620ee452c01957a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ff739a0ca05f76db620ee452c01957a… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits