Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] chore: Use proper dependency names in README
by Philipp Hörist (＠lovetox) 03 Jul '22

03 Jul '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: df2af1ee by Peter Shkenev at 2022-07-03T16:59:00+02:00 chore: Use proper dependency names in README - - - - - 1 changed file: - README.md Changes: ===================================== README.md ===================================== @@ -2,46 +2,45 @@ # Welcome to Gajim ### Runtime Requirements -- python3.9 or higher -- python3-gi -- python3-gi-cairo -- python3-nbxmpp (>=2.99.0) -- python3-openssl (>=16.2) -- python3-css-parser -- python3-keyring -- python3-precis-i18n -- python3-packaging -- python3-pil -- python3-setuptools -- Gtk3 (>=3.22) -- GLib (>=2.60.0) -- gir1.2-gtksource-4 -- gir1.2-soup-2.4 +- [Python](https://www.python.org/) (>=3.9) +- [PyGObject](https://pypi.org/project/PyGObject/) +- [pycairo](https://pypi.org/project/pycairo/) +- [nbxmpp](https://pypi.org/project/nbxmpp/) (>=3.0.0) +- [pyOpenSSL](https://pypi.org/project/pyOpenSSL/) (>=16.2) +- [css-parser](https://pypi.org/project/css-parser/) +- [keyring](https://pypi.org/project/keyring/) +- [precis_i18n](https://pypi.org/project/precis-i18n/) +- [packaging](https://pypi.org/project/packaging/) +- [Pillow](https://pypi.org/project/Pillow/) +- [setuptools](https://pypi.org/project/setuptools/) +- [Gtk3](https://gitlab.com/gnome/gtk) (>=3.22) +- [GLib](https://gitlab.com/gnome/glib) (>=2.60.0) +- [GtkSourceView](https://gitlab.gnome.org/GNOME/gtksourceview) +- [libsoup](https://gitlab.gnome.org/GNOME/libsoup/) ### Optional Runtime Requirements -- python3-sentry-sdk for Sentry error reporting to dev.gajim.org (users decide whether to send reports or not) -- gir1.2-gspell-1 and hunspell-LANG where lang is your locale eg. en, fr etc -- gir1.2-secret-1 for GNOME Keyring or KDE support as password storage - D-Bus running to have gajim-remote working -- gir1.2-gupnpigd-1.0 for better NAT traversing -- gir1.2-networkmanager-1.0 for network lose detection -- gir1.2-geoclue-2.0 for sharing your location -- gir1.2-gsound-1.0 for sound on Linux +- [sentry-sdk](https://pypi.org/project/sentry-sdk/) for Sentry error reporting to dev.gajim.org (users decide whether to send reports or not) +- [gspell](https://gitlab.gnome.org/GNOME/gspell) and hunspell-LANG where lang is your locale eg. en, fr etc +- [libsecret](https://gitlab.gnome.org/GNOME/libsecret/) for GNOME Keyring or KDE support as password storage +- [GUPnP-IGD](https://gitlab.gnome.org/GNOME/gupnp) for better NAT traversing +- [NetworkManager](https://gitlab.freedesktop.org/NetworkManager/NetworkManage… for network lose detection +- [GeoClue](https://gitlab.freedesktop.org/geoclue/geoclue) for sharing your location +- [GSound](https://gitlab.gnome.org/GNOME/gsound) for sound on Linux #### For Video and Audio Calls -- gir1.2-farstream-0.2 for video calls -- gir1.2-gstreamer-1.0 for video and audio calls -- gir1.2-gst-plugins-base-1.0 for video and audio calls -- gstreamer1.0-plugins-ugly for video and audio calls -- gstreamer1.0-libav for video and audio calls -- gstreamer1.0-gtk3 +- [Farstream](https://gitlab.freedesktop.org/farstream/farstream) +- [GStreamer](https://gitlab.freedesktop.org/gstreamer/gstreamer) +- [gst-plugins-base](https://gitlab.freedesktop.org/gstreamer/gst-plugins-base) +- [gst-plugins-ugly](https://gitlab.freedesktop.org/gstreamer/gst-plugins-ugly) +- [gst-libav](https://gitlab.freedesktop.org/gstreamer/gst-libav) ### Compile-time Requirements -- python3-setuptools -- gettext +- [setuptools](https://pypi.org/project/setuptools/) +- [gettext](https://savannah.gnu.org/projects/gettext/) ### Running Tests View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/df2af1eee8209204e89358cd789aadcd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/df2af1eee8209204e89358cd789aadcd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] README.md: use proper dependency names
by Philipp Hörist (＠lovetox) 03 Jul '22

03 Jul '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8478717a by Peter Shkenev at 2022-07-03T14:57:41+00:00 README.md: use proper dependency names - - - - - 1 changed file: - README.md Changes: ===================================== README.md ===================================== @@ -2,46 +2,45 @@ # Welcome to Gajim ### Runtime Requirements -- python3.9 or higher -- python3-gi -- python3-gi-cairo -- python3-nbxmpp (>=2.99.0) -- python3-openssl (>=16.2) -- python3-css-parser -- python3-keyring -- python3-precis-i18n -- python3-packaging -- python3-pil -- python3-setuptools -- Gtk3 (>=3.22) -- GLib (>=2.60.0) -- gir1.2-gtksource-4 -- gir1.2-soup-2.4 +- [Python](https://www.python.org/) (>=3.9) +- [PyGObject](https://pypi.org/project/PyGObject/) +- [pycairo](https://pypi.org/project/pycairo/) +- [nbxmpp](https://pypi.org/project/nbxmpp/) (>=3.0.0) +- [pyOpenSSL](https://pypi.org/project/pyOpenSSL/) (>=16.2) +- [css-parser](https://pypi.org/project/css-parser/) +- [keyring](https://pypi.org/project/keyring/) +- [precis_i18n](https://pypi.org/project/precis-i18n/) +- [packaging](https://pypi.org/project/packaging/) +- [Pillow](https://pypi.org/project/Pillow/) +- [setuptools](https://pypi.org/project/setuptools/) +- [Gtk3](https://gitlab.com/gnome/gtk) (>=3.22) +- [GLib](https://gitlab.com/gnome/glib) (>=2.60.0) +- [GtkSourceView](https://gitlab.gnome.org/GNOME/gtksourceview) +- [libsoup](https://gitlab.gnome.org/GNOME/libsoup/) ### Optional Runtime Requirements -- python3-sentry-sdk for Sentry error reporting to dev.gajim.org (users decide whether to send reports or not) -- gir1.2-gspell-1 and hunspell-LANG where lang is your locale eg. en, fr etc -- gir1.2-secret-1 for GNOME Keyring or KDE support as password storage - D-Bus running to have gajim-remote working -- gir1.2-gupnpigd-1.0 for better NAT traversing -- gir1.2-networkmanager-1.0 for network lose detection -- gir1.2-geoclue-2.0 for sharing your location -- gir1.2-gsound-1.0 for sound on Linux +- [sentry-sdk](https://pypi.org/project/sentry-sdk/) for Sentry error reporting to dev.gajim.org (users decide whether to send reports or not) +- [gspell](https://gitlab.gnome.org/GNOME/gspell) and hunspell-LANG where lang is your locale eg. en, fr etc +- [libsecret](https://gitlab.gnome.org/GNOME/libsecret/) for GNOME Keyring or KDE support as password storage +- [GUPnP-IGD](https://gitlab.gnome.org/GNOME/gupnp) for better NAT traversing +- [NetworkManager](https://gitlab.freedesktop.org/NetworkManager/NetworkManage… for network lose detection +- [GeoClue](https://gitlab.freedesktop.org/geoclue/geoclue) for sharing your location +- [GSound](https://gitlab.gnome.org/GNOME/gsound) for sound on Linux #### For Video and Audio Calls -- gir1.2-farstream-0.2 for video calls -- gir1.2-gstreamer-1.0 for video and audio calls -- gir1.2-gst-plugins-base-1.0 for video and audio calls -- gstreamer1.0-plugins-ugly for video and audio calls -- gstreamer1.0-libav for video and audio calls -- gstreamer1.0-gtk3 +- [Farstream](https://gitlab.freedesktop.org/farstream/farstream) +- [GStreamer](https://gitlab.freedesktop.org/gstreamer/gstreamer) +- [gst-plugins-base](https://gitlab.freedesktop.org/gstreamer/gst-plugins-base) +- [gst-plugins-ugly](https://gitlab.freedesktop.org/gstreamer/gst-plugins-ugly) +- [gst-libav](https://gitlab.freedesktop.org/gstreamer/gst-libav) ### Compile-time Requirements -- python3-setuptools -- gettext +- [setuptools](https://pypi.org/project/setuptools/) +- [gettext](https://savannah.gnu.org/projects/gettext/) ### Running Tests View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8478717a8f1079a29276403140c72f8f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8478717a8f1079a29276403140c72f8f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Raise nbxmpp version
by Philipp Hörist (＠lovetox) 03 Jul '22

03 Jul '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4d113bb8 by lovetox at 2022-07-03T16:02:46+02:00 chore: Raise nbxmpp version - - - - - 1 changed file: - gajim/gajim.py Changes: ===================================== gajim/gajim.py ===================================== @@ -30,7 +30,7 @@ from gajim.common import i18n -_MIN_NBXMPP_VER = '3.0.0.dev3' +_MIN_NBXMPP_VER = '3.0.0' _MIN_GTK_VER = '3.22.27' _MIN_CAIRO_VER = '1.16.0' _MIN_PYGOBJECT_VER = '3.32.0' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4d113bb89a13fdf865bb10b4a9094691… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4d113bb89a13fdf865bb10b4a9094691… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: CodeWidget: Don't highlight matching brackets
by Philipp Hörist (＠lovetox) 03 Jul '22

03 Jul '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: d12c76e5 by André Apitzsch at 2022-07-02T16:37:54+02:00 fix: CodeWidget: Don't highlight matching brackets Highlighting matching brackets is confusing without a visible cursor. Fixes #11026. - - - - - 1 changed file: - gajim/gtk/conversation/code_widget.py Changes: ===================================== gajim/gtk/conversation/code_widget.py ===================================== @@ -100,6 +100,7 @@ def __init__(self) -> None: self.set_top_margin(2) self.set_bottom_margin(2) self.set_monospace(True) + self.get_buffer().set_highlight_matching_brackets(False) self._source_manager = GtkSource.LanguageManager.get_default() self._style_scheme_manager = GtkSource.StyleSchemeManager.get_default() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d12c76e5f24927f418b095ad63a6de3f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d12c76e5f24927f418b095ad63a6de3f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] Things
by Philipp Hörist (＠lovetox) 02 Jul '22

02 Jul '22

Philipp Hörist pushed to branch newcontrol at gajim / gajim Commits: afcdabe4 by lovetox at 2022-07-02T08:50:11+02:00 Things - - - - - 8 changed files: - gajim/gtk/chat_stack.py - gajim/gtk/const.py - gajim/gtk/control_stack.py - gajim/gtk/controls/groupchat.py - gajim/gtk/groupchat_details.py - gajim/gtk/groupchat_manage.py - gajim/gtk/menus.py - gajim/gtk/message_actions_box.py Changes: ===================================== gajim/gtk/chat_stack.py ===================================== @@ -26,12 +26,13 @@ from nbxmpp.protocol import JID from gajim.common import app, helpers +from gajim.common.i18n import _ from gajim.common.const import CallType from gajim.common.modules.contacts import BareContact from gajim.common.modules.contacts import GroupchatContact from gajim.common.modules.contacts import GroupchatParticipant from gajim.common.structs import OutgoingMessage -from gajim.common.types import ChatContactT +from gajim.common.types import BareContactT, ChatContactT from .chat_banner import ChatBanner from .control_stack import ControlStack @@ -49,6 +50,8 @@ def __init__(self): self.set_vexpand(True) self.set_hexpand(True) + self.add_named(ChatPlaceholderBox(), 'empty') + self._chat_banner = ChatBanner() self._control_stack = ControlStack() self._message_action_box = MessageActionsBox() @@ -79,15 +82,19 @@ def show_chat(self, account: str, jid: JID) -> None: self._chat_banner.switch_contact(account, jid) self._control_stack.show_chat(account, jid) self._message_action_box.switch_contact(self._current_contact) - if not isinstance(self._current_contact, GroupchatContact): + + self._update_base_actions(self._current_contact) + if isinstance(self._current_contact, GroupchatContact): + self._update_group_chat_actions(self._current_contact) + else: self._update_chat_actions(self._current_contact) + self.set_visible_child_name('controls') + def _connect_actions(self) -> None: actions = [ 'add-to-roster', - 'block-contact', 'clear-chat', - 'information', 'invite-contacts', 'send-file', 'send-file-httpupload', @@ -113,29 +120,17 @@ def _connect_actions(self) -> None: assert action is not None action.connect('change-state', self._on_stateful_action) - def _update_chat_actions(self, contact: ChatContactT) -> None: - account = contact.account - client = app.get_client(account) - online = app.account_is_connected(account) - - if isinstance(contact, BareContact): - app.window.get_action('add-to-roster').set_enabled( - not contact.is_in_roster) - - app.window.get_action('block-contact').set_enabled( - online and client.get_module('Blocking').supported) + def _update_base_actions(self, contact: ChatContactT): + client = app.get_client(contact.account) + online = app.account_is_connected(contact.account) + # TODO: handle gc participants chatstate = contact.settings.get('send_chatstate') chatstate = GLib.Variant('s', chatstate) app.window.get_action('send-chatstate').change_state(chatstate) - if isinstance(contact, BareContact): - app.window.get_action('start-voice-call').set_enabled( - online and contact.supports_audio() and - sys.platform != 'win32') - app.window.get_action('start-video-call').set_enabled( - online and contact.supports_video() and - sys.platform != 'win32') + state = GLib.Variant('b', contact.settings.get('send_marker')) + app.window.get_action('send-marker').change_state(state) has_text = self._message_action_box.msg_textview.has_text() app.window.get_action('send-message').set_enabled( @@ -152,14 +147,30 @@ def _update_chat_actions(self, contact: ChatContactT) -> None: jingle.get_enabled() or httpupload.get_enabled()) - state = GLib.Variant('b', contact.settings.get('send_marker')) - app.window.get_action('send-marker').change_state(state) + app.window.get_action('show-contact-info').set_enabled(online) + app.window.get_action('input-bold').set_enabled(True) + app.window.get_action('input-italic').set_enabled(True) + app.window.get_action('input-strike').set_enabled(True) + app.window.get_action('input-clear').set_enabled(True) + app.window.get_action('clear-chat').set_enabled(True) + + def _update_chat_actions(self, contact: BareContact) -> None: + account = contact.account + online = app.account_is_connected(account) - app.window.get_action('information').set_enabled(online) + app.window.get_action('start-voice-call').set_enabled( + online and contact.supports_audio() and + sys.platform != 'win32') + app.window.get_action('start-video-call').set_enabled( + online and contact.supports_video() and + sys.platform != 'win32') - # TODO - # clear-chat - # show-contact-info + def _update_group_chat_actions(self, contact: GroupchatContact) -> None: + pass + + def _update_participant_actions(self, + contact: GroupchatParticipant) -> None: + pass def _on_action(self, action: Gio.SimpleAction, @@ -174,12 +185,6 @@ def _on_action(self, if action_name == 'send-message': self._on_send_message() - elif action_name == 'block-contact': - app.window.block_contact(account, jid) - - elif action_name == 'information': - app.window.contact_info(account, jid) - elif action_name == 'start-voice-call': app.call_manager.start_call(account, jid, CallType.AUDIO) @@ -188,8 +193,9 @@ def _on_action(self, elif action_name.startswith('send-file'): name = action.get_name() + control = self._control_stack.get_current_control() if 'httpupload' in name: - app.interface.send_httpupload(self) + app.interface.send_httpupload(control) return if 'jingle' in name: @@ -202,7 +208,7 @@ def _on_action(self, return if method == 'httpupload': - app.interface.send_httpupload(self) + app.interface.send_httpupload(control) else: app.interface.instances[ 'file_transfers'].show_file_send_request(account, contact) @@ -217,13 +223,11 @@ def _on_action(self, open_window('AddContact', account=account, jid=jid) elif action_name == 'clear-chat': - self._control_stack.get_control().reset_view() + self._control_stack.get_current_control().reset_view() elif action_name == 'show-contact-info': if isinstance(contact, GroupchatContact): - open_window('GroupchatDetails', - contact=contact, - subject=self._subject_text) + open_window('GroupchatDetails', contact=contact) else: app.window.contact_info(account, jid) @@ -320,7 +324,32 @@ def _get_pref_ft_method(self, contact: ChatContactT) -> Optional[str]: return None def clear(self) -> None: + self.set_visible_child_name('empty') self._control_stack.clear() def process_event(self, event: Any) -> None: self._control_stack.process_event(event) + + +class ChatPlaceholderBox(Gtk.Box): + def __init__(self): + Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL, + spacing=18) + self.set_valign(Gtk.Align.CENTER) + pixbuf = Gtk.IconTheme.load_icon_for_scale( + Gtk.IconTheme.get_default(), + 'org.gajim.Gajim-symbolic', + 100, + self.get_scale_factor(), + Gtk.IconLookupFlags.FORCE_SIZE) + image = Gtk.Image.new_from_pixbuf(pixbuf) + image.get_style_context().add_class('dim-label') + self.add(image) + + button = Gtk.Button(label=_('Start Chatting…')) + button.set_halign(Gtk.Align.CENTER) + button.connect('clicked', self._on_start_chatting) + self.add(button) + + def _on_start_chatting(self, _button: Gtk.Button) -> None: + app.app.activate_action('start-chat', GLib.Variant('s', '')) ===================================== gajim/gtk/const.py ===================================== @@ -26,8 +26,6 @@ from enum import IntEnum from enum import unique -from gi.repository import GLib - from gajim.common.setting_values import AllSettingsT @@ -199,10 +197,8 @@ def __str__(self): ('send-file-httpupload', None, False), ('send-file-jingle', None, False), ('send-file', None, False), - ('block-contact', None, False), - ('information', None, False), ('invite-contacts', None, False), - ('add-to-roster', None, False), + ('add-to-roster', None, True), ('start-voice-call', None, False), ('start-video-call', None, False), ('clear-chat', None, False), ===================================== gajim/gtk/control_stack.py ===================================== @@ -23,9 +23,6 @@ from nbxmpp import JID -from gajim.common import app -from gajim.common.i18n import _ - from .controls.chat import ChatControl from .controls.groupchat import GroupchatControl from .controls.private import PrivateChatControl @@ -41,8 +38,6 @@ def __init__(self): self.set_vexpand(True) self.set_hexpand(True) - self.add_named(ChatPlaceholderBox(), 'empty') - self.show_all() self._controls: dict[tuple[str, JID], ControlT] = {} self._current_control = None @@ -127,7 +122,6 @@ def is_chat_loaded(self, account: str, jid: JID) -> bool: return control.is_chat_loaded def clear(self) -> None: - self.set_visible_child_name('empty') self._current_control = None def process_event(self, event: Any) -> None: @@ -141,27 +135,3 @@ def remove_chats_for_account(self, account: str) -> None: if chat_account != account: continue self.remove_chat(account, jid) - - -class ChatPlaceholderBox(Gtk.Box): - def __init__(self): - Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL, - spacing=18) - self.set_valign(Gtk.Align.CENTER) - pixbuf = Gtk.IconTheme.load_icon_for_scale( - Gtk.IconTheme.get_default(), - 'org.gajim.Gajim-symbolic', - 100, - self.get_scale_factor(), - Gtk.IconLookupFlags.FORCE_SIZE) - image = Gtk.Image.new_from_pixbuf(pixbuf) - image.get_style_context().add_class('dim-label') - self.add(image) - - button = Gtk.Button(label=_('Start Chatting…')) - button.set_halign(Gtk.Align.CENTER) - button.connect('clicked', self._on_start_chatting) - self.add(button) - - def _on_start_chatting(self, _button: Gtk.Button) -> None: - app.app.activate_action('start-chat', GLib.Variant('s', '')) ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -1089,7 +1089,6 @@ def delegate_action(self, action: str) -> int: if action == 'change-subject': open_window('GroupchatDetails', contact=self.contact, - subject=self._subject_text, page='manage') return Gdk.EVENT_STOP ===================================== gajim/gtk/groupchat_details.py ===================================== @@ -41,7 +41,6 @@ class GroupchatDetails(Gtk.ApplicationWindow): def __init__(self, contact: GroupchatContact, - subject: str, page: Optional[str] = None ) -> None: Gtk.ApplicationWindow.__init__(self) @@ -55,7 +54,6 @@ def __init__(self, self.account = contact.account self._client = app.get_client(contact.account) - self._subject_text = subject self._contact = contact self._contact.connect('avatar-update', self._on_avatar_update) @@ -132,8 +130,7 @@ def _on_avatar_update(self, def _add_groupchat_manage(self) -> None: self._groupchat_manage = GroupchatManage(self.account, - self._contact, - self._subject_text) + self._contact) self._ui.manage_box.add(self._groupchat_manage) def _add_groupchat_info(self) -> None: ===================================== gajim/gtk/groupchat_manage.py ===================================== @@ -43,7 +43,6 @@ class GroupchatManage(Gtk.Box): def __init__(self, account: str, contact: GroupchatContact, - subject: str ) -> None: Gtk.Box.__init__(self) self._account = account @@ -51,8 +50,6 @@ def __init__(self, self._contact = contact self._contact.connect('room-subject', self._on_room_subject) - self._subject_text = subject - self._room_config_form = None self._ui = get_builder('groupchat_manage.ui') @@ -81,7 +78,11 @@ def disco_info(self): return app.storage.cache.get_last_disco_info(self._contact.jid) def _prepare_subject(self) -> None: - self._ui.subject_textview.get_buffer().set_text(self._subject_text) + text = '' + if self._contact.subject is not None: + text = self._contact.subject.text + + self._ui.subject_textview.get_buffer().set_text(text) joined = self._contact.is_joined change_allowed = self._is_subject_change_allowed() @@ -103,8 +104,11 @@ def _on_subject_text_changed(self, buffer_: Gtk.TextBuffer) -> None: text = buffer_.get_text(buffer_.get_start_iter(), buffer_.get_end_iter(), False) + + assert self._contact.subject is not None + self._ui.subject_change_button.set_sensitive( - text != self._subject_text) + text != self._contact.subject.text) def _on_subject_change_clicked(self, _button: Gtk.Button) -> None: buffer_ = self._ui.subject_textview.get_buffer() @@ -121,7 +125,6 @@ def _on_room_subject(self, if subject is None: return - self._subject_text = subject.text self._ui.subject_textview.get_buffer().set_text(subject.text) def _prepare_manage(self) -> None: ===================================== gajim/gtk/menus.py ===================================== @@ -41,29 +41,29 @@ from gajim.common.const import URIAction from gajim.common.structs import URI from gajim.common.structs import VariantMixin -from gajim.common.modules.contacts import BareContact, GroupchatContact, can_add_to_roster +from gajim.common.modules.contacts import BareContact +from gajim.common.modules.contacts import GroupchatContact +from gajim.common.modules.contacts import can_add_to_roster from gajim.gui.structs import AddChatActionParams from gajim.gui.structs import AccountJidParam from gajim.gui.structs import ChatListEntryParam from gajim.gui.structs import RemoveHistoryActionParams from gajim.gui.util import GajimMenu -from gajim.gui.const import ControlType MenuValueT = Union[None, str, GLib.Variant, VariantMixin] MenuItemListT = list[tuple[str, str, MenuValueT]] -def get_self_contact_menu(control_id: str, - contact: types.BareContact) -> GajimMenu: +def get_self_contact_menu(contact: types.BareContact) -> GajimMenu: account = contact.account jid = contact.jid menu = GajimMenu() menu.add_item(_('Profile'), f'app.{account}-profile', f'"{account}"') - submenu = get_send_file_submenu(control_id) + submenu = get_send_file_submenu() menu.append_submenu(_('Send File'), submenu) params = RemoveHistoryActionParams(account=account, jid=jid) @@ -72,46 +72,35 @@ def get_self_contact_menu(control_id: str, return menu -def get_singlechat_menu(contact: Union[types.BareContact, - types.GroupchatParticipant] - ) -> GajimMenu: - - is_self_contact = isinstance(contact, BareContact) and contact.is_self +def get_singlechat_menu(contact: types.BareContact) -> GajimMenu: + account = contact.account menu = GajimMenu() - if is_self_contact: - menu.add_item(_('Profile'), 'win.profile') - else: - menu.add_item(_('Details'), 'win.information') - menu.add_item(_('Block Contact…'), 'win.block-contact') + menu.add_item(_('Details'), 'win.show-contact-info') + menu.add_item(_('Block Contact…'), f'win.block-contact-{account}') submenu = get_send_file_submenu() menu.append_submenu(_('Send File'), submenu) - if is_self_contact: - menu.add_item(_('Search…'), 'win.search-history') - else: - menu.add_item(_('Start Voice Call…'), 'win.start-voice-call') - menu.add_item(_('Start Video Call…'), 'win.start-video-call') + menu.add_item(_('Start Voice Call…'), 'win.start-voice-call') + menu.add_item(_('Start Video Call…'), 'win.start-video-call') if can_add_to_roster(contact): - menu.append(_('Add to Contact List…'), 'win.add-to-roster') + params = AccountJidParam(account=account, jid=contact.jid) + menu.add_item(_('Add to Contact List…'), 'win.add-to-roster', params) return menu -def get_private_chat_menu(control_id: str, - contact: types.GroupchatParticipant - ) -> GajimMenu: - +def get_private_chat_menu(contact: types.GroupchatParticipant) -> GajimMenu: menu = GajimMenu() - menu.add_item(_('Details'), f'win.information-{control_id}') - menu.add_item(_('Upload File…'), f'win.send-file-httpupload-{control_id}') + menu.add_item(_('Details'), 'win.show-contact-info') + menu.add_item(_('Upload File…'), 'win.send-file-httpupload') menu.add_item(_('Search…'), 'win.search-history') if can_add_to_roster(contact): - menu.append(_('Add to Contact List…'), - f'win.add-to-roster-{control_id}') + params = AccountJidParam(account=contact.account, jid=contact.jid) + menu.add_item(_('Add to Contact List…'), 'win.add-to-roster', params) return menu ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -35,7 +35,7 @@ from gajim.common import i18n from gajim.common.i18n import _ from gajim.common.const import Direction -from gajim.common.modules.contacts import GroupchatContact +from gajim.common.modules.contacts import GroupchatContact, GroupchatParticipant from gajim.common.types import ChatContactT from gajim.gui.security_label_selector import SecurityLabelSelector @@ -44,7 +44,7 @@ from .dialogs import ErrorDialog from .dialogs import PastePreviewDialog from .emoji_chooser import emoji_chooser -from .menus import get_encryption_menu +from .menus import get_encryption_menu, get_private_chat_menu, get_self_contact_menu from .menus import get_format_menu from .menus import get_groupchat_menu from .menus import get_singlechat_menu @@ -254,11 +254,15 @@ def _on_encryption_details_clicked(self, _button: Gtk.Button) -> None: contact = self.get_current_contact() encryption = contact.settings.get('encryption') app.plugin_manager.extension_point( - 'encryption_dialog' + encryption, self) + 'encryption_dialog' + encryption, contact) def _set_settings_menu(self, contact: ChatContactT) -> None: if isinstance(contact, GroupchatContact): menu = get_groupchat_menu(contact) + elif isinstance(contact, GroupchatParticipant): + menu = get_private_chat_menu(contact) + elif contact.is_self: + menu = get_self_contact_menu(contact) else: menu = get_singlechat_menu(contact) self._ui.settings_menu.set_menu_model(menu) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/afcdabe40e740eb3fc0fd19c24ced016… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/afcdabe40e740eb3fc0fd19c24ced016… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Update pyrightconfig
by Daniel Brötzmann (＠wurstsalat) 28 Jun '22

28 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: e94c3bc8 by wurstsalat at 2022-06-28T23:44:55+02:00 chore: Update pyrightconfig - - - - - 1 changed file: - pyrightconfig.json Changes: ===================================== pyrightconfig.json ===================================== @@ -41,6 +41,7 @@ "gajim/common/sound.py", "gajim/common/storage/", "gajim/common/task_manager.py", + "gajim/gtk/conversation", "gajim/gtk/about.py", "gajim/gtk/account_page.py", "gajim/gtk/account_side_bar.py", @@ -65,9 +66,8 @@ "gajim/gtk/control_stack.py", "gajim/gtk/const.py", "gajim/gtk/contact_info.py", - "gajim/gtk/contacts_flowbox.py", "gajim/gtk/contact_settings.py", - "gajim/gtk/conversation", + "gajim/gtk/contacts_flowbox.py", "gajim/gtk/dialogs.py", "gajim/gtk/emoji_data_gtk.py", "gajim/gtk/exception.py", @@ -79,11 +79,13 @@ "gajim/gtk/groupchat_details.py", "gajim/gtk/groupchat_invitation.py", "gajim/gtk/groupchat_inviter.py", - "gajim/gtk/groupchat_nick.py", + "gajim/gtk/groupchat_join.py", "gajim/gtk/groupchat_nick_completion.py", + "gajim/gtk/groupchat_nick.py", "gajim/gtk/groupchat_outcasts.py", "gajim/gtk/groupchat_settings.py", "gajim/gtk/groupchat_state.py", + "gajim/gtk/gstreamer.py", "gajim/gtk/history_export.py", "gajim/gtk/history_sync.py", "gajim/gtk/main_stack.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e94c3bc8f617227ab598111cddc130df… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e94c3bc8f617227ab598111cddc130df… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] Controls: Remove obsolete code
by Daniel Brötzmann (＠wurstsalat) 28 Jun '22

28 Jun '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: b0ef2e17 by wurstsalat at 2022-06-28T23:27:53+02:00 Controls: Remove obsolete code - - - - - 3 changed files: - gajim/gtk/controls/base.py - gajim/gtk/controls/chat.py - gajim/gtk/controls/groupchat.py Changes: ===================================== gajim/gtk/controls/base.py ===================================== @@ -42,7 +42,6 @@ from gi.repository import Gio from nbxmpp import JID -from nbxmpp.const import Chatstate from nbxmpp.modules.security_labels import Displaymarking from gajim.common import app @@ -65,8 +64,6 @@ from gajim.gui.conversation.scrolled import ScrolledView from gajim.gui.conversation.jump_to_end_button import JumpToEndButton from gajim.gui.file_transfer_send import SendFileDialog -from gajim.gui.message_input import MessageInputTextView -from gajim.gui.security_label_selector import SecurityLabelSelector from gajim.gui.util import get_hardware_key_codes from gajim.gui.builder import get_builder from gajim.gui.util import set_urgency_hint @@ -333,14 +330,6 @@ def update_actions(self) -> None: Derived types MAY implement this """ - def draw_banner(self) -> None: - """ - Draw the fat line at the top of the window - that houses the icon, jid, etc - - Derived types MAY implement this. - """ - def update_toolbar(self) -> None: """ update state of buttons in toolbar ===================================== gajim/gtk/controls/chat.py ===================================== @@ -114,9 +114,6 @@ def focus(self) -> None: def delegate_action(self, action: str) -> int: return Gdk.EVENT_PROPAGATE - def _on_nickname_received(self, _event): - self.update_ui() - def _on_caps_update(self, _contact: types.BareContact, _signal_name: str @@ -152,9 +149,6 @@ def _on_message_received(self, event: events.MessageReceived) -> None: if event.properties.is_sent_carbon: kind = 'outgoing' - resource_contact = self.contact.get_resource(event.resource) - self.xml.phone_image.set_visible(resource_contact.is_phone) - self.add_message(event.msgtxt, kind, tim=event.properties.timestamp, @@ -265,13 +259,13 @@ def shutdown(self) -> None: app.check_finalize(self) def _on_drag_data_received(self, - _widget: Gtk.Widget, - _context: Gdk.DragContext, - _x_coord: int, - _y_coord: int, + widget: Gtk.Widget, + context: Gdk.DragContext, + x_coord: int, + y_coord: int, selection: Gtk.SelectionData, target_type: int, - _timestamp: int + timestamp: int ) -> None: if not selection.get_data(): return ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -133,10 +133,6 @@ def __init__(self, account: str, jid: JID) -> None: self.add_actions() GLib.idle_add(self.update_actions) - # muc attention flag (when we are mentioned in a muc) - # if True, the room has mentioned us - self.attention_flag: bool = False - # Holds CaptchaRequest widget self._captcha_request: Optional[DataFormWidget] = None @@ -691,11 +687,6 @@ def _set_control_inactive(self) -> None: def rejoin(self) -> None: self._client.get_module('MUC').join(self.room_jid) - # def send_pm(self, nick, message=None): - # ctrl = self._start_private_message(nick) - # if message is not None: - # ctrl.send_message(message) - def _on_user_joined(self, _contact: GroupchatContact, _signal_name: str, @@ -1050,17 +1041,16 @@ def _close_control(self) -> None: GLib.Variant('as', [self.account, str(self.room_jid)])) def set_control_active(self, state: bool) -> None: - self.attention_flag = False BaseControl.set_control_active(self, state) def _on_drag_data_received(self, - _widget: Gtk.Widget, - _context: Gdk.DragContext, - _x_coord: int, - _y_coord: int, + widget: Gtk.Widget, + context: Gdk.DragContext, + x_coord: int, + y_coord: int, selection: Gtk.SelectionData, target_type: int, - _timestamp: int + timestamp: int ) -> None: if not selection.get_data(): return @@ -1232,33 +1222,33 @@ def _on_captcha_changed(self, ) -> None: self.xml.captcha_set_button.set_sensitive(is_valid) - def _on_captcha_set_clicked(self, _button): + def _on_captcha_set_clicked(self, _button: Gtk.Button) -> None: form_node = self._captcha_request.get_submit_form() self._client.get_module('MUC').send_captcha(self.room_jid, form_node) self._remove_captcha_request() self._show_page('groupchat') - def _on_captcha_cancel_clicked(self, *args: Any) -> None: + def _on_captcha_cancel_clicked(self, _button: Gtk.Button) -> None: self._client.get_module('MUC').cancel_captcha(self.room_jid) self._remove_captcha_request() self._close_control() - def _on_captcha_try_again_clicked(self, *args: Any) -> None: + def _on_captcha_try_again_clicked(self, _button: Gtk.Button) -> None: self._client.get_module('MUC').join(self.room_jid) self._show_page('groupchat') - def _on_remove_bookmark_button_clicked(self, *args: Any) -> None: + def _on_remove_bookmark_button_clicked(self, _button: Gtk.Button) -> None: self._client.get_module('Bookmarks').remove(self.room_jid) self._close_control() - def _on_retry_join_clicked(self, *args: Any) -> None: + def _on_retry_join_clicked(self, _button: Gtk.Button) -> None: self._client.get_module('MUC').join(self.room_jid) self._show_page('groupchat') - def _on_page_cancel_clicked(self, *args: Any) -> None: + def _on_page_cancel_clicked(self, _button: Gtk.Button) -> None: self._show_page('groupchat') - def _on_page_close_clicked(self, *args: Any) -> None: + def _on_page_close_clicked(self, _button: Gtk.Button) -> None: self._close_control() def _on_groupchat_state_abort_clicked(self, _button: Gtk.Button) -> None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b0ef2e1756bc340e5ce6fe10ca929140… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b0ef2e1756bc340e5ce6fe10ca929140… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] Remove obsolete code
by Philipp Hörist (＠lovetox) 28 Jun '22

28 Jun '22

Philipp Hörist pushed to branch newcontrol at gajim / gajim Commits: d01f9ab6 by lovetox at 2022-06-28T23:18:21+02:00 Remove obsolete code - - - - - 2 changed files: - gajim/gtk/controls/base.py - gajim/gui_interface.py Changes: ===================================== gajim/gtk/controls/base.py ===================================== @@ -359,28 +359,6 @@ def _update_toolbar(self) -> None: Derived types MAY implement this """ - def set_session(self, session): - oldsession = None - if hasattr(self, 'session'): - oldsession = self.session - - if oldsession and session == oldsession: - return - - self.session = session - - if session: - session.control = self - - if session and oldsession: - oldsession.control = None - - def remove_session(self, session): - if session != self.session: - return - self.session.control = None - self.session = None - def _nec_ping(self, obj): raise NotImplementedError @@ -885,18 +863,3 @@ def has_focus(self) -> bool: if self == app.window.get_active_control(): return True return False - - -class ScrolledWindow(Gtk.ScrolledWindow): - def __init__(self, *args: Any, **kwargs: Any) -> None: - Gtk.ScrolledWindow.__init__(self, *args, **kwargs) - - self.set_overlay_scrolling(False) - self.set_max_content_height(100) - self.set_propagate_natural_height(True) - self.get_style_context().add_class('scrolled-no-border') - self.get_style_context().add_class('no-scroll-indicator') - self.get_style_context().add_class('scrollbar-style') - self.get_style_context().add_class('one-line-scrollbar') - self.set_shadow_type(Gtk.ShadowType.IN) - self.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC) ===================================== gajim/gui_interface.py ===================================== @@ -125,7 +125,6 @@ def _create_core_handlers_list(self) -> None: # pylint: disable=line-too-long self.handlers = { 'signed-in': [self.handle_event_signed_in], - 'presence-received': [self.handle_event_presence], 'message-sent': [self.handle_event_msgsent], 'message-not-sent': [self.handle_event_msgnotsent], } @@ -166,14 +165,6 @@ def handle_event_signed_in(event): if app.settings.get('ask_online_status'): app.window.show_account_page(account) - def handle_event_presence(self, event): - account = event.conn.name - jid = event.jid - - ctrl = app.window.get_control(account, jid) - if ctrl and ctrl.session and len(event.contact_list) > 1: - ctrl.remove_session(ctrl.session) - @staticmethod def handle_event_msgsent(event): if not event.play_sound: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d01f9ab69398556a487864f33bebb116… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d01f9ab69398556a487864f33bebb116… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] Move send_message() to chat stack
by Philipp Hörist (＠lovetox) 28 Jun '22

28 Jun '22

Philipp Hörist pushed to branch newcontrol at gajim / gajim Commits: b9e62055 by lovetox at 2022-06-28T23:15:58+02:00 Move send_message() to chat stack - - - - - 6 changed files: - gajim/gtk/chat_stack.py - gajim/gtk/control_stack.py - gajim/gtk/controls/base.py - gajim/gtk/controls/chat.py - gajim/gtk/controls/groupchat.py - gajim/gtk/message_actions_box.py Changes: ===================================== gajim/gtk/chat_stack.py ===================================== @@ -25,11 +25,12 @@ from gi.repository import Gtk from nbxmpp.protocol import JID -from gajim.common import app +from gajim.common import app, helpers from gajim.common.const import CallType from gajim.common.modules.contacts import BareContact from gajim.common.modules.contacts import GroupchatContact from gajim.common.modules.contacts import GroupchatParticipant +from gajim.common.structs import OutgoingMessage from gajim.common.types import ChatContactT from .chat_banner import ChatBanner @@ -170,7 +171,10 @@ def _on_action(self, account = contact.account jid = contact.jid - if action_name == 'block-contact': + if action_name == 'send-message': + self._on_send_message() + + elif action_name == 'block-contact': app.window.block_contact(account, jid) elif action_name == 'information': @@ -238,6 +242,62 @@ def _on_stateful_action(self, action.set_state(param) contact.settings.set('send_marker', param.get_boolean()) + def _on_send_message(self) -> None: + self._message_action_box.msg_textview.replace_emojis() + message = self._message_action_box.msg_textview.get_text() + + control = self._control_stack.get_current_control() + + action = app.window.lookup_action('set-encryption') + encryption = action.get_state().get_string() + + if encryption: + self.sendmessage = True + app.plugin_manager.extension_point( + 'send_message' + encryption, + control) + if not self.sendmessage: + return + + contact = self._current_contact + client = app.get_client(contact.account) + + message = helpers.remove_invalid_xml_chars(message) + if message in ('', None, '\n'): + return + + # if process_commands and self.process_as_command(message): + # return + + # TODO + # label = self.get_seclabel() + + correct_id: Optional[str] = None + if control.correcting and control.last_sent_msg: + correct_id = control.last_sent_msg + else: + correct_id = None + + chatstate = client.get_module('Chatstate').get_active_chatstate( + contact) + + type_ = 'chat' + if isinstance(contact, GroupchatContact): + type_ = 'groupchat' + + message_ = OutgoingMessage(account=contact.account, + contact=contact, + message=message, + type_=type_, + chatstate=chatstate, + # label=label, + control=control, + correct_id=correct_id) + + client.send_message(message_) + + self._message_action_box.msg_textview.clear() + def _get_pref_ft_method(self, contact: ChatContactT) -> Optional[str]: ft_pref = app.settings.get_account_setting(contact.account, 'filetransfer_preference') ===================================== gajim/gtk/control_stack.py ===================================== @@ -53,6 +53,9 @@ def get_control(self, account: str, jid: JID) -> Optional[ControlT]: except KeyError: return None + def get_current_control(self) -> ControlT: + return self._current_control + def get_controls(self, account: Optional[str] ) -> Generator[ControlT, None, None]: if account is None: ===================================== gajim/gtk/controls/base.py ===================================== @@ -589,60 +589,6 @@ def get_seclabel(self) -> Optional[str]: def get_our_nick(self) -> str: return app.nicks[self.account] - def _on_send_message(self, *args: Any) -> None: - self.msg_textview.replace_emojis() - message = self.msg_textview.get_text() - self.send_message(message) - - def send_message(self, - message: str, - type_: str = 'chat', - resource: Optional[str] = None, - process_commands: bool = True, - attention: bool = False - ) -> None: - """ - Send the given message to the active tab. Doesn't return None if error - """ - if not message or message == '\n': - return None - - if process_commands and self.process_as_command(message): - return - - label = self.get_seclabel() - - correct_id: Optional[str] = None - if self.correcting and self.last_sent_msg: - correct_id = self.last_sent_msg - else: - correct_id = None - - chatstate = self._client.get_module('Chatstate').get_active_chatstate( - self.contact) - - message_ = OutgoingMessage(account=self.account, - contact=self.contact, - message=message, - type_=type_, - chatstate=chatstate, - resource=resource, - user_nick=self.user_nick, - label=label, - control=self, - attention=attention, - correct_id=correct_id) - - self._client.send_message(message_) - - # Record the history of sent messages - # self.save_message(message, 'sent') - - # Be sure to send user nickname only once according to JEP-0172 - self.user_nick = None - - self.msg_textview.clear() - def _allow_add_message(self) -> bool: # Only add messages if the view is already populated return self.is_chat_loaded and self._scrolled_view.get_lower_complete() ===================================== gajim/gtk/controls/chat.py ===================================== @@ -103,6 +103,7 @@ def jid(self) -> JID: return self.contact.jid def focus(self) -> None: + # TODO does not work anymore if not hasattr(self, 'msg_textview'): # focus() is called sometimes with GLib.idle_add() # This means there is the possibility that shutdown() was called @@ -222,32 +223,6 @@ def update_ui(self) -> None: self.update_toolbar() self.update_actions() - def send_message(self, - message: str, - process_commands: bool = True, - attention: bool = False - ) -> None: - """ - Send a message to contact - """ - - if self.encryption: - self.sendmessage = True - app.plugin_manager.extension_point('send_message' + self.encryption, - self) - if not self.sendmessage: - return - - message = helpers.remove_invalid_xml_chars(message) - if message in ('', None, '\n'): - return - - BaseControl.send_message(self, - message, - type_='chat', - process_commands=process_commands, - attention=attention) - def add_message(self, text: str, kind: str, ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -574,7 +574,8 @@ def add_message(self, highlight = helpers.message_needs_highlight( text, self.contact.nickname, self._client.get_own_jid().bare) - self.msg_textview.process_outgoing_message(contact, highlight) + # TODO + # self.msg_textview.process_outgoing_message(contact, highlight) BaseControl.add_message(self, text, @@ -1023,55 +1024,6 @@ def _on_message_sent(self, event: events.MessageSent) -> None: self.msg_textview.get_style_context().remove_class( 'gajim-msg-correcting') - def send_message(self, - message: str, - process_commands: bool = True - ) -> None: - """ - Call this function to send our message - """ - if not message: - return - - if self.encryption: - self.sendmessage = True - app.plugin_manager.extension_point( - 'send_message' + self.encryption, self) - if not self.sendmessage: - return - - if process_commands and self.process_as_command(message): - return - - message = helpers.remove_invalid_xml_chars(message) - - if not message: - return - - label = self.get_seclabel() - if message != '' or message != '\n': - # self.save_message(message, 'sent') - - if self.correcting and self.last_sent_msg: - correct_id = self.last_sent_msg - else: - correct_id = None - chatstate = self._client.get_module('Chatstate')\ - .get_active_chatstate(self.contact) - - # Send the message - message_ = OutgoingMessage(account=self.account, - contact=self.contact, - message=message, - type_='groupchat', - label=label, - chatstate=chatstate, - correct_id=correct_id) - self._client.send_message(message_) - - self.msg_textview.get_buffer().set_text('') - self.msg_textview.grab_focus() - def _on_message_error(self, event: events.MessageError) -> None: self.conversation_view.show_error(event.message_id, event.error) @@ -1156,7 +1108,9 @@ def delegate_action(self, action: str) -> int: def focus(self) -> None: page_name = self._get_current_page() if page_name == 'groupchat': - self.msg_textview.grab_focus() + # TODO + # self.msg_textview.grab_focus() + pass elif page_name == 'password': self.xml.password_entry.grab_focus_without_selecting() elif page_name == 'nickname': ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -466,14 +466,14 @@ def _on_textview_key_press_event(self, textview.insert_newline() return True - if not app.account_is_available(self.account): + if not app.account_is_available(self._contact.account): # we are not connected ErrorDialog( _('No Connection Available'), _('Your message can not be sent until you are connected.')) return True - self._on_send_message() + app.window.activate_action('send-message', None) return True elif event.keyval == Gdk.KEY_z: # CTRL+z View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b9e620553475a5232112ca07d357905c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b9e620553475a5232112ca07d357905c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] 2 commits: ChatBanner: Improve styling
by Daniel Brötzmann (＠wurstsalat) 28 Jun '22

28 Jun '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: 52807f7d by wurstsalat at 2022-06-28T23:01:55+02:00 ChatBanner: Improve styling - - - - - 691adea6 by wurstsalat at 2022-06-28T23:02:42+02:00 PrivateChatControl: Remove obsolete method - - - - - 2 changed files: - gajim/data/gui/chat_banner.ui - gajim/gtk/controls/private.py Changes: ===================================== gajim/data/gui/chat_banner.ui ===================================== @@ -5,7 +5,7 @@ <object class="GtkBox" id="banner_box"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="spacing">6</property> + <property name="spacing">12</property> <child> <object class="GtkImage" id="avatar_image"> <property name="visible">True</property> @@ -35,7 +35,6 @@ <property name="can-focus">False</property> <property name="halign">start</property> <property name="hexpand">True</property> - <property name="label">Name</property> <property name="ellipsize">end</property> <property name="single-line-mode">True</property> <property name="xalign">0</property> ===================================== gajim/gtk/controls/private.py ===================================== @@ -66,7 +66,6 @@ def _connect_contact_signals(self) -> None: # 'room-destroyed': self._on_room_destroyed, 'room-joined': self._on_room_joined, # 'room-left': self._on_room_left - 'chatstate-update': self._on_chatstate_update, }) @property View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/4c0a56c94852b80a61d500111bd0552… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/4c0a56c94852b80a61d500111bd0552… 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