Commits

commits@gajim.org

17632 discussions

[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

[Git][gajim/gajim][master] refactor: Move GroupChatNickCompletion into ChatActionProcessor
by Daniel Brötzmann (＠wurstsalat) 23 Jun '22

23 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: b403484a by wurstsalat at 2022-06-23T22:11:29+02:00 refactor: Move GroupChatNickCompletion into ChatActionProcessor - - - - - 4 changed files: - gajim/gtk/chat_action_processor.py - gajim/gtk/controls/groupchat.py - gajim/gtk/groupchat_nick_completion.py - gajim/gtk/message_input.py Changes: ===================================== gajim/gtk/chat_action_processor.py ===================================== @@ -24,9 +24,13 @@ from gi.repository import Gtk from gajim.common import app +from gajim.common import types from gajim.common.const import Direction +from gajim.common.modules.contacts import GroupchatContact from .emoji_data_gtk import get_emoji_data +from .groupchat_nick_completion import GroupChatNickCompletion + if TYPE_CHECKING: from .message_input import MessageInputTextView @@ -34,7 +38,11 @@ class ChatActionProcessor(Gtk.Popover): - def __init__(self, message_input: MessageInputTextView) -> None: + def __init__(self, + account: str, + contact: types.ChatContactT, + message_input: MessageInputTextView + ) -> None: Gtk.Popover.__init__(self) self._menu = Gio.Menu() self.bind_model(self._menu) @@ -51,6 +59,12 @@ def __init__(self, message_input: MessageInputTextView) -> None: self._buf = message_input.get_buffer() self._buf.connect('changed', self._on_changed) + self._nick_completion: Optional[GroupChatNickCompletion] = None + if contact.is_groupchat: + assert isinstance(contact, GroupchatContact) + self._nick_completion = GroupChatNickCompletion( + account, contact, message_input) + self._start_mark: Optional[Gtk.TextMark] = None self._current_iter: Optional[Gtk.TextIter] = None @@ -60,9 +74,14 @@ def _on_destroy(self, _popover: Gtk.Popover) -> None: app.check_finalize(self) def _on_key_press(self, - _textview: Gtk.TextView, + textview: MessageInputTextView, event: Gdk.EventKey ) -> bool: + if self._nick_completion is not None: + res = self._nick_completion.process_key_press(textview, event) + if res: + return True + if not self._active: return False @@ -305,3 +324,7 @@ def _move_selection(self, direction: Direction) -> None: def _item_has_focus(item: Gtk.ModelButton) -> bool: flags = item.get_state_flags() return 'GTK_STATE_FLAG_FOCUSED' in str(flags) + + def process_outgoing_message(self, contact: str, highlight: bool) -> None: + if self._nick_completion is not None: + self._nick_completion.record_message(contact, highlight) ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -72,7 +72,6 @@ from gajim.gui.groupchat_inviter import GroupChatInviter from gajim.gui.groupchat_roster import GroupchatRoster from gajim.gui.groupchat_state import GroupchatState -from gajim.gui.groupchat_nick_completion import GroupChatNickCompletion from gajim.gui.util import open_window from ..menus import get_encryption_menu @@ -152,9 +151,6 @@ def __init__(self, account: str, jid: JID) -> None: # if True, the room has mentioned us self.attention_flag: bool = False - self._nick_completion = GroupChatNickCompletion( - self.account, self.contact, self.msg_textview) - # Send file self.xml.sendfile_button.set_action_name( f'win.send-file-{self.control_id}') @@ -657,7 +653,7 @@ def add_message(self, highlight = helpers.message_needs_highlight( text, self.contact.nickname, self._client.get_own_jid().bare) - self._nick_completion.record_message(contact, highlight) + self.msg_textview.process_outgoing_message(contact, highlight) BaseControl.add_message(self, text, ===================================== gajim/gtk/groupchat_nick_completion.py ===================================== @@ -44,8 +44,6 @@ def __init__(self, self._contact.connect( 'user-nickname-changed', self._on_user_nickname_changed) - message_input.connect('key-press-event', self._on_key_press) - self._sender_list: list[str] = [] self._attention_list: list[str] = [] self._nick_hits: list[str] = [] @@ -140,10 +138,10 @@ def _nick_matching(nick: str) -> bool: return matches + other_nicks - def _on_key_press(self, - textview: MessageInputTextView, - event: Gdk.EventKey - ) -> bool: + def process_key_press(self, + textview: MessageInputTextView, + event: Gdk.EventKey + ) -> bool: if event.keyval not in (Gdk.KEY_ISO_Left_Tab, Gdk.KEY_Tab): self._last_key_tab = False return False @@ -156,7 +154,6 @@ def _on_key_press(self, text_split = text.split() - # nick completion # check if tab is pressed with empty message if text_split: # if there are any words begin = text_split[-1] # last word we typed @@ -194,22 +191,21 @@ def _on_key_press(self, return False if self._nick_hits: + shell_like_completion = app.settings.get('shell_like_completion') + if len(text_split) < 2 or with_refer_to_nick_char: # This is the 1st word of the line or no word or we are - # cycling at the beginning, possibly with a space in - # one nick + # cycling at the beginning, possibly with a space in one nick add = gc_refer_to_nick_char + ' ' else: add = ' ' start_iter = end_iter.copy() if (self._last_key_tab and with_refer_to_nick_char or (text and text[-1] == ' ')): - # have to accommodate for the added space from last - # completion + # have to accommodate for the added space from last completion # gc_refer_to_nick_char may be more than one char! start_iter.backward_chars(len(begin) + len(add)) - elif (self._last_key_tab and - not app.settings.get('shell_like_completion')): + elif self._last_key_tab and not shell_like_completion: # have to accommodate for the added space from last # completion start_iter.backward_chars( @@ -225,11 +221,10 @@ def _on_key_press(self, # get a shell-like completion # if there's more than one nick for this completion, complete # only the part that all these nicks have in common - if (app.settings.get('shell_like_completion') and - len(self._nick_hits) > 1): + if shell_like_completion and len(self._nick_hits) > 1: end = False completion = '' - add = "" # if nick is not complete, don't add anything + add = '' # if nick is not complete, don't add anything while not end and len(completion) < len(self._nick_hits[0]): completion = self._nick_hits[0][:len(completion) + 1] for nick in self._nick_hits: ===================================== gajim/gtk/message_input.py ===================================== @@ -73,7 +73,8 @@ def __init__(self, account: str, contact: ChatContactT) -> None: self._undo_list: list[str] = [] self.undo_pressed: bool = False - self._chat_action_processor = ChatActionProcessor(self) + self._chat_action_processor = ChatActionProcessor( + account, contact, self) self.get_buffer().create_tag('strong', weight=Pango.Weight.BOLD) self.get_buffer().create_tag('emphasis', style=Pango.Style.ITALIC) @@ -313,3 +314,10 @@ def undo(self, *args: Any) -> None: if self._undo_list: buf.set_text(self._undo_list.pop()) self.undo_pressed = True + + def process_outgoing_message(self, + contact_name: str, + highlight: bool + ) -> None: + self._chat_action_processor.process_outgoing_message( + contact_name, highlight) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b403484a10236a77d8cc2cdf60b0bfcb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b403484a10236a77d8cc2cdf60b0bfcb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] refactor: ChatStack: Add control methods
by Philipp Hörist (＠lovetox) 23 Jun '22

23 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4f7a0fa9 by lovetox at 2022-06-23T21:55:00+02:00 refactor: ChatStack: Add control methods - - - - - 2 changed files: - gajim/gtk/chat_page.py - gajim/gtk/chat_stack.py Changes: ===================================== gajim/gtk/chat_page.py ===================================== @@ -151,12 +151,12 @@ def _on_chat_selected(self, account: str, jid: JID) -> None: - self._control_stack.show_chat(account, jid) + self._chat_stack.show_chat(account, jid) self._search_view.set_context(account, jid) self.emit('chat-selected', workspace_id, account, jid) def _on_chat_unselected(self, _chat_list_stack: ChatListStack) -> None: - self._control_stack.clear() + self._chat_stack.clear() self._search_view.set_context(None, None) def _on_search_history(self, @@ -185,7 +185,7 @@ def _on_chat_list_changed(self, self._ui.search_entry.set_text('') def process_event(self, event: ApplicationEvent): - self._control_stack.process_event(event) + self._chat_stack.process_event(event) self._chat_list_stack.process_event(event) def add_chat_list(self, workspace_id: str) -> None: ===================================== gajim/gtk/chat_stack.py ===================================== @@ -12,9 +12,12 @@ # 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 + import logging from gi.repository import Gtk +from nbxmpp.protocol import JID from .control_stack import ControlStack from .util import EventHelper @@ -32,7 +35,7 @@ def __init__(self): self._control_stack = ControlStack() - box = Gtk.Box() + box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) box.add(self._control_stack) self.add_named(box, 'controls') @@ -41,3 +44,12 @@ def __init__(self): def get_control_stack(self) -> ControlStack: return self._control_stack + + def show_chat(self, account: str, jid: JID) -> None: + self._control_stack.show_chat(account, jid) + + def clear(self) -> None: + self._control_stack.clear() + + def process_event(self, event: Any) -> None: + self._control_stack.process_event(event) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4f7a0fa94fac91439dedcb3eeeebdbca… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4f7a0fa94fac91439dedcb3eeeebdbca… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: refactor: Rename ChatStack
by Philipp Hörist (＠lovetox) 23 Jun '22

23 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: b56ee020 by lovetox at 2022-06-23T20:56:51+02:00 refactor: Rename ChatStack - - - - - d982f6b8 by lovetox at 2022-06-23T21:01:53+02:00 refactor: Change layout of chat page Add new Chat Stack to aid in the upcoming refactor - - - - - 4 changed files: - gajim/gtk/chat_page.py - gajim/gtk/chat_stack.py - + gajim/gtk/control_stack.py - pyrightconfig.json Changes: ===================================== gajim/gtk/chat_page.py ===================================== @@ -35,6 +35,7 @@ from .chat_list import ChatList from .chat_list_stack import ChatListStack from .chat_stack import ChatStack +from .control_stack import ControlStack from .search_view import SearchView from .types import ControlT @@ -60,6 +61,8 @@ def __init__(self): self._chat_stack = ChatStack() self._ui.right_grid_overlay.add(self._chat_stack) + self._control_stack = self._chat_stack.get_control_stack() + self._search_view = SearchView() self._search_view.connect('hide-search', self._on_search_hide) @@ -118,8 +121,8 @@ def set_startup_finished(self) -> None: def get_chat_list_stack(self) -> ChatListStack: return self._chat_list_stack - def get_chat_stack(self) -> ChatStack: - return self._chat_stack + def get_control_stack(self) -> ControlStack: + return self._control_stack @staticmethod def _on_start_chat_clicked(_button: Gtk.Button) -> None: @@ -148,12 +151,12 @@ def _on_chat_selected(self, account: str, jid: JID) -> None: - self._chat_stack.show_chat(account, jid) + self._control_stack.show_chat(account, jid) self._search_view.set_context(account, jid) self.emit('chat-selected', workspace_id, account, jid) def _on_chat_unselected(self, _chat_list_stack: ChatListStack) -> None: - self._chat_stack.clear() + self._control_stack.clear() self._search_view.set_context(None, None) def _on_search_history(self, @@ -182,7 +185,7 @@ def _on_chat_list_changed(self, self._ui.search_entry.set_text('') def process_event(self, event: ApplicationEvent): - self._chat_stack.process_event(event) + self._control_stack.process_event(event) self._chat_list_stack.process_event(event) def add_chat_list(self, workspace_id: str) -> None: @@ -227,15 +230,15 @@ def add_chat_for_workspace(self, return if type_ == 'groupchat': - self._chat_stack.add_group_chat(account, jid) + self._control_stack.add_group_chat(account, jid) elif type_ == 'pm': if not self._startup_finished: # TODO: Currently we can’t load private chats at start # because the Contacts dont exist yet return - self._chat_stack.add_private_chat(account, jid) + self._control_stack.add_private_chat(account, jid) else: - self._chat_stack.add_chat(account, jid) + self._control_stack.add_chat(account, jid) self._chat_list_stack.add_chat(workspace_id, account, jid, type_, pinned) @@ -279,7 +282,7 @@ def remove_chat(self, account: str, jid: JID) -> None: def _on_chat_removed(self, _chat_list: ChatList, account: str, jid: JID, type_: str) -> None: - self._chat_stack.remove_chat(account, jid) + self._control_stack.remove_chat(account, jid) if type_ == 'groupchat': client = app.get_client(account) client.get_module('MUC').leave(jid) @@ -290,10 +293,10 @@ def remove_chats_for_account(self, account: str) -> None: chat_list.unselect_all() self._chat_list_stack.remove_chats_for_account(account) - self._chat_stack.remove_chats_for_account(account) + self._control_stack.remove_chats_for_account(account) def get_control(self, account: str, jid: JID) -> Optional[ControlT]: - return self._chat_stack.get_control(account, jid) + return self._control_stack.get_control(account, jid) def get_active_control(self) -> Optional[ControlT]: chat = self._chat_list_stack.get_selected_chat() @@ -302,11 +305,11 @@ def get_active_control(self) -> Optional[ControlT]: return self.get_control(chat.account, chat.jid) def is_chat_loaded(self, account: str, jid: JID) -> bool: - return self._chat_stack.is_chat_loaded(account, jid) + return self._control_stack.is_chat_loaded(account, jid) def get_controls(self, account: Optional[str] ) -> Generator[ControlT, None, None]: - return self._chat_stack.get_controls(account) + return self._control_stack.get_controls(account) def hide_search(self) -> bool: if self._search_revealer.get_reveal_child(): ===================================== gajim/gtk/chat_stack.py ===================================== @@ -12,26 +12,11 @@ # 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 typing import Optional -from typing import Generator - import logging -from gi.repository import GLib from gi.repository import Gtk -from nbxmpp import JID - -from gajim.common import app -from gajim.common import ged -from gajim.common.i18n import _ - -from .controls.chat import ChatControl -from .controls.groupchat import GroupchatControl -from .controls.private import PrivateChatControl - -from .types import ControlT +from .control_stack import ControlStack from .util import EventHelper log = logging.getLogger('gajim.gui.chatstack') @@ -45,133 +30,14 @@ def __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 - - def get_control(self, account: str, jid: JID) -> Optional[ControlT]: - try: - return self._controls[(account, jid)] - except KeyError: - return None - - def get_controls(self, account: Optional[str] - ) -> Generator[ControlT, None, None]: - if account is None: - for control in self._controls.values(): - yield control - return - - for key, control in self._controls.items(): - if key[0] == account: - yield control - - def add_chat(self, account: str, jid: JID) -> None: - if self._controls.get((account, jid)) is not None: - # Control is already in the Stack - return - - chat_control = ChatControl(account, jid) - self._controls[(account, jid)] = chat_control - self.add_named(chat_control.widget, f'{account}:{jid}') - chat_control.widget.show_all() - - def add_group_chat(self, account: str, jid: JID) -> None: - if self._controls.get((account, jid)) is not None: - return - - control = GroupchatControl(account, jid) - self._controls[(account, jid)] = control - self.add_named(control.widget, f'{account}:{jid}') - control.widget.show_all() - - def add_private_chat(self, account: str, jid: JID) -> None: - control = PrivateChatControl(account, jid) - self._controls[(account, jid)] = control - self.add_named(control.widget, f'{account}:{jid}') - control.widget.show_all() + self._control_stack = ControlStack() - def remove_chat(self, account: str, jid: JID) -> None: - control = self._controls.pop((account, jid)) - self.remove(control.widget) - control.shutdown() + box = Gtk.Box() + box.add(self._control_stack) - def show_chat(self, account: str, jid: JID) -> None: - new_name = f'{account}:{jid}' - current_name = self.get_visible_child_name() - assert current_name is not None + self.add_named(box, 'controls') - if current_name == new_name: - return - - control = self.get_control(account, jid) - if control is None: - log.warning('No Control found for %s, %s', account, jid) - return - - if self._current_control is not None: - self._current_control.set_control_active(False) - self._current_control.reset_view() - - control.set_control_active(True) - self._current_control = control - - self.set_visible_child_name(new_name) - GLib.idle_add(control.focus) - - def is_chat_loaded(self, account: str, jid: JID) -> bool: - control = self.get_control(account, jid) - if control is None: - return False - 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: - control = self.get_control(event.account, event.jid) - if control is None: - return - control.process_event(event) - - def remove_chats_for_account(self, account: str) -> None: - for chat_account, jid in list(self._controls.keys()): - if chat_account != account: - 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): - 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) + self.show_all() - def _on_start_chatting(self, _button: Gtk.Button) -> None: - app.app.activate_action('start-chat', GLib.Variant('s', '')) + def get_control_stack(self) -> ControlStack: + return self._control_stack ===================================== gajim/gtk/control_stack.py ===================================== @@ -0,0 +1,177 @@ +# 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 typing import Any +from typing import Optional +from typing import Generator + +import logging + +from gi.repository import GLib +from gi.repository import Gtk + +from nbxmpp import JID + +from gajim.common import app +from gajim.common import ged +from gajim.common.i18n import _ + +from .controls.chat import ChatControl +from .controls.groupchat import GroupchatControl +from .controls.private import PrivateChatControl + +from .types import ControlT +from .util import EventHelper + +log = logging.getLogger('gajim.gui.controlstack') + + +class ControlStack(Gtk.Stack, EventHelper): + 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 + + def get_control(self, account: str, jid: JID) -> Optional[ControlT]: + try: + return self._controls[(account, jid)] + except KeyError: + return None + + def get_controls(self, account: Optional[str] + ) -> Generator[ControlT, None, None]: + if account is None: + for control in self._controls.values(): + yield control + return + + for key, control in self._controls.items(): + if key[0] == account: + yield control + + def add_chat(self, account: str, jid: JID) -> None: + if self._controls.get((account, jid)) is not None: + # Control is already in the Stack + return + + chat_control = ChatControl(account, jid) + self._controls[(account, jid)] = chat_control + self.add_named(chat_control.widget, f'{account}:{jid}') + chat_control.widget.show_all() + + def add_group_chat(self, account: str, jid: JID) -> None: + if self._controls.get((account, jid)) is not None: + return + + control = GroupchatControl(account, jid) + self._controls[(account, jid)] = control + self.add_named(control.widget, f'{account}:{jid}') + control.widget.show_all() + + def add_private_chat(self, account: str, jid: JID) -> None: + control = PrivateChatControl(account, jid) + self._controls[(account, jid)] = control + self.add_named(control.widget, f'{account}:{jid}') + control.widget.show_all() + + def remove_chat(self, account: str, jid: JID) -> None: + control = self._controls.pop((account, jid)) + self.remove(control.widget) + control.shutdown() + + def show_chat(self, account: str, jid: JID) -> None: + new_name = f'{account}:{jid}' + current_name = self.get_visible_child_name() + assert current_name is not None + + if current_name == new_name: + return + + control = self.get_control(account, jid) + if control is None: + log.warning('No Control found for %s, %s', account, jid) + return + + if self._current_control is not None: + self._current_control.set_control_active(False) + self._current_control.reset_view() + + control.set_control_active(True) + self._current_control = control + + self.set_visible_child_name(new_name) + GLib.idle_add(control.focus) + + def is_chat_loaded(self, account: str, jid: JID) -> bool: + control = self.get_control(account, jid) + if control is None: + return False + 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: + control = self.get_control(event.account, event.jid) + if control is None: + return + control.process_event(event) + + def remove_chats_for_account(self, account: str) -> None: + for chat_account, jid in list(self._controls.keys()): + if chat_account != account: + 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): + 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', '')) ===================================== pyrightconfig.json ===================================== @@ -62,6 +62,7 @@ "gajim/gtk/chat_list.py", "gajim/gtk/chat_page.py", "gajim/gtk/chat_stack.py", + "gajim/gtk/control_stack.py", "gajim/gtk/const.py", "gajim/gtk/contact_info.py", "gajim/gtk/contacts_flowbox.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/0ae36837eb957626fa497c8409059dc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/0ae36837eb957626fa497c8409059dc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: StatusIcon: Logic error on activate
by Philipp Hörist (＠lovetox) 22 Jun '22

22 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0ae36837 by lovetox at 2022-06-22T22:46:22+02:00 fix: StatusIcon: Logic error on activate - - - - - 1 changed file: - gajim/gtk/status_icon.py Changes: ===================================== gajim/gtk/status_icon.py ===================================== @@ -193,7 +193,7 @@ def _on_toggle_window(self, _widget: Gtk.MenuItem) -> None: def _on_activate(self, *args: Any) -> None: if app.window.is_minimized(): app.window.unminimize() - if app.window.is_withdrawn(): + elif app.window.is_withdrawn(): app.window.show() else: app.window.hide() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0ae36837eb957626fa497c8409059dc4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0ae36837eb957626fa497c8409059dc4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Fix test for GroupChatNickCompletion
by Daniel Brötzmann (＠wurstsalat) 22 Jun '22

22 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 6e1b928d by wurstsalat at 2022-06-22T20:54:16+02:00 chore: Fix test for GroupChatNickCompletion - - - - - 2 changed files: - gajim/gtk/groupchat_nick_completion.py - test/no_gui/test_nick_completion.py Changes: ===================================== gajim/gtk/groupchat_nick_completion.py ===================================== @@ -39,14 +39,12 @@ def __init__(self, message_input: MessageInputTextView ) -> None: self._account = account - self._client = app.get_client(account) self._contact = contact self._contact.connect( 'user-nickname-changed', self._on_user_nickname_changed) - self._message_input = message_input - self._message_input.connect('key-press-event', self._on_key_press) + message_input.connect('key-press-event', self._on_key_press) self._sender_list: list[str] = [] self._attention_list: list[str] = [] @@ -174,7 +172,7 @@ def _on_key_press(self, text.endswith(gc_refer_to_nick_char + ' ')): with_refer_to_nick_char = True after_nick_len = len(gc_refer_to_nick_char + ' ') - if (self._nick_hits and self._last_key_tab and + if (self._nick_hits and self._last_key_tab and text[:-after_nick_len].endswith(self._nick_hits[0])): # we should cycle # Previous nick in list may had a space inside, so we check text @@ -219,7 +217,8 @@ def _on_key_press(self, else: start_iter.backward_chars(len(begin)) - self._client.get_module('Chatstate').block_chatstates( + client = app.get_client(self._account) + client.get_module('Chatstate').block_chatstates( self._contact, True) message_buffer.delete(start_iter, end_iter) @@ -252,7 +251,7 @@ def _on_key_press(self, completion = self._nick_hits[0] message_buffer.insert_at_cursor(completion + add) - self._client.get_module('Chatstate').block_chatstates( + client.get_module('Chatstate').block_chatstates( self._contact, False) self._last_key_tab = True ===================================== test/no_gui/test_nick_completion.py ===================================== @@ -1,50 +1,62 @@ import unittest +from unittest.mock import MagicMock from gajim import gui gui.init('gtk') -from gajim.gui.util import NickCompletionGenerator + +from gajim.gui.groupchat_nick_completion import GroupChatNickCompletion + class Test(unittest.TestCase): def test_generate_suggestions(self): - gen = NickCompletionGenerator('meeeee') + contact = MagicMock() + message_input = MagicMock() + gen = GroupChatNickCompletion('testacc', contact, message_input) - l = ['aaaa', 'meeeee', 'fooo', 'xxxxz', 'xaaaz'] + l = ['aaaa', 'fooo', 'xxxxz', 'xaaaz'] for n in l: gen.record_message(n, False) l2 = ['xxx'] + l - r = gen.generate_suggestions(nicks=l2, beginning='x') + r = gen._generate_suggestions(nicks=l2, beginning='x') self.assertEqual(r, ['xaaaz', 'xxxxz', 'xxx']) - r = gen.generate_suggestions( + r = gen._generate_suggestions( nicks=l2, beginning='m' - ) + ) self.assertEqual(r, []) for n in ['xaaaz', 'xxxxz']: gen.record_message(n, True) - r = gen.generate_suggestions( + r = gen._generate_suggestions( nicks=l2, beginning='x' - ) + ) self.assertEqual(r, ['xxxxz', 'xaaaz', 'xxx']) - r = gen.generate_suggestions( + r = gen._generate_suggestions( nicks=l2, beginning='' - ) + ) self.assertEqual(r, ['xxxxz', 'xaaaz', 'aaaa', 'fooo', 'xxx']) l2[1] = 'bbbb' - gen.contact_renamed('aaaa', 'bbbb') - r = gen.generate_suggestions( + + old_name = 'aaaa' + new_name = 'bbbb' + + for lst in (gen._attention_list, gen._sender_list): + for idx, contact in enumerate(lst): + if contact == old_name: + lst[idx] = new_name + + r = gen._generate_suggestions( nicks=l2, beginning='' - ) + ) self.assertEqual(r, ['xxxxz', 'xaaaz', 'bbbb', 'fooo', 'xxx']) - -if __name__ == "__main__": +if __name__ == '__main__': unittest.main() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6e1b928dd68c30ec0402bfc7c48683e5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6e1b928dd68c30ec0402bfc7c48683e5… 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