Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][newcontrol] 2 commits: chore: Control: Remove obsolete overlay from UI file
by Daniel Brötzmann (＠wurstsalat) 31 Jul '22

31 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: 527de18a by wurstsalat at 2022-07-31T20:04:32+02:00 chore: Control: Remove obsolete overlay from UI file - - - - - 4486547a by wurstsalat at 2022-07-31T20:13:41+02:00 fix: GroupchatRoster: Hide revealer initially - - - - - 2 changed files: - gajim/data/gui/chat_control.ui - gajim/gtk/controls/groupchat.py Changes: ===================================== gajim/data/gui/chat_control.ui ===================================== @@ -5,43 +5,31 @@ <object class="GtkBox" id="control_box"> <property name="can-focus">True</property> <child> - <object class="GtkOverlay" id="overlay"> - <property name="visible">True</property> - <property name="can-focus">False</property> + <object class="GtkBox" id="conv_view_box"> + <property name="can-focus">True</property> + <property name="margin-start">7</property> + <property name="margin-end">7</property> + <property name="spacing">3</property> <child> - <object class="GtkBox" id="conv_view_box"> - <property name="can-focus">True</property> - <property name="margin-start">7</property> - <property name="margin-end">7</property> - <property name="spacing">3</property> - <child> - <object class="GtkOverlay" id="conv_view_overlay"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="hexpand">True</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> + <object class="GtkOverlay" id="conv_view_overlay"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="hexpand">True</property> <child> <placeholder/> </child> </object> <packing> - <property name="index">-1</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> </object> ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -83,17 +83,17 @@ def __init__(self, account: str, jid: JID) -> None: self._groupchat_state = GroupchatState(self.contact) self.xml.conv_view_overlay.add_overlay(self._groupchat_state) - self._roster_revealer = Gtk.Revealer() - self.xml.conv_view_box.add(self._roster_revealer) - self.roster = GroupchatRoster(self.account, self.room_jid, self) - self._roster_revealer.add(self.roster) + self.roster.connect('row-activated', self._on_roster_row_activated) show_roster = app.settings.get('hide_groupchat_occupants_list') + self._roster_revealer = Gtk.Revealer(no_show_all=not show_roster) + self._roster_revealer.add(self.roster) self._roster_revealer.set_reveal_child(show_roster) + self.xml.conv_view_box.add(self._roster_revealer) + app.settings.connect_signal( 'hide_groupchat_occupants_list', self._show_roster) - self.roster.connect('row-activated', self._on_roster_row_activated) self._subject_text = '' @@ -149,6 +149,8 @@ def invite(self, invited_jid: JID) -> None: def _show_roster(self, show_roster: bool, *args: Any) -> None: transition = Gtk.RevealerTransitionType.SLIDE_RIGHT if show_roster: + self._roster_revealer.set_no_show_all(False) + self._roster_revealer.show_all() transition = Gtk.RevealerTransitionType.SLIDE_LEFT self._roster_revealer.set_transition_type(transition) self._roster_revealer.set_reveal_child(show_roster) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/7f9a2d1395af3f534b7107300453632… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/7f9a2d1395af3f534b7107300453632… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] fix: Unregister signals when chatstack is cleared
by Philipp Hörist (＠lovetox) 31 Jul '22

31 Jul '22

Philipp Hörist pushed to branch newcontrol at gajim / gajim Commits: 7f9a2d13 by lovetox at 2022-07-31T13:39:47+02:00 fix: Unregister signals when chatstack is cleared - - - - - 3 changed files: - gajim/gtk/chat_banner.py - gajim/gtk/chat_stack.py - gajim/gtk/message_actions_box.py Changes: ===================================== gajim/gtk/chat_banner.py ===================================== @@ -29,6 +29,7 @@ from gajim.common import types from gajim.common.const import AvatarSize from gajim.common.const import SimpleClientState +from gajim.common.events import AccountEnabled from gajim.common.events import BookmarksReceived from gajim.common.events import MessageReceived from gajim.common.events import MucDiscoUpdate @@ -48,7 +49,6 @@ def __init__(self) -> None: Gtk.Box.__init__(self) EventHelper.__init__(self) - self._account: Optional[str] = None self._client: Optional[types.Client] = None self._contact: Optional[types.ChatContactT] = None @@ -58,14 +58,6 @@ def __init__(self) -> None: self._account_badge: Optional[AccountBadge] = None - self.register_events([ - ('message-received', ged.GUI1, self._on_message_received), - ('bookmarks-received', ged.GUI1, self._on_bookmarks_received), - ('muc-disco-update', ged.GUI1, self._on_muc_disco_update), - ('account-enabled', ged.GUI2, self._on_account_changed), - ('account-disabled', ged.GUI2, self._on_account_changed) - ]) - hide_roster = app.settings.get('hide_groupchat_occupants_list') self._set_toggle_roster_button_icon(hide_roster) app.settings.connect_signal( @@ -74,12 +66,26 @@ def __init__(self) -> None: self.show_all() + def clear(self) -> None: + if self._contact is not None: + self._contact.disconnect_all_from_obj(self) + self._contact = None + + if self._client is not None: + self._client.disconnect_all_from_obj(self) + self._client = None + + self.unregister_events() + + self._contact = None + self._client = None + def switch_contact(self, account: str, jid: JID ) -> None: - self._account = account - self._update_account_badge() + + self._update_account_badge(account) if self._client is not None: self._client.disconnect_all_from_obj(self) @@ -119,6 +125,14 @@ def switch_contact(self, 'user-nickname-changed': self._on_user_nickname_changed }) + self.register_events([ + ('message-received', ged.GUI1, self._on_message_received), + ('bookmarks-received', ged.GUI1, self._on_bookmarks_received), + ('muc-disco-update', ged.GUI1, self._on_muc_disco_update), + ('account-enabled', ged.GUI2, self._on_account_changed), + ('account-disabled', ged.GUI2, self._on_account_changed) + ]) + if hide_banner: self.set_no_show_all(True) self.hide() @@ -206,13 +220,18 @@ def _on_muc_disco_update(self, event: MucDiscoUpdate) -> None: self._update_content() - def _on_account_changed(self, *args: Any) -> None: - self._update_account_badge() + def _on_account_changed(self, event: AccountEnabled) -> None: + self._update_account_badge(event.account) def _on_message_received(self, event: MessageReceived) -> None: - if not event.msgtxt or self._contact is None: + if not event.msgtxt: return + if event.properties.is_sent_carbon: + return + + assert self._contact is not None + if event.jid != self._contact.jid: return @@ -275,14 +294,13 @@ def _update_content(self) -> None: if self_contact: self._ui.visitor_box.set_visible(self_contact.role.is_visitor) - def _update_account_badge(self) -> None: + def _update_account_badge(self, account: str) -> None: if self._account_badge is not None: self._account_badge.destroy() enabled_accounts = app.get_enabled_accounts_with_labels() if len(enabled_accounts) > 1: - assert self._account - self._account_badge = AccountBadge(self._account) + self._account_badge = AccountBadge(account) self._ui.account_badge_box.add(self._account_badge) def _on_request_voice_clicked(self, _button: Gtk.Button) -> None: ===================================== gajim/gtk/chat_stack.py ===================================== @@ -172,8 +172,10 @@ def show_chat(self, account: str, jid: JID) -> None: 'room-config-failed': self._on_room_config_failed, }) self._update_group_chat_actions(self._current_contact) + elif isinstance(self._current_contact, GroupchatParticipant): self._update_participant_actions(self._current_contact) + else: self._update_chat_actions(self._current_contact) @@ -671,7 +673,12 @@ def _close_control(self) -> None: str(self._current_contact.jid)])) def clear(self) -> None: + if self._current_contact is not None: + self._current_contact.disconnect_all_from_obj(self) + self.set_visible_child_name('empty') + self._chat_banner.clear() + self._message_action_box.clear() self._control_stack.clear() def process_event(self, event: Any) -> None: ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -235,6 +235,17 @@ def switch_contact(self, contact: ChatContactT) -> None: self._update_message_input_state() + def clear(self) -> None: + if self._client is not None: + self._set_chatstate(False) + self._client.disconnect_all_from_obj(self) + + if self._contact is not None: + self._contact.disconnect_all_from_obj(self) + + self._contact = None + self._client = None + def _on_client_state_changed(self, _client: Client, _signal_name: str, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7f9a2d1395af3f534b7107300453632a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7f9a2d1395af3f534b7107300453632a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] 22 commits: fix: GroupchatState: Call correct page for not-joined
by Philipp Hörist (＠lovetox) 30 Jul '22

30 Jul '22

Philipp Hörist pushed to branch newcontrol at gajim / gajim Commits: c80134c4 by wurstsalat at 2022-07-29T17:39:19+02:00 fix: GroupchatState: Call correct page for not-joined - - - - - bdb08e30 by André Apitzsch at 2022-07-29T20:38:49+02:00 fix: Fix handling of URLs without scheme Fixes #11059 - - - - - b7cd7dcc by André Apitzsch at 2022-07-29T21:08:10+02:00 other: Flatpak: Update dependencies - - - - - 54d4c9f8 by lovetox at 2022-07-29T23:04:43+02:00 ci: Split windows job into build and deploy stages - - - - - f5d7ee23 by lovetox at 2022-07-29T23:04:43+02:00 ci: Move git setup into script - - - - - 646d1bf5 by lovetox at 2022-07-30T08:10:42+02:00 ci: Make apt-get install unattended - - - - - f06eeb4f by lovetox at 2022-07-30T19:15:50+02:00 cs: Add type annotations - - - - - 0549087c by lovetox at 2022-07-30T19:16:54+02:00 refactor: GroupchatState: Use contact state-changed signal - - - - - 38e8aa20 by lovetox at 2022-07-30T19:16:56+02:00 refactor: Contacts: Add is_irc() - - - - - 17b0ecb4 by lovetox at 2022-07-30T19:16:56+02:00 feat: New control - - - - - 15a02207 by lovetox at 2022-07-30T19:16:56+02:00 refactor: Fix nick completion test - - - - - f74d93bf by lovetox at 2022-07-30T19:16:56+02:00 cs: Update pyrightconfig.json - - - - - 70deadc8 by wurstsalat at 2022-07-30T19:16:56+02:00 fix: MessageActionBox: Show quick invite button for group chats only - - - - - fd39ed15 by wurstsalat at 2022-07-30T19:16:56+02:00 Control/View: Cleanup scroll to end and unused methods - - - - - 06e23b69 by wurstsalat at 2022-07-30T19:16:56+02:00 refactor: Controls: Handle more events in BaseControl - - - - - 0a9fe06a by wurstsalat at 2022-07-30T19:16:56+02:00 Controls: Cleanup UI files - - - - - 27021389 by wurstsalat at 2022-07-30T19:16:56+02:00 refactor: Controls: Unify UI files - - - - - 0e1b2304 by wurstsalat at 2022-07-30T19:16:56+02:00 fix: BaseControl: Fix displaying received GcMessage events - - - - - d7b822a6 by wurstsalat at 2022-07-30T19:16:56+02:00 refactor: Control: Move drag and drop handling to ChatStack - - - - - 2c5059b5 by wurstsalat at 2022-07-30T19:16:56+02:00 refactor: Move getting copy modifiers into separate methods - - - - - 1291feb9 by wurstsalat at 2022-07-30T19:16:56+02:00 fix: MessageRow: Accept CommonError for message errors - - - - - 69f9a0dc by wurstsalat at 2022-07-30T19:16:56+02:00 refactor: BaseControl: Get room name directly for private chats - - - - - 21 changed files: - .ci/appveyor_build.py - .ci/deploy.py - + .ci/prepare_git.sh - .gitlab-ci.yml - flatpak/org.gajim.Gajim.Devel.yaml - flatpak/org.gajim.Gajim.yaml - gajim/command_system/implementation/middleware.py - gajim/common/const.py - gajim/common/events.py - gajim/common/helpers.py - gajim/common/modules/contacts.py - gajim/common/modules/httpupload.py - gajim/common/modules/muc.py - gajim/common/setting_values.py - gajim/common/settings.py - gajim/common/storage/archive.py - gajim/common/structs.py - gajim/common/types.py - + gajim/data/gui/chat_banner.ui - gajim/data/gui/chat_control.ui - gajim/data/gui/chat_paned.ui The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/894ae581a95e7e1c11257c0dfed12c3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/894ae581a95e7e1c11257c0dfed12c3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Make apt-get install unattended
by Philipp Hörist (＠lovetox) 30 Jul '22

30 Jul '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 646d1bf5 by lovetox at 2022-07-30T08:10:42+02:00 ci: Make apt-get install unattended - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -74,7 +74,7 @@ build-linux: - if: '$CI_COMMIT_TAG' script: - apt-get update - - apt-get install python3-nbxmpp-nightly + - apt-get install -y python3-nbxmpp-nightly - python3 setup.py sdist - python3 .ci/debian_build.py "$(find dist/gajim-*)" 1 View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/646d1bf5ba4f7e8554957330877d9e96… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/646d1bf5ba4f7e8554957330877d9e96… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] 3 commits: refactor: Move getting copy modifiers into separate methods
by Daniel Brötzmann (＠wurstsalat) 29 Jul '22

29 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: 7425872e by wurstsalat at 2022-07-29T23:51:26+02:00 refactor: Move getting copy modifiers into separate methods - - - - - 722220a1 by wurstsalat at 2022-07-29T23:52:02+02:00 fix: MessageRow: Accept CommonError for message errors - - - - - 894ae581 by wurstsalat at 2022-07-29T23:59:52+02:00 refactor: BaseControl: Get room name directly for private chats - - - - - 5 changed files: - gajim/gtk/controls/base.py - gajim/gtk/controls/private.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/conversation/view.py - gajim/gtk/util.py Changes: ===================================== gajim/gtk/controls/base.py ===================================== @@ -32,7 +32,6 @@ import os import logging -import sys import time import uuid @@ -61,6 +60,8 @@ from gajim.gui.conversation.view import ConversationView from gajim.gui.conversation.scrolled import ScrolledView from gajim.gui.conversation.jump_to_end_button import JumpToEndButton +from gajim.gui.util import get_copy_modifier +from gajim.gui.util import get_copy_modifier_keys from gajim.gui.util import get_hardware_key_codes from gajim.gui.builder import get_builder from gajim.gui.util import set_urgency_hint @@ -82,18 +83,12 @@ # So we match hardware keycodes instead of keyvals. # Multiple hardware keycodes can trigger a keyval like Gdk.KEY_c. KEYCODES_KEY_C = get_hardware_key_codes(Gdk.KEY_c) - -if sys.platform == 'darwin': - COPY_MODIFIER = Gdk.ModifierType.META_MASK - COPY_MODIFIER_KEYS = (Gdk.KEY_Meta_L, Gdk.KEY_Meta_R) -else: - COPY_MODIFIER = Gdk.ModifierType.CONTROL_MASK - COPY_MODIFIER_KEYS = (Gdk.KEY_Control_L, Gdk.KEY_Control_R) +COPY_MODIFIER = get_copy_modifier() +COPY_MODIFIER_KEYS = get_copy_modifier_keys() log = logging.getLogger('gajim.gui.controls.base') -################################################################################ class BaseControl(ChatCommandProcessor, CommandTools, EventHelper): """ A base class containing a banner, ConversationView, MessageInputTextView @@ -511,8 +506,10 @@ def _notify(self, return if self.is_privatechat: + room_contact = self._client.get_module('Contacts').get_contact( + self.contact.jid.bare) msg_type = 'private-chat-message' - title += f' (private in {self.room_name})' + title += f' (private in {room_contact.name})' sound = 'first_message_received' # Is it a history message? Don't want sound-floods when we join. ===================================== gajim/gtk/controls/private.py ===================================== @@ -61,10 +61,6 @@ def _connect_contact_signals(self) -> None: # 'room-destroyed': self._on_room_destroyed, }) - @property - def room_name(self) -> str: - return self._room_contact.name - def get_our_nick(self) -> str: muc_data = self._client.get_module('MUC').get_muc_data( self._room_contact.jid) ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -15,6 +15,7 @@ from __future__ import annotations from typing import Optional +from typing import Union from datetime import datetime from datetime import timedelta @@ -30,6 +31,7 @@ from nbxmpp.errors import StanzaError from nbxmpp.modules.security_labels import Displaymarking +from nbxmpp.structs import CommonError from gajim.common import app from gajim.common.const import AvatarSize @@ -71,7 +73,7 @@ def __init__(self, additional_data: Optional[AdditionalDataDict] = None, display_marking: Optional[Displaymarking] = None, marker: Optional[str] = None, - error: Optional[StanzaError] = None, + error: Union[CommonError, StanzaError, None] = None, encryption_enabled: bool = False, log_line_id: Optional[int] = None) -> None: ===================================== gajim/gtk/conversation/view.py ===================================== @@ -31,6 +31,7 @@ from nbxmpp.errors import StanzaError from nbxmpp.modules.security_labels import Displaymarking +from nbxmpp.structs import CommonError from nbxmpp.structs import MucSubject from nbxmpp.protocol import JID @@ -228,7 +229,8 @@ def add_message(self, display_marking: Optional[Displaymarking] = None, additional_data: Optional[AdditionalDataDict] = None, marker: Optional[str] = None, - error: Optional[StanzaError] = None) -> None: + error: Union[CommonError, StanzaError, None] = None + ) -> None: if not timestamp: timestamp = time.time() ===================================== gajim/gtk/util.py ===================================== @@ -23,6 +23,7 @@ import logging import math +import sys import textwrap from io import BytesIO from importlib import import_module @@ -358,6 +359,18 @@ def get_primary_accel_mod() -> Optional[Gdk.ModifierType]: return Gtk.accelerator_parse('<Primary>')[1] +def get_copy_modifier() -> Gdk.ModifierType: + if sys.platform == 'darwin': + return Gdk.ModifierType.META_MASK + return Gdk.ModifierType.CONTROL_MASK + + +def get_copy_modifier_keys() -> tuple[int, int]: + if sys.platform == 'darwin': + return Gdk.KEY_Meta_L, Gdk.KEY_Meta_R + return Gdk.KEY_Control_L, Gdk.KEY_Control_R + + def get_hardware_key_codes(keyval: int) -> list[int]: display = Gdk.Display.get_default() assert display is not None View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b44ea8f393f19822e22c08a52236a75… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b44ea8f393f19822e22c08a52236a75… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: ci: Split windows job into build and deploy stages
by Philipp Hörist (＠lovetox) 29 Jul '22

29 Jul '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 54d4c9f8 by lovetox at 2022-07-29T23:04:43+02:00 ci: Split windows job into build and deploy stages - - - - - f5d7ee23 by lovetox at 2022-07-29T23:04:43+02:00 ci: Move git setup into script - - - - - 4 changed files: - .ci/appveyor_build.py - .ci/deploy.py - + .ci/prepare_git.sh - .gitlab-ci.yml Changes: ===================================== .ci/appveyor_build.py ===================================== @@ -1,5 +1,8 @@ #!/usr/bin/env python3 +from typing import Any + +import json import os import requests import time @@ -7,6 +10,7 @@ from rich.console import Console + ACCOUNT = 'lovetox' PROJECT_SLUG = 'gajim' BRANCH = 'master' @@ -67,7 +71,7 @@ def is_build_finished(build: dict[str, str]) -> bool: return build['status'] == 'success' -def get_artifacts(build_id: str) -> None: +def check_for_response(build_id: str) -> None: time.sleep(INITIAL_START_DELAY) while True: time.sleep(RETRY_TIMEOUT) @@ -89,28 +93,26 @@ def get_artifacts(build_id: str) -> None: build_folder.mkdir() for job in build['jobs']: - download_job_artifacts(job['jobId'], build_folder) - - console.print('All artifacts downloaded!') + response = get_job_response(job['jobId']) + result = build_folder / f'{job["jobId"]}.json' + result.write_text(json.dumps(response)) + console.print('Write job response:', result) -def download_job_artifacts(job_id: str, target_folder: Path) -> None: +def get_job_response(job_id: str) -> list[dict[str, Any]]: artifacts_api_url = f'{BASE_URL}/buildjobs/{job_id}/artifacts' req = requests.get(artifacts_api_url, headers=HEADERS) req.raise_for_status() response = req.json() for artifact in response: - filename = artifact['fileName'] - console.print('Download', filename, '...') - file_url = f'{artifacts_api_url}/{filename}' - req = requests.get(file_url, headers=HEADERS) - req.raise_for_status() - with open(target_folder / filename, 'wb') as file: - file.write(req.content) + file_url = f'{artifacts_api_url}/{artifact["fileName"]}' + artifact['fileUrl'] = file_url + + return response if __name__ == '__main__': push_yaml_to_project() build_id = start_build() - get_artifacts(build_id) + check_for_response(build_id) ===================================== .ci/deploy.py ===================================== @@ -1,13 +1,17 @@ +#!/usr/bin/env python3 + from typing import Any from typing import Optional import functools +import json import os import sys from datetime import date from ftplib import FTP_TLS from pathlib import Path +import requests from rich.console import Console @@ -15,6 +19,9 @@ FTP_USER = os.environ['FTP_USER'] FTP_PASS = os.environ['FTP_PASS'] +API_KEY = os.environ['APPVEYOR_API_KEY'] +HEADERS = {'Authorization': f'Bearer {API_KEY}'} + WINDOWS_NIGHTLY_FOLDER = 'downloads/snap/win' LINUX_NIGHTLY_FOLDER = 'downloads/snap' @@ -84,6 +91,29 @@ def upload_file(ftp: FTP_TLS, ftp.storbinary('STOR ' + name, f) +def download_artifacts(path: Path) -> None: + build_results = list(path.glob('*.json')) + if not build_results: + sys.exit('No build build_results found') + + responses = [json.loads(response.read_text()) for response in build_results] + + for response in responses: + for artifact in response: + filename = artifact['fileName'] + file_url = artifact['fileUrl'] + + console.print('Download', filename, '...') + + req = requests.get(file_url, headers=HEADERS) + req.raise_for_status() + with open(path / filename, 'wb') as file: + file.write(req.content) + + for result in build_results: + result.unlink() + + def get_deploy_method() -> str: deploy_type = os.environ['DEPLOY_TYPE'] is_nightly = bool(os.environ.get('GAJIM_NIGHTLY_BUILD')) @@ -95,6 +125,7 @@ def get_deploy_method() -> str: @ftp_connection def deploy_windows_nightly(ftp: FTP_TLS, filedir: Path) -> None: ftp.cwd(WINDOWS_NIGHTLY_FOLDER) + download_artifacts(filedir) upload_all_from_dir(ftp, filedir) @@ -102,6 +133,7 @@ def deploy_windows_nightly(ftp: FTP_TLS, filedir: Path) -> None: def deploy_windows_release(ftp: FTP_TLS, filedir: Path) -> None: tag = get_gajim_tag() create_release_folder(ftp, tag) + download_artifacts(filedir) upload_all_from_dir(ftp, filedir) ===================================== .ci/prepare_git.sh ===================================== @@ -0,0 +1,9 @@ +#!/bin/bash + +eval $(ssh-agent -s) +echo "$2" | tr -d '\r' | ssh-add - > /dev/null +mkdir -p ~/.ssh +chmod 700 ~/.ssh +ssh-keyscan "$1" >> ~/.ssh/known_hosts +git config --global user.email "$CI_GIT_USER_EMAIL" +git config --global user.name "$CI_GIT_USER_USERNAME" ===================================== .gitlab-ci.yml ===================================== @@ -84,22 +84,18 @@ build-linux: paths: - dist/gajim-*.tar.gz -build-and-deploy-windows: +build-windows: stage: build dependencies: [] rules: - if: '$GAJIM_NIGHTLY_BUILD' - if: '$CI_COMMIT_TAG' - variables: - DEPLOY_TYPE: "windows" script: - python3 .ci/appveyor_build.py - - python3 .ci/deploy.py build - - # artifacts: - # expire_in: 1 day - # paths: - # - build/Gajim-*.exe + artifacts: + expire_in: 1 day + paths: + - build/*.json deploy-linux: stage: deploy @@ -113,16 +109,17 @@ deploy-linux: script: - python3 .ci/deploy.py dist -# deploy-windows: -# stage: deploy -# rules: -# - if: '$GAJIM_NIGHTLY_BUILD' -# - if: '$CI_COMMIT_TAG' -# when: manual -# variables: -# DEPLOY_TYPE: "windows" -# script: -# - python3 .ci/deploy.py build +deploy-windows: + stage: deploy + dependencies: + - build-windows + rules: + - if: '$GAJIM_NIGHTLY_BUILD' + - if: '$CI_COMMIT_TAG' + variables: + DEPLOY_TYPE: "windows" + script: + - python3 .ci/deploy.py build deploy-flatpak: image: git-deploy:latest @@ -131,14 +128,8 @@ deploy-flatpak: rules: - if: '$CI_COMMIT_TAG' before_script: - - eval $(ssh-agent -s) - - echo "${FLATHUB_DEPLOY_KEY}" | tr -d '\r' | ssh-add - > /dev/null - - mkdir -p ~/.ssh - - chmod 700 ~/.ssh - - ssh-keyscan github.com >> ~/.ssh/known_hosts + - .ci/prepare_git.sh github.com ${FLATHUB_DEPLOY_KEY} script: - - git config --global user.email "$CI_GIT_USER_EMAIL" - - git config --global user.name "$CI_GIT_USER_USERNAME" - git clone git@github.com:flathub/org.gajim.Gajim.git - cd org.gajim.Gajim - mv ../flatpak/org.gajim.Gajim.yaml org.gajim.Gajim.yaml @@ -155,14 +146,8 @@ publish-release: rules: - if: '$CI_COMMIT_TAG' before_script: - - eval $(ssh-agent -s) - - echo "${WEBSITE_DEPLOY_KEY}" | tr -d '\r' | ssh-add - > /dev/null - - mkdir -p ~/.ssh - - chmod 700 ~/.ssh - - ssh-keyscan dev.gajim.org >> ~/.ssh/known_hosts + - .ci/prepare_git.sh dev.gajim.org ${WEBSITE_DEPLOY_KEY} script: - - git config --global user.email "$CI_GIT_USER_EMAIL" - - git config --global user.name "$CI_GIT_USER_USERNAME" - git clone git@dev.gajim.org:gajim/website.git - cd website - git checkout master View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b7cd7dcc3140044dddd1d67a7243a82… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b7cd7dcc3140044dddd1d67a7243a82… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] 2 commits: fix: BaseControl: Fix displaying received GcMessage events
by Daniel Brötzmann (＠wurstsalat) 29 Jul '22

29 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: 9dd83e35 by wurstsalat at 2022-07-29T21:15:29+02:00 fix: BaseControl: Fix displaying received GcMessage events - - - - - b44ea8f3 by wurstsalat at 2022-07-29T21:21:39+02:00 refactor: Control: Move drag and drop handling to ChatStack - - - - - 5 changed files: - gajim/data/gui/chat_control.ui - gajim/gtk/chat_stack.py - gajim/gtk/controls/base.py - gajim/gtk/controls/chat.py - gajim/gtk/controls/groupchat.py Changes: ===================================== gajim/data/gui/chat_control.ui ===================================== @@ -45,49 +45,4 @@ </packing> </child> </object> - <object class="GtkBox" id="drop_area"> - <property name="name">DropArea</property> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="opacity">0.90</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="orientation">vertical</property> - <property name="spacing">18</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="valign">end</property> - <property name="vexpand">True</property> - <property name="icon-name">mail-attachment-symbolic</property> - <property name="icon_size">6</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="valign">start</property> - <property name="vexpand">True</property> - <property name="label" translatable="yes">Drop Files or Contacts</property> - <property name="wrap">True</property> - <property name="max-width-chars">40</property> - <style> - <class name="bold16"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> </interface> ===================================== gajim/gtk/chat_stack.py ===================================== @@ -43,6 +43,7 @@ from .chat_banner import ChatBanner from .chat_function_page import ChatFunctionPage +from .const import TARGET_TYPE_URI_LIST from .control_stack import ControlStack from .controls.groupchat import GroupchatControl from .message_actions_box import MessageActionsBox @@ -59,6 +60,8 @@ def __init__(self): self.set_vexpand(True) self.set_hexpand(True) + self._current_contact: Optional[ChatContactT] = None + self.add_named(ChatPlaceholderBox(), 'empty') self._chat_function_page = ChatFunctionPage() @@ -77,9 +80,51 @@ def __init__(self): box.add(Gtk.Separator()) box.add(self._message_action_box) - self._current_contact: Optional[ChatContactT] = None - - self.add_named(box, 'controls') + dnd_icon = Gtk.Image.new_from_icon_name( + 'mail-attachment-symbolic', Gtk.IconSize.DIALOG) + dnd_icon.set_vexpand(True) + dnd_icon.set_valign(Gtk.Align.END) + dnd_label = Gtk.Label(label=_('Drop files or contacts')) + dnd_label.set_max_width_chars(40) + dnd_label.set_vexpand(True) + dnd_label.set_valign(Gtk.Align.START) + dnd_label.get_style_context().add_class('bold16') + + self._drop_area = Gtk.Box( + orientation=Gtk.Orientation.VERTICAL, spacing=18) + self._drop_area.set_no_show_all(True) + self._drop_area.set_hexpand(True) + self._drop_area.set_vexpand(True) + self._drop_area.set_name('DropArea') + self._drop_area.add(dnd_icon) + self._drop_area.add(dnd_label) + + overlay = Gtk.Overlay() + overlay.add_overlay(self._drop_area) + overlay.add(box) + overlay.connect('drag-data-received', self._on_drag_data_received) + overlay.connect('drag-motion', self._on_drag_motion) + overlay.connect('drag-leave', self._on_drag_leave) + + uri_entry = Gtk.TargetEntry.new( + 'text/uri-list', + Gtk.TargetFlags.OTHER_APP, + TARGET_TYPE_URI_LIST) + dnd_list = [uri_entry, + Gtk.TargetEntry.new( + 'OBJECT_DROP', + Gtk.TargetFlags.SAME_APP, + 0)] + dst_targets = Gtk.TargetList.new([uri_entry]) + dst_targets.add_text_targets(0) + + overlay.drag_dest_set( + Gtk.DestDefaults.ALL, + dnd_list, + Gdk.DragAction.COPY | Gdk.DragAction.MOVE) + overlay.drag_dest_set_target_list(dst_targets) + + self.add_named(overlay, 'controls') self._connect_actions() self.show_all() @@ -484,6 +529,45 @@ def _on_stateful_action(self, action.set_state(param) contact.settings.set('send_marker', param.get_boolean()) + def _on_drag_data_received(self, + _widget: Gtk.Widget, + _context: Gdk.DragContext, + _x_coord: int, + _y_coord: int, + selection: Gtk.SelectionData, + target_type: int, + _timestamp: int + ) -> None: + if not selection.get_data(): + return + + log.debug('Drop received: %s, %s', selection.get_data(), target_type) + + # TODO: Contact drag and drop for invitations (AdHoc MUC/MUC) + if target_type == TARGET_TYPE_URI_LIST: + control = app.window.get_active_control() + if control is not None: + control.drag_data_file_transfer(selection) + + def _on_drag_leave(self, + _widget: Gtk.Widget, + _context: Gdk.DragContext, + _time: int + ) -> None: + self._drop_area.set_no_show_all(True) + self._drop_area.hide() + + def _on_drag_motion(self, + _widget: Gtk.Widget, + _context: Gdk.DragContext, + _x_coord: int, + _y_coord: int, + _time: int + ) -> bool: + self._drop_area.set_no_show_all(False) + self._drop_area.show_all() + return True + def _show_chat_function_page(self, function: str, data: Optional[str] = None ===================================== gajim/gtk/controls/base.py ===================================== @@ -65,7 +65,6 @@ from gajim.gui.builder import get_builder from gajim.gui.util import set_urgency_hint from gajim.gui.const import ControlType -from gajim.gui.const import TARGET_TYPE_URI_LIST from gajim.command_system.implementation.middleware import ChatCommandProcessor from gajim.command_system.implementation.middleware import CommandTools @@ -121,32 +120,6 @@ def __init__(self, widget_name: str, account: str, jid: JID) -> None: self.xml = get_builder('chat_control.ui') self.widget = cast(Gtk.Box, self.xml.get_object('control_box')) - # Drag and drop - self.xml.overlay.add_overlay(self.xml.drop_area) - self.xml.drop_area.hide() - self.xml.overlay.connect( - 'drag-data-received', self._on_drag_data_received) - self.xml.overlay.connect('drag-motion', self._on_drag_motion) - self.xml.overlay.connect('drag-leave', self._on_drag_leave) - - uri_entry = Gtk.TargetEntry.new( - 'text/uri-list', - Gtk.TargetFlags.OTHER_APP, - TARGET_TYPE_URI_LIST) - dst_targets = Gtk.TargetList.new([uri_entry]) - dst_targets.add_text_targets(0) - self._dnd_list = [uri_entry, - Gtk.TargetEntry.new( - 'MY_TREE_MODEL_ROW', - Gtk.TargetFlags.SAME_APP, - 0)] - - self.xml.overlay.drag_dest_set( - Gtk.DestDefaults.ALL, - self._dnd_list, - Gdk.DragAction.COPY | Gdk.DragAction.MOVE) - self.xml.overlay.drag_dest_set_target_list(dst_targets) - # Create ConversationView and connect signals self.conversation_view = ConversationView(self.account, self.contact) @@ -230,7 +203,7 @@ def process_event(self, event: events.ApplicationEvent) -> None: self.conversation_view.update_call_rows() return - if isinstance(event, events.MessageReceived): + if isinstance(event, events.MessageReceived) and not self.is_groupchat: self._on_message_received(event) return @@ -396,38 +369,6 @@ def _on_autoscroll_changed(self, def _on_jump_to_end(self, _button: Gtk.Button) -> None: self.reset_view() - def _on_drag_data_received(self, - widget: Gtk.Widget, - context: Gdk.DragContext, - x_coord: int, - y_coord: int, - selection: Gtk.SelectionData, - target_type: int, - timestamp: int - ) -> None: - """ - Derived types SHOULD implement this - """ - - def _on_drag_leave(self, - _widget: Gtk.Widget, - _context: Gdk.DragContext, - _time: int - ) -> None: - self.xml.drop_area.set_no_show_all(True) - self.xml.drop_area.hide() - - def _on_drag_motion(self, - _widget: Gtk.Widget, - _context: Gdk.DragContext, - _x_coord: int, - _y_coord: int, - _time: int - ) -> bool: - self.xml.drop_area.set_no_show_all(False) - self.xml.drop_area.show_all() - return True - def drag_data_file_transfer(self, selection: Gtk.SelectionData) -> None: # we may have more than one file dropped uri_splitted = selection.get_uris() ===================================== gajim/gtk/controls/chat.py ===================================== @@ -31,9 +31,6 @@ import logging -from gi.repository import Gtk -from gi.repository import Gdk - from nbxmpp import JID from nbxmpp.const import Chatstate from nbxmpp.modules.security_labels import Displaymarking @@ -46,7 +43,6 @@ from gajim.common.modules.contacts import BareContact from gajim.gui.controls.base import BaseControl -from gajim.gui.const import TARGET_TYPE_URI_LIST from gajim.gui.const import ControlType from gajim.command_system.implementation.hosts import ChatCommands @@ -197,25 +193,6 @@ def shutdown(self) -> None: super(ChatControl, self).shutdown() app.check_finalize(self) - def _on_drag_data_received(self, - widget: Gtk.Widget, - context: Gdk.DragContext, - x_coord: int, - y_coord: int, - selection: Gtk.SelectionData, - target_type: int, - timestamp: int - ) -> None: - if not selection.get_data(): - return - - log.debug('Drop received: %s, %s', selection.get_data(), target_type) - - # TODO: Contact drag and drop for AdHocMUC - if target_type == TARGET_TYPE_URI_LIST: - # File drag and drop (handled in chat_control_base) - self.drag_data_file_transfer(selection) - def _on_presence_received(self, event: events.PresenceReceived) -> None: if not app.settings.get('print_status_in_chats'): return ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -37,7 +37,6 @@ from nbxmpp.structs import MucSubject from gi.repository import Gtk -from gi.repository import Gdk from gajim.common import app from gajim.common import events @@ -55,7 +54,6 @@ from gajim.command_system.implementation.hosts import GroupChatCommands from gajim.gui.const import ControlType -from gajim.gui.const import TARGET_TYPE_URI_LIST from gajim.gui.dialogs import DialogButton from gajim.gui.dialogs import ConfirmationDialog from gajim.gui.groupchat_roster import GroupchatRoster @@ -635,22 +633,3 @@ def shutdown(self, reason: Optional[str] = None) -> None: super(GroupchatControl, self).shutdown() app.check_finalize(self) - - def _on_drag_data_received(self, - widget: Gtk.Widget, - context: Gdk.DragContext, - x_coord: int, - y_coord: int, - selection: Gtk.SelectionData, - target_type: int, - timestamp: int - ) -> None: - if not selection.get_data(): - return - - log.debug('Drop received: %s, %s', selection.get_data(), target_type) - - # TODO: Contact drag and drop for Invitations - if target_type == TARGET_TYPE_URI_LIST: - # File drag and drop (handled in chat_control_base) - self.drag_data_file_transfer(selection) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/3d8ac70c960e51c3080bb9beb873da8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/3d8ac70c960e51c3080bb9beb873da8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] other: Flatpak: Update dependencies
by André (＠andre) 29 Jul '22

29 Jul '22

André pushed to branch master at gajim / gajim Commits: b7cd7dcc by André Apitzsch at 2022-07-29T21:08:10+02:00 other: Flatpak: Update dependencies - - - - - 2 changed files: - flatpak/org.gajim.Gajim.Devel.yaml - flatpak/org.gajim.Gajim.yaml Changes: ===================================== flatpak/org.gajim.Gajim.Devel.yaml ===================================== @@ -94,8 +94,8 @@ modules: - pip3 install . sources: - type: archive - url: https://files.pythonhosted.org/packages/source/c/cffi/cffi-1.15.0.tar.gz - sha256: 920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954 + url: https://files.pythonhosted.org/packages/source/c/cffi/cffi-1.15.1.tar.gz + sha256: d400bfb9a37b1351253cb402671cea7e89bdecc294e8016a707f6d1d8ac934f9 - name: python3-asn1crypto buildsystem: simple @@ -120,22 +120,22 @@ modules: only-arches: - aarch64 build-commands: - - pip3 install cryptography-37.0.2-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl + - pip3 install cryptography-37.0.4-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl sources: - type: file - url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-37… - sha256: 093cb351031656d3ee2f4fa1be579a8c69c754cf874206be1d4cf3b542042804 + url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-37… + sha256: 80f49023dd13ba35f7c34072fa17f604d2f19bf0989f292cedf7ab5770b87a0b - name: python3-cryptography buildsystem: simple only-arches: - x86_64 build-commands: - - pip3 install cryptography-37.0.2-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pip3 install cryptography-37.0.4-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl sources: - type: file - url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-37… - sha256: 59b281eab51e1b6b6afa525af2bd93c16d49358404f814fe2c2410058623928c + url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-37… + sha256: f2dcb0b3b63afb6df7fd94ec6fbddac81b5492513f7b0436210d390c14d46ee8 - name: python3-pyopenssl buildsystem: simple @@ -176,34 +176,34 @@ modules: - name: python3-zipp buildsystem: simple build-commands: - - pip3 install zipp-3.8.0-py3-none-any.whl + - pip3 install zipp-3.8.1-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py3/z/zipp/zipp-3.8.0-py3-none-any.… - sha256: c4f6e5bbf48e74f7a38e7cc5b0480ff42b0ae5178957d564d18932525d5cf099 + url: https://files.pythonhosted.org/packages/py3/z/zipp/zipp-3.8.1-py3-none-any.… + sha256: 47c40d7fe183a6f21403a199b3e4192cca5774656965b0a4988ad2f8feb5f009 # keyring dependency - name: python3-importlib-metadata buildsystem: simple build-commands: - - pip3 install importlib_metadata-4.11.4-py3-none-any.whl + - pip3 install importlib_metadata-4.12.0-py3-none-any.whl cleanup: - /bin sources: - type: file - url: https://files.pythonhosted.org/packages/py3/i/importlib_metadata/importlib_… - sha256: c58c8eb8a762858f49e18436ff552e83914778e50e9d2f1660535ffb364552ec + url: https://files.pythonhosted.org/packages/py3/i/importlib_metadata/importlib_… + sha256: 7401a975809ea1fdc658c3aa4f78cc2195a0e019c5cbc4c06122884e9ae80c23 - name: python3-keyring buildsystem: simple build-commands: - - pip3 install keyring-23.5.1-py3-none-any.whl + - pip3 install keyring-23.7.0-py3-none-any.whl cleanup: - /bin sources: - type: file - url: https://files.pythonhosted.org/packages/py3/k/keyring/keyring-23.5.1-py3-no… - sha256: 9ef58314bcc823f426b49ec787539a2d73571b37de4cd498f839803b01acff1e + url: https://files.pythonhosted.org/packages/py3/k/keyring/keyring-23.7.0-py3-no… + sha256: e67fc91a7955785fd2efcbccdd72d7dacf136dbc381d27de305b2b660b3de886 - name: python3-css-parser buildsystem: simple @@ -275,36 +275,36 @@ modules: - pip3 install . sources: - type: archive - url: https://files.pythonhosted.org/packages/source/p/pillow/Pillow-9.1.1.tar.gz - sha256: 7502539939b53d7565f3d11d87c78e7ec900d3c72945d4ee0e2f250d598309a0 + url: https://files.pythonhosted.org/packages/source/p/pillow/Pillow-9.2.0.tar.gz + sha256: 75e636fd3e0fb872693f23ccb8a5ff2cd578801251f3a4f6854c6a5d437d3c04 # sentry-sdk dependency - name: python3-urllib3 buildsystem: simple build-commands: - - pip3 install urllib3-1.26.9-py2.py3-none-any.whl + - pip3 install urllib3-1.26.11-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py2.py3/u/urllib3/urllib3-1.26.9-py… - sha256: 44ece4d53fb1706f667c9bd1c648f5469a2ec925fcf3a776667042d645472c14 + url: https://files.pythonhosted.org/packages/py2.py3/u/urllib3/urllib3-1.26.11-p… + sha256: c33ccba33c819596124764c23a97d25f32b28433ba0dedeb77d873a38722c9bc - name: python3-certifi buildsystem: simple build-commands: - - pip3 install certifi-2022.5.18.1-py3-none-any.whl + - pip3 install certifi-2022.6.15-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py3/c/certifi/certifi-2022.5.18.1-p… - sha256: f1d53542ee8cbedbe2118b5686372fb33c297fcd6379b050cca0ef13a597382a + url: https://files.pythonhosted.org/packages/py3/c/certifi/certifi-2022.6.15-py3… + sha256: fe86415d55e84719d75f8b69414f6438ac3547d2078ab91b67e779ef69378412 - name: python3-sentry-sdk buildsystem: simple build-commands: - - pip3 install sentry_sdk-1.5.12-py2.py3-none-any.whl + - pip3 install sentry_sdk-1.9.0-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py2.py3/s/sentry_sdk/sentry_sdk-1.5… - sha256: 778b53f0a6c83b1ee43d3b7886318ba86d975e686cb2c7906ccc35b334360be1 + url: https://files.pythonhosted.org/packages/py2.py3/s/sentry_sdk/sentry_sdk-1.9… + sha256: 60b13757d6344a94bf0ccb3c0a006c4de77daab09871b30fbbd05d5ec24e54fb - name: python3-nbxmpp buildsystem: simple ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -87,8 +87,8 @@ modules: - pip3 install . sources: - type: archive - url: https://files.pythonhosted.org/packages/source/c/cffi/cffi-1.15.0.tar.gz - sha256: 920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954 + url: https://files.pythonhosted.org/packages/source/c/cffi/cffi-1.15.1.tar.gz + sha256: d400bfb9a37b1351253cb402671cea7e89bdecc294e8016a707f6d1d8ac934f9 - name: python3-asn1crypto buildsystem: simple @@ -113,22 +113,22 @@ modules: only-arches: - aarch64 build-commands: - - pip3 install cryptography-37.0.2-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl + - pip3 install cryptography-37.0.4-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl sources: - type: file - url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-37… - sha256: 093cb351031656d3ee2f4fa1be579a8c69c754cf874206be1d4cf3b542042804 + url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-37… + sha256: 80f49023dd13ba35f7c34072fa17f604d2f19bf0989f292cedf7ab5770b87a0b - name: python3-cryptography buildsystem: simple only-arches: - x86_64 build-commands: - - pip3 install cryptography-37.0.2-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pip3 install cryptography-37.0.4-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl sources: - type: file - url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-37… - sha256: 59b281eab51e1b6b6afa525af2bd93c16d49358404f814fe2c2410058623928c + url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-37… + sha256: f2dcb0b3b63afb6df7fd94ec6fbddac81b5492513f7b0436210d390c14d46ee8 - name: python3-pyopenssl buildsystem: simple @@ -169,34 +169,34 @@ modules: - name: python3-zipp buildsystem: simple build-commands: - - pip3 install zipp-3.8.0-py3-none-any.whl + - pip3 install zipp-3.8.1-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py3/z/zipp/zipp-3.8.0-py3-none-any.… - sha256: c4f6e5bbf48e74f7a38e7cc5b0480ff42b0ae5178957d564d18932525d5cf099 + url: https://files.pythonhosted.org/packages/py3/z/zipp/zipp-3.8.1-py3-none-any.… + sha256: 47c40d7fe183a6f21403a199b3e4192cca5774656965b0a4988ad2f8feb5f009 # keyring dependency - name: python3-importlib-metadata buildsystem: simple build-commands: - - pip3 install importlib_metadata-4.11.4-py3-none-any.whl + - pip3 install importlib_metadata-4.12.0-py3-none-any.whl cleanup: - /bin sources: - type: file - url: https://files.pythonhosted.org/packages/py3/i/importlib_metadata/importlib_… - sha256: c58c8eb8a762858f49e18436ff552e83914778e50e9d2f1660535ffb364552ec + url: https://files.pythonhosted.org/packages/py3/i/importlib_metadata/importlib_… + sha256: 7401a975809ea1fdc658c3aa4f78cc2195a0e019c5cbc4c06122884e9ae80c23 - name: python3-keyring buildsystem: simple build-commands: - - pip3 install keyring-23.5.1-py3-none-any.whl + - pip3 install keyring-23.7.0-py3-none-any.whl cleanup: - /bin sources: - type: file - url: https://files.pythonhosted.org/packages/py3/k/keyring/keyring-23.5.1-py3-no… - sha256: 9ef58314bcc823f426b49ec787539a2d73571b37de4cd498f839803b01acff1e + url: https://files.pythonhosted.org/packages/py3/k/keyring/keyring-23.7.0-py3-no… + sha256: e67fc91a7955785fd2efcbccdd72d7dacf136dbc381d27de305b2b660b3de886 - name: python3-css-parser buildsystem: simple @@ -268,45 +268,45 @@ modules: - pip3 install . sources: - type: archive - url: https://files.pythonhosted.org/packages/source/p/pillow/Pillow-9.1.1.tar.gz - sha256: 7502539939b53d7565f3d11d87c78e7ec900d3c72945d4ee0e2f250d598309a0 + url: https://files.pythonhosted.org/packages/source/p/pillow/Pillow-9.2.0.tar.gz + sha256: 75e636fd3e0fb872693f23ccb8a5ff2cd578801251f3a4f6854c6a5d437d3c04 # sentry-sdk dependency - name: python3-urllib3 buildsystem: simple build-commands: - - pip3 install urllib3-1.26.9-py2.py3-none-any.whl + - pip3 install urllib3-1.26.11-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py2.py3/u/urllib3/urllib3-1.26.9-py… - sha256: 44ece4d53fb1706f667c9bd1c648f5469a2ec925fcf3a776667042d645472c14 + url: https://files.pythonhosted.org/packages/py2.py3/u/urllib3/urllib3-1.26.11-p… + sha256: c33ccba33c819596124764c23a97d25f32b28433ba0dedeb77d873a38722c9bc - name: python3-certifi buildsystem: simple build-commands: - - pip3 install certifi-2022.5.18.1-py3-none-any.whl + - pip3 install certifi-2022.6.15-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py3/c/certifi/certifi-2022.5.18.1-p… - sha256: f1d53542ee8cbedbe2118b5686372fb33c297fcd6379b050cca0ef13a597382a + url: https://files.pythonhosted.org/packages/py3/c/certifi/certifi-2022.6.15-py3… + sha256: fe86415d55e84719d75f8b69414f6438ac3547d2078ab91b67e779ef69378412 - name: python3-sentry-sdk buildsystem: simple build-commands: - - pip3 install sentry_sdk-1.5.12-py2.py3-none-any.whl + - pip3 install sentry_sdk-1.9.0-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py2.py3/s/sentry_sdk/sentry_sdk-1.5… - sha256: 778b53f0a6c83b1ee43d3b7886318ba86d975e686cb2c7906ccc35b334360be1 + url: https://files.pythonhosted.org/packages/py2.py3/s/sentry_sdk/sentry_sdk-1.9… + sha256: 60b13757d6344a94bf0ccb3c0a006c4de77daab09871b30fbbd05d5ec24e54fb - name: python3-nbxmpp buildsystem: simple build-commands: - - pip3 install nbxmpp-3.1.0-py3-none-any.whl + - pip3 install nbxmpp-3.1.1-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py3/n/nbxmpp/nbxmpp-3.1.0-py3-none-… - sha256: 0020c12f3900ba9ef9de570c1ed3e83cbcab33cd163580bbe0a6708a6f91b5ec + url: https://files.pythonhosted.org/packages/py3/n/nbxmpp/nbxmpp-3.1.1-py3-none-… + sha256: 46f2bb684650a29f3ec5b098e5ddcf32454146f90820f856b524fcaad67239a2 - name: gajim buildsystem: simple View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b7cd7dcc3140044dddd1d67a7243a829… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b7cd7dcc3140044dddd1d67a7243a829… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Fix handling of URLs without scheme
by Philipp Hörist (＠lovetox) 29 Jul '22

29 Jul '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: bdb08e30 by André Apitzsch at 2022-07-29T20:38:49+02:00 fix: Fix handling of URLs without scheme Fixes #11059 - - - - - 1 changed file: - gajim/common/helpers.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -57,6 +57,7 @@ from datetime import datetime from datetime import timedelta from urllib.parse import unquote +from urllib.parse import urlparse from encodings.punycode import punycode_encode from functools import wraps from pathlib import Path @@ -990,6 +991,13 @@ def parse_uri(uri: str) -> URI: if uri.startswith('file://'): return URI(type=URIType.FILE, data=uri) + try: + urlparts = urlparse(uri) + if not urlparts.scheme: + return URI(type=URIType.WEB, data=f'http://{uri}') + except Exception: + pass + return URI(type=URIType.WEB, data=uri) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bdb08e307e61d2701423db4180691a28… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bdb08e307e61d2701423db4180691a28… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] refactor: Controls: Unify UI files
by Daniel Brötzmann (＠wurstsalat) 29 Jul '22

29 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: 3d8ac70c by wurstsalat at 2022-07-29T19:40:43+02:00 refactor: Controls: Unify UI files - - - - - 5 changed files: - gajim/data/gui/chat_control.ui - − gajim/data/gui/groupchat_control.ui - gajim/gtk/builder.pyi - gajim/gtk/controls/base.py - gajim/gtk/controls/groupchat.py Changes: ===================================== gajim/data/gui/chat_control.ui ===================================== @@ -4,22 +4,21 @@ <requires lib="gtk+" version="3.24"/> <object class="GtkBox" id="control_box"> <property name="can-focus">True</property> - <property name="margin-start">7</property> - <property name="margin-end">7</property> - <property name="spacing">1</property> <child> <object class="GtkOverlay" id="overlay"> <property name="visible">True</property> <property name="can-focus">False</property> <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="orientation">vertical</property> + <object class="GtkBox" id="conv_view_box"> + <property name="can-focus">True</property> + <property name="margin-start">7</property> + <property name="margin-end">7</property> + <property name="spacing">3</property> <child> <object class="GtkOverlay" id="conv_view_overlay"> <property name="visible">True</property> <property name="can-focus">False</property> + <property name="hexpand">True</property> <child> <placeholder/> </child> @@ -27,9 +26,12 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">0</property> </packing> </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="index">-1</property> @@ -74,7 +76,7 @@ <property name="can-focus">False</property> <property name="valign">start</property> <property name="vexpand">True</property> - <property name="label" translatable="yes">Drop files or contacts</property> + <property name="label" translatable="yes">Drop Files or Contacts</property> <property name="wrap">True</property> <property name="max-width-chars">40</property> <style> ===================================== gajim/data/gui/groupchat_control.ui deleted ===================================== @@ -1,105 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<interface> - <requires lib="gtk+" version="3.24"/> - <object class="GtkBox" id="control_box"> - <property name="can-focus">True</property> - <child> - <object class="GtkOverlay" id="overlay"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <child> - <object class="GtkBox"> - <property name="can-focus">True</property> - <property name="margin-start">7</property> - <property name="margin-end">7</property> - <property name="spacing">3</property> - <child> - <object class="GtkOverlay" id="conv_view_overlay"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="hexpand">True</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkRevealer" id="roster_revealer"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="transition-type">none</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="index">-1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <object class="GtkBox" id="drop_area"> - <property name="name">DropArea</property> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="opacity">0.90</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="orientation">vertical</property> - <property name="spacing">18</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="valign">end</property> - <property name="vexpand">True</property> - <property name="icon-name">mail-attachment-symbolic</property> - <property name="icon_size">6</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="valign">start</property> - <property name="vexpand">True</property> - <property name="label" translatable="yes">Drop Files or Contacts</property> - <property name="wrap">True</property> - <property name="max-width-chars">40</property> - <style> - <class name="bold16"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> -</interface> ===================================== gajim/gtk/builder.pyi ===================================== @@ -209,24 +209,12 @@ class ChatBannerBuilder(Builder): class ChatControlBuilder(Builder): - drop_area: Gtk.Box - formattings_menu: Gtk.Menu - bold: Gtk.MenuItem - italic: Gtk.MenuItem - strike: Gtk.MenuItem - chat_control_hbox: Gtk.Box + control_box: Gtk.Box overlay: Gtk.Overlay - textview_box: Gtk.Box + conv_view_box: Gtk.Box conv_view_overlay: Gtk.Overlay - hbox: Gtk.Box - emoticons_button: Gtk.MenuButton - formattings_button: Gtk.MenuButton - settings_menu: Gtk.MenuButton - authentication_button: Gtk.Button - lock_image: Gtk.Image - encryption_menu: Gtk.MenuButton - sendfile_button: Gtk.Button - send_message_button: Gtk.Button + roster_revealer: Gtk.Revealer + drop_area: Gtk.Box class ChatListRowBuilder(Builder): @@ -401,56 +389,6 @@ class GroupchatConfigBuilder(Builder): error_label: Gtk.Label -class GroupchatControlBuilder(Builder): - drop_area: Gtk.Box - formattings_menu: Gtk.Menu - bold: Gtk.MenuItem - italic: Gtk.MenuItem - strike: Gtk.MenuItem - groupchat_control_hbox: Gtk.Box - overlay: Gtk.Overlay - stack: Gtk.Stack - groupchat_control_vbox: Gtk.Box - textview_box: Gtk.Box - conv_view_overlay: Gtk.Overlay - hbox: Gtk.Box - quick_invite_button: Gtk.Button - settings_menu: Gtk.MenuButton - authentication_button: Gtk.Button - lock_image: Gtk.Image - encryption_menu: Gtk.MenuButton - sendfile_button: Gtk.Button - emoticons_button: Gtk.MenuButton - send_message_button: Gtk.Button - formattings_button: Gtk.MenuButton - roster_revealer: Gtk.Revealer - nickname_entry: Gtk.Entry - nickname_change_button: Gtk.Button - password_set_button: Gtk.Button - password_entry: Gtk.Entry - captcha_set_button: Gtk.Button - captcha_box: Gtk.Box - remove_bookmark_button: Gtk.Button - retry_button: Gtk.Button - close_button: Gtk.Button - error_label: Gtk.Label - error_heading: Gtk.Label - captcha_close_button: Gtk.Button - captcha_try_again_button: Gtk.Button - captcha_error_label: Gtk.Label - kick_label: Gtk.Label - kick_participant_button: Gtk.Button - kick_reason_entry: Gtk.Entry - ban_label: Gtk.Label - ban_participant_button: Gtk.Button - ban_reason_entry: Gtk.Entry - destroy_button: Gtk.Button - destroy_alternate_entry: Gtk.Entry - destroy_reason_entry: Gtk.Entry - invite_grid: Gtk.Grid - invite_button: Gtk.Button - - class GroupchatCreationBuilder(Builder): account_liststore: Gtk.ListStore stack: Gtk.Stack @@ -1040,8 +978,6 @@ def get_builder(file_name: Literal['groupchat_affiliation.ui'], widgets: list[st @overload def get_builder(file_name: Literal['groupchat_config.ui'], widgets: list[str] = ...) -> GroupchatConfigBuilder: ... @overload -def get_builder(file_name: Literal['groupchat_control.ui'], widgets: list[str] = ...) -> GroupchatControlBuilder: ... -@overload def get_builder(file_name: Literal['groupchat_creation.ui'], widgets: list[str] = ...) -> GroupchatCreationBuilder: ... @overload def get_builder(file_name: Literal['groupchat_details.ui'], widgets: list[str] = ...) -> GroupchatDetailsBuilder: ... ===================================== gajim/gtk/controls/base.py ===================================== @@ -28,6 +28,7 @@ from typing import Any from typing import Optional from typing import Union +from typing import cast import os import logging @@ -117,8 +118,8 @@ def __init__(self, widget_name: str, account: str, jid: JID) -> None: self.control_id: str = str(uuid.uuid4()) - self.xml = get_builder(f'{widget_name}.ui') - self.widget: Gtk.Box = self.xml.get_object('control_box') + self.xml = get_builder('chat_control.ui') + self.widget = cast(Gtk.Box, self.xml.get_object('control_box')) # Drag and drop self.xml.overlay.add_overlay(self.xml.drop_area) ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -85,11 +85,14 @@ def __init__(self, account: str, jid: JID) -> None: self._groupchat_state = GroupchatState(self.contact) self.xml.conv_view_overlay.add_overlay(self._groupchat_state) + self._roster_revealer = Gtk.Revealer() + self.xml.conv_view_box.add(self._roster_revealer) + self.roster = GroupchatRoster(self.account, self.room_jid, self) - self.xml.roster_revealer.add(self.roster) + self._roster_revealer.add(self.roster) show_roster = app.settings.get('hide_groupchat_occupants_list') - self.xml.roster_revealer.set_reveal_child(show_roster) + self._roster_revealer.set_reveal_child(show_roster) app.settings.connect_signal( 'hide_groupchat_occupants_list', self._show_roster) self.roster.connect('row-activated', self._on_roster_row_activated) @@ -149,8 +152,8 @@ def _show_roster(self, show_roster: bool, *args: Any) -> None: transition = Gtk.RevealerTransitionType.SLIDE_RIGHT if show_roster: transition = Gtk.RevealerTransitionType.SLIDE_LEFT - self.xml.roster_revealer.set_transition_type(transition) - self.xml.roster_revealer.set_reveal_child(show_roster) + self._roster_revealer.set_transition_type(transition) + self._roster_revealer.set_reveal_child(show_roster) def _on_roster_row_activated(self, _roster: GroupchatRoster, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3d8ac70c960e51c3080bb9beb873da8f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3d8ac70c960e51c3080bb9beb873da8f… 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