Commits June 2022

commits@gajim.org

1 participants
132 discussions

[Git][gajim/gajim][newcontrol] refactor: ChatBanner: Adapt to moved functionality
by Daniel Brötzmann (＠wurstsalat) 27 Jun '22

27 Jun '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: 3c6ace6b by wurstsalat at 2022-06-27T23:55:51+02:00 refactor: ChatBanner: Adapt to moved functionality - - - - - 9 changed files: - gajim/data/gui/chat_control.ui - gajim/data/gui/groupchat_control.ui - gajim/gtk/builder.pyi - gajim/gtk/chat_banner.py - gajim/gtk/control_stack.py - gajim/gtk/controls/base.py - gajim/gtk/controls/chat.py - gajim/gtk/controls/groupchat.py - gajim/gtk/controls/private.py Changes: ===================================== gajim/data/gui/chat_control.ui ===================================== @@ -95,144 +95,7 @@ <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkEventBox" id="banner_eventbox"> - <property name="name">ChatControl-BannerEventBox</property> - <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkEventBox" id="avatar_eventbox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="visible-window">False</property> - <child> - <object class="GtkImage" id="avatar_image"> - <property name="width-request">48</property> - <property name="height-request">48</property> - <property name="visible">True</property> - <property name="can-focus">False</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> -  - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="row-spacing">3</property> - <property name="column-spacing">3</property> - <child> - <object class="GtkLabel" id="banner_name_label"> - <property name="name">ChatControl-BannerNameLabel</property> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">start</property> - <property name="hexpand">True</property> - <property name="label">Contact name</property> - <property name="ellipsize">end</property> - <property name="xalign">0</property> - <style> - <class name="large-header"/> - </style> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="banner_label"> - <property name="name">ChatControl-BannerLabel</property> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">start</property> - <property name="hexpand">True</property> - <property name="label">label</property> - <property name="selectable">True</property> - <property name="ellipsize">end</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">1</property> - </packing> - </child> - <child> - <object class="GtkImage" id="phone_image"> - <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="tooltip-text" translatable="yes">The last message was written on a mobile client</property> - <property name="halign">start</property> - <property name="margin-end">4</property> - <property name="icon-name">phone-apple-iphone-symbolic</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> - </packing> - </child> - <child> - <object class="GtkBox" id="account_badge_box"> - <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="halign">end</property> - <property name="valign">center</property> - <property name="orientation">vertical</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="left-attach">2</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <placeholder/> - </child> - </object> - </child> - <style> - <class name="gajim-banner"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> + <placeholder/> </child> <child> <object class="GtkSeparator"> ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -105,181 +105,7 @@ <property name="hexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="GtkEventBox" id="banner_eventbox"> - <property name="name">GroupChatControl-BannerEventBox</property> - <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkImage" id="avatar_image"> - <property name="width-request">48</property> - <property name="height-request">48</property> - <property name="visible">True</property> - <property name="can-focus">False</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="banner_name_label"> - <property name="name">GroupChatControl-BannerNameLabel</property> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="hexpand">True</property> - <property name="label">Group Chat Name</property> - <property name="selectable">True</property> - <property name="ellipsize">end</property> - <property name="single-line-mode">True</property> - <property name="xalign">0</property> - <style> - <class name="large-header"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkBox" id="visitor_box"> - <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">You are a visitor</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkMenuButton" id="visitor_menu_button"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="focus-on-click">False</property> - <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes">What does this mean?</property> - <property name="valign">center</property> - <property name="popover">visitor_popover</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">dialog-information-symbolic</property> - </object> - </child> - <style> - <class name="suggested-action"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkBox" id="account_badge_box"> - <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="halign">end</property> - <property name="valign">center</property> - <property name="margin-end">6</property> - <property name="hexpand">True</property> - <property name="orientation">vertical</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkButton" id="toggle_roster_button"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes">Toggle participants list</property> - <property name="valign">center</property> - <signal name="clicked" handler="_show_roster" swapped="no"/> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="spacing">3</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">system-users-symbolic</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkImage" id="toggle_roster_image"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">go-previous-symbolic</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <style> - <class name="dim-label"/> - </style> - </object> - </child> - <style> - <class name="flat"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">4</property> - </packing> - </child> - </object> - </child> - <style> - <class name="gajim-banner"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> + <placeholder/> </child> <child> <object class="GtkSeparator"> @@ -1612,12 +1438,6 @@ <property name="position">9</property> </packing> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="index">-1</property> @@ -1631,70 +1451,4 @@ </packing> </child> </object> - <object class="GtkPopover" id="visitor_popover"> - <property name="can-focus">False</property> - <property name="relative-to">visitor_menu_button</property> - <property name="position">bottom</property> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">You are a visitor</property> - <style> - <class name="bold"/> - </style> - </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="label" translatable="yes">In order to write messages in this chat, you need to request voice first. -A moderator will process your request.</property> - <property name="wrap">True</property> - <property name="max-width-chars">30</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButton"> - <property name="label" translatable="yes">_Request</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="halign">center</property> - <property name="use-underline">True</property> - <signal name="clicked" handler="_on_request_voice_clicked" swapped="no"/> - <style> - <class name="suggested-action"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack-type">end</property> - <property name="position">2</property> - </packing> - </child> - <style> - <class name="padding-6"/> - </style> - </object> - </child> - </object> </interface> ===================================== gajim/gtk/builder.pyi ===================================== @@ -217,13 +217,6 @@ class ChatControlBuilder(Builder): chat_control_hbox: Gtk.Box overlay: Gtk.Overlay textview_box: Gtk.Box - banner_eventbox: Gtk.EventBox - avatar_eventbox: Gtk.EventBox - avatar_image: Gtk.Image - banner_name_label: Gtk.Label - banner_label: Gtk.Label - phone_image: Gtk.Image - account_badge_box: Gtk.Box conv_view_overlay: Gtk.Overlay hbox: Gtk.Box emoticons_button: Gtk.MenuButton @@ -418,14 +411,6 @@ class GroupchatControlBuilder(Builder): stack: Gtk.Stack groupchat_control_vbox: Gtk.Box textview_box: Gtk.Box - banner_eventbox: Gtk.EventBox - avatar_image: Gtk.Image - banner_name_label: Gtk.Label - visitor_box: Gtk.Box - visitor_menu_button: Gtk.MenuButton - account_badge_box: Gtk.Box - toggle_roster_button: Gtk.Button - toggle_roster_image: Gtk.Image conv_view_overlay: Gtk.Overlay hbox: Gtk.Box quick_invite_button: Gtk.Button @@ -463,7 +448,6 @@ class GroupchatControlBuilder(Builder): destroy_reason_entry: Gtk.Entry invite_grid: Gtk.Grid invite_button: Gtk.Button - visitor_popover: Gtk.Popover class GroupchatCreationBuilder(Builder): ===================================== gajim/gtk/chat_banner.py ===================================== @@ -61,7 +61,9 @@ def __init__(self) -> 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) + ('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) ]) app.settings.connect_signal( @@ -200,6 +202,9 @@ 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_message_received(self, event: MessageReceived) -> None: if not event.msgtxt or self._contact is None: return ===================================== gajim/gtk/control_stack.py ===================================== @@ -24,7 +24,6 @@ from nbxmpp import JID from gajim.common import app -from gajim.common import ged from gajim.common.i18n import _ from .controls.chat import ChatControl @@ -32,26 +31,18 @@ from .controls.private import PrivateChatControl from .types import ControlT -from .util import EventHelper log = logging.getLogger('gajim.gui.controlstack') -class ControlStack(Gtk.Stack, EventHelper): +class ControlStack(Gtk.Stack): def __init__(self): Gtk.Stack.__init__(self) - EventHelper.__init__(self) - self.set_vexpand(True) self.set_hexpand(True) self.add_named(ChatPlaceholderBox(), 'empty') - self.register_events([ - ('account-enabled', ged.GUI2, self._on_account_changed), - ('account-disabled', ged.GUI2, self._on_account_changed), - ]) - self.show_all() self._controls: dict[tuple[str, JID], ControlT] = {} self._current_control = None @@ -148,10 +139,6 @@ def remove_chats_for_account(self, account: str) -> None: continue self.remove_chat(account, jid) - def _on_account_changed(self, *args: Any) -> None: - for control in self._controls.values(): - control.update_account_badge() - class ChatPlaceholderBox(Gtk.Box): def __init__(self): ===================================== gajim/gtk/controls/base.py ===================================== @@ -71,7 +71,6 @@ from gajim.gui.builder import get_builder from gajim.gui.util import set_urgency_hint from gajim.gui.util import scroll_to_end -from gajim.gui.util import AccountBadge from gajim.gui.const import ControlType from gajim.gui.const import TARGET_TYPE_URI_LIST @@ -142,11 +141,6 @@ def __init__(self, widget_name: str, account: str, jid: JID) -> None: # self.xml.connect_signals(self) self.widget: Gtk.Box = self.xml.get_object(f'{widget_name}_hbox') - self._account_badge = AccountBadge(self.account) - self.xml.account_badge_box.add(self._account_badge) - show_account_badge = len(app.settings.get_active_accounts()) > 1 - self.xml.account_badge_box.set_visible(show_account_badge) - # Drag and drop self.xml.overlay.add_overlay(self.xml.drop_area) self.xml.drop_area.hide() @@ -985,10 +979,6 @@ def has_focus(self) -> bool: return True return False - def update_account_badge(self) -> None: - show = len(app.settings.get_active_accounts()) > 1 - self.xml.account_badge_box.set_visible(show) - class ScrolledWindow(Gtk.ScrolledWindow): def __init__(self, *args: Any, **kwargs: Any) -> None: ===================================== gajim/gtk/controls/chat.py ===================================== @@ -45,7 +45,6 @@ from gajim.common.client import Client from gajim.common.i18n import _ from gajim.common.helpers import AdditionalDataDict -from gajim.common.const import AvatarSize from gajim.common.const import SimpleClientState from gajim.common.const import KindConstant from gajim.common.modules.contacts import BareContact @@ -57,7 +56,6 @@ from gajim.command_system.implementation.hosts import ChatCommands from gajim.command_system.framework import CommandHost - log = logging.getLogger('gajim.gui.controls.chat') ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -46,10 +46,8 @@ from gajim.common import app from gajim.common import events -from gajim.common import ged from gajim.common import helpers from gajim.common.client import Client -from gajim.common.const import AvatarSize from gajim.common.const import SimpleClientState from gajim.common.helpers import AdditionalDataDict from gajim.common.helpers import event_filter @@ -74,9 +72,6 @@ from gajim.gui.groupchat_state import GroupchatState from gajim.gui.util import open_window -from ..menus import get_encryption_menu -from ..menus import get_groupchat_menu - log = logging.getLogger('gajim.gui.controls.groupchat') @@ -133,10 +128,6 @@ def __init__(self, account: str, jid: JID) -> None: 'hide_groupchat_occupants_list', self.xml.roster_revealer, 'set_reveal_child') - self._set_toggle_roster_button_icon(show_roster) - app.settings.connect_signal( - 'hide_groupchat_occupants_list', - self._set_toggle_roster_button_icon) self.roster.connect('row-activated', self._on_roster_row_activated) self.add_actions() @@ -146,8 +137,6 @@ def __init__(self, account: str, jid: JID) -> None: # if True, the room has mentioned us self.attention_flag: bool = False - self._update_avatar() - # Holds CaptchaRequest widget self._captcha_request: Optional[DataFormWidget] = None @@ -182,7 +171,6 @@ def __init__(self, account: str, jid: JID) -> None: def _connect_contact_signals(self) -> None: self.contact.multi_connect({ 'state-changed': self._on_muc_state_changed, - 'avatar-update': self._on_avatar_update, 'user-joined': self._on_user_joined, 'user-left': self._on_user_left, 'user-affiliation-changed': self._on_user_affiliation_changed, @@ -476,17 +464,8 @@ def _on_change_affiliation(self, self.room_jid, {jid: {'affiliation': affiliation}}) - def _set_toggle_roster_button_icon(self, - show_roster: bool, - *args: Any) -> None: - icon = 'go-next-symbolic' if show_roster else 'go-previous-symbolic' - self.xml.toggle_roster_image.set_from_icon_name( - icon, Gtk.IconSize.BUTTON) - def _show_roster(self, *args: Any) -> None: show = not self.xml.roster_revealer.get_reveal_child() - self._set_toggle_roster_button_icon(show) - transition = Gtk.RevealerTransitionType.SLIDE_RIGHT if show: transition = Gtk.RevealerTransitionType.SLIDE_LEFT @@ -510,17 +489,6 @@ def _on_roster_row_activated(self, contact = self.contact.get_resource(nick) app.window.add_private_chat(self.account, contact.jid, select=True) - def _on_avatar_update(self, - _contact: GroupchatContact, - _signal_name: str - ) -> None: - self._update_avatar() - - def _update_avatar(self) -> None: - surface = self.contact.get_avatar( - AvatarSize.CHAT, app.window.get_scale_factor()) - self.xml.avatar_image.set_from_surface(surface) - def _on_room_voice_request(self, _contact: GroupchatContact, _signal_name: str, @@ -701,11 +669,8 @@ def _nec_ping(self, event: events.ApplicationEvent) -> None: self.add_info_message(event.error) def _set_control_active(self) -> None: - contact = self.contact.get_self() - if contact.role.is_visitor: - self.xml.visitor_box.show() - else: - self.set_message_input_state(True) + self_contact = self.contact.get_self() + self.set_message_input_state(not self_contact.role.is_visitor) self.roster.initial_draw() self.conversation_view.update_avatars() @@ -714,7 +679,6 @@ def _set_control_active(self) -> None: def _set_control_inactive(self) -> None: self.set_message_input_state(False) - self.xml.visitor_box.hide() self.roster.enable_sort(False) self.roster.clear() @@ -858,10 +822,6 @@ def _on_user_role_changed(self, actor = '' if actor is None else _(' by {actor}').format(actor=actor) if properties.is_muc_self_presence: - if user_contact.role.is_visitor: - self.xml.visitor_box.show() - else: - self.xml.visitor_box.hide() self.set_message_input_state(not user_contact.role.is_visitor) message = _('** Your Role has been set to ' '{role}{actor}{reason}').format(role=role, ===================================== gajim/gtk/controls/private.py ===================================== @@ -24,8 +24,6 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -from typing import Any - from nbxmpp import JID from nbxmpp.structs import MessageProperties from nbxmpp.structs import PresenceProperties View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3c6ace6b4a85454f754ffe219f264f4e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3c6ace6b4a85454f754ffe219f264f4e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] refactor: Move ChatBanner into separate widget
by Daniel Brötzmann (＠wurstsalat) 27 Jun '22

27 Jun '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: 44ecff1f by wurstsalat at 2022-06-27T23:05:43+02:00 refactor: Move ChatBanner into separate widget - - - - - 8 changed files: - + gajim/data/gui/chat_banner.ui - gajim/gtk/builder.pyi - + gajim/gtk/chat_banner.py - gajim/gtk/chat_stack.py - gajim/gtk/controls/base.py - gajim/gtk/controls/chat.py - gajim/gtk/controls/groupchat.py - gajim/gtk/controls/private.py Changes: ===================================== gajim/data/gui/chat_banner.ui ===================================== @@ -0,0 +1,275 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<interface> + <requires lib="gtk+" version="3.24"/> + <object class="GtkBox" id="banner_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkImage" id="avatar_image"> + <property name="visible">True</property> + <property name="can-focus">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="valign">center</property> + <property name="orientation">vertical</property> + <property name="spacing">3</property> + <child> + <object class="GtkLabel" id="name_label"> + <property name="visible">True</property> + <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> + <style> + <class name="large-header"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkImage" id="phone_image"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="tooltip-text" translatable="yes">The last message was written on a mobile client</property> + <property name="halign">start</property> + <property name="margin-end">4</property> + <property name="icon-name">phone-apple-iphone-symbolic</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="toggle_roster_button"> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="no-show-all">True</property> + <property name="tooltip-text" translatable="yes">Toggle participants list</property> + <property name="valign">center</property> + <property name="relief">none</property> + <signal name="clicked" handler="_on_toggle_roster_clicked" swapped="no"/> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="spacing">3</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">system-users-symbolic</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkImage" id="toggle_roster_image"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">go-previous-symbolic</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <style> + <class name="dim-label"/> + </style> + </object> + </child> + <style> + <class name="flat"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="account_badge_box"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="halign">end</property> + <property name="valign">center</property> + <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkBox" id="visitor_box"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">You are a visitor</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="visitor_menu_button"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="focus-on-click">False</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">What does this mean?</property> + <property name="valign">center</property> + <property name="popover">visitor_popover</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">dialog-information-symbolic</property> + </object> + </child> + <style> + <class name="suggested-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">3</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <style> + <class name="gajim-banner"/> + <class name="padding-6"/> + </style> + </object> + <object class="GtkPopover" id="visitor_popover"> + <property name="can-focus">False</property> + <property name="relative-to">visitor_menu_button</property> + <property name="position">bottom</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">You are a visitor</property> + <style> + <class name="bold"/> + </style> + </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="label" translatable="yes">In order to write messages in this chat, you need to request voice first. +A moderator will process your request.</property> + <property name="wrap">True</property> + <property name="max-width-chars">30</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_Request</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="halign">center</property> + <property name="use-underline">True</property> + <signal name="clicked" handler="_on_request_voice_clicked" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">2</property> + </packing> + </child> + <style> + <class name="padding-12"/> + </style> + </object> + </child> + </object> +</interface> ===================================== gajim/gtk/builder.pyi ===================================== @@ -195,6 +195,19 @@ class CertificateBuilder(Builder): image1: Gtk.Image +class ChatBannerBuilder(Builder): + banner_box: Gtk.Box + avatar_image: Gtk.Image + name_label: Gtk.Label + phone_image: Gtk.Image + toggle_roster_button: Gtk.Button + toggle_roster_image: Gtk.Image + account_badge_box: Gtk.Box + visitor_box: Gtk.Box + visitor_menu_button: Gtk.MenuButton + visitor_popover: Gtk.Popover + + class ChatControlBuilder(Builder): drop_area: Gtk.Box formattings_menu: Gtk.Menu @@ -1013,6 +1026,8 @@ def get_builder(file_name: Literal['call_window.ui'], widgets: list[str] = ...) @overload def get_builder(file_name: Literal['certificate.ui'], widgets: list[str] = ...) -> CertificateBuilder: ... @overload +def get_builder(file_name: Literal['chat_banner.ui'], widgets: list[str] = ...) -> ChatBannerBuilder: ... +@overload def get_builder(file_name: Literal['chat_control.ui'], widgets: list[str] = ...) -> ChatControlBuilder: ... @overload def get_builder(file_name: Literal['chat_list_row.ui'], widgets: list[str] = ...) -> ChatListRowBuilder: ... ===================================== gajim/gtk/chat_banner.py ===================================== @@ -0,0 +1,296 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from __future__ import annotations + +from typing import Any +from typing import Optional + +from gi.repository import Gtk + +import cairo + +from nbxmpp.protocol import JID +from nbxmpp.structs import PresenceProperties + +from gajim.common import app +from gajim.common import ged +from gajim.common import types +from gajim.common.const import AvatarSize +from gajim.common.const import SimpleClientState +from gajim.common.events import BookmarksReceived +from gajim.common.events import MessageReceived +from gajim.common.events import MucDiscoUpdate +from gajim.common.ged import EventHelper +from gajim.common.helpers import get_uf_chatstate +from gajim.common.i18n import _ +from gajim.common.modules.contacts import BareContact +from gajim.common.modules.contacts import GroupchatContact +from gajim.common.modules.contacts import GroupchatParticipant + +from .builder import get_builder +from .util import AccountBadge + + +class ChatBanner(Gtk.Box, EventHelper): + 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 + + self._ui = get_builder('chat_banner.ui') + self.add(self._ui.banner_box) + self._ui.connect_signals(self) + + 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) + ]) + + app.settings.connect_signal( + 'hide_groupchat_occupants_list', + self._set_toggle_roster_button_icon) + + self.show_all() + + def switch_contact(self, + account: str, + jid: JID + ) -> None: + self._account = account + self._update_account_badge() + + if self._client is not None: + self._client.disconnect_signals() + + self._client = app.get_client(account) + self._client.connect_signal('state-changed', + self._on_client_state_changed) + + if self._contact is not None: + self._contact.disconnect_signals() + + self._contact = self._client.get_module('Contacts').get_contact(jid) + self._contact.multi_connect({ + 'chatstate-update': self._on_chatstate_update, + 'nickname-update': self._on_nickname_update, + 'avatar-update': self._on_avatar_update, + 'presence-update': self._on_presence_update, + 'caps-update': self._on_caps_update + }) + + if isinstance(self._contact, GroupchatContact): + self._contact.multi_connect({ + 'user-role-changed': self._on_user_role_changed, + 'state-changed': self._on_muc_state_changed + }) + self._ui.toggle_roster_button.show() + hide_banner = app.settings.get('hide_groupchat_banner') + else: + self._ui.toggle_roster_button.hide() + hide_banner = app.settings.get('hide_chat_banner') + + if isinstance(self._contact, GroupchatParticipant): + self._contact.multi_connect({ + 'user-avatar-update': self._on_user_avatar_update, + 'user-nickname-changed': self._on_user_nickname_changed + }) + + if hide_banner: + self.set_no_show_all(True) + self.hide() + else: + self.set_no_show_all(False) + self.show_all() + + hide_roster = app.settings.get('hide_groupchat_occupants_list') + self._set_toggle_roster_button_icon(hide_roster) + self._update_avatar() + self._update_content() + + def _on_client_state_changed(self, + _client: types.Client, + _signal_name: str, + state: SimpleClientState): + self._update_avatar() + self._update_content() + + def _on_presence_update(self, + _contact: types.BareContact, + _signal_name: str + ) -> None: + self._update_avatar() + + def _on_chatstate_update(self, + _contact: types.BareContact, + _signal_name: str + ) -> None: + self._update_content() + + def _on_nickname_update(self, + _contact: types.BareContact, + _signal_name: str + ) -> None: + self._update_content() + + def _on_avatar_update(self, + _contact: types.BareContact, + _signal_name: str + ) -> None: + self._update_avatar() + + def _on_caps_update(self, + _contact: types.BareContact, + _signal_name: str + ) -> None: + self._update_avatar() + + def _on_muc_state_changed(self, + contact: GroupchatContact, + _signal_name: str + ) -> None: + if contact.is_joined: + self._update_content() + + def _on_user_role_changed(self, + _contact: GroupchatContact, + _signal_name: str, + user_contact: GroupchatParticipant, + properties: PresenceProperties + ) -> None: + if properties.is_muc_self_presence: + self._ui.visitor_box.set_visible(user_contact.role.is_visitor) + + def _on_user_nickname_changed(self, + user_contact: GroupchatParticipant, + _signal_name: str, + properties: PresenceProperties, + ) -> None: + if user_contact.name != properties.muc_nickname: + return + + self._update_content() + + def _on_user_avatar_update(self, *args: Any) -> None: + self._update_avatar() + + def _on_bookmarks_received(self, _event: BookmarksReceived) -> None: + self._update_content() + + def _on_muc_disco_update(self, event: MucDiscoUpdate) -> None: + if self._contact is None or event.jid != self._contact.jid: + return + + self._update_content() + + def _on_message_received(self, event: MessageReceived) -> None: + if not event.msgtxt or self._contact is None: + return + + if event.jid != self._contact.jid: + return + + self._ui.phone_image.set_visible(False) + + if isinstance(self._contact, ( + GroupchatContact, GroupchatParticipant)): + return + + kind = 'outgoing' if event.properties.is_sent_carbon else 'incoming' + if kind == 'outgoing': + return + + resource_contact = self._contact.get_resource(event.resource) + self._ui.phone_image.set_visible(resource_contact.is_phone) + + def _update_avatar(self) -> None: + scale = app.window.get_scale_factor() + assert self._contact + surface = self._contact.get_avatar(AvatarSize.CHAT, scale) + assert isinstance(surface, cairo.Surface) + self._ui.avatar_image.set_from_surface(surface) + + def _update_content(self) -> None: + if self._client is None or self._contact is None: + return + + name = self._contact.name + + if self._contact.jid.bare_match(self._client.get_own_jid()): + name = _('Note to myself') + + if self._contact.is_pm_contact: + gc_contact = self._client.get_module('Contacts').get_contact( + self._contact.jid.bare) + name = f'{name} ({gc_contact.name})' + + label_text = f'<span>{name}</span>' + label_tooltip = name + show_chatstate = app.settings.get('show_chatstate_in_banner') + if (show_chatstate and isinstance( + self._contact, (BareContact, GroupchatParticipant))): + chatstate = self._contact.chatstate + if chatstate is not None: + chatstate = get_uf_chatstate(chatstate.value) + else: + chatstate = '' + + label_text = f'<span>{name}</span>' \ + f'<span size="x-small" weight="light">' \ + f' {chatstate}</span>' + label_tooltip = f'{name} {chatstate}' + + self._ui.name_label.set_markup(label_text) + self._ui.name_label.set_tooltip_text(label_tooltip) + + if isinstance(self._contact, GroupchatContact): + self_contact = self._contact.get_self() + if self_contact: + self._ui.visitor_box.set_visible(self_contact.role.is_visitor) + + def _update_account_badge(self) -> 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._ui.account_badge_box.add(self._account_badge) + + def _on_request_voice_clicked(self, _button: Gtk.Button) -> None: + self._ui.visitor_popover.popdown() + control = app.window.get_active_control() + if control is not None: + app.window.activate_action( + f'request-voice-{control.control_id}', None) + + def _on_toggle_roster_clicked(self, _button: Gtk.Button) -> None: + control = app.window.get_active_control() + if control is not None: + app.window.activate_action( + f'toggle-occupants-list-{control.control_id}', None) + + def _set_toggle_roster_button_icon(self, + show_roster: bool, + *args: Any) -> None: + icon = 'go-next-symbolic' if show_roster else 'go-previous-symbolic' + self._ui.toggle_roster_image.set_from_icon_name( + icon, Gtk.IconSize.BUTTON) ===================================== gajim/gtk/chat_stack.py ===================================== @@ -32,6 +32,7 @@ from gajim.common.modules.contacts import GroupchatParticipant from gajim.common.types import ChatContactT +from .chat_banner import ChatBanner from .control_stack import ControlStack from .message_actions_box import MessageActionsBox from .util import EventHelper, open_window @@ -47,10 +48,12 @@ def __init__(self): self.set_vexpand(True) self.set_hexpand(True) + self._chat_banner = ChatBanner() self._control_stack = ControlStack() self._message_action_box = MessageActionsBox() box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) + box.add(self._chat_banner) box.add(self._control_stack) box.add(self._message_action_box) @@ -71,6 +74,7 @@ def show_chat(self, account: str, jid: JID) -> None: client = app.get_client(account) self._current_contact = client.get_module('Contacts').get_contact(jid) + 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): ===================================== gajim/gtk/controls/base.py ===================================== @@ -371,7 +371,6 @@ def draw_banner(self) -> None: Derived types MAY implement this. """ - self.draw_banner_text() def update_toolbar(self) -> None: """ @@ -381,22 +380,10 @@ def update_toolbar(self) -> None: app.plugin_manager.gui_extension_point( 'chat_control_base_update_toolbar', self) - def draw_banner_text(self) -> None: - """ - Derived types SHOULD implement this - """ - def update_ui(self) -> None: """ Derived types SHOULD implement this """ - self.draw_banner() - - def repaint_themed_widgets(self) -> None: - """ - Derived types MAY implement this - """ - self.draw_banner() def _update_toolbar(self) -> None: """ ===================================== gajim/gtk/controls/chat.py ===================================== @@ -87,12 +87,7 @@ def __init__(self, account: str, jid: JID) -> None: self._client.connect_signal('state-changed', self._on_client_state_changed) - if not app.settings.get('hide_chat_banner'): - self.xml.banner_eventbox.set_no_show_all(False) - self.update_toolbar() - self._update_avatar() - self.update_ui() self.msg_textview.grab_focus() @@ -104,10 +99,6 @@ def __init__(self, account: str, jid: JID) -> None: def _connect_contact_signals(self) -> None: self.contact.multi_connect({ - 'presence-update': self._on_presence_update, - 'chatstate-update': self._on_chatstate_update, - 'nickname-update': self._on_nickname_update, - 'avatar-update': self._on_avatar_update, 'caps-update': self._on_caps_update, }) @@ -129,24 +120,6 @@ def delegate_action(self, action: str) -> int: def _on_nickname_received(self, _event): self.update_ui() - def _on_chatstate_update(self, - _contact: types.BareContact, - _signal_name: str - ) -> None: - self.draw_banner_text() - - def _on_nickname_update(self, - _contact: types.BareContact, - _signal_name: str - ) -> None: - self.draw_banner_text() - - def _on_presence_update(self, - _contact: types.BareContact, - _signal_name: str - ) -> None: - self._update_avatar() - def _on_caps_update(self, _contact: types.BareContact, _signal_name: str @@ -251,46 +224,8 @@ def _nec_ping(self, event: events.ApplicationEvent): def update_ui(self) -> None: BaseControl.update_ui(self) self.update_toolbar() - self._update_avatar() self.update_actions() - def draw_banner_text(self) -> None: - """ - Draws the chat banner's text (e.g. name, chat state) in the top of the - chat window - """ - contact = self.contact - name = contact.name - - if self.jid == self._client.get_own_jid().bare: - name = _('Note to myself') - - if self._type.is_privatechat: - name = f'{name} ({self.room_name})' - - chatstate = self.contact.chatstate - if chatstate is not None: - chatstate = chatstate.value - - if app.settings.get('show_chatstate_in_banner'): - chatstate = helpers.get_uf_chatstate(chatstate) - - label_text = f'<span>{name}</span>' \ - f'<span size="x-small" weight="light">' \ - f' {chatstate}</span>' - label_tooltip = f'{name} {chatstate}' - else: - label_text = f'<span>{name}</span>' - label_tooltip = name - - status_text = '' - self.xml.banner_label.hide() - self.xml.banner_label.set_no_show_all(True) - self.xml.banner_label.set_markup(status_text) - - self.xml.banner_name_label.set_markup(label_text) - self.xml.banner_name_label.set_tooltip_text(label_tooltip) - def send_message(self, message: str, process_commands: bool = True, @@ -358,17 +293,6 @@ def shutdown(self) -> None: super(ChatControl, self).shutdown() app.check_finalize(self) - def _on_avatar_update(self, - _contact: types.BareContact, - _signal_name: str - ) -> None: - self._update_avatar() - - def _update_avatar(self) -> None: - scale = app.window.get_scale_factor() - surface = self.contact.get_avatar(AvatarSize.CHAT, scale) - self.xml.avatar_image.set_from_surface(surface) - def _on_drag_data_received(self, _widget: Gtk.Widget, _context: Gdk.DragContext, @@ -394,9 +318,7 @@ def _on_client_state_changed(self, state: SimpleClientState): self.set_message_input_state(state.is_connected) - self._update_avatar() self.update_toolbar() - self.draw_banner() self.update_actions() def _on_presence_received(self, event: events.PresenceReceived) -> None: ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -142,9 +142,6 @@ def __init__(self, account: str, jid: JID) -> None: self.add_actions() GLib.idle_add(self.update_actions) - if not app.settings.get('hide_groupchat_banner'): - self.xml.banner_eventbox.set_no_show_all(False) - # muc attention flag (when we are mentioned in a muc) # if True, the room has mentioned us self.attention_flag: bool = False @@ -169,10 +166,6 @@ def __init__(self, account: str, jid: JID) -> None: app.settings.connect_signal('gc_print_status_default', self.update_actions) - self.register_events([ - ('bookmarks-received', ged.GUI1, self._on_bookmarks_received), - ]) - self._set_control_inactive() # Stack @@ -349,7 +342,6 @@ def _get_current_page(self) -> str: def _on_muc_disco_update(self, _event: events.MucDiscoUpdate) -> None: self.update_actions() - self.draw_banner_text() # Actions def _on_invite(self, @@ -529,16 +521,6 @@ def _update_avatar(self) -> None: AvatarSize.CHAT, app.window.get_scale_factor()) self.xml.avatar_image.set_from_surface(surface) - def draw_banner_text(self) -> None: - """ - Draw the text in the fat line at the top of the window that houses the - room jid - """ - self.xml.banner_name_label.set_text(self.contact.name) - - def _on_bookmarks_received(self, _event: events.BookmarksReceived) -> None: - self.draw_banner_text() - def _on_room_voice_request(self, _contact: GroupchatContact, _signal_name: str, ===================================== gajim/gtk/controls/private.py ===================================== @@ -60,7 +60,6 @@ def __init__(self, account: str, jid: JID) -> None: def _connect_contact_signals(self) -> None: self.contact.multi_connect({ - 'user-avatar-update': self._on_user_avatar_update, 'user-joined': self._on_user_joined, 'user-left': self._on_user_left, 'user-status-show-changed': self._on_user_status_show_changed, @@ -97,7 +96,6 @@ def _on_user_nickname_changed(self, self.add_info_message(message) - self.draw_banner() self.update_ui() def _on_user_status_show_changed(self, @@ -183,6 +181,3 @@ def send_message(self, def update_ui(self) -> None: ChatControl.update_ui(self) - - def _on_user_avatar_update(self, *args: Any) -> None: - self._update_avatar() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/44ecff1f1c75834f00e26a180d764ccc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/44ecff1f1c75834f00e26a180d764ccc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: StatusIcon: Don’t lose new message icon on state change
by Philipp Hörist (＠lovetox) 27 Jun '22

27 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 53b2dbca by lovetox at 2022-06-27T22:39:37+02:00 fix: StatusIcon: Don’t lose new message icon on state change Fixes #11013 - - - - - 1 changed file: - gajim/gtk/status_icon.py Changes: ===================================== gajim/gtk/status_icon.py ===================================== @@ -80,8 +80,7 @@ def _can_use_libindicator() -> bool: app.is_installed('AYATANA_APPINDICATOR')) def _on_setting_changed(self, *args: Any) -> None: - count = app.window.get_total_unread_count() - self._backend.update_state(count=count) + self._backend.update_state() def connect_unread_widget(self, widget: Gtk.Widget, signal: str) -> None: widget.connect(signal, self._on_unread_count_changed) @@ -89,8 +88,7 @@ def connect_unread_widget(self, widget: Gtk.Widget, signal: str) -> None: def _on_unread_count_changed(self, *args: Any) -> None: if not app.settings.get('trayicon_notification_on_events'): return - count = app.window.get_total_unread_count() - self._backend.update_state(count=count) + self._backend.update_state() def is_visible(self) -> bool: return self._backend.is_visible() @@ -100,7 +98,7 @@ def shutdown(self) -> None: class NoneBackend: - def update_state(self, count: int = 0) -> None: + def update_state(self, init: bool = False) -> None: pass def is_visible(self) -> bool: @@ -133,7 +131,7 @@ def __init__(self) -> None: client.connect_signal('state-changed', self._on_client_state_changed) - def update_state(self, count: int = 0) -> None: + def update_state(self, init: bool = False) -> None: raise NotImplementedError def is_visible(self) -> bool: @@ -220,9 +218,9 @@ def __init__(self) -> None: self._status_icon.connect('popup-menu', self._on_popup_menu) self._status_icon.connect('size-changed', self._on_size_changed) - self.update_state() + self.update_state(init=True) - def update_state(self, count: int = 0) -> None: + def update_state(self, init: bool = False) -> None: if self._shutdown: # Shutdown in progress, don't update icon return @@ -233,7 +231,7 @@ def update_state(self, count: int = 0) -> None: self._status_icon.set_visible(True) - if count > 0: + if not init and app.window.get_total_unread_count(): self._status_icon.set_from_icon_name('mail-message-new') return @@ -308,16 +306,16 @@ def __init__(self) -> None: self._status_icon.set_secondary_activate_target( self._ui.toggle_window_menuitem) - self.update_state() + self.update_state(init=True) - def update_state(self, count: int = 0) -> None: + def update_state(self, init: bool = False) -> None: if not app.settings.get('show_trayicon'): self._status_icon.set_status(appindicator.IndicatorStatus.PASSIVE) return self._status_icon.set_status(appindicator.IndicatorStatus.ACTIVE) - if count > 0: + if not init and app.window.get_total_unread_count(): icon_name = 'mail-message-new' self._status_icon.set_icon_full(icon_name, _('Pending Event')) return View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/53b2dbca098e82176281fc5ee555d248… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/53b2dbca098e82176281fc5ee555d248… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: GtkStatusIcon: Always show when Gajim has not toplevel focus
by Philipp Hörist (＠lovetox) 27 Jun '22

27 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 17fe5225 by lovetox at 2022-06-27T22:19:35+02:00 fix: GtkStatusIcon: Always show when Gajim has not toplevel focus - - - - - 1 changed file: - gajim/gtk/status_icon.py Changes: ===================================== gajim/gtk/status_icon.py ===================================== @@ -188,9 +188,6 @@ def _on_sounds_mute(widget: Gtk.CheckMenuItem) -> None: app.settings.set('sounds_on', not widget.get_active()) def _on_toggle_window(self, _widget: Gtk.MenuItem) -> None: - self._on_activate() - - def _on_activate(self, *args: Any) -> None: if app.window.is_minimized(): app.window.unminimize() elif app.window.is_withdrawn(): @@ -258,17 +255,22 @@ def _on_size_changed(self, self.update_state() def _on_popup_menu(self, - _status_icon: Gtk.StatusIcon, + status_icon: Gtk.StatusIcon, button: int, activate_time: int) -> None: - if button == 1: - self._on_activate() - elif button == 2: - self._on_activate() + + if button in (1, 2): + self._on_activate(status_icon) elif button == 3: - self._build_menu(activate_time) + self._build_menu(button, activate_time) + + def _on_activate(self, _status_icon: Gtk.StatusIcon) -> None: + if app.window.has_toplevel_focus(): + app.window.hide() + else: + app.window.show() - def _build_menu(self, event_time: int) -> None: + def _build_menu(self, button: int, event_time: int) -> None: for menu in self._popup_menus: menu.destroy() @@ -289,7 +291,7 @@ def _build_menu(self, event_time: int) -> None: self._ui.systray_context_menu.show_all() self._ui.systray_context_menu.popup( - None, None, None, None, 0, event_time) + None, None, None, None, button, event_time) class AppIndicator(GtkMenuBackend): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/17fe52257359b0e616f03fefe092fe67… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/17fe52257359b0e616f03fefe092fe67… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] refactor: Replace reduce_chars_newlines() with stdlib
by Philipp Hörist (＠lovetox) 27 Jun '22

27 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: f182fecb by lovetox at 2022-06-27T20:02:40+02:00 refactor: Replace reduce_chars_newlines() with stdlib - - - - - 3 changed files: - gajim/common/helpers.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/menus.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -385,36 +385,6 @@ def sanitize_filename(filename: str) -> str: return filename -def reduce_chars_newlines(text: str, max_chars: int = 0, - max_lines: int = 0) -> str: - """ - Cut the chars after 'max_chars' on each line and show only the first - 'max_lines' - - If any of the params is not present (None or 0) the action on it is not - performed - """ - def _cut_if_long(string_: str) -> str: - if len(string_) > max_chars: - string_ = string_[:max_chars - 3] + '…' - return string_ - - if max_lines == 0: - lines = text.split('\n') - else: - lines = text.split('\n', max_lines)[:max_lines] - if max_chars > 0: - if lines: - lines = [_cut_if_long(e) for e in lines] - if lines: - reduced_text = '\n'.join(lines) - if reduced_text != text: - reduced_text += '…' - else: - reduced_text = '' - return reduced_text - - def get_contact_dict_for_account(account: str) -> dict[str, types.BareContact]: """ Creates a dict of jid -> contact with all contacts of account ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -18,6 +18,7 @@ from datetime import datetime from datetime import timedelta +import textwrap from gi.repository import Gdk from gi.repository import GdkPixbuf @@ -40,7 +41,6 @@ from gajim.common.helpers import get_group_chat_nick from gajim.common.helpers import get_muc_context from gajim.common.helpers import message_needs_highlight -from gajim.common.helpers import reduce_chars_newlines from gajim.common.helpers import to_user_string from gajim.common.i18n import _ from gajim.common.i18n import Q_ @@ -187,8 +187,10 @@ def __init__(self, if correction_original is not None: self._original_text = correction_original self._message_icons.set_correction_icon_visible(True) - original_text = reduce_chars_newlines( - correction_original, max_chars=150, max_lines=10) + original_text = textwrap.fill(correction_original, + width=150, + max_lines=10, + placeholder='…') self._message_icons.set_correction_tooltip( _('Message corrected. Original message:' '\n%s') % original_text) @@ -425,8 +427,10 @@ def set_correction(self, text: str, nickname: Optional[str]) -> None: self._message_icons.set_receipt_icon_visible(False) self._message_icons.set_correction_icon_visible(True) - original_text = reduce_chars_newlines( - self._original_text, max_chars=150, max_lines=10) + original_text = textwrap.fill(self._original_text, + width=150, + max_lines=10, + placeholder='…') self._message_icons.set_correction_tooltip( _('Message corrected. Original message:\n%s') % original_text) ===================================== gajim/gtk/menus.py ===================================== @@ -21,6 +21,7 @@ from typing import Optional from typing import Union +import textwrap from urllib.parse import quote from gi.repository import Gtk @@ -34,7 +35,6 @@ from gajim.common.helpers import is_affiliation_change_allowed from gajim.common.helpers import is_role_change_allowed from gajim.common.helpers import jid_is_blocked -from gajim.common.helpers import reduce_chars_newlines from gajim.common.i18n import _ from gajim.common.i18n import get_short_lang_code from gajim.common.const import URIType @@ -222,7 +222,9 @@ def get_encryption_menu(control_id: str, def get_conv_action_context_menu(account: str, selected_text: str ) -> Gtk.MenuItem: - selected_text_short = reduce_chars_newlines(selected_text, 10, 1) + selected_text_short = textwrap.shorten(selected_text, + width=10, + placeholder='…') action_menu_item = Gtk.MenuItem.new_with_mnemonic( _('_Actions for "%s"') % selected_text_short) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f182fecb7a2dd249545b849725bb660a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f182fecb7a2dd249545b849725bb660a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new branch newcontrol
by Philipp Hörist (＠lovetox) 27 Jun '22

27 Jun '22

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

1 0

[Git][gajim/gajim][master] chore: Update git update hook
by Philipp Hörist (＠lovetox) 26 Jun '22

26 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 30e6108b by lovetox at 2022-06-27T00:57:30+02:00 chore: Update git update hook - - - - - 1 changed file: - .githooks/update Changes: ===================================== .githooks/update ===================================== @@ -68,7 +68,10 @@ def enforce_message_rules(subject: str) -> None: def main(args: Tuple[str, str, str]) -> None: ref_name, old_ref, new_ref = args - if 'refs/tags' in ref_name: + print('UPDATE', ref_name, old_ref, new_ref) + + if ref_name != 'refs/heads/master': + # We enforce only for master branch return shas = get_commit_shas(old_ref, new_ref) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/30e6108b8b0617153497638a98984355… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/30e6108b8b0617153497638a98984355… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: GroupChatNickCompletion: Only process Tab press
by Daniel Brötzmann (＠wurstsalat) 25 Jun '22

25 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 3a32a87b by wurstsalat at 2022-06-25T09:34:20+02:00 fix: GroupChatNickCompletion: Only process Tab press - - - - - 1 changed file: - gajim/gtk/groupchat_nick_completion.py Changes: ===================================== gajim/gtk/groupchat_nick_completion.py ===================================== @@ -142,7 +142,9 @@ def process_key_press(self, textview: MessageInputTextView, event: Gdk.EventKey ) -> bool: - if event.keyval not in (Gdk.KEY_ISO_Left_Tab, Gdk.KEY_Tab): + if (event.get_state() & Gdk.ModifierType.SHIFT_MASK or + event.get_state() & Gdk.ModifierType.CONTROL_MASK or + event.keyval not in (Gdk.KEY_ISO_Left_Tab, Gdk.KEY_Tab)): self._last_key_tab = False return False View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3a32a87bedc4645eae635842070e49b0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3a32a87bedc4645eae635842070e49b0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Notifications: Change Gdk window hints on Windows
by Daniel Brötzmann (＠wurstsalat) 24 Jun '22

24 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 8fae869b by wurstsalat at 2022-06-24T11:22:07+02:00 fix: Notifications: Change Gdk window hints on Windows Fixes #11008 - - - - - 1 changed file: - gajim/gtk/notification.py Changes: ===================================== gajim/gtk/notification.py ===================================== @@ -162,10 +162,11 @@ class PopupNotification(Gtk.Window): def __init__(self, event: events.Notification, timeout: int) -> None: Gtk.Window.__init__(self) - self.set_type_hint(Gdk.WindowTypeHint.NOTIFICATION) + self.set_type_hint(Gdk.WindowTypeHint.UTILITY) self.set_focus_on_map(False) self.set_accept_focus(False) self.set_skip_taskbar_hint(True) + self.set_skip_pager_hint(True) self.set_decorated(False) self.set_keep_above(True) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8fae869b19fbc5d156696f3103999c78… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8fae869b19fbc5d156696f3103999c78… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Row name: Align label correctly
by Daniel Brötzmann (＠wurstsalat) 24 Jun '22

24 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 74a085aa by Daniel Brötzmann at 2022-06-24T08:02:10+00:00 fix: Row name: Align label correctly - - - - - 1 changed file: - gajim/gtk/conversation/rows/base.py Changes: ===================================== gajim/gtk/conversation/rows/base.py ===================================== @@ -82,6 +82,7 @@ def create_name_widget(name: str, is_self: bool) -> Gtk.Label: label = Gtk.Label() label.set_selectable(True) label.set_ellipsize(Pango.EllipsizeMode.END) + label.set_valign(Gtk.Align.END) label.get_style_context().add_class('conversation-nickname') label.set_markup(GLib.markup_escape_text(name)) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/74a085aa53483d893618148cc3a7fb2d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/74a085aa53483d893618148cc3a7fb2d… 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 June 2022