Commits September 2019

commits@gajim.org

1 participants
59 discussions

[Git][gajim/gajim][chat_markers] Revert "Remove chat marker from modules"
by Yann Leboulanger 29 Sep '19

29 Sep '19

Yann Leboulanger pushed to branch chat_markers at gajim / gajim Commits: d6f64b8e by Yann Leboulanger at 2019-09-29T19:47:38Z Revert "Remove chat marker from modules" This reverts commit f5377d98af23483244d71196a8e5cfab96111118. - - - - - 1 changed file: - gajim/common/modules/__init__.py Changes: ===================================== gajim/common/modules/__init__.py ===================================== @@ -40,6 +40,7 @@ MODULES = [ 'bookmarks', 'caps', 'carbons', + 'chat_markers', 'chatstates', 'delimiter', 'discovery', View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d6f64b8ee9ed598a6eb3b552a816ad5685… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d6f64b8ee9ed598a6eb3b552a816ad5685… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][chat_markers] add missing chat_markers module
by Yann Leboulanger 29 Sep '19

29 Sep '19

Yann Leboulanger pushed to branch chat_markers at gajim / gajim Commits: a90aa9eb by Yann Leboulanger at 2019-09-29T19:46:28Z add missing chat_markers module - - - - - 1 changed file: - + gajim/common/modules/chat_markers.py Changes: ===================================== gajim/common/modules/chat_markers.py ===================================== @@ -0,0 +1,40 @@ +# 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/>. + +# Chat Markers (XEP-0333) +#TODO: add <thread> support + +import nbxmpp + +from gajim.common.modules.base import BaseModule + + +class ChatMarkers(BaseModule): + def __init__(self, con): + BaseModule.__init__(self, con) + + def send_marker(self, jid, marker, id_, is_gc): + if is_gc: + message = nbxmpp.Message(to=jid, typ='groupchat') + else: + message = nbxmpp.Message(to=jid, typ='chat') + message.setTag(marker, namespace=nbxmpp.NS_CHATMARKERS, + attrs={'id': id_}) + self._nbxmpp().send(message) + + def send_displayed_marker(self, jid, id_, is_gc): + self.send_marker(jid, 'displayed', id_, is_gc) + +def get_instance(*args, **kwargs): + return ChatMarkers(*args, **kwargs), 'ChatMarkers' View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a90aa9eba7af2a7eb19f56237b669e60bb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a90aa9eba7af2a7eb19f56237b669e60bb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] XML Console: Make accounts selectable
by Philipp Hörist 29 Sep '19

29 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0cba9f53 by Daniel Brötzmann at 2019-09-29T19:42:30Z XML Console: Make accounts selectable - - - - - 6 changed files: - gajim/app_actions.py - gajim/application.py - gajim/data/gui/application_menu.ui - gajim/data/gui/xml_console_window.ui → gajim/data/gui/xml_console.ui - gajim/gtk/xml_console.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/app_actions.py ===================================== @@ -249,12 +249,8 @@ def on_server_info(action, param): def on_xml_console(action, param): - account = param.get_string() - window = app.get_app_window(XMLConsoleWindow, account) - if window is None: - XMLConsoleWindow(account) - else: - window.present() + XMLConsoleWindow() + def on_manage_proxies(action, param): ===================================== gajim/application.py ===================================== @@ -431,6 +431,7 @@ class GajimApplication(Gtk.Application): ('history-manager', app_actions.on_history_manager), ('preferences', app_actions.on_preferences), ('plugins', app_actions.on_plugins), + ('xml-console', app_actions.on_xml_console), ('file-transfer', app_actions.on_file_transfers), ('history', app_actions.on_history), ('shortcuts', app_actions.on_keyboard_shortcuts), @@ -496,9 +497,7 @@ class GajimApplication(Gtk.Application): from gajim import app_actions as a if account == 'Local': - return [ - ('-xml-console', a.on_xml_console, 'always', 's') - ] + return [] return [ ('-bookmarks', a.on_bookmarks, 'online', 's'), @@ -507,7 +506,6 @@ class GajimApplication(Gtk.Application): ('-add-contact', a.on_add_contact, 'online', 'as'), ('-services', a.on_service_disco, 'online', 's'), ('-profile', a.on_profile, 'feature', 's'), - ('-xml-console', a.on_xml_console, 'always', 's'), ('-server-info', a.on_server_info, 'online', 's'), ('-archive', a.on_mam_preferences, 'feature', 's'), ('-pep-config', a.on_pep_config, 'online', 's'), ===================================== gajim/data/gui/application_menu.ui ===================================== @@ -28,6 +28,11 @@ </item> </section> <section> + <item> + <attribute name="label" translatable="yes">XML Console</attribute> + <attribute name="action">app.xml-console</attribute> + <attribute name="accel"><Primary><Shift>X</attribute> + </item> <item> <attribute name="label" translatable="yes">File Transfer</attribute> <attribute name="action">app.file-transfer</attribute> ===================================== gajim/data/gui/xml_console_window.ui → gajim/data/gui/xml_console.ui ===================================== @@ -75,16 +75,12 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="title" translatable="yes">XML Console</property> - <property name="has_subtitle">False</property> <property name="show_close_button">True</property> <child> - <object class="GtkSwitch"> + <object class="GtkImage"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="halign">start</property> - <property name="valign">center</property> - <property name="active">True</property> - <signal name="notify::active" handler="_on_enable" swapped="no"/> + <property name="can_focus">False</property> + <property name="icon_name">utilities-terminal-symbolic</property> </object> </child> </object> ===================================== gajim/gtk/xml_console.py ===================================== @@ -35,7 +35,7 @@ from gajim.gtk.const import SettingType class XMLConsoleWindow(Gtk.ApplicationWindow): - def __init__(self, account): + def __init__(self): Gtk.ApplicationWindow.__init__(self) self.set_application(app.app) self.set_position(Gtk.WindowPosition.CENTER) @@ -44,8 +44,7 @@ class XMLConsoleWindow(Gtk.ApplicationWindow): self.set_show_menubar(False) self.set_name('XMLConsoleWindow') - self.account = account - self.enabled = True + self.selected_account = None self.presence = True self.message = True self.iq = True @@ -55,24 +54,21 @@ class XMLConsoleWindow(Gtk.ApplicationWindow): self.filter_dialog = None self.last_stanza = None - self._ui = get_builder('xml_console_window.ui') - - jid = app.get_jid_from_account(account) + self._ui = get_builder('xml_console.ui') self.set_titlebar(self._ui.headerbar) - self._ui.headerbar.set_subtitle(jid) - + self._set_titlebar() self.add(self._ui.box) self._ui.paned.set_position(self._ui.paned.get_property('max-position')) button = get_image_button( - 'edit-clear-all-symbolic', _('Clear')) - button.connect('clicked', self._on_clear) + 'applications-system-symbolic', _('Filter')) + button.connect('clicked', self._on_filter_options) self._ui.actionbar.pack_start(button) button = get_image_button( - 'applications-system-symbolic', _('Filter')) - button.connect('clicked', self._on_filter_options) + 'edit-clear-symbolic', _('Clear')) + button.connect('clicked', self._on_clear) self._ui.actionbar.pack_start(button) button = get_image_button( @@ -84,7 +80,7 @@ class XMLConsoleWindow(Gtk.ApplicationWindow): button.connect('clicked', self._on_paste_last) self._ui.actionbar.pack_start(button) - button = get_image_button('mail-send-symbolic', _('Send')) + button = Gtk.Button.new_with_mnemonic(_('_Send')) button.connect('clicked', self._on_send) self._ui.actionbar.pack_end(button) @@ -105,6 +101,13 @@ class XMLConsoleWindow(Gtk.ApplicationWindow): app.ged.register_event_handler( 'stanza-sent', ged.GUI1, self._nec_stanza_sent) + def _set_titlebar(self): + if self.selected_account is None: + title = _('All Accounts') + else: + title = app.get_jid_from_account(self.selected_account) + self._ui.headerbar.set_subtitle(title) + def _create_tags(self): buffer_ = self._ui.textview.get_buffer() in_color = app.css_config.get_value( @@ -160,12 +163,12 @@ class XMLConsoleWindow(Gtk.ApplicationWindow): self._ui.input_entry.grab_focus() def _on_send(self, *args): - if not app.account_is_connected(self.account): + if not app.account_is_connected(self.selected_account): # If offline or connecting ErrorDialog( _('Connection not available'), _('Please make sure you are connected with \'%s\'.') % - self.account) + self.selected_account) return buffer_ = self._ui.input_entry.get_buffer() begin_iter, end_iter = buffer_.get_bounds() @@ -184,7 +187,7 @@ class XMLConsoleWindow(Gtk.ApplicationWindow): # stream management node = nbxmpp.Protocol(node=stanza, attrs={'xmlns': 'jabber:client'}) - app.connections[self.account].connection.send(node) + app.connections[self.selected_account].connection.send(node) self.last_stanza = stanza buffer_.set_text('') @@ -207,32 +210,46 @@ class XMLConsoleWindow(Gtk.ApplicationWindow): if self.filter_dialog: self.filter_dialog.present() return - options = [ + + # Get all accounts for settings combobox + accounts = app.get_accounts_sorted() + combo_accounts = [] + for account in accounts: + label = app.get_account_label(account) + combo_accounts.append((account, label)) + combo_accounts.insert(0, (None, _('All Accounts'))) + + settings = [ + Setting(SettingKind.COMBO, _('Account'), + SettingType.VALUE, self.selected_account, + callback=self._set_account, + props={'combo_items': combo_accounts}), + Setting(SettingKind.SWITCH, 'Presence', SettingType.VALUE, self.presence, - callback=self._on_option, data='presence'), + callback=self._on_setting, data='presence'), Setting(SettingKind.SWITCH, 'Message', SettingType.VALUE, self.message, - callback=self._on_option, data='message'), + callback=self._on_setting, data='message'), Setting(SettingKind.SWITCH, 'IQ', SettingType.VALUE, self.iq, - callback=self._on_option, data='iq'), + callback=self._on_setting, data='iq'), Setting(SettingKind.SWITCH, 'Stream Management', SettingType.VALUE, self.stream, - callback=self._on_option, data='stream'), + callback=self._on_setting, data='stream'), Setting(SettingKind.SWITCH, 'In', SettingType.VALUE, self.incoming, - callback=self._on_option, data='incoming'), + callback=self._on_setting, data='incoming'), Setting(SettingKind.SWITCH, 'Out', SettingType.VALUE, self.outgoing, - callback=self._on_option, data='outgoing'), + callback=self._on_setting, data='outgoing'), ] - self.filter_dialog = SettingsDialog(self, 'Filter', + self.filter_dialog = SettingsDialog(self, _('Filter'), Gtk.DialogFlags.DESTROY_WITH_PARENT, - options, self.account) + settings, self.selected_account) self.filter_dialog.connect('destroy', self._on_filter_destroyed) def _on_filter_destroyed(self, win): @@ -247,10 +264,11 @@ class XMLConsoleWindow(Gtk.ApplicationWindow): app.ged.remove_event_handler( 'stanza-sent', ged.GUI1, self._nec_stanza_sent) - def _on_enable(self, switch, param): - self.enabled = switch.get_active() + def _set_account(self, value, data): + self.selected_account = value + self._set_titlebar() - def _on_option(self, value, data): + def _on_setting(self, value, data): setattr(self, data, value) value = not value table = self._ui.textview.get_buffer().get_tag_table() @@ -263,19 +281,21 @@ class XMLConsoleWindow(Gtk.ApplicationWindow): tag.set_property('invisible', value) def _nec_stanza_received(self, obj): - if obj.conn.name != self.account: - return - self._print_stanza(obj.stanza_str, 'incoming') + if self.selected_account is not None: + if obj.conn.name != self.selected_account: + return + self._print_stanza(obj, 'incoming') def _nec_stanza_sent(self, obj): - if obj.conn.name != self.account: - return - self._print_stanza(obj.stanza_str, 'outgoing') + if self.selected_account is not None: + if obj.conn.name != self.selected_account: + return + self._print_stanza(obj, 'outgoing') - def _print_stanza(self, stanza, kind): + def _print_stanza(self, obj, kind): + account = app.get_jid_from_account(obj.conn.name) + stanza = obj.stanza_str # Kind must be 'incoming' or 'outgoing' - if not self.enabled: - return if not stanza: return @@ -294,9 +314,10 @@ class XMLConsoleWindow(Gtk.ApplicationWindow): elif stanza.startswith('<r') or stanza.startswith('<a'): type_ = 'stream' - stanza = '\n{stanza}\n\n'.format( + stanza = '\n{stanza}\n\n'.format( kind=kind.capitalize(), time=time.strftime('%c'), + account=account, stanza=stanza.replace('><', '>\n<')) buffer_.insert_with_tags_by_name(end_iter, stanza, type_, kind) ===================================== gajim/gui_menu_builder.py ===================================== @@ -678,8 +678,6 @@ def get_account_menu(account): ('-pep-config', _('PEP Configuration')), ('-sync-history', _('Synchronise History')), ('-privacylists', _('Privacy Lists')), - - ('-xml-console', _('XML Console')) ]), (_('Admin'), [ ('-send-server-message', _('Send Server Message…')), @@ -689,10 +687,6 @@ def get_account_menu(account): ]), ] - zeroconf_menu = [ - ('-xml-console', _('XML Console')), - ] - def build_menu(preset): menu = Gio.Menu() for item in preset: @@ -713,8 +707,6 @@ def get_account_menu(account): menu.append_submenu(label, submenu) return menu - if account == 'Local': - return build_menu(zeroconf_menu) return build_menu(account_menu) @@ -741,8 +733,9 @@ def build_accounts_menu(): acc_menu.append_item(modify_account_item) for acc in accounts_list: label = escape_mnemonic(app.get_account_label(acc)) - acc_menu.append_submenu( - label, get_account_menu(acc)) + if acc != 'Local': + acc_menu.append_submenu( + label, get_account_menu(acc)) else: acc_menu = get_account_menu(accounts_list[0]) modify_account_item = Gio.MenuItem.new(_('_Modify Account…'), View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0cba9f536ef81263362f3bf5b520851d30… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0cba9f536ef81263362f3bf5b520851d30… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Deleted branch normal_control
by Philipp Hörist 29 Sep '19

29 Sep '19

Philipp Hörist deleted branch normal_control at gajim / gajim -- You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Deleted branch splash_screen
by Philipp Hörist 29 Sep '19

29 Sep '19

Philipp Hörist deleted branch splash_screen at gajim / gajim -- You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Deleted branch osx_newbuildsys
by Philipp Hörist 29 Sep '19

29 Sep '19

Philipp Hörist deleted branch osx_newbuildsys at gajim / gajim -- You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][chat_markers] Remove chat marker from modules
by Philipp Hörist 29 Sep '19

29 Sep '19

Philipp Hörist pushed to branch chat_markers at gajim / gajim Commits: f5377d98 by Philipp Hörist at 2019-09-29T19:07:51Z Remove chat marker from modules - - - - - 1 changed file: - gajim/common/modules/__init__.py Changes: ===================================== gajim/common/modules/__init__.py ===================================== @@ -40,7 +40,6 @@ MODULES = [ 'bookmarks', 'caps', 'carbons', - 'chat_markers', 'chatstates', 'delimiter', 'discovery', View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f5377d98af23483244d71196a8e5cfab96… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f5377d98af23483244d71196a8e5cfab96… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][chat_markers] 68 commits: DialogButton: Add Accept button type
by Philipp Hörist 29 Sep '19

29 Sep '19

Philipp Hörist pushed to branch chat_markers at gajim / gajim Commits: ee7ad12f by Daniel Brötzmann at 2019-09-02T15:25:57Z DialogButton: Add Accept button type - - - - - 1044d1c7 by Philipp Hörist at 2019-09-02T19:55:01Z Improve default avatar caching Caches now also the circle clipping - - - - - 032930ce by Philipp Hörist at 2019-09-03T20:47:30Z Avatar: Add indicator for show value - - - - - 279143f8 by Philipp Hörist at 2019-09-03T20:50:27Z StartChat: Display show value with avatar - - - - - d15ec5e7 by Philipp Hörist at 2019-09-03T20:50:31Z ChatControl: Display show value with avatar - - - - - c51e8498 by Philipp Hörist at 2019-09-03T22:53:10Z PrivateChatControl: Display show value with avatar - - - - - 2745d3ce by Philipp Hörist at 2019-09-04T16:50:26Z Use cross-platform compatible cursors see: https://lazka.github.io/pgi-docs/Gdk-3.0/classes/Cursor.html#Gdk.Cursor.new… Fixes #9800 - - - - - 0927655c by Philipp Hörist at 2019-09-04T16:51:13Z Remove unused import - - - - - 18070f59 by Philipp Hörist at 2019-09-04T18:29:28Z Avatar: Make show indicator smaller - - - - - 0a3bd34e by Daniel Brötzmann at 2019-09-05T19:33:28Z Replace PlainConnectionDialog with NewConfirmationCheckDialog - - - - - 911aaa1f by Daniel Brötzmann at 2019-09-05T19:34:05Z Remove PlainConnectionDialog - - - - - 2257da6c by Daniel Brötzmann at 2019-09-05T21:02:00Z CommandSystem: Add setting to disable execution of commands by default - - - - - 9f59eb54 by Daniel Brötzmann at 2019-09-05T21:02:00Z CommandSystem: Fix some pylint errors - - - - - 45a200f7 by Philipp Hörist at 2019-09-06T20:23:28Z Remove menu for saving avatar to harddisk All avatars are available under ~/.cache/gajim/avatars - - - - - ea251998 by Philipp Hörist at 2019-09-06T20:23:28Z Avatar: Force avatars to be square - - - - - 5623dfba by Philipp Hörist at 2019-09-06T20:23:28Z Avatar: Remove unused method - - - - - a27a4003 by Daniel Brötzmann at 2019-09-07T15:09:32Z Use Accept (and make it the default) for image pasting - - - - - d47bee03 by Daniel Brötzmann at 2019-09-07T15:10:23Z Use Accept default button, adapt some text strings - - - - - 07bb750d by Daniel Brötzmann at 2019-09-09T12:35:06Z Fix handle_event_http_auth answers from NewConfirmationDialog - - - - - ac428f11 by Daniel Brötzmann at 2019-09-11T05:02:45Z Rework SSLErrorDialog - - - - - ed80f936 by Daniel Brötzmann at 2019-09-11T09:11:27Z Remove obsolete ConfirmationDialogDoubleCheck - - - - - 16046d7e by Andrey Gursky at 2019-09-11T15:17:47Z ChatControlBase: fix autoscroll on keyboard shortcuts The issue reported by concerto [1] is a regression since af312830ef42fdb7. [1] https://conference.gajim.org:5281/muc_log/gajim/2019-09-10#df591057-8693-4e… - - - - - 890846fc by Philipp Hörist at 2019-09-12T18:50:24Z Show SSLError dialog for all errors Fixes #9835 - - - - - c4a4f60f by Philipp Hörist at 2019-09-15T20:13:42Z GroupChat: Use correct key when formatting message - - - - - 92d127ae by Philipp Hörist at 2019-09-16T19:37:30Z AddContact: Handle only bare JIDs - - - - - 2c4f4d1e by Philipp Hörist at 2019-09-16T19:41:21Z AddContact: Set info button sensitive if JID is passed - - - - - a1c352f2 by Philipp Hörist at 2019-09-17T18:03:16Z XMLConsole: Inject jabber:client into message, presence and iq - - - - - fee45899 by Philipp Hörist at 2019-09-21T11:02:11Z Remove unused glade file - - - - - 642638be by Philipp Hörist at 2019-09-21T11:03:09Z Make GCTooltip destructable - - - - - 7f5a6d0a by Philipp Hörist at 2019-09-21T21:57:33Z Change some MUC helper methods - Add plural support for get_uf_affiliation() - Accept nbxmpp.Role and nbxmpp.Affiliation as arguments - Add is_affiliation_change_allowed() - Add is_role_change_allowed() - - - - - 921594c1 by Philipp Hörist at 2019-09-21T21:59:47Z Rework Groupchat Roster - Add own module for roster code - Use avatars with status integrated - Favor performance over features - - - - - e1cdd603 by Philipp Hörist at 2019-09-22T07:29:36Z MUC: Improve change affiliation logic - - - - - 933702df by Philipp Hörist at 2019-09-22T08:22:52Z MUC: Show Make/Revoke Member menu entry correctly - - - - - dcbd5f9c by Philipp Hörist at 2019-09-22T08:31:49Z Remove unused import - - - - - 837e9a1a by Philipp Hörist at 2019-09-22T09:35:22Z Icons: Add 32 px feather icons for HiDPI Screens - - - - - c230f5c4 by Philipp Hörist at 2019-09-22T16:43:17Z Consider private variables for @event_filter - - - - - 94b058cd by Philipp Hörist at 2019-09-22T16:59:32Z Add account-disconnected event This is a dedicated event so we dont have to use the our-show event - - - - - 44e6b0f0 by Philipp Hörist at 2019-09-22T19:58:58Z MUC: Refactor auto-rejoin - Rewrite auto-rejoin code and move it into muc module - - - - - 9922ce1d by Philipp Hörist at 2019-09-23T15:16:23Z Groupchat: Remove traces of continued conversations - - - - - ca328a67 by Philipp Hörist at 2019-09-23T15:20:19Z Groupchat: Remove unused argument - - - - - 19e862c2 by Philipp Hörist at 2019-09-23T18:17:46Z Update pylint-ci.sh - - - - - 1e37087a by Philipp Hörist at 2019-09-23T19:16:49Z Update pylint-ci.sh - - - - - 1d4f0a58 by Philipp Hörist at 2019-09-23T19:36:15Z Update gitlab-ci.yml - - - - - a01c130a by Philipp Hörist at 2019-09-23T20:23:36Z CI: Disable pylint E1136 for now This reports a false positiv, see https://gitlab.gnome.org/GNOME/pygobject/issues/361 - - - - - 40ea0c9d by Philipp Hörist at 2019-09-23T20:34:03Z CI: Disable pylint E1133 for now see https://gitlab.gnome.org/GNOME/pygobject/issues/361 - - - - - 3647524a by Philipp Hörist at 2019-09-24T16:31:58Z Presence: Dont show SubscriptionRequestWindow on auto approve - - - - - 3de999d9 by Daniel Brötzmann at 2019-09-25T16:32:05Z Fix show_unsubscribed_dialog - - - - - 3d381a98 by Philipp Hörist at 2019-09-28T23:16:57Z Add Bookmarks 2 (XEP-0402) support - - - - - 0c84072e by Philipp Hörist at 2019-09-28T23:33:52Z Bookmarks: Register event handler correctly - - - - - 8936a07e by Daniel Brötzmann at 2019-09-29T00:31:30Z ServerInfo: Rework Dialog - Split information into different notebook tabs - Show connection information (Fixes #6096) - - - - - 1f663a24 by Philipp Hörist at 2019-09-29T08:35:03Z Remove unused function - - - - - f5244e37 by Philipp Hörist at 2019-09-29T11:20:16Z Bookmarks: Don't accept PEP notificiations before request - - - - - a934551c by Philipp Hörist at 2019-09-29T11:32:03Z Bookmarks: Add dev config setting for testing bookmarks 2 - - - - - 56e3a0bc by Philipp Hörist at 2019-09-29T12:44:45Z MUC: Move muc state code into MUCManager - - - - - 61fce039 by Philipp Hörist at 2019-09-29T12:46:41Z Remove unused attributes - - - - - bcd15212 by Philipp Hörist at 2019-09-29T12:57:44Z Groupchat: Fix hide_groupchat_banner option - - - - - 52ccca95 by Philipp Hörist at 2019-09-29T13:46:35Z ChatControl: Move set_lock_image to ChatControlBase - - - - - 687d0fda by Philipp Hörist at 2019-09-29T14:53:02Z ChatControl: Access attributes on GtkBuilder directly - - - - - a4c82784 by Philipp Hörist at 2019-09-29T15:03:39Z ChatControl: Remove usage of widget_set_visible() - - - - - 5324291c by Philipp Hörist at 2019-09-29T15:03:56Z Remove unused method - - - - - 7cadbc69 by Philipp Hörist at 2019-09-29T15:37:47Z Groupchat: Fix various pylint errors - - - - - 9403eaba by Philipp Hörist at 2019-09-29T15:59:33Z Modules: Fix various pylint errors - - - - - 18583623 by Philipp Hörist at 2019-09-29T16:11:28Z DBus: Fix various pylint errors - - - - - f70365da by Philipp Hörist at 2019-09-29T16:19:47Z Jingle: Fix undefined variable - - - - - 97625a72 by Link Mauve at 2019-09-29T18:28:52Z Preferences: Add a video preview widget In order to work on every system Gajim runs on (instead of only X11), this new widget uses GTK+ Gstreamer elements. It currently completely breaks the actual Jingle thing, but that was already pretty broken so will be fixed in a later commit. It might be nice to think about the way we want to make preferences interact with a currently-running audio/video session, since it currently uses a separate pipeline and thus will conflict when e.g. both will want to access the same camera device, if the OS doesn’t implement multiplexing (Linux doesn’t). - - - - - 3b1f1cd5 by Philipp Hörist at 2019-09-29T18:45:31Z Groupchat: Fix tab completion - - - - - e5347232 by Yann Leboulanger at 2019-09-29T18:59:13Z start implementing XEP-0333, chat markers - - - - - d8887381 by Yann Leboulanger at 2019-09-29T18:59:13Z fix error - - - - - 30 changed files: - .gitlab-ci.yml - gajim/app_actions.py - gajim/chat_control.py - gajim/chat_control_base.py - gajim/command_system/errors.py - gajim/command_system/framework.py - gajim/command_system/implementation/custom.py - gajim/command_system/implementation/execute.py - gajim/command_system/implementation/hosts.py - gajim/command_system/implementation/middleware.py - gajim/command_system/implementation/standard.py - gajim/command_system/mapping.py - gajim/command_system/tools.py - gajim/common/app.py - gajim/common/config.py - gajim/common/connection.py - gajim/common/contacts.py - gajim/common/dbus/location.py - gajim/common/dbus/logind.py - gajim/common/dbus/music_track.py - gajim/common/dbus/screensaver.py - gajim/common/events.py - gajim/common/helpers.py - gajim/common/modules/__init__.py - gajim/common/modules/adhoc_commands.py - gajim/common/modules/base.py - gajim/common/modules/bits_of_binary.py - gajim/common/modules/bookmarks.py - gajim/common/modules/chatstates.py - gajim/common/modules/discovery.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b22005a86aabbc404f2670fc90997c582… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b22005a86aabbc404f2670fc90997c582… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Groupchat: Fix tab completion
by Philipp Hörist 29 Sep '19

29 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3b1f1cd5 by Philipp Hörist at 2019-09-29T18:45:31Z Groupchat: Fix tab completion - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== @@ -1769,7 +1769,7 @@ class GroupchatControl(ChatControlBase): if res: return True - if event.keyval != Gdk.KEY_Tab: # TAB + if event.keyval == Gdk.KEY_Tab: # TAB message_buffer = widget.get_buffer() start_iter, end_iter = message_buffer.get_bounds() cursor_position = message_buffer.get_insert() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3b1f1cd51ecb5cd165956cf7dfce5141d4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3b1f1cd51ecb5cd165956cf7dfce5141d4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Preferences: Add a video preview widget
by Philipp Hörist 29 Sep '19

29 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 97625a72 by Link Mauve at 2019-09-29T18:28:52Z Preferences: Add a video preview widget In order to work on every system Gajim runs on (instead of only X11), this new widget uses GTK+ Gstreamer elements. It currently completely breaks the actual Jingle thing, but that was already pretty broken so will be fixed in a later commit. It might be nice to think about the way we want to make preferences interact with a currently-running audio/video session, since it currently uses a separate pipeline and thus will conflict when e.g. both will want to access the same camera device, if the OS doesn’t implement multiplexing (Linux doesn’t). - - - - - 4 changed files: - gajim/common/config.py - gajim/common/multimedia_helpers.py - gajim/data/gui/preferences_window.ui - gajim/gtk/preferences.py Changes: ===================================== gajim/common/config.py ===================================== @@ -257,7 +257,6 @@ class Config: 'audio_input_device': [opt_str, 'autoaudiosrc ! volume name=gajim_vol'], 'audio_output_device': [opt_str, 'autoaudiosink'], 'video_input_device': [opt_str, 'autovideosrc'], - 'video_output_device': [opt_str, 'autovideosink'], 'video_framerate': [opt_str, '', _('Optionally fix Jingle output video framerate. Example: 10/1 or 25/2.')], 'video_size': [opt_str, '', _('Optionally resize Jingle output video. Example: 320x240.')], 'video_see_self': [opt_bool, True, _('If enabled, you will see your webcam\'s video stream as well.')], ===================================== gajim/common/multimedia_helpers.py ===================================== @@ -97,24 +97,16 @@ class VideoInputManager(DeviceManager): self.devices = {} # Test src self.detect_element('videotestsrc', _('Video test'), - '%s is-live=true ! video/x-raw,framerate=10/1') + '%s is-live=true ! video/x-raw,framerate=10/1 ! videoconvert') # Auto src self.detect_element('autovideosrc', _('Autodetect')) - # V4L2 src + # Best source on Linux, for both camera and screen sharing + self.detect_element('pipewiresrc', _('Pipewire')) + # Camera source on Linux self.detect_element('v4l2src', _('V4L2: %s')) - # Funny things, just to test... - # self.devices['GOOM'] = 'audiotestsrc ! goom' - self.detect_element('ximagesrc', _('Screen'), '%s ! ffmpegcolorspace') - - -class VideoOutputManager(DeviceManager): - def detect(self): - self.devices = {} - # Fake video output - self.detect_element('fakesink', _('Fake video output')) - # Auto sink - self.detect_element('xvimagesink', - _('X Window System (X11/XShm/Xv): %s')) - # ximagesink - self.detect_element('ximagesink', _('X Window System (without Xv)')) - self.detect_element('autovideosink', _('Autodetect')) + # X11 screen sharing on Linux + self.detect_element('ximagesrc', _('X11'), '%s ! ffmpegcolorspace') + # Recommended source on Windows + self.detect_element('ksvideosrc', _('Windows')) + # Recommended source on OS X + self.detect_element('avfvideosrc', _('macOS')) ===================================== gajim/data/gui/preferences_window.ui ===================================== @@ -2232,9 +2232,8 @@ $T will be replaced by auto-not-available timeout.</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">V_ideo output device</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">video_output_combobox</property> + <property name="label" translatable="yes">Video output</property> + <property name="mnemonic_widget">selected_video_output</property> <style> <class name="dim-label"/> </style> @@ -2245,10 +2244,10 @@ $T will be replaced by auto-not-available timeout.</property> </packing> </child> <child> - <object class="GtkComboBox" id="video_output_combobox"> + <object class="GtkLabel" id="selected_video_output"> <property name="visible">True</property> <property name="can_focus">False</property> - <signal name="changed" handler="on_video_output_combobox_changed" swapped="no"/> + <property name="halign">start</property> </object> <packing> <property name="left_attach">1</property> ===================================== gajim/gtk/preferences.py ===================================== @@ -13,6 +13,7 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. import os +import logging from gi.repository import Gtk from gi.repository import Gdk @@ -41,7 +42,8 @@ from gajim.gtk.sounds import ManageSounds try: from gajim.common.multimedia_helpers import AudioInputManager, AudioOutputManager - from gajim.common.multimedia_helpers import VideoInputManager, VideoOutputManager + 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 @@ -49,6 +51,8 @@ except (ImportError, ValueError): if app.is_installed('GSPELL'): from gi.repository import Gspell # pylint: disable=ungrouped-imports +log = logging.getLogger('gajim.gtk.preferences') + class Preferences(Gtk.ApplicationWindow): def __init__(self): @@ -333,7 +337,8 @@ class Preferences(Gtk.ApplicationWindow): ### Audio/Video tab ### def create_av_combobox(opt_name, device_dict, config_name=None, - key=None): + # This key is there to give the first index to autovideosrc and co. + key=lambda x: '' if x[1].startswith('auto') else x[0].lower()): combobox = self._ui.get_object(opt_name + '_combobox') cell = Gtk.CellRendererText() cell.set_property('ellipsize', Pango.EllipsizeMode.END) @@ -348,33 +353,109 @@ class Preferences(Gtk.ApplicationWindow): config = app.config.get(opt_name + '_device') for index, (name, value) in enumerate(sorted(device_dict.items(), - key=key)): + key=key)): model.append((name, value)) if config == value: combobox.set_active(index) if HAS_GST and app.is_installed('FARSTREAM'): create_av_combobox('audio_input', AudioInputManager().get_devices()) - create_av_combobox('audio_output', AudioOutputManager().get_devices( - )) + create_av_combobox('audio_output', AudioOutputManager().get_devices()) create_av_combobox('video_input', VideoInputManager().get_devices()) - create_av_combobox('video_output', VideoOutputManager().get_devices( - )) - - create_av_combobox('video_framerate', {_('Default'): '', - '15fps': '15/1', '10fps': '10/1', '5fps': '5/1', - '2.5fps': '5/2'}, 'video_framerate', key=lambda x: -1 if \ - not x[1] else float(x[0][:-3])) - create_av_combobox('video_size', {_('Default'): '', - '800x600': '800x600', '640x480': '640x480', - '320x240': '320x240'}, 'video_size', key=lambda x: -1 if \ - not x[1] else int(x[0][:3])) + + create_av_combobox( + 'video_framerate', + {_('Default'): '', + '15fps': '15/1', + '10fps': '10/1', + '5fps': '5/1', + '2.5fps': '5/2'}, + 'video_framerate', + key=lambda x: -1 if not x[1] else float(x[0][:-3])) + create_av_combobox( + 'video_size', + {_('Default'): '', + '800x600': '800x600', + '640x480': '640x480', + '320x240': '320x240'}, + 'video_size', + key=lambda x: -1 if not x[1] else int(x[0][:3])) st = app.config.get('video_see_self') self._ui.video_see_self_checkbutton.set_active(st) + def on_av_map(tab): + label = self._ui.selected_video_output + sink, widget, name = self.setup_video_output() + if sink is None: + log.error('Failed to obtain a working Gstreamer GTK+ sink, ' + 'video support will be disabled') + self._ui.video_input_combobox.set_sensitive(False) + label.set_markup( + _('<span color="red" font-weight="bold">' + 'Unavailable</span>, video support will be disabled')) + return + + text = '' + if name == 'gtkglsink': + text = _('<span color="green" font-weight="bold">' + 'OpenGL</span> accelerated') + elif name == 'gtksink': + text = _('<span color="yellow" font-weight="bold">' + 'Unaccelerated</span>') + label.set_markup(text) + if self.av_pipeline is None: + self.av_pipeline = Gst.Pipeline.new('preferences-pipeline') + else: + self.av_pipeline.set_state(Gst.State.NULL) + self.av_pipeline.add(sink) + self.av_sink = sink + if self.av_widget is not None: + tab.remove(self.av_widget) + tab.add(widget) + self.av_widget = widget + + src_name = app.config.get('video_input_device') + self.av_src = Gst.parse_bin_from_description(src_name, True) + if self.av_src is not None: + self.av_pipeline.add(self.av_src) + self.av_src.link(self.av_sink) + self.av_pipeline.set_state(Gst.State.PLAYING) + else: + # Parsing the pipeline stored in video_input_device failed, + # let’s try the default one. + self.av_src = Gst.ElementFactory.make('autovideosrc', None) + if self.av_src is None: + log.error('Failed to obtain a working Gstreamer source,' + ' video will be disabled.') + self._ui.video_input_combobox.set_sensitive(False) + return + # Great, this succeeded, let’s store it back into the + # config and use it. We’ve made autovideosrc the first + # element in the combobox so we can pick index 0 without + # worry. + combobox = self._ui.video_input_combobox + combobox.set_active(0) + + def on_av_unmap(tab): + self.av_pipeline.set_state(Gst.State.NULL) + self.av_pipeline.remove(self.av_src) + self.av_src = None + self.av_pipeline.remove(self.av_sink) + self.av_sink = None + tab.remove(self.av_widget) + self.av_widget = None + + self.av_pipeline = None + self.av_src = None + self.av_sink = None + self.av_widget = None + tab = self._ui.audio_video_tab + tab.connect('map', on_av_map) + tab.connect('unmap', on_av_unmap) + else: for opt_name in ('audio_input', 'audio_output', 'video_input', - 'video_output', 'video_framerate', 'video_size'): + 'video_framerate', 'video_size'): combobox = self._ui.get_object(opt_name + '_combobox') combobox.set_sensitive(False) @@ -438,6 +519,27 @@ class Preferences(Gtk.ApplicationWindow): if event.keyval == Gdk.KEY_Escape: self.destroy() + @staticmethod + def setup_video_output(): + gtkglsink = Gst.ElementFactory.make('gtkglsink', None) + if gtkglsink is not None: + glsinkbin = Gst.ElementFactory.make('glsinkbin', None) + if glsinkbin is None: + return None, None, None + glsinkbin.set_property('sink', gtkglsink) + sink = glsinkbin + widget = gtkglsink.get_property('widget') + name = 'gtkglsink' + else: + sink = Gst.ElementFactory.make('gtksink', None) + if sink is None: + return None, None, None + widget = sink.get_property('widget') + name = 'gtksink' + widget.set_visible(True) + widget.set_property('expand', True) + return sink, widget, name + def get_per_account_option(self, opt): """ Return the value of the option opt if it's the same in all accounts else @@ -919,6 +1021,7 @@ class Preferences(Gtk.ApplicationWindow): active = combobox.get_active() device = model[active][1] app.config.set(config_name, device) + return device def on_audio_input_combobox_changed(self, widget): self.on_av_combobox_changed(widget, 'audio_input_device') @@ -927,10 +1030,19 @@ class Preferences(Gtk.ApplicationWindow): self.on_av_combobox_changed(widget, 'audio_output_device') def on_video_input_combobox_changed(self, widget): - self.on_av_combobox_changed(widget, 'video_input_device') + device = self.on_av_combobox_changed(widget, 'video_input_device') + + src = Gst.parse_bin_from_description(device, True) + if src is None: + return - def on_video_output_combobox_changed(self, widget): - self.on_av_combobox_changed(widget, 'video_output_device') + self.av_pipeline.set_state(Gst.State.NULL) + if self.av_src is not None: + self.av_pipeline.remove(self.av_src) + self.av_pipeline.add(src) + src.link(self.av_sink) + self.av_src = src + self.av_pipeline.set_state(Gst.State.PLAYING) def on_video_framerate_combobox_changed(self, widget): self.on_av_combobox_changed(widget, 'video_framerate') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/97625a726e5e31a5aa202c8440669abf3d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/97625a726e5e31a5aa202c8440669abf3d… 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 September 2019