Commits July 2020

commits@gajim.org

1 participants
77 discussions

[Git][gajim/gajim][master] Remove show value 'chat' from status selectors
by Philipp Hörist 25 Jul '20

25 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 426500fb by Daniel Brötzmann at 2020-07-25T13:41:29+02:00 Remove show value 'chat' from status selectors - - - - - 2 changed files: - gajim/common/config.py - gajim/roster_window.py Changes: ===================================== gajim/common/config.py ===================================== @@ -391,10 +391,9 @@ class Config: } defaultstatusmsg_default = { - 'online': [False, _('I\'m available.')], - 'chat': [False, _('I\'m free for chat.')], + 'online': [False, _('I’m available.')], 'away': [False, _('Be right back.')], - 'xa': [False, _('I\'m not available.')], + 'xa': [False, _('I’m not available.')], 'dnd': [False, _('Do not disturb.')], 'offline': [False, _('Bye!')], } ===================================== gajim/roster_window.py ===================================== @@ -4506,7 +4506,7 @@ class RosterWindow: sub_menu = Gtk.Menu() status_menuitem.set_submenu(sub_menu) - for show in ('online', 'chat', 'away', 'xa', 'dnd'): + for show in ('online', 'away', 'xa', 'dnd'): uf_show = helpers.get_uf_show(show, use_mnemonic=True) item = Gtk.MenuItem.new_with_mnemonic(uf_show) sub_menu.append(item) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/426500fbdf1f44587056ab4a20176b82… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/426500fbdf1f44587056ab4a20176b82… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Preferences: Change order and visibilty of checkbuttons
by Philipp Hörist 25 Jul '20

25 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 11a687b5 by lovetox at 2020-07-25T13:39:03+02:00 Preferences: Change order and visibilty of checkbuttons - Hide update check on linux - Remove Windows only tooltip - Change order of elements - - - - - 1 changed file: - gajim/data/gui/preferences_window.ui Changes: ===================================== gajim/data/gui/preferences_window.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.22"/> <object class="GtkAdjustment" id="adjustment_status_auto_away"> @@ -2719,6 +2719,25 @@ to discover one from the server. (Example: stun.iptel.org)</property> <property name="position">2</property> </packing> </child> + <child> + <object class="GtkCheckButton" id="update_check"> + <property name="label" translatable="yes">_Check for Gajim updates periodically</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="no_show_all">True</property> + <property name="tooltip_text" translatable="yes">Enables a weekly update check</property> + <property name="halign">start</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="_on_update_check_toggled" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> <child> <object class="GtkBox"> <property name="visible">True</property> @@ -2768,27 +2787,7 @@ to discover one from the server. (Example: stun.iptel.org)</property> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="update_check"> - <property name="label" translatable="yes">_Check for Gajim updates periodically</property> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="no_show_all">True</property> - <property name="tooltip_text" translatable="yes">Enables a weekly update check (Windows only)</property> - <property name="halign">start</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="_on_update_check_toggled" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> <child> @@ -2805,7 +2804,7 @@ to discover one from the server. (Example: stun.iptel.org)</property> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> </object> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/11a687b5f230cbaf33c70e69eed575fd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/11a687b5f230cbaf33c70e69eed575fd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Introduce automatic update check for Gajim
by Philipp Hörist 25 Jul '20

25 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 14cae62b by wurstsalat at 2020-07-25T13:24:19+02:00 Introduce automatic update check for Gajim - - - - - 4 changed files: - gajim/common/config.py - gajim/data/gui/preferences_window.ui - gajim/gtk/preferences.py - gajim/gui_interface.py Changes: ===================================== gajim/common/config.py ===================================== @@ -250,6 +250,8 @@ class Config: 'groupchat_roster_width': [opt_int, 210, _('Width of group chat roster in pixel')], 'dev_force_bookmark_2': [opt_bool, False, _('Force Bookmark 2 usage')], 'show_help_start_chat': [opt_bool, True, _('Shows an info bar with helpful hints in the Start / Join Chat dialog')], + 'check_for_update': [opt_bool, True, _('Check for Gajim updates periodically')], + 'last_update_check': [opt_str, '', _('Date of the last update check')], }, {}) # type: Tuple[Dict[str, List[Any]], Dict[Any, Any]] __options_per_key = { ===================================== gajim/data/gui/preferences_window.ui ===================================== @@ -2771,6 +2771,26 @@ to discover one from the server. (Example: stun.iptel.org)</property> <property name="position">3</property> </packing> </child> + <child> + <object class="GtkCheckButton" id="update_check"> + <property name="label" translatable="yes">_Check for Gajim updates periodically</property> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="no_show_all">True</property> + <property name="tooltip_text" translatable="yes">Enables a weekly update check (Windows only)</property> + <property name="halign">start</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="_on_update_check_toggled" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> <child> <object class="GtkButton" id="reset_help"> <property name="label" translatable="yes">_Reset Hints</property> ===================================== gajim/gtk/preferences.py ===================================== @@ -14,6 +14,7 @@ import logging import os +import sys from gi.repository import GLib from gi.repository import Gtk @@ -429,6 +430,11 @@ class Preferences(Gtk.ApplicationWindow): self._ui.enable_logging.set_active(app.get_debug_mode()) self._ui.enable_logging.show() + if sys.platform in ('win32', 'darwin'): + st = app.config.get('check_for_update') + self._ui.update_check.set_active(st) + self._ui.update_check.show() + self._ui.connect_signals(self) self.connect('key-press-event', self._on_key_press) @@ -1066,6 +1072,9 @@ class Preferences(Gtk.ApplicationWindow): def _on_debug_folder_clicked(self, _widget): open_file(configpaths.get('DEBUG')) + def _on_update_check_toggled(self, widget): + self.on_checkbutton_toggled(widget, 'check_for_update') + def _on_reset_help_clicked(self, widget): widget.set_sensitive(False) helping_hints = [ ===================================== gajim/gui_interface.py ===================================== @@ -35,14 +35,18 @@ import os import sys import re import time +import json import logging from functools import partial from threading import Thread +from datetime import datetime from importlib.util import find_spec +from packaging.version import Version as V from gi.repository import Gtk from gi.repository import GLib from gi.repository import Gio +from gi.repository import Soup from nbxmpp import idlequeue from nbxmpp import Hashes2 @@ -91,6 +95,7 @@ from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import WarningDialog from gajim.gtk.dialogs import InformationDialog from gajim.gtk.dialogs import NewConfirmationDialog +from gajim.gtk.dialogs import NewConfirmationCheckDialog from gajim.gtk.dialogs import InputDialog from gajim.gtk.dialogs import PassphraseDialog from gajim.gtk.dialogs import InvitationReceivedDialog @@ -1839,6 +1844,81 @@ class Interface: app.config.set_per('accounts', app.ZEROCONF_ACC_NAME, 'active', False) + def check_for_updates(self): + if not app.config.get('check_for_update'): + return + + now = datetime.now() + last_check = app.config.get('last_update_check') + if not last_check: + def _on_cancel(): + app.config.set('check_for_update', False) + + def _on_check(): + self._get_latest_release() + + NewConfirmationDialog( + _('Update Check'), + _('Gajim Update Check'), + _('Search for Gajim updates periodically?'), + [DialogButton.make('Cancel', + text=_('_No'), + callback=_on_cancel), + DialogButton.make('Accept', + text=_('_Search Periodically'), + callback=_on_check)]).show() + return + + last_check_time = datetime.strptime(last_check, '%Y-%m-%d %H:%M') + if (now - last_check_time).days < 7: + return + + self._get_latest_release() + + def _get_latest_release(self): + log.info('Checking for Gajim updates') + session = Soup.Session() + session.props.user_agent = 'Gajim %s' % app.version + message = Soup.Message.new('GET', 'https://gajim.org/current-version.json') + session.queue_message(message, self._on_update_checked) + + def _on_update_checked(self, _session, message): + now = datetime.now() + app.config.set('last_update_check', now.strftime('%Y-%m-%d %H:%M')) + + body = message.props.response_body.data + if not body: + log.warning('Could not reach gajim.org for update check') + return + + data = json.loads(body) + latest_version = data['current_version'] + + if V(latest_version) > V(app.version): + def _on_cancel(is_checked): + if is_checked: + app.config.set('check_for_update', False) + + def _on_update(is_checked): + if is_checked: + app.config.set('check_for_update', False) + helpers.open_uri('https://gajim.org/download') + + NewConfirmationCheckDialog( + _('Update Available'), + _('Gajim Update Available'), + _('There is an update available for Gajim ' + '(latest version: %s)' % str(latest_version)), + _('_Do not show again'), + [DialogButton.make('Cancel', + text=_('_Later'), + callback=_on_cancel), + DialogButton.make('Accept', + text=_('_Update Now'), + callback=_on_update)]).show() + else: + log.info('Gajim is up to date') + def run(self, application): if app.config.get('trayicon') != 'never': self.show_systray() @@ -1997,6 +2077,8 @@ class Interface: if sys.platform not in ('win32', 'darwin'): logind.enable() music_track.enable() + else: + GLib.timeout_add_seconds(20, self.check_for_updates) idle.Monitor.set_interval(app.config.get('autoawaytime') * 60, app.config.get('autoxatime') * 60) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/14cae62baa288f1bc9fa8baa23f492cb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/14cae62baa288f1bc9fa8baa23f492cb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Preferences: Add checkbutton for use_keyring
by Philipp Hörist 25 Jul '20

25 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 556a861d by wurstsalat at 2020-07-25T12:50:36+02:00 Preferences: Add checkbutton for use_keyring - - - - - 2 changed files: - gajim/data/gui/preferences_window.ui - gajim/gtk/preferences.py Changes: ===================================== gajim/data/gui/preferences_window.ui ===================================== @@ -2702,6 +2702,23 @@ to discover one from the server. (Example: stun.iptel.org)</property> <property name="position">1</property> </packing> </child> + <child> + <object class="GtkCheckButton" id="use_keyring_checkbutton"> + <property name="label" translatable="yes">Use your system’s _keyring to store passwords</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_use_keyring_toggled" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> <child> <object class="GtkBox"> <property name="visible">True</property> @@ -2751,7 +2768,7 @@ to discover one from the server. (Example: stun.iptel.org)</property> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <child> @@ -2768,7 +2785,7 @@ to discover one from the server. (Example: stun.iptel.org)</property> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> </object> ===================================== gajim/gtk/preferences.py ===================================== @@ -423,6 +423,9 @@ class Preferences(Gtk.ApplicationWindow): st = app.config.get('log_contact_status_changes') self._ui.log_show_changes_checkbutton.set_active(st) + st = app.config.get('use_keyring') + self._ui.use_keyring_checkbutton.set_active(st) + self._ui.enable_logging.set_active(app.get_debug_mode()) self._ui.enable_logging.show() @@ -1052,6 +1055,10 @@ class Preferences(Gtk.ApplicationWindow): def on_log_show_changes_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'log_contact_status_changes') + # Use system’s keyring + def _on_use_keyring_toggled(self, widget): + self.on_checkbutton_toggled(widget, 'use_keyring') + # Enable debug logging def on_enable_logging_toggled(self, widget): app.set_debug_mode(widget.get_active()) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/556a861d0185b678cbc70e2387dd8fe7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/556a861d0185b678cbc70e2387dd8fe7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add StatusSelector with popover
by Philipp Hörist 25 Jul '20

25 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0d7f2706 by Daniel Brötzmann at 2020-07-25T12:27:43+02:00 Add StatusSelector with popover - - - - - 4 changed files: - gajim/data/gui/roster_window.ui - gajim/data/style/gajim.css - + gajim/gtk/status_selector.py - gajim/roster_window.py Changes: ===================================== gajim/data/gui/roster_window.ui ===================================== @@ -3,74 +3,6 @@ <interface> <requires lib="gtk+" version="3.22"/> <object class="GtkAccelGroup" id="accelgroup1"/> - <object class="GtkListStore" id="status_liststore"> - <columns> -  - <column type="gchararray"/> -  - <column type="gchararray"/> -  - <column type="gchararray"/> -  - <column type="gboolean"/> - </columns> - <data> - <row> - <col id="0">online</col> - <col id="1">online</col> - <col id="2">online</col> - <col id="3">True</col> - </row> - <row> - <col id="0">chat</col> - <col id="1">chat</col> - <col id="2">chat</col> - <col id="3">True</col> - </row> - <row> - <col id="0">away</col> - <col id="1">away</col> - <col id="2">away</col> - <col id="3">True</col> - </row> - <row> - <col id="0">xa</col> - <col id="1">xa</col> - <col id="2">xa</col> - <col id="3">True</col> - </row> - <row> - <col id="0">dnd</col> - <col id="1">dnd</col> - <col id="2">dnd</col> - <col id="3">True</col> - </row> - <row> - <col id="0">SEPARATOR</col> - <col id="1">None</col> - <col id="2">None</col> - <col id="3">True</col> - </row> - <row> - <col id="0" translatable="yes">Change Status Message…</col> - <col id="1">gajim-kbd_input</col> - <col id="2">status</col> - <col id="3">False</col> - </row> - <row> - <col id="0">SEPARATOR</col> - <col id="1">None</col> - <col id="2">None</col> - <col id="3">True</col> - </row> - <row> - <col id="0">offline</col> - <col id="1">offline</col> - <col id="2">offline</col> - <col id="3">True</col> - </row> - </data> - </object> <object class="GtkApplicationWindow" id="roster_window"> <property name="name">RosterWindow</property> <property name="width_request">85</property> @@ -151,36 +83,6 @@ <property name="position">1</property> </packing> </child> - <child> - <object class="GtkComboBox" id="status_combobox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="model">status_liststore</property> - <signal name="changed" handler="on_status_combobox_changed" swapped="no"/> - <child> - <object class="GtkCellRendererPixbuf"/> - <attributes> - <attribute name="sensitive">3</attribute> - <attribute name="icon-name">1</attribute> - </attributes> - </child> - <child> - <object class="GtkCellRendererText"> - <property name="xpad">5</property> - <property name="ellipsize">end</property> - </object> - <attributes> - <attribute name="sensitive">3</attribute> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> </object> <packing> <property name="resize">False</property> ===================================== gajim/data/style/gajim.css ===================================== @@ -242,6 +242,7 @@ infobar.error > revealer > box { /* Padding/Margins */ .margin-top6 { margin-top: 6px; } .margin-top12 { margin-top: 12px; } +.margin-3 { margin: 3px; } .margin-12 { margin: 12px; } .margin-18 { margin: 18px; } .padding-18 { margin: 18px; } ===================================== gajim/gtk/status_selector.py ===================================== @@ -0,0 +1,139 @@ +# 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/>. + +from gi.repository import Gtk +from gi.repository import Pango + +from gajim.common import app +from gajim.common.helpers import get_uf_show +from gajim.common.helpers import get_global_show +from gajim.common.helpers import statuses_unified +from gajim.common.i18n import _ +from gajim.dialogs import ChangeStatusMessageDialog + +from gajim.gtk.util import get_icon_name + + +class StatusSelector(Gtk.MenuButton): + def __init__(self, compact=False): + Gtk.MenuButton.__init__(self) + self.set_direction(Gtk.ArrowType.UP) + self._compact = compact + self._create_popover() + + self._current_show_icon = Gtk.Image() + self._current_show_icon.set_from_icon_name( + get_icon_name('offline'), Gtk.IconSize.MENU) + + box = Gtk.Box(spacing=6) + box.add(self._current_show_icon) + if not self._compact: + self._current_show_label = Gtk.Label(label=get_uf_show('offline')) + self._current_show_label.set_ellipsize(Pango.EllipsizeMode.END) + self._current_show_label.set_halign(Gtk.Align.START) + self._current_show_label.set_xalign(0) + box.add(self._current_show_label) + self.add(box) + + def _create_popover(self): + popover_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) + popover_box.get_style_context().add_class('margin-3') + popover_items = [ + 'online', + 'away', + 'xa', + 'dnd', + 'separator', + 'change_status_message', + 'separator', + 'offline', + ] + + for item in popover_items: + if item == 'separator': + popover_box.add(Gtk.Separator()) + continue + + show_icon = Gtk.Image() + show_label = Gtk.Label() + show_label.set_halign(Gtk.Align.START) + + if item == 'change_status_message': + show_icon.set_from_icon_name('document-edit-symbolic', + Gtk.IconSize.MENU) + show_label.set_text_with_mnemonic(_('_Change Status Message')) + else: + show_icon.set_from_icon_name(get_icon_name(item), + Gtk.IconSize.MENU) + show_label.set_text_with_mnemonic( + get_uf_show(item, use_mnemonic=True)) + + show_box = Gtk.Box(spacing=6) + show_box.add(show_icon) + show_box.add(show_label) + + button = Gtk.Button() + button.set_name(item) + button.set_relief(Gtk.ReliefStyle.NONE) + button.add(show_box) + button.connect('clicked', self._on_change_status) + + if item == 'change_status_message': + self._change_status_message = button + + popover_box.add(button) + + popover_box.show_all() + self._status_popover = Gtk.Popover() + self._status_popover.add(popover_box) + self.set_popover(self._status_popover) + + def _on_change_status(self, button): + def _on_response(message, pep_dict): + if message is None: # None if user pressed Cancel + return + for account in app.contacts.get_accounts(): + sync_account = app.config.get_per( + 'accounts', account, 'sync_with_global_status') + if not sync_account: + continue + app.interface.roster.send_status(account, new_show, message) + app.interface.roster.send_pep(account, pep_dict) + + self._status_popover.popdown() + new_show = button.get_name() + if new_show == 'change_status_message': + new_show = get_global_show() + ChangeStatusMessageDialog(_on_response, new_show) + return + + app.interface.roster.get_status_message(new_show, _on_response) + + def update(self): + show = get_global_show() + uf_show = get_uf_show(show) + self._current_show_icon.set_from_icon_name( + get_icon_name(show), Gtk.IconSize.MENU) + if statuses_unified(): + self._current_show_icon.set_tooltip_text(_('Status: %s') % uf_show) + if not self._compact: + self._current_show_label.set_text(uf_show) + else: + show_label = _('%s (desynced)') % uf_show + self._current_show_icon.set_tooltip_text( + _('Status: %s') % show_label) + if not self._compact: + self._current_show_label.set_text(show_label) + + self._change_status_message.set_sensitive(show != 'offline') ===================================== gajim/roster_window.py ===================================== @@ -76,6 +76,7 @@ from gajim.gtk.service_registration import ServiceRegistration from gajim.gtk.discovery import ServiceDiscoveryWindow from gajim.gtk.tooltips import RosterTooltip from gajim.gtk.adhoc import AdHocCommand +from gajim.gtk.status_selector import StatusSelector from gajim.gtk.util import get_icon_name from gajim.gtk.util import resize_window from gajim.gtk.util import restore_roster_position @@ -247,26 +248,6 @@ class RosterWindow: return True return False - @staticmethod - def _status_cell_data_func(cell_layout, cell, tree_model, iter_): - if isinstance(cell, Gtk.CellRendererPixbuf): - icon_name = tree_model[iter_][1] - if icon_name is None: - return - if tree_model[iter_][2] == 'status': - cell.set_property('icon_name', icon_name) - else: - iconset_name = get_icon_name(icon_name) - cell.set_property('icon_name', iconset_name) - else: - show = tree_model[iter_][0] - id_ = tree_model[iter_][2] - if id_ not in ('status', 'desync'): - show = helpers.get_uf_show(show) - cell.set_property('text', show) - - - ############################################################################# ### Methods for adding and removing roster window items ############################################################################# @@ -2083,6 +2064,7 @@ class RosterWindow: self.delete_pep(app.get_jid_from_account(account), account) app.connections[account].change_status(status, txt) + self._status_selector.update() def chg_contact_status(self, contact, show, status, account): """ @@ -2173,7 +2155,9 @@ class RosterWindow: for contact in [c for c in lcontact if ( (c.show != 'offline' or c.is_transport()) and not ctrl)]: self.chg_contact_status(contact, 'offline', '', account) - self.update_status_combobox() + if app.interface.systray_enabled: + app.interface.systray.change_status(show) + self._status_selector.update() def get_status_message(self, show, on_response, show_pep=True, always_ask=False): @@ -2211,44 +2195,6 @@ class RosterWindow: self.send_pep(account, pep_dict) self.get_status_message(status, on_response) - def update_status_combobox(self): - # table to change index in connection.connected to index in combobox - table = { - 'offline':8, - 'connecting':8, - 'error': 8, - 'online':0, - 'chat':1, - 'away':2, - 'xa':3, - 'dnd':4 - } - - liststore = self.status_combobox.get_model() - - # Check if a desync'ed status entry and separator is currently - # in the liststore and remove it. - while len(liststore) > 9: - titer = liststore.get_iter_first() - liststore.remove(titer) - - show = helpers.get_global_show() - # temporarily block signal in order not to send status that we show - # in the combobox - self.combobox_callback_active = False - if helpers.statuses_unified(): - self.status_combobox.set_active(table[show]) - else: - uf_show = helpers.get_uf_show(show) - liststore.prepend(['SEPARATOR', None, '', True]) - status_combobox_text = uf_show + ' (' + _("desynced") + ')' - liststore.prepend( - [status_combobox_text, show, 'desync', False]) - self.status_combobox.set_active(0) - self.combobox_callback_active = True - if app.interface.systray_enabled: - app.interface.systray.change_status(show) - def get_show(self, lcontact): prio = lcontact[0].priority show = lcontact[0].show @@ -2545,17 +2491,10 @@ class RosterWindow: self.rename_self_contact(obj.old_jid, obj.new_jid, obj.conn.name) def _nec_our_show(self, event): - model = self.status_combobox.get_model() - iter_ = model.get_iter_from_string('6') if event.show == 'offline': - # sensitivity for this menuitem - if app.get_number_of_connected_accounts() == 0: - model[iter_][3] = False self.application.set_account_actions_state(event.account) self.application.update_app_actions_state() - else: - # sensitivity for this menuitem - model[iter_][3] = True + self.on_status_changed(event.account, event.show) def _nec_connection_type(self, obj): @@ -3091,20 +3030,18 @@ class RosterWindow: def accel_group_func(self, accel_group, acceleratable, keyval, modifier): # CTRL mask if modifier & Gdk.ModifierType.CONTROL_MASK: - if keyval == Gdk.KEY_s: # CTRL + s - model = self.status_combobox.get_model() - accounts = list(app.connections.keys()) - status = model[self.previous_status_combobox_active][2] - def on_response(message, pep_dict): - if message is not None: # None if user pressed Cancel - for account in accounts: - if not app.config.get_per('accounts', account, - 'sync_with_global_status'): + if keyval == Gdk.KEY_s: # CTRL + s + show = helpers.get_global_show() + def _on_response(message, pep_dict): + if message is not None: # None if user pressed Cancel + for account in app.contacts.get_accounts(): + sync_account = app.config.get_per( + 'accounts', account, 'sync_with_global_status') + if not sync_account: continue - current_show = app.connections[account].status - self.send_status(account, current_show, message) + self.send_status(account, show, message) self.send_pep(account, pep_dict) - dialogs.ChangeStatusMessageDialog(on_response, status) + dialogs.ChangeStatusMessageDialog(_on_response, show) return True if keyval == Gdk.KEY_k: # CTRL + k self.enable_rfilter('') @@ -3281,78 +3218,6 @@ class RosterWindow: DialogButton.make('Remove', callback=on_ok2)]).show() - def on_status_combobox_changed(self, widget): - """ - When we change our status via the combobox - """ - model = self.status_combobox.get_model() - active = self.status_combobox.get_active() - if active == -1: # no active item - return - if not self.combobox_callback_active: - self.previous_status_combobox_active = active - return - accounts = list(app.connections.keys()) - if not accounts: - ErrorDialog(_('No account available'), - _('You must create an account before you can chat with other ' - 'contacts.')) - self.update_status_combobox() - return - - status = model[active][2] - if status == 'status': - # 'Change status message' selected: - # do not change show, just show change status dialog - status = model[self.previous_status_combobox_active][2] - def on_response(message, pep_dict): - if message is not None: # None if user pressed Cancel - for account in accounts: - if not app.config.get_per('accounts', account, - 'sync_with_global_status'): - continue - current_show = app.connections[account].status - self.send_status(account, current_show, message) - self.send_pep(account, pep_dict) - self.combobox_callback_active = False - self.status_combobox.set_active( - self.previous_status_combobox_active) - self.combobox_callback_active = True - dialogs.ChangeStatusMessageDialog(on_response, status) - return - # we are about to change show, so save this new show so in case - # after user chooses "Change status message" menuitem - # we can return to this show - self.previous_status_combobox_active = active - - def on_continue(message, pep_dict): - if message is None: - # user pressed Cancel to change status message dialog - self.update_status_combobox() - return - global_sync_accounts = [] - for acct in accounts: - if app.config.get_per('accounts', acct, - 'sync_with_global_status'): - global_sync_accounts.append(acct) - global_sync_connected_accounts = \ - app.get_number_of_connected_accounts(global_sync_accounts) - for account in accounts: - if not app.config.get_per('accounts', account, - 'sync_with_global_status'): - continue - # we are connected (so we wanna change show and status) - # or no account is connected and we want to connect with new - # show and status - - if not global_sync_connected_accounts > 0 or \ - app.account_is_available(account): - self.send_status(account, status, message) - self.send_pep(account, pep_dict) - self.update_status_combobox() - - self.get_status_message(status, on_continue) - def on_publish_tune_toggled(self, widget, account): active = widget.get_active() app.connections[account].get_module('UserTune').set_enabled(active) @@ -4321,18 +4186,19 @@ class RosterWindow: def update_icons(self): # Update the roster self.setup_and_draw_roster() - # Update the status combobox - self.status_combobox.queue_draw() + # Update the systray if app.interface.systray_enabled: app.interface.systray.set_img() + app.interface.systray.change_status(helpers.get_global_show()) for win in app.interface.msg_win_mgr.windows(): for ctrl in win.controls(): ctrl.update_ui() win.redraw_tab(ctrl) - self.update_status_combobox() + self._status_selector.update() + def set_account_status_icon(self, account): child_iterA = self._get_account_iter(account, self.model) @@ -5294,20 +5160,9 @@ class RosterWindow: # accounts to draw next time we draw accounts. self.accounts_to_draw = [] - # StatusComboBox - self.status_combobox = self.xml.get_object('status_combobox') - pixbuf_renderer, text_renderer = self.status_combobox.get_cells() - self.status_combobox.set_cell_data_func( - pixbuf_renderer, self._status_cell_data_func) - self.status_combobox.set_cell_data_func( - text_renderer, self._status_cell_data_func) - self.status_combobox.set_row_separator_func(self._iter_is_separator) - - self.status_combobox.set_active(8) - # holds index to previously selected item so if - # "change status message..." is selected we can fallback to previously - # selected item and not stay with that item selected - self.previous_status_combobox_active = 8 + # Status selector + self._status_selector = StatusSelector() + self.xml.roster_vbox2.add(self._status_selector) # Enable/Disable checkboxes at start if app.config.get('showoffline'): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0d7f27068bf86dc988489096af727c6c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0d7f27068bf86dc988489096af727c6c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: DOAP: Update Gajim subtitle and Wiki URL
by Philipp Hörist 24 Jul '20

24 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3655c946 by Daniel Brötzmann at 2020-07-23T18:54:05+02:00 DOAP: Update Gajim subtitle and Wiki URL - - - - - 4f6e6a02 by Daniel Brötzmann at 2020-07-23T18:54:59+02:00 Appdata: Update subtitle, description and Wiki URLs - - - - - 31224691 by Daniel Brötzmann at 2020-07-23T18:55:35+02:00 Gajim Dekstop file: Update subtitle - - - - - 3 changed files: - data/gajim.doap - data/org.gajim.Gajim.appdata.xml.in - data/org.gajim.Gajim.desktop.in Changes: ===================================== data/gajim.doap ===================================== @@ -8,7 +8,7 @@ <name>Gajim</name> <short-name>gajim</short-name> - <shortdesc xml:lang="en">XMPP Chat Client</shortdesc> + <shortdesc xml:lang="en">A fully-featured XMPP chat client</shortdesc> <description xml:lang="en"> Gajim aims to be an easy to use and fully-featured XMPP client. Just chat with your friends or family, easily share pictures and thoughts or discuss the news with your groups. @@ -17,7 +17,7 @@ </description> <homepage rdf:resource="https://gajim.org/" /> - <wiki rdf:resource="https://dev.gajim.org/gajim/gajim/wikis/home" /> + <wiki rdf:resource="https://dev.gajim.org/gajim/gajim/-/wikis/home" /> <bug-database rdf:resource="https://dev.gajim.org/gajim/gajim/issues" /> <category rdf:resource="https://linkmauve.fr/ns/xmpp-doap#category-client" /> <category rdf:resource="http://api.gnome.org/doap-extensions#apps" /> ===================================== data/org.gajim.Gajim.appdata.xml.in ===================================== @@ -5,17 +5,14 @@ <metadata_license>CC-BY-SA-3.0</metadata_license> <project_license>GPL-3.0</project_license> <name>Gajim</name> - <summary>A GTK XMPP client</summary> + <summary>A fully-featured XMPP chat client</summary> <description> - Gajim aims to be an easy to use and fully-featured XMPP client. - With Gajim you can chat through various XMPP services of your choice - (e.g. Jabber.org) as well as transports (e.g. Facebook, IRC). - + Gajim aims to be an easy to use and fully-featured XMPP client. Just chat with your friends or family, easily share pictures and thoughts or discuss the news with your groups. - Gajim integrates well with your other devices: just chat and see what's - been said on your mobile device. + Chat securely with End-to-End encryption via OMEMO or OpenPGP. + Gajim integrates well with your other devices: simply continue conversations on your mobile device. Features: <ul> @@ -65,10 +62,10 @@ <update_contact>gajim-devel_AT_gajim.org</update_contact> <url type="homepage">https://gajim.org/</url> <url type="bugtracker">https://dev.gajim.org/gajim/gajim</url> - <url type="faq">https://dev.gajim.org/gajim/gajim/wikis/help/gajimfaq</url> - <url type="help">https://dev.gajim.org/gajim/gajim/wikis/help/Help</url> - <url type="donation">https://gajim.org/development/#donating</url> - <url type="translate">https://dev.gajim.org/gajim/gajim/wikis/development/DevTranslate</url> + <url type="faq">https://dev.gajim.org/gajim/gajim/-/wikis/help/gajimfaq</url> + <url type="help">https://dev.gajim.org/gajim/gajim/-/wikis/help/Help</url> + <url type="donation">https://gajim.org/development/#donations</url> + <url type="translate">https://dev.gajim.org/gajim/gajim/-/wikis/development/devtranslate</url> <translation type="gettext">gajim</translation> <content_rating type="oars-1.1"> <content_attribute id="social-chat">intense</content_attribute> ===================================== data/org.gajim.Gajim.desktop.in ===================================== @@ -2,7 +2,7 @@ Categories=Network;InstantMessaging;GTK;Chat; Name=Gajim GenericName=XMPP IM Client -Comment=A GTK XMPP client +Comment=A fully-featured XMPP chat client #Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! Keywords=chat;messaging;im;xmpp;bonjour;voip; Exec=gajim %u View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/d8982bb6c0a774a6583c6aea6f972b1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/d8982bb6c0a774a6583c6aea6f972b1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: ChatControl: Fix Jingle session termination
by Philipp Hörist 22 Jul '20

22 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: e7eb929b by Daniel Brötzmann at 2020-07-22T11:33:59+02:00 ChatControl: Fix Jingle session termination - - - - - d8982bb6 by Daniel Brötzmann at 2020-07-22T11:33:59+02:00 Jingle A/V: Log used codec - - - - - 2 changed files: - gajim/chat_control.py - gajim/common/jingle_rtp.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -765,7 +765,7 @@ class ChatControl(ChatControlBase): new_sid = None if jingle_state == self.JINGLE_STATE_NULL: new_sid = None - if state in ('connection_received', 'connecting'): + if state in ('connection_received', 'connecting', 'connected'): new_sid = sid jingle.state = jingle_state @@ -888,9 +888,6 @@ class ChatControl(ChatControlBase): if not jingle.sid: return - jingle.sid = None - jingle.state = self.JINGLE_STATE_NULL - con = app.connections[self.account] session = con.get_module('Jingle').get_jingle_session( self.contact.get_full_jid(), jingle.sid) @@ -898,6 +895,10 @@ class ChatControl(ChatControlBase): content = session.get_content(jingle_type) if content: session.remove_content(content.creator, content.name) + + jingle.sid = None + jingle.state = self.JINGLE_STATE_NULL + var = GLib.Variant.new_boolean(False) jingle.action.change_state(var) ===================================== gajim/common/jingle_rtp.py ===================================== @@ -182,6 +182,7 @@ class JingleRTPContent(JingleContent): self.funnel.set_state(Gst.State.PLAYING) def _on_src_pad_added(self, stream, pad, codec): + log.info('Used codec: %s', codec.to_string()) if not self.funnel: self._setup_funnel() pad.link(self.funnel.get_request_pad('sink_%u')) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/bfb023d3182be3a7e5aaedf461efac9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/bfb023d3182be3a7e5aaedf461efac9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.2] 5 commits: GUI: Fix deprecation warnings
by Philipp Hörist 16 Jul '20

16 Jul '20

Philipp Hörist pushed to branch gajim_1.2 at gajim / gajim Commits: 6a270922 by André Apitzsch at 2020-07-16T22:28:48+02:00 GUI: Fix deprecation warnings - - - - - 956b852b by lovetox at 2020-07-16T22:28:48+02:00 Correctly detect IBR feature Fixes #10176 - - - - - e5735218 by lovetox at 2020-07-16T22:29:15+02:00 Plugins: Disable config dialog button if plugin is not active - - - - - 02f2c6fc by Daniel Brötzmann at 2020-07-16T22:29:15+02:00 ChatControlBase: Add support for KDE notification drag and drop This adds Gdk.DragAction.MOVE to the drag_dest, enabling Gajim to process dropped items from KDE notifications (for example). Fixes #9011 - - - - - 626de12f by lovetox at 2020-07-16T22:29:15+02:00 PluginManager: Register plugin handlers when enabling account - - - - - 13 changed files: - gajim/chat_control_base.py - gajim/common/modules/discovery.py - gajim/common/modules/register.py - gajim/data/gui/advanced_configuration.ui - gajim/data/gui/blocked_contacts_window.ui - gajim/data/gui/filetransfers.ui - gajim/data/gui/history_manager.ui - gajim/data/gui/history_window.ui - gajim/data/gui/preferences_window.ui - gajim/gtk/server_info.py - gajim/gtk/settings.py - gajim/plugins/gui.py - gajim/plugins/pluginmanager.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -177,7 +177,7 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): self.xml.overlay.drag_dest_set( Gtk.DestDefaults.ALL, self._dnd_list, - Gdk.DragAction.COPY) + Gdk.DragAction.COPY | Gdk.DragAction.MOVE) self.xml.overlay.drag_dest_set_target_list(dst_targets) # Create textviews and connect signals ===================================== gajim/common/modules/discovery.py ===================================== @@ -138,9 +138,7 @@ class Discovery(BaseModule): self._con.get_module('VCardTemp').pass_disco(result) self._con.get_module('Carbons').pass_disco(result) self._con.get_module('HTTPUpload').pass_disco(result) - - if Namespace.REGISTER in result.features: - self._con.register_supported = True + self._con.get_module('Register').pass_disco(result) self._con.connect_machine(restart=True) ===================================== gajim/common/modules/register.py ===================================== @@ -38,6 +38,11 @@ class Register(BaseModule): self.agent_registrations = {} + self.supported = False + + def pass_disco(self, info): + self.supported = Namespace.REGISTER in info.features + def register_agent(self, agent, form, is_form, success_cb, error_cb): if not app.account_is_available(self._account): return ===================================== gajim/data/gui/advanced_configuration.ui ===================================== @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.20"/> + <requires lib="gtk+" version="3.22"/> <object class="GtkBox" id="box"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -113,7 +113,6 @@ <object class="GtkTreeView" id="advanced_treeview"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="rules_hint">True</property> <signal name="row-activated" handler="_on_treeview_row_activated" swapped="no"/> <child internal-child="selection"> <object class="GtkTreeSelection"> ===================================== gajim/data/gui/blocked_contacts_window.ui ===================================== @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.12"/> + <requires lib="gtk+" version="3.22"/> <object class="GtkImage" id="image1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-remove</property> + <property name="icon_name">list-remove-symbolic</property> </object> <object class="GtkWindow" id="blocked_contacts_window"> <property name="visible">True</property> @@ -33,7 +33,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="headers_visible">False</property> - <property name="rules_hint">True</property> <signal name="row-activated" handler="on_contacts_treeview_row_activated" swapped="no"/> <child internal-child="selection"> <object class="GtkTreeSelection" id="treeview-selection1"/> @@ -66,5 +65,8 @@ </child> </object> </child> + <child type="titlebar"> + <placeholder/> + </child> </object> </interface> ===================================== gajim/data/gui/filetransfers.ui ===================================== @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.20"/> + <requires lib="gtk+" version="3.22"/> <object class="GtkAccelGroup" id="accelgroup1"/> <object class="GtkMenu" id="file_transfers_menu"> <property name="can_focus">False</property> @@ -60,9 +60,6 @@ <property name="type_hint">dialog</property> <signal name="delete-event" handler="_on_file_transfers_dialog_delete_event" swapped="no"/> <signal name="key-press-event" handler="_on_file_transfers_window_key_press_event" swapped="no"/> - <child type="titlebar"> - <placeholder/> - </child> <child> <object class="GtkBox"> <property name="visible">True</property> @@ -201,6 +198,9 @@ </child> </object> </child> + <child type="titlebar"> + <placeholder/> + </child> <child internal-child="accessible"> <object class="AtkObject" id="file_transfers_window-atkobject"> <property name="AtkObject::accessible-name" translatable="yes">File Transfers</property> ===================================== gajim/data/gui/history_manager.ui ===================================== @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.20"/> + <requires lib="gtk+" version="3.22"/> <object class="GtkMenu" id="context_menu"> <property name="can_focus">False</property> <child> @@ -31,9 +31,6 @@ <property name="default_width">1000</property> <property name="default_height">500</property> <signal name="delete-event" handler="on_history_manager_window_delete_event" swapped="no"/> - <child> - <placeholder/> - </child> <child> <object class="GtkBox"> <property name="visible">True</property> @@ -56,7 +53,6 @@ <object class="GtkTreeView" id="jids_listview"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="rules_hint">True</property> <signal name="button-press-event" handler="on_listview_button_press_event" swapped="no"/> <signal name="key-press-event" handler="on_jids_listview_key_press_event" swapped="no"/> <child internal-child="selection"> @@ -80,8 +76,8 @@ <object class="GtkBox" id="welcome_box"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">20</property> - <property name="margin_right">20</property> + <property name="margin_start">20</property> + <property name="margin_end">20</property> <property name="orientation">vertical</property> <property name="spacing">10</property> <child> @@ -144,13 +140,12 @@ If you plan to do massive deletions, please make sure Gajim is not running. Gene <object class="GtkScrolledWindow" id="logs_scrolledwindow"> <property name="can_focus">True</property> <property name="no_show_all">True</property> - <property name="margin_left">6</property> + <property name="margin_start">6</property> <property name="shadow_type">in</property> <child> <object class="GtkTreeView" id="logs_listview"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="rules_hint">True</property> <property name="enable_search">False</property> <signal name="button-press-event" handler="on_listview_button_press_event" swapped="no"/> <signal name="key-press-event" handler="on_logs_listview_key_press_event" swapped="no"/> @@ -170,13 +165,12 @@ If you plan to do massive deletions, please make sure Gajim is not running. Gene <object class="GtkScrolledWindow" id="search_results_scrolledwindow"> <property name="can_focus">True</property> <property name="no_show_all">True</property> - <property name="margin_left">6</property> + <property name="margin_start">6</property> <property name="shadow_type">in</property> <child> <object class="GtkTreeView" id="search_results_listview"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="rules_hint">True</property> <signal name="button-press-event" handler="on_listview_button_press_event" swapped="no"/> <signal name="row-activated" handler="on_search_results_listview_row_activated" swapped="no"/> <child internal-child="selection"> @@ -256,5 +250,8 @@ If you plan to do massive deletions, please make sure Gajim is not running. Gene </child> </object> </child> + <child type="titlebar"> + <placeholder/> + </child> </object> </interface> ===================================== gajim/data/gui/history_window.ui ===================================== @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.20"/> + <requires lib="gtk+" version="3.22"/> <object class="GtkListStore" id="liststore1"> <columns>  @@ -16,8 +16,8 @@ <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">12</property> - <property name="margin_right">12</property> + <property name="margin_start">12</property> + <property name="margin_end">12</property> <property name="margin_top">12</property> <property name="margin_bottom">12</property> <property name="orientation">vertical</property> @@ -75,8 +75,8 @@ <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">12</property> - <property name="margin_right">12</property> + <property name="margin_start">12</property> + <property name="margin_end">12</property> <property name="margin_top">12</property> <property name="margin_bottom">12</property> <property name="orientation">vertical</property> @@ -282,8 +282,8 @@ <property name="width_request">600</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">18</property> - <property name="margin_right">18</property> + <property name="margin_start">18</property> + <property name="margin_end">18</property> <property name="margin_top">18</property> <property name="margin_bottom">18</property> <property name="orientation">vertical</property> @@ -328,7 +328,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="margin_left">6</property> + <property name="margin_start">6</property> <property name="label" translatable="yes">Store History</property> <style> <class name="dim-label"/> @@ -416,8 +416,8 @@ <object class="GtkLabel" id="date_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">3</property> - <property name="margin_right">3</property> + <property name="margin_start">3</property> + <property name="margin_end">3</property> </object> <packing> <property name="expand">False</property> @@ -515,7 +515,6 @@ <object class="GtkTreeView" id="results_treeview"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="rules_hint">True</property> <property name="hover_expand">True</property> <signal name="cursor-changed" handler="on_results_treeview_cursor_changed" swapped="no"/> <child internal-child="selection"> ===================================== gajim/data/gui/preferences_window.ui ===================================== @@ -862,72 +862,65 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> + <property name="margin_top">6</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkBox"> + <object class="GtkCheckButton" id="show_chatstate_in_tabs"> + <property name="label" translatable="yes">Show chatstate in tabs</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">6</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkCheckButton" id="show_chatstate_in_tabs"> - <property name="label" translatable="yes">Show chatstate in tabs</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">If checked, the tab will be colored according to the current chatstate of the contact</property> - <property name="halign">start</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_show_chatstate_in_tabs_toggled" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="show_chatstate_in_roster"> - <property name="label" translatable="yes">Show chatstate in contact list</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">If checked, the contact row will be colored according to the current chatstate of the contact</property> - <property name="halign">start</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_show_chatstate_in_roster_toggled" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="show_chatstate_in_banner"> - <property name="label" translatable="yes">Show chatstate in banner</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">If checked, a description of the contacts current chatstate is shown in the banner</property> - <property name="halign">start</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_show_chatstate_in_banner_toggled" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">If checked, the tab will be colored according to the current chatstate of the contact</property> + <property name="halign">start</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_show_chatstate_in_tabs_toggled" swapped="no"/> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="show_chatstate_in_roster"> + <property name="label" translatable="yes">Show chatstate in contact list</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">If checked, the contact row will be colored according to the current chatstate of the contact</property> + <property name="halign">start</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_show_chatstate_in_roster_toggled" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="show_chatstate_in_banner"> + <property name="label" translatable="yes">Show chatstate in banner</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">If checked, a description of the contacts current chatstate is shown in the banner</property> + <property name="halign">start</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_show_chatstate_in_banner_toggled" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> </child> </object> </child> ===================================== gajim/gtk/server_info.py ===================================== @@ -262,6 +262,8 @@ class ServerInfo(Gtk.ApplicationWindow, EventHelper): con.get_module('MUC').supported), Feature('XEP-0054: vcard-temp', con.get_module('VCardTemp').supported), + Feature('XEP-0077: In-Band Registration', + con.get_module('Register').supported), Feature('XEP-0163: Personal Eventing Protocol', con.get_module('PEP').supported), Feature('XEP-0163: #publish-options', ===================================== gajim/gtk/settings.py ===================================== @@ -674,5 +674,6 @@ class ChangePasswordSetting(DialogSetting): activatable = False if self.account in app.connections: con = app.connections[self.account] - activatable = con.state.is_available and con.register_supported + activatable = (con.state.is_available and + con.get_module('Register').supported) self.set_activatable(activatable) ===================================== gajim/plugins/gui.py ===================================== @@ -168,7 +168,7 @@ class PluginsWindow(Gtk.ApplicationWindow, EventHelper): self._ui.uninstall_plugin_button.set_sensitive(True) self._ui.configure_plugin_button.set_sensitive( - plugin.config_dialog is not None) + plugin.config_dialog is not None and plugin.active) def _clear_installed_plugin_info(self): self._ui.plugin_name_label.set_text('') @@ -217,6 +217,7 @@ class PluginsWindow(Gtk.ApplicationWindow, EventHelper): transient_for=self) return + self._ui.configure_plugin_button.set_sensitive(not is_active) self.installed_plugins_model[path][Column.ACTIVE] = not is_active def _on_configure_plugin(self, _widget): ===================================== gajim/plugins/pluginmanager.py ===================================== @@ -647,6 +647,9 @@ class PluginManager(metaclass=Singleton): continue modules.register_single_module(con, instance, name) + for handler in instance.handlers: + con.connection.register_handler(handler) + def _plugin_is_active_in_global_config(self, plugin): return app.config.get_per('plugins', plugin.short_name, 'active') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/014a0ab9f369aef8dcfac3002835b53… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/014a0ab9f369aef8dcfac3002835b53… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] PluginManager: Register plugin handlers when enabling account
by Philipp Hörist 16 Jul '20

16 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: bfb023d3 by lovetox at 2020-07-16T21:28:21+02:00 PluginManager: Register plugin handlers when enabling account - - - - - 1 changed file: - gajim/plugins/pluginmanager.py Changes: ===================================== gajim/plugins/pluginmanager.py ===================================== @@ -647,6 +647,9 @@ class PluginManager(metaclass=Singleton): continue modules.register_single_module(con, instance, name) + for handler in instance.handlers: + con.connection.register_handler(handler) + def _plugin_is_active_in_global_config(self, plugin): return app.config.get_per('plugins', plugin.short_name, 'active') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bfb023d3182be3a7e5aaedf461efac91… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bfb023d3182be3a7e5aaedf461efac91… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ChatControlBase: Add support for KDE notification drag and drop
by Philipp Hörist 15 Jul '20

15 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 515f0818 by Daniel Brötzmann at 2020-07-15T12:35:35+02:00 ChatControlBase: Add support for KDE notification drag and drop This adds Gdk.DragAction.MOVE to the drag_dest, enabling Gajim to process dropped items from KDE notifications (for example). Fixes #9011 - - - - - 1 changed file: - gajim/chat_control_base.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -177,7 +177,7 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): self.xml.overlay.drag_dest_set( Gtk.DestDefaults.ALL, self._dnd_list, - Gdk.DragAction.COPY) + Gdk.DragAction.COPY | Gdk.DragAction.MOVE) self.xml.overlay.drag_dest_set_target_list(dst_targets) # Create textviews and connect signals View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/515f0818159ff27f6e5dc5a4ecb4acef… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/515f0818159ff27f6e5dc5a4ecb4acef… 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 July 2020