Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] ChatControlBase: Don’t unselect text after key press
by Philipp Hörist 18 Jan '21

18 Jan '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 965b4a6f by lovetox at 2021-01-18T21:40:49+01:00 ChatControlBase: Don’t unselect text after key press This clears the SELECTION Clipboard for example when pressing ALT + TAB - - - - - 1 changed file: - gajim/chat_control_base.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -294,7 +294,6 @@ def _on_conv_textview_key_press_event(self, textview, event): return Gdk.EVENT_PROPAGATE # Focus the Message Input and resend the event - textview.unselect() self.msg_textview.grab_focus() self.msg_textview.get_toplevel().propagate_key_event(event) return Gdk.EVENT_STOP View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/965b4a6f71ab5a71acae21e0bb8e5d60… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/965b4a6f71ab5a71acae21e0bb8e5d60… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Search also in user data dir for translations
by Philipp Hörist 18 Jan '21

18 Jan '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: ae18a849 by André Apitzsch at 2021-01-18T20:35:41+01:00 Search also in user data dir for translations Translation wasn't available if Gajim is installed in a user's home directory only." - - - - - 1 changed file: - gajim/common/i18n.py Changes: ===================================== gajim/common/i18n.py ===================================== @@ -24,6 +24,7 @@ import gettext import unicodedata from pathlib import Path +from gi.repository import GLib DOMAIN = 'gajim' LANG = 'en' @@ -45,10 +46,8 @@ def get_locale_dirs(): # Check if we run as flatpak return [Path('/app/share/')] - data_dirs = os.getenv('XDG_DATA_DIRS') - if data_dirs: - return list(map(Path, data_dirs.split(':'))) - return [Path('/usr/local/share/'), Path('/usr/share/')] + data_dirs = [GLib.get_user_data_dir()] + GLib.get_system_data_dirs() + return [Path(dir_) for dir_ in data_dirs] def iter_locale_dirs(): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ae18a849ed683ee3e7e2ef6f0068c934… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ae18a849ed683ee3e7e2ef6f0068c934… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] GroupchatCreation: Make it a dialog and raise size
by Philipp Hörist 18 Jan '21

18 Jan '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3b702000 by lovetox at 2021-01-18T18:50:28+01:00 GroupchatCreation: Make it a dialog and raise size - - - - - 1 changed file: - gajim/gtk/groupchat_creation.py Changes: ===================================== gajim/gtk/groupchat_creation.py ===================================== @@ -40,6 +40,8 @@ def __init__(self, account): self.set_name('CreateGroupchat') self.set_application(app.app) self.set_position(Gtk.WindowPosition.CENTER) + self.set_type_hint(Gdk.WindowTypeHint.DIALOG) + self.set_default_size(500, -1) self.set_show_menubar(False) self.set_resizable(True) self.set_title(_('Create Group Chat')) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3b70200047a39e4656e992e0f8bd161b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3b70200047a39e4656e992e0f8bd161b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Add remove_chat()
by Philipp Hörist 17 Jan '21

17 Jan '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 8447b316 by lovetox at 2021-01-17T22:08:23+01:00 Add remove_chat() - - - - - 4 changed files: - gajim/gtk/chat_list.py - gajim/gtk/chat_list_stack.py - gajim/gtk/chat_stack.py - gajim/gtk/main.py Changes: ===================================== gajim/gtk/chat_list.py ===================================== @@ -35,6 +35,11 @@ def select_chat(self, account, jid): row = self._chats[(account, jid)] self.select_row(row) + def remove_chat(self, account, jid): + row = self._chats.pop((account, jid)) + self.remove(row) + row.destroy() + def _on_row_selected(self, _listbox, row): if row is None: self._chat_stack.clear() ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -48,3 +48,7 @@ def store_open_chats(self, workspace_id): open_chats = chat_list.get_open_chats() app.settings.set_workspace_setting( workspace_id, 'open_chats', open_chats) + + def remove_chat(self, workspace_id, account, jid): + chat_list = self._chat_lists[workspace_id] + chat_list.remove_chat(account, jid) ===================================== gajim/gtk/chat_stack.py ===================================== @@ -33,6 +33,11 @@ def add_chat(self, account, jid): self.add_named(chat_control.widget, f'{account}:{jid}') chat_control.widget.show_all() + def remove_chat(self, account, jid): + control = self._controls[account].pop(jid) + control.shutdown() + self.remove(control) + def show_chat(self, account, jid): self.set_visible_child_name(f'{account}:{jid}') ===================================== gajim/gtk/main.py ===================================== @@ -68,6 +68,11 @@ def add_chat_for_workspace(self, workspace_id, account, jid): self._chat_list_stack.select_chat(workspace_id, account, jid) self._chat_list_stack.store_open_chats(workspace_id) + def remove_chat(self, workspace_id, account, jid): + self._chat_stack.remove_chat(account, jid) + self._chat_list_stack.remove_chat(workspace_id, account, jid) + self._chat_list_stack.store_open_chats(workspace_id) + def get_control(self, account, jid): return self._chat_stack.get_control(account, jid) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8447b3162023ab36fbc76eafc61c3649… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8447b3162023ab36fbc76eafc61c3649… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: Add Workspace settings API
by Philipp Hörist 17 Jan '21

17 Jan '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: a38e4a31 by lovetox at 2021-01-17T13:45:21+01:00 Add Workspace settings API - - - - - cd3cd65b by lovetox at 2021-01-17T21:49:13+01:00 Store and Open chats - - - - - 5 changed files: - gajim/common/setting_values.py - gajim/common/settings.py - gajim/gtk/chat_list.py - gajim/gtk/chat_list_stack.py - gajim/gtk/main.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -1,3 +1,4 @@ +import uuid from gajim.common.i18n import _ @@ -186,6 +187,7 @@ class _ACCOUNT_DEFAULT: 'last_update_check': '', 'always_ask_for_status_message': False, 'show_send_message_button': False, + 'workspace_order': [], } ACCOUNT_SETTINGS = { @@ -283,6 +285,15 @@ class _ACCOUNT_DEFAULT: } +WORKSPACE_SETTINGS = { + 'name': _('My Workspace'), + 'open_chats': [], +} + + +INITAL_WORKSPACE = {str(uuid.uuid4()): {}} + + PLUGIN_SETTINGS = { 'active': False } ===================================== gajim/common/settings.py ===================================== @@ -19,6 +19,7 @@ import sys import json +import uuid import logging import sqlite3 import inspect @@ -38,14 +39,16 @@ from gajim.common.setting_values import ACCOUNT_SETTINGS from gajim.common.setting_values import PROXY_SETTINGS from gajim.common.setting_values import PROXY_EXAMPLES +from gajim.common.setting_values import INITAL_WORKSPACE from gajim.common.setting_values import PLUGIN_SETTINGS +from gajim.common.setting_values import WORKSPACE_SETTINGS from gajim.common.setting_values import DEFAULT_SOUNDEVENT_SETTINGS from gajim.common.setting_values import STATUS_PRESET_SETTINGS from gajim.common.setting_values import STATUS_PRESET_EXAMPLES from gajim.common.setting_values import HAS_APP_DEFAULT from gajim.common.setting_values import HAS_ACCOUNT_DEFAULT -SETTING_TYPE = Union[bool, int, str, object] +SETTING_TYPE = Union[bool, int, str, object, list] log = logging.getLogger('gajim.c.settings') @@ -65,10 +68,12 @@ INSERT INTO settings(name, settings) VALUES ('status_presets', '%s'); INSERT INTO settings(name, settings) VALUES ('proxies', '%s'); INSERT INTO settings(name, settings) VALUES ('plugins', '{}'); + INSERT INTO settings(name, settings) VALUES ('workspaces', '%s'); - PRAGMA user_version=0; + PRAGMA user_version=1; ''' % (json.dumps(STATUS_PRESET_EXAMPLES), - json.dumps(PROXY_EXAMPLES)) + json.dumps(PROXY_EXAMPLES), + json.dumps(INITAL_WORKSPACE)) class Settings: @@ -235,7 +240,12 @@ def _migrate_database(self) -> None: sys.exit() def _migrate(self) -> None: - pass + version = self._get_user_version() + if version < 1: + sql = '''INSERT INTO settings(name, settings) + VALUES ('workspaces', ?)''' + self._con.execute(sql, (json.dumps(INITAL_WORKSPACE),)) + self._set_user_version(2) def _migrate_old_config(self) -> None: config_file = configpaths.get('CONFIG_FILE') @@ -907,6 +917,68 @@ def remove_proxy(self, proxy_name: str) -> None: if self.get_account_setting(account, 'proxy') == proxy_name: self.set_account_setting(account, 'proxy', None) + def set_workspace_setting(self, + workspace_id: str, + setting: str, + value: SETTING_TYPE) -> None: + + if setting not in WORKSPACE_SETTINGS: + raise ValueError(f'Invalid workspace setting: {setting}') + + if workspace_id not in self._settings['workspaces']: + raise ValueError(f'Workspace does not exists: {workspace_id}') + + default = WORKSPACE_SETTINGS[setting] + if not isinstance(value, type(default)): + raise TypeError(f'Invalid type for {setting}: ' + f'{value} {type(value)}') + + self._settings['workspaces'][workspace_id][setting] = value + self._commit_settings('workspaces') + + def get_workspace_setting(self, + workspace_id: str, + setting: str) -> SETTING_TYPE: + + if setting not in WORKSPACE_SETTINGS: + raise ValueError(f'Invalid workspace setting: {setting}') + + if workspace_id not in self._settings['workspaces']: + raise ValueError(f'Workspace does not exists: {workspace_id}') + + try: + return self._settings['workspaces'][workspace_id][setting] + except KeyError: + return WORKSPACE_SETTINGS[setting] + + def get_workspaces(self) -> None: + workspace_order = app.settings.get_app_setting('workspace_order') + + def sort_workspaces(workspace_id): + try: + return workspace_order.index(workspace_id) + except ValueError: + # Handle the case that a workflow id is for some reason not + # in the workspace order list + return 10000 + + workspaces = list(self._settings['workspaces'].keys()) + workspaces.sort(key=sort_workspaces) + return workspaces + + def add_workspace(self, name: str) -> None: + id_ = str(uuid.uuid4()) + self._settings['workspaces'][id_] = { + 'name': name, + } + self._commit_settings('workspaces') + return id_ + + def remove_workspace(self, id_: str) -> None: + del self._settings['workspaces'][id_] + self._commit_settings('workspaces') + + class LegacyConfig: ===================================== gajim/gtk/chat_list.py ===================================== @@ -41,6 +41,9 @@ def _on_row_selected(self, _listbox, row): return self._chat_stack.show_chat(row.account, row.jid) + def get_open_chats(self): + return list(self._chats.keys()) + class ChatRow(Gtk.ListBoxRow): def __init__(self, account, jid): ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -1,6 +1,8 @@ from gi.repository import Gtk +from gajim.common import app + from gajim.gui.chat_list import ChatList @@ -21,19 +23,28 @@ def _on_search_changed(self, search_entry): chat_list = self.get_visible_child() chat_list.set_filter_text(search_entry.get_text()) - def add_chat_list(self, name): + def add_chat_list(self, workspace_id): chat_list = ChatList(self._ui, self._chat_stack) - self._chat_lists[name] = chat_list - self.add_named(chat_list, name) + self._chat_lists[workspace_id] = chat_list + self.add_named(chat_list, workspace_id) + return chat_list - def show_chat_list(self, name): - self.set_visible_child_name(name) + def show_chat_list(self, workspace_id): + self.set_visible_child_name(workspace_id) - def add_chat(self, name, *args): - chat_list = self._chat_lists.get(name) + def add_chat(self, workspace_id, *args): + chat_list = self._chat_lists.get(workspace_id) + if chat_list is None: + chat_list = self.add_chat_list(workspace_id) chat_list.add_chat(*args) - def select_chat(self, name, *args): - self.show_chat_list(name) - chat_list = self._chat_lists.get(name) + def select_chat(self, workspace_id, *args): + self.show_chat_list(workspace_id) + chat_list = self._chat_lists.get(workspace_id) chat_list.select_chat(*args) + + def store_open_chats(self, workspace_id): + chat_list = self._chat_lists[workspace_id] + open_chats = chat_list.get_open_chats() + app.settings.set_workspace_setting( + workspace_id, 'open_chats', open_chats) ===================================== gajim/gtk/main.py ===================================== @@ -5,7 +5,6 @@ from gajim.gui.util import get_builder from gajim.gui.chat_list_stack import ChatListStack from gajim.gui.chat_stack import ChatStack -from gajim.gui.util import get_app_window class MainWindow(Gtk.ApplicationWindow): @@ -19,6 +18,10 @@ def __init__(self): self.window = self app.window = self + self._active_workspace = None + + self._startup_finished = False + self._ui = get_builder('main.ui') self.add(self._ui.main_grid) @@ -30,8 +33,6 @@ def __init__(self): self._ui.right_grid.add(self._chat_stack) self._ui.connect_signals(self) - self._chat_list_stack.add_chat_list('default') - self.show_all() self._load_chats() @@ -51,20 +52,30 @@ def show_title(self, *args): def get_active_jid(self, *args): pass + def get_active_workspace(self): + # TODO + return app.settings.get_workspaces()[0] + def add_chat(self, account, jid): + workspace_id = self.get_active_workspace() + self.add_chat_for_workspace(workspace_id, account, jid) + + def add_chat_for_workspace(self, workspace_id, account, jid): self._chat_stack.add_chat(account, jid) - self._chat_list_stack.add_chat('default', account, jid) - self._chat_list_stack.select_chat('default', account, jid) + self._chat_list_stack.add_chat(workspace_id, account, jid) + + if self._startup_finished: + self._chat_list_stack.select_chat(workspace_id, account, jid) + self._chat_list_stack.store_open_chats(workspace_id) def get_control(self, account, jid): return self._chat_stack.get_control(account, jid) def _load_chats(self): - for account in app.settings.get_accounts(): - jids = app.settings.get_account_setting( - account, 'opened_chat_controls') - if not jids: - continue - - for jid in jids.split(','): - self.add_chat(account, jid) + for workspace_id in app.settings.get_workspaces(): + open_chats = app.settings.get_workspace_setting(workspace_id, + 'open_chats') + for account, jid in open_chats: + self.add_chat_for_workspace(workspace_id, account, jid) + + self._startup_finished = True View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a4e279ef234bbc0861a4a68396653b8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a4e279ef234bbc0861a4a68396653b8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] AV: Fix closing chat window while in call
by Philipp Hörist 17 Jan '21

17 Jan '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: ea83fa7b by Daniel Brötzmann at 2021-01-16T17:36:59+01:00 AV: Fix closing chat window while in call - - - - - 1 changed file: - gajim/chat_control.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -25,6 +25,7 @@ from typing import ClassVar # pylint: disable=unused-import from typing import Type # pylint: disable=unused-import +from typing import Optional # pylint: disable=unused-import import os import time @@ -908,7 +909,8 @@ def stop_jingle(self, sid=None, reason=None): if video_sid and sid in (video_sid, None): self.close_jingle_content('video') - def close_jingle_content(self, jingle_type: str) -> None: + def close_jingle_content(self, jingle_type: str, + shutdown: Optional[bool] = False) -> None: jingle = self.jingle[jingle_type] if not jingle.sid: return @@ -921,9 +923,10 @@ def close_jingle_content(self, jingle_type: str) -> None: if content: session.remove_content(content.creator, content.name) - jingle.sid = None - jingle.state = JingleState.NULL - jingle.update() + if not shutdown: + jingle.sid = None + jingle.state = JingleState.NULL + jingle.update() def _on_end_call_clicked(self, _widget): self.close_jingle_content('audio') @@ -1213,7 +1216,7 @@ def shutdown(self): con.get_module('Chatstate').set_chatstate(self.contact, Chatstate.GONE) for jingle_type in ('audio', 'video'): - self.close_jingle_content(jingle_type) + self.close_jingle_content(jingle_type, shutdown=True) self.jingle.clear() # disconnect self from session View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ea83fa7b20d16da7c59288133012439d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ea83fa7b20d16da7c59288133012439d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Really disable CI
by Philipp Hörist 16 Jan '21

16 Jan '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: a4e279ef by lovetox at 2021-01-16T22:00:25+01:00 Really disable CI - - - - - 1 changed file: - − .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml deleted ===================================== @@ -1,8 +0,0 @@ -# include: -# - project: 'gajim/ci' -# ref: master -# file: '.gajim-ci.yml' - -# variables: -# NBXMPP_BRANCH: master -# PLUGINS_BRANCH: master View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a4e279ef234bbc0861a4a68396653b89… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a4e279ef234bbc0861a4a68396653b89… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Disable CI
by Philipp Hörist 16 Jan '21

16 Jan '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: c25a591b by lovetox at 2021-01-16T21:59:45+01:00 Disable CI - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -1,8 +1,8 @@ -include: -- project: 'gajim/ci' - ref: master - file: '.gajim-ci.yml' +# include: +# - project: 'gajim/ci' +# ref: master +# file: '.gajim-ci.yml' -variables: - NBXMPP_BRANCH: master - PLUGINS_BRANCH: master +# variables: +# NBXMPP_BRANCH: master +# PLUGINS_BRANCH: master View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c25a591b5993312713c5ef398d9f414f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c25a591b5993312713c5ef398d9f414f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new branch mainwindow
by Philipp Hörist 16 Jan '21

16 Jan '21

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

1 0

[Git][gajim/gajim][master] PEPConfig: Raise default size
by Philipp Hörist 15 Jan '21

15 Jan '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0abe497c by lovetox at 2021-01-15T23:28:28+01:00 PEPConfig: Raise default size - - - - - 1 changed file: - gajim/gtk/pep_config.py Changes: ===================================== gajim/gtk/pep_config.py ===================================== @@ -38,7 +38,7 @@ def __init__(self, account): self.set_position(Gtk.WindowPosition.CENTER) self.set_show_menubar(False) self.set_name('PEPConfig') - self.set_default_size(300, 350) + self.set_default_size(500, 350) self.set_resizable(True) self.set_transient_for(app.interface.roster.window) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0abe497c0964c6a4db92b8f0e3c13efd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0abe497c0964c6a4db92b8f0e3c13efd… 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