Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim] Pushed new branch set-sast-config-1
by Philipp Hörist (＠lovetox) 26 Dec '21

26 Dec '21

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

1 0

[Git][gajim/gajim] Pushed new branch set-secret-detection-config-2
by Philipp Hörist (＠lovetox) 26 Dec '21

26 Dec '21

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

1 0

[Git][gajim/gajim] Pushed new branch set-secret-detection-config-1
by Philipp Hörist (＠lovetox) 26 Dec '21

26 Dec '21

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

1 0

[Git][gajim/gajim][master] Scripts: Port link-gtk to python
by Philipp Hörist (＠lovetox) 26 Dec '21

26 Dec '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 17e9923a by lovetox at 2021-12-26T23:15:38+01:00 Scripts: Port link-gtk to python - - - - - 3 changed files: - .gitlab-ci.yml - + scripts/ci/link-gtk.py - − scripts/ci/link-gtk.sh Changes: ===================================== .gitlab-ci.yml ===================================== @@ -12,7 +12,7 @@ pyright: - pip3 install -I git+https://dev.gajim.org/gajim/gi-stubs.git - npm install pyright - python3 -V - - scripts/ci/link-gtk.sh + - python3 scripts/ci/link-gtk.py - $(npm bin)/pyright --version - $(npm bin)/pyright interruptible: true ===================================== scripts/ci/link-gtk.py ===================================== @@ -0,0 +1,33 @@ +#!/usr/bin/env python + +# Creates links from gui folder to all files in the gtk folder +# This is needed for pyright to work correctly with the dynamic gui imports + +from pathlib import Path + +IGNORED_FILES = ['__init__.py'] +IGNORED_DIRS = ['__pycache__'] + +cwd = Path.cwd() + +if cwd.name != 'gajim': + exit('Script needs to be excecuted from gajim repository root directory') + +gui_path = cwd / 'gajim' / 'gui' +gtk_path = cwd / 'gajim' / 'gtk' + + +def link(target): + source = str(target) + source = source.replace('gajim/gtk', 'gajim/gui') + source = Path(source) + source.symlink_to(target) + print('create symlink from', source, 'to', target) + +for path in gtk_path.iterdir(): + if path.is_dir(): + if path.name not in IGNORED_DIRS: + link(path) + + elif path.name not in IGNORED_FILES: + link(path) ===================================== scripts/ci/link-gtk.sh deleted ===================================== @@ -1,7 +0,0 @@ -#!/bin/bash - -cd gajim -mv gui gui_temp -cp -r gtk gui -mv -f gui_temp/__init__.py gui/__init__.py -rm -r gui_temp View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/17e9923ae82142fb6b97cd1ba41e72a2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/17e9923ae82142fb6b97cd1ba41e72a2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Scripts: Simplify UI type generation
by Philipp Hörist (＠lovetox) 26 Dec '21

26 Dec '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: a308fa83 by lovetox at 2021-12-26T22:32:27+01:00 Scripts: Simplify UI type generation - - - - - 1 changed file: - scripts/dev/generate_ui_types.py Changes: ===================================== scripts/dev/generate_ui_types.py ===================================== @@ -1,28 +1,21 @@ #!/usr/bin/env python3 -import sys -from pathlib import Path +# Reads all .ui files and creates builder.pyi +# Excecute this script from the repo root dir +from pathlib import Path from xml.etree import ElementTree as ET -try: - path = sys.argv[1] -except Exception: - print('path to file/folder missing') - exit() - -path = Path(path) -if path.is_dir(): - paths = list(path.iterdir()) +cwd = Path.cwd() -elif path.is_file(): - paths = [path] +if cwd.name != 'gajim': + exit('Script needs to be excecuted from gajim repository root directory') -else: - print('Path must be folder or file:', path) - exit() +in_path = cwd / 'gajim' / 'data' / 'gui' +out_path = cwd / 'gajim' / 'gtk' / 'builder.pyi' +paths = list(in_path.iterdir()) IMPORTS = ''' from typing import Literal @@ -86,8 +79,7 @@ def parse(path, file): builder_names = [] -current_dir = Path('./builder.pyi') -with current_dir.open(mode='w') as file: +with out_path.open(mode='w') as file: file.write(IMPORTS) for path in paths: if path.name.endswith('~'): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a308fa83765232b8078a3a41bebaf1d8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a308fa83765232b8078a3a41bebaf1d8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update Builder annotations
by Philipp Hörist (＠lovetox) 26 Dec '21

26 Dec '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 84ef2245 by lovetox at 2021-12-26T22:25:09+01:00 Update Builder annotations - - - - - 1 changed file: - gajim/gtk/builder.pyi Changes: ===================================== gajim/gtk/builder.pyi ===================================== @@ -339,18 +339,6 @@ class FiletransfersBuilder(Builder): file_transfers_window_atkobject: Atk.Object -class GroupchatInviteBuilder(Builder): - account_store: Gtk.ListStore - contacts_placeholder: Gtk.Box - invite_grid: Gtk.Grid - invitees: Gtk.ScrolledWindow - invitees_listbox: Gtk.ListBox - search_entry: Gtk.SearchEntry - scrolledwindow: Gtk.ScrolledWindow - contacts_listbox: Gtk.ListBox - invitees_placeholder: Gtk.Box - - class PreviewBuilder(Builder): preview_box: Gtk.Box icon_event_box: Gtk.EventBox @@ -665,6 +653,16 @@ class GroupchatInfoScrolledBuilder(Builder): address: Gtk.Label +class GroupchatInviterBuilder(Builder): + account_store: Gtk.ListStore + invite_box: Gtk.Box + search_entry: Gtk.SearchEntry + scrolledwindow: Gtk.ScrolledWindow + contacts_listbox: Gtk.ListBox + contacts_placeholder: Gtk.Box + invitees_scrolled: Gtk.ScrolledWindow + + class GroupchatControlBuilder(Builder): drop_area: Gtk.Box formattings_menu: Gtk.Menu @@ -1021,8 +1019,6 @@ def get_builder(file_name: Literal['workspace_dialog.ui'], widgets: list[str] = @overload def get_builder(file_name: Literal['filetransfers.ui'], widgets: list[str] = ...) -> FiletransfersBuilder: ... @overload -def get_builder(file_name: Literal['groupchat_invite.ui'], widgets: list[str] = ...) -> GroupchatInviteBuilder: ... -@overload def get_builder(file_name: Literal['preview.ui'], widgets: list[str] = ...) -> PreviewBuilder: ... @overload def get_builder(file_name: Literal['exception_dialog.ui'], widgets: list[str] = ...) -> ExceptionDialogBuilder: ... @@ -1063,6 +1059,8 @@ def get_builder(file_name: Literal['contact_info.ui'], widgets: list[str] = ...) @overload def get_builder(file_name: Literal['groupchat_info_scrolled.ui'], widgets: list[str] = ...) -> GroupchatInfoScrolledBuilder: ... @overload +def get_builder(file_name: Literal['groupchat_inviter.ui'], widgets: list[str] = ...) -> GroupchatInviterBuilder: ... +@overload def get_builder(file_name: Literal['groupchat_control.ui'], widgets: list[str] = ...) -> GroupchatControlBuilder: ... @overload def get_builder(file_name: Literal['start_chat_dialog.ui'], widgets: list[str] = ...) -> StartChatDialogBuilder: ... View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/84ef2245ee0578750e31fdd1001c877b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/84ef2245ee0578750e31fdd1001c877b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix type annotations
by Philipp Hörist (＠lovetox) 26 Dec '21

26 Dec '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4f6d7da0 by lovetox at 2021-12-26T20:59:14+01:00 Fix type annotations - - - - - 1 changed file: - gajim/gtk/groupchat_roster.py Changes: ===================================== gajim/gtk/groupchat_roster.py ===================================== @@ -37,6 +37,7 @@ from gajim.common.const import AvatarSize from gajim.common.const import StyleAttr from gajim.common.nec import NetworkEvent +from gajim.common.modules.contacts import GroupchatContact from gajim.gui_menu_builder import get_groupchat_roster_menu from .tooltips import GCTooltip @@ -85,7 +86,7 @@ def __init__(self, self._control = control self._control_id = control.control_id self._tooltip = GCTooltip() - self._group_chat_contact = cast(types.GroupchatContact, control.contact) + self._group_chat_contact = cast(GroupchatContact, control.contact) self._group_chat_contact.connect( 'user-avatar-update', self._on_user_avatar_update) self._group_chat_contact.connect('user-joined', self._on_user_joined) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4f6d7da03538ade87b18d82dd8da5642… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4f6d7da03538ade87b18d82dd8da5642… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Toolips: Fix typing
by Daniel Brötzmann (＠wurstsalat) 26 Dec '21

26 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: c0b295fa by wurstsalat at 2021-12-26T18:23:01+01:00 Toolips: Fix typing - - - - - 1 changed file: - gajim/gtk/tooltips.py Changes: ===================================== gajim/gtk/tooltips.py ===================================== @@ -24,6 +24,8 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from __future__ import annotations + import os import time import logging @@ -35,7 +37,8 @@ from nbxmpp import JID -from gajim.common import app, types +from gajim.common import app +from gajim.common import types from gajim.common import helpers from gajim.common.const import AvatarSize from gajim.common.const import PEPEventType View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c0b295fa5352920ff65ac66f16604afa… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c0b295fa5352920ff65ac66f16604afa… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: WorkspaceSidebar: Typing
by Daniel Brötzmann (＠wurstsalat) 26 Dec '21

26 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: dcf0ed9f by wurstsalat at 2021-12-26T17:44:55+01:00 WorkspaceSidebar: Typing - - - - - 0f72a7d2 by wurstsalat at 2021-12-26T17:57:07+01:00 ResourceSelector: Typing - - - - - 2 changed files: - gajim/gtk/resource_selector.py - gajim/gtk/workspace_side_bar.py Changes: ===================================== gajim/gtk/resource_selector.py ===================================== @@ -12,7 +12,7 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -from typing import List +from __future__ import annotations from typing import Optional from typing import Tuple @@ -27,6 +27,7 @@ from nbxmpp.structs import DiscoInfo from gajim.common import app +from gajim.common import types from gajim.common.i18n import _ from gajim.common.modules.contacts import BareContact from gajim.common.modules.contacts import ResourceContact @@ -43,8 +44,9 @@ class ResourceSelector(Gtk.ScrolledWindow): (bool, )), } - def __init__(self, contact: BareContact, - constraints: List[_Namespaces] = None) -> None: + def __init__(self, + contact: BareContact, + constraints: Optional[list[_Namespaces]] = None) -> None: Gtk.ScrolledWindow.__init__(self) self.set_shadow_type(Gtk.ShadowType.IN) self.set_size_request(-1, 200) @@ -68,11 +70,14 @@ def __init__(self, contact: BareContact, self.show_all() @staticmethod - def _sort_func(row1, row2): + def _sort_func(row1: ResourceRow, row2: ResourceRow) -> int: return locale.strcoll( row1.device_text.lower(), row2.device_text.lower()) - def _on_row_selected(self, _listbox, row): + def _on_row_selected(self, + _listbox: Gtk.ListBox, + row: ResourceRow + ) -> None: state = bool(row is not None) self.emit('selection-changed', state) @@ -92,7 +97,10 @@ def _add_entries(self) -> None: for resource in self._contact.iter_resources(): self._listbox.add(ResourceRow(resource, self._constraints)) - def _on_update(self, _contact, _signal_name): + def _on_update(self, + _contact: types.ResourceContact, + _signal_name: str + ) -> None: for child in self._listbox.get_children(): self._listbox.remove(child) self._add_entries() @@ -102,15 +110,17 @@ def get_jid(self) -> JID: class ResourceRow(Gtk.ListBoxRow): - def __init__(self, resource_contact: ResourceContact, - constraints: List[_Namespaces]) -> None: + def __init__(self, + resource_contact: ResourceContact, + constraints: list[_Namespaces] + ) -> None: Gtk.ListBoxRow.__init__(self) self.jid = resource_contact.jid icon_name = 'computer-symbolic' tooltip_text = _('Computer') - self.device_text = resource_contact.jid.resource + self.device_text = resource_contact.jid.resource or '' disco_info = app.storage.cache.get_last_disco_info( resource_contact.jid) @@ -135,7 +145,7 @@ def __init__(self, resource_contact: ResourceContact, box.add(name_label) for constraint in constraints: - if not resource_contact.supports(constraint): + if not resource_contact.supports(str(constraint)): self.set_sensitive(False) self.set_tooltip_text(_('This devices is not compatible.')) ===================================== gajim/gtk/workspace_side_bar.py ===================================== @@ -17,6 +17,7 @@ from typing import Any from typing import List from typing import Optional +from typing import Union import logging @@ -60,8 +61,8 @@ def __init__(self, chat_page: ChatPage) -> None: Gdk.DragAction.MOVE) self.drag_row: Optional[Workspace] = None - self.row_before = None - self.row_after = None + self.row_before: Optional[Workspace] = None + self.row_after: Union[Workspace, AddWorkspace, None] = None self.connect('drag-motion', self._on_drag_motion) self.connect('drag-data-received', self._on_drag_data_received) @@ -74,7 +75,7 @@ def __init__(self, chat_page: ChatPage) -> None: self._on_unread_count_changed) chat_list_stack.connect('chat-selected', self._on_chat_selected) - self._workspaces = {} + self._workspaces: dict[str, Workspace] = {} def _on_drag_motion(self, _widget: Gtk.Widget, @@ -82,7 +83,7 @@ def _on_drag_motion(self, _x_coord: int, y_coord: int, _time: int - ) -> None: + ) -> bool: row = self.get_row_at_y(y_coord) if row: @@ -172,11 +173,16 @@ def _on_unread_count_changed(self, workspace = self._workspaces[workspace_id] workspace.set_unread_count(count) - def _on_chat_selected(self, _chat_list_stack, workspace_id, *args): + def _on_chat_selected(self, + _chat_list_stack: ChatListStack, + workspace_id: str, + *args: Any) -> None: self.activate_workspace(workspace_id) @staticmethod - def _on_row_activated(_listbox, row): + def _on_row_activated(_listbox: Gtk.ListBox, + row: Union[Workspace, AddWorkspace] + ) -> None: if row.workspace_id == 'add': open_window('WorkspaceDialog') else: @@ -208,7 +214,7 @@ def activate_workspace(self, workspace_id: str) -> None: row = self._workspaces[workspace_id] self.select_row(row) - def get_active_workspace(self) -> str: + def get_active_workspace(self) -> Optional[str]: row = self.get_selected_row() if row is None: return None @@ -230,7 +236,7 @@ def update_avatar(self, workspace_id: str) -> None: class CommonWorkspace(Gtk.ListBoxRow): - def __init__(self, workspace_id): + def __init__(self, workspace_id: str) -> None: Gtk.ListBoxRow.__init__(self) self.workspace_id = workspace_id View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f03998805709844034b4065f3145b27… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f03998805709844034b4065f3145b27… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update pyrightconfig.json
by Philipp Hörist (＠lovetox) 26 Dec '21

26 Dec '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: f0399880 by lovetox at 2021-12-26T14:52:05+01:00 Update pyrightconfig.json - - - - - 1 changed file: - pyrightconfig.json Changes: ===================================== pyrightconfig.json ===================================== @@ -15,6 +15,8 @@ "include": [ "gajim/gtk/chat_filter.py", "gajim/gtk/app_side_bar.py", + "gajim/gtk/status_selector.py", + "gajim/gtk/status_message_selector.py", "gajim/common/cert_store.py" ], } View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f03998805709844034b4065f3145b27e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f03998805709844034b4065f3145b27e… 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