Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][mainwindow] Bring back more actions
by Philipp Hörist 07 Feb '21

07 Feb '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 7a10f604 by lovetox at 2021-02-07T21:10:48+01:00 Bring back more actions - - - - - 1 changed file: - gajim/gtk/main.py Changes: ===================================== gajim/gtk/main.py ===================================== @@ -1,5 +1,7 @@ +import logging from gi.repository import Gtk +from gi.repository import Gdk from gi.repository import GLib from gi.repository import Gio @@ -23,6 +25,9 @@ from .util import open_window +log = logging.getLogger('gajim.gui.main') + + class MainWindow(Gtk.ApplicationWindow, EventHelper): def __init__(self): Gtk.ApplicationWindow.__init__(self) @@ -118,6 +123,7 @@ def __init__(self): self._load_chats() self._add_accounts() self._add_actions() + self._add_actions2() @staticmethod def _on_our_show(event): @@ -154,6 +160,117 @@ def _add_actions(self): act.connect('activate', func) self.add_action(act) + def _add_actions2(self): + actions = [ + 'change-nickname', + 'change-subject', + 'escape', + 'browse-history', + 'send-file', + 'show-contact-info', + 'show-emoji-chooser', + 'clear-chat', + 'delete-line', + 'close-tab', + 'move-tab-up', + 'move-tab-down', + 'switch-next-tab', + 'switch-prev-tab', + 'switch-next-unread-tab-right' + 'switch-next-unread-tab-left', + 'switch-tab-1', + 'switch-tab-2', + 'switch-tab-3', + 'switch-tab-4', + 'switch-tab-5', + 'switch-tab-6', + 'switch-tab-7', + 'switch-tab-8', + 'switch-tab-9', + ] + + disabled_for_emacs = ( + 'browse-history', + 'send-file', + 'close-tab' + ) + + key_theme = Gtk.Settings.get_default().get_property( + 'gtk-key-theme-name') + + for action in actions: + if key_theme == 'Emacs' and action in disabled_for_emacs: + continue + act = Gio.SimpleAction.new(action, None) + act.connect('activate', self._on_action) + self.add_action(act) + + def _on_action(self, action, _param): + control = self.get_active_control() + if control is None: + return + + log.info('Activate action: %s, active control: %s', + action.get_name(), control.contact.jid) + + action = action.get_name() + + res = control.delegate_action(action) + if res != Gdk.EVENT_PROPAGATE: + return res + + # if action == 'escape' and app.settings.get('escape_key_closes'): + # self.remove_tab(control, self.CLOSE_ESC) + # return + + # if action == 'close-tab': + # self.remove_tab(control, self.CLOSE_CTRL_KEY) + # return + + # if action == 'move-tab-up': + # old_position = self.notebook.get_current_page() + # self.notebook.reorder_child(control.widget, + # old_position - 1) + # return + + # if action == 'move-tab-down': + # old_position = self.notebook.get_current_page() + # total_pages = self.notebook.get_n_pages() + # if old_position == total_pages - 1: + # self.notebook.reorder_child(control.widget, 0) + # else: + # self.notebook.reorder_child(control.widget, + # old_position + 1) + # return + + # if action == 'switch-next-tab': + # new = self.notebook.get_current_page() + 1 + # if new >= self.notebook.get_n_pages(): + # new = 0 + # self.notebook.set_current_page(new) + # return + + # if action == 'switch-prev-tab': + # new = self.notebook.get_current_page() - 1 + # if new < 0: + # new = self.notebook.get_n_pages() - 1 + # self.notebook.set_current_page(new) + # return + + # if action == 'switch-next-unread-tab-right': + # self.move_to_next_unread_tab(True) + # return + + # if action == 'switch-next-unread-tab-left': + # self.move_to_next_unread_tab(False) + # return + + # if action.startswith('switch-tab-'): + # number = int(action[-1]) + # self.notebook.set_current_page(number - 1) + # return + + def get_widget(self, name): return getattr(self._ui, name) @@ -286,6 +403,12 @@ def chat_exists_for_workspace(self, workspace_id, account, jid): def get_control(self, account, jid): return self._chat_stack.get_control(account, jid) + def get_active_control(self): + chat = self._chat_list_stack.get_selected_chat() + if chat is None: + return None + return self.get_control(chat.account, chat.jid) + def _add_accounts(self): for account in list(app.connections.keys()): self._ui.main_stack.add_named( View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7a10f604d8d0728189803f29ffdc413f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7a10f604d8d0728189803f29ffdc413f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Connect Menu actions
by Philipp Hörist 07 Feb '21

07 Feb '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 7e470b2e by lovetox at 2021-02-07T20:53:11+01:00 Connect Menu actions - - - - - 1 changed file: - gajim/gtk/main.py Changes: ===================================== gajim/gtk/main.py ===================================== @@ -68,7 +68,6 @@ def __init__(self): self._ui.paned.set_position(app.settings.get('chat_handle_position')) self._ui.paned.connect('button-release-event', self._on_button_release) - # pylint: disable=line-too-long self.register_events([ ('presence-received', ged.GUI1, self._on_event), ('nickname-received', ged.GUI1, self._on_event), @@ -110,6 +109,8 @@ def __init__(self): ('muc-disco-update', ged.GUI1, self._on_event), ('muc-configuration-finished', ged.GUI1, self._on_event), ('muc-configuration-failed', ged.GUI1, self._on_event), + ('our-show', ged.GUI1, self._on_our_show), + ('signed-in', ged.GUI1, self._on_signed_in), ]) self.show_all() @@ -118,6 +119,17 @@ def __init__(self): self._add_accounts() self._add_actions() + @staticmethod + def _on_our_show(event): + if event.show == 'offline': + app.app.set_account_actions_state(event.account) + app.app.update_app_actions_state() + + @staticmethod + def _on_signed_in(event): + app.app.set_account_actions_state(event.account, True) + app.app.update_app_actions_state() + @staticmethod def _on_button_release(paned, event): if event.window != paned.get_handle_window(): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7e470b2ec441c326598be5c0c818fc41… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7e470b2ec441c326598be5c0c818fc41… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new tag gajim-1.3.0
by Philipp Hörist 07 Feb '21

07 Feb '21

Philipp Hörist pushed new tag gajim-1.3.0 at gajim / gajim -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/tree/gajim-1.3.0 You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.3] 1.3.0
by Philipp Hörist 07 Feb '21

07 Feb '21

Philipp Hörist pushed to branch gajim_1.3 at gajim / gajim Commits: 6f032987 by lovetox at 2021-02-07T18:02:42+01:00 1.3.0 - - - - - 3 changed files: - ChangeLog - appveyor.yml - gajim/__init__.py Changes: ===================================== ChangeLog ===================================== @@ -1,3 +1,21 @@ +Gajim 1.3.0 (08 February 2021) + + New + + * Add --gdebug option + + Bug fixes + + * Search also in user data dir for translations + * AV: Fix closing chat window while in call + * Chat: Don’t unselect text after key press + * Profile: Correctly handle not existing vcard + * Fix display problems with feather icons + * Bookmarks: Check for config-node-max feature + * #10401 Fix race condition when removing an account + * #10421 Chat: Fix race condition when closing with ESC + + Gajim 1.3.0-beta2 (10 January 2020) Changes ===================================== appveyor.yml ===================================== @@ -39,8 +39,8 @@ build_script: bash "git clone C:/projects/gajim C:/msys64/home/appveyor/gajim" bash "C:/msys64/home/appveyor/gajim/win/build.sh $($env:MSYS_ARCH)" - Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim.exe" -FileName "Gajim-1.3.0-beta2-$($env:ARCH)-$($env:TIME_STRING).exe" - Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim-Portable.exe" -FileName "Gajim-Portable-1.3.0-beta2-$($env:ARCH)-$($env:TIME_STRING).exe" + Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim.exe" -FileName "Gajim-1.3.0-$($env:ARCH)-$($env:TIME_STRING).exe" + Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim-Portable.exe" -FileName "Gajim-Portable-1.3.0-$($env:ARCH)-$($env:TIME_STRING).exe" # on_finish: # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) ===================================== gajim/__init__.py ===================================== @@ -2,7 +2,7 @@ import sys from pathlib import Path -__version__ = "1.3.0-beta2" +__version__ = "1.3.0" IS_FLATPAK = Path('/app/share/run-as-flatpak').exists() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6f0329870288135502b9329422ba2768… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6f0329870288135502b9329422ba2768… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.3] Update appdata.xml
by Philipp Hörist 07 Feb '21

07 Feb '21

Philipp Hörist pushed to branch gajim_1.3 at gajim / gajim Commits: 749e50f4 by lovetox at 2021-02-07T17:41:51+01:00 Update appdata.xml - - - - - 1 changed file: - data/org.gajim.Gajim.appdata.xml.in Changes: ===================================== data/org.gajim.Gajim.appdata.xml.in ===================================== @@ -72,6 +72,7 @@ <content_attribute id="social-audio">intense</content_attribute> </content_rating> <releases> + <release version="1.3.0" date="2021-02-08" /> <release version="1.2.2" date="2020-08-15" /> <release version="1.2.1" date="2020-07-08" /> <release version="1.2.0" date="2020-06-21" /> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/749e50f4262374fdc4d7e0f50a640c80… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/749e50f4262374fdc4d7e0f50a640c80… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update appdata.xml
by Philipp Hörist 07 Feb '21

07 Feb '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: c93d1170 by lovetox at 2021-02-07T17:41:20+01:00 Update appdata.xml - - - - - 1 changed file: - data/org.gajim.Gajim.appdata.xml.in Changes: ===================================== data/org.gajim.Gajim.appdata.xml.in ===================================== @@ -72,6 +72,7 @@ <content_attribute id="social-audio">intense</content_attribute> </content_rating> <releases> + <release version="1.3.0" date="2021-02-08" /> <release version="1.2.2" date="2020-08-15" /> <release version="1.2.1" date="2020-07-08" /> <release version="1.2.0" date="2020-06-21" /> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c93d1170232fd53909408b973e9fbf62… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c93d1170232fd53909408b973e9fbf62… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.3] 2 commits: PubSub: Discover publish options correctly
by Philipp Hörist 07 Feb '21

07 Feb '21

Philipp Hörist pushed to branch gajim_1.3 at gajim / gajim Commits: 3680b883 by lovetox at 2021-02-07T17:39:17+01:00 PubSub: Discover publish options correctly - - - - - 3dfb991d by lovetox at 2021-02-07T17:39:28+01:00 Bookmarks: Check for config-node-max feature Fixes #10425 - - - - - 2 changed files: - gajim/common/modules/bookmarks.py - gajim/common/modules/pubsub.py Changes: ===================================== gajim/common/modules/bookmarks.py ===================================== @@ -35,6 +35,9 @@ from gajim.common.modules.util import event_node +NODE_MAX_NS = 'http://jabber.org/protocol/pubsub#config-node-max' + + class Bookmarks(BaseModule): def __init__(self, con): BaseModule.__init__(self, con) @@ -43,6 +46,7 @@ def __init__(self, con): self._conversion = False self._compat = False self._compat_pep = False + self._node_max = False self._bookmarks = {} self._join_timeouts = [] self._request_in_progress = True @@ -132,6 +136,7 @@ def _bookmark_1_event_received(self, _con, _stanza, properties): NetworkEvent('bookmarks-received', account=self._account)) def pass_disco(self, info): + self._node_max = NODE_MAX_NS in info.features self._compat_pep = Namespace.BOOKMARKS_COMPAT_PEP in info.features self._compat = Namespace.BOOKMARKS_COMPAT in info.features self._conversion = Namespace.BOOKMARK_CONVERSION in info.features @@ -141,7 +146,10 @@ def _bookmark_module(self): if not self._con.get_module('PubSub').publish_options: return 'PrivateBookmarks' - if app.settings.get('dev_force_bookmark_2') or self._compat_pep: + if app.settings.get('dev_force_bookmark_2'): + return 'NativeBookmarks' + + if self._compat_pep and self._node_max: return 'NativeBookmarks' if self._conversion: ===================================== gajim/common/modules/pubsub.py ===================================== @@ -44,8 +44,9 @@ def __init__(self, con): self.publish_options = False def pass_disco(self, info): - self._log.info('Discovered Pubsub publish options: %s', info.jid) - self.publish_options = True + if Namespace.PUBSUB_PUBLISH_OPTIONS in info.features: + self._log.info('Discovered Pubsub publish options: %s', info.jid) + self.publish_options = True def send_pb_subscription_query(self, jid, cb, **kwargs): if not app.account_is_available(self._account): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c112ccffff3d7eb7762837589f612f1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c112ccffff3d7eb7762837589f612f1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Add Namespace
by Philipp Hörist 07 Feb '21

07 Feb '21

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: e280f973 by lovetox at 2021-02-07T17:10:20+01:00 Add Namespace - - - - - 1 changed file: - nbxmpp/namespaces.py Changes: ===================================== nbxmpp/namespaces.py ===================================== @@ -129,6 +129,7 @@ class _Namespaces: PUBSUB_EVENT: str = 'http://jabber.org/protocol/pubsub#event' PUBSUB_OWNER: str = 'http://jabber.org/protocol/pubsub#owner' PUBSUB_PUBLISH_OPTIONS: str = 'http://jabber.org/protocol/pubsub#publish-options' + PUBSUB_NODE_MAX: str = 'http://jabber.org/protocol/pubsub#config-node-max' RECEIPTS: str = 'urn:xmpp:receipts' REGISTER: str = 'jabber:iq:register' REGISTER_FEATURE: str = 'http://jabber.org/features/iq-register' View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/e280f973cb81d5da8b176db9… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/e280f973cb81d5da8b176db9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: PubSub: Discover publish options correctly
by Philipp Hörist 07 Feb '21

07 Feb '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: d37f6e84 by lovetox at 2021-02-07T17:35:11+01:00 PubSub: Discover publish options correctly - - - - - 2fd685f7 by lovetox at 2021-02-07T17:35:11+01:00 Bookmarks: Check for config-node-max feature Fixes #10425 - - - - - 2 changed files: - gajim/common/modules/bookmarks.py - gajim/common/modules/pubsub.py Changes: ===================================== gajim/common/modules/bookmarks.py ===================================== @@ -35,6 +35,9 @@ from gajim.common.modules.util import event_node +NODE_MAX_NS = 'http://jabber.org/protocol/pubsub#config-node-max' + + class Bookmarks(BaseModule): def __init__(self, con): BaseModule.__init__(self, con) @@ -43,6 +46,7 @@ def __init__(self, con): self._conversion = False self._compat = False self._compat_pep = False + self._node_max = False self._bookmarks = {} self._join_timeouts = [] self._request_in_progress = True @@ -132,6 +136,7 @@ def _bookmark_1_event_received(self, _con, _stanza, properties): NetworkEvent('bookmarks-received', account=self._account)) def pass_disco(self, info): + self._node_max = NODE_MAX_NS in info.features self._compat_pep = Namespace.BOOKMARKS_COMPAT_PEP in info.features self._compat = Namespace.BOOKMARKS_COMPAT in info.features self._conversion = Namespace.BOOKMARK_CONVERSION in info.features @@ -141,7 +146,10 @@ def _bookmark_module(self): if not self._con.get_module('PubSub').publish_options: return 'PrivateBookmarks' - if app.settings.get('dev_force_bookmark_2') or self._compat_pep: + if app.settings.get('dev_force_bookmark_2'): + return 'NativeBookmarks' + + if self._compat_pep and self._node_max: return 'NativeBookmarks' if self._conversion: ===================================== gajim/common/modules/pubsub.py ===================================== @@ -44,8 +44,9 @@ def __init__(self, con): self.publish_options = False def pass_disco(self, info): - self._log.info('Discovered Pubsub publish options: %s', info.jid) - self.publish_options = True + if Namespace.PUBSUB_PUBLISH_OPTIONS in info.features: + self._log.info('Discovered Pubsub publish options: %s', info.jid) + self.publish_options = True def send_pb_subscription_query(self, jid, cb, **kwargs): if not app.account_is_available(self._account): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/69b4ae1823fdf6391e1ccf07e3f45eb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/69b4ae1823fdf6391e1ccf07e3f45eb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Save handle position
by Philipp Hörist 07 Feb '21

07 Feb '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 683e442b by lovetox at 2021-02-07T16:08:20+01:00 Save handle position - - - - - 2 changed files: - gajim/common/setting_values.py - gajim/gtk/main.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -189,6 +189,7 @@ class _ACCOUNT_DEFAULT: 'always_ask_for_status_message': False, 'show_send_message_button': False, 'workspace_order': [], + 'chat_handle_position': 350, } ACCOUNT_SETTINGS = { ===================================== gajim/gtk/main.py ===================================== @@ -65,6 +65,9 @@ def __init__(self): 'clicked', self._on_start_chat_clicked) self._ui.connect_signals(self) + self._ui.paned.set_position(app.settings.get('chat_handle_position')) + self._ui.paned.connect('button-release-event', self._on_button_release) + # pylint: disable=line-too-long self.register_events([ ('presence-received', ged.GUI1, self._on_event), @@ -115,6 +118,13 @@ def __init__(self): self._add_accounts() self._add_actions() + @staticmethod + def _on_button_release(paned, event): + if event.window != paned.get_handle_window(): + return + position = paned.get_position() + app.settings.set('chat_handle_position', position) + def _add_actions(self): actions = [ ('add-workspace', 's', self._add_workspace), View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/683e442baf8b483b130b52a4dda7cdff… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/683e442baf8b483b130b52a4dda7cdff… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits