Daniel Brötzmann pushed to branch master at gajim / gajim
Commits:
50f7f29f by wurstsalat at 2025-09-07T14:01:32+02:00
cfix: Profile: Hide avatar edit button on cancel/save
- - - - -
0fa45f7f by wurstsalat at 2025-09-07T14:01:32+02:00
cfix: Message selection: Add selection mode check for shortcut
- - - - -
3 changed files:
- gajim/gtk/chat_stack.py
- gajim/gtk/control.py
- gajim/gtk/profile.py
Changes:
=====================================
gajim/gtk/chat_stack.py
=====================================
@@ -818,10 +818,14 @@ def _on_key_pressed(
_keycode: int,
state: Gdk.ModifierType,
) -> bool:
+ if not self._chat_control.message_selection_active():
+ return Gdk.EVENT_PROPAGATE
+
if state & Gdk.ModifierType.CONTROL_MASK:
if keyval == Gdk.KEY_c:
self._chat_control.copy_selected_messages()
return Gdk.EVENT_STOP
+
return Gdk.EVENT_PROPAGATE
def _show_chat_function_page(
=====================================
gajim/gtk/control.py
=====================================
@@ -213,6 +213,9 @@ def copy_selected_messages(self) -> None:
self._scrolled_view.copy_selected_messages()
self._message_selection.set_visible(False)
+ def message_selection_active(self) -> bool:
+ return self._message_selection.get_visible()
+
def process_escape(self) -> bool:
message_selection_active = self._message_selection.get_visible()
if message_selection_active:
=====================================
gajim/gtk/profile.py
=====================================
@@ -248,6 +248,7 @@ def _on_cancel_clicked(self, _button: Gtk.Button) -> None:
self._ui.cancel_button.set_visible(False)
self._ui.save_button.set_visible(False)
self._ui.remove_avatar_button.set_visible(False)
+ self._avatar_edit_button.set_visible(False)
self._ui.privacy_button.set_visible(False)
self._ui.nickname_entry.set_sensitive(False)
self._ui.avatar_image.set_from_paintable(self._current_avatar)
@@ -264,6 +265,7 @@ def _on_save_clicked(self, _button: Gtk.Button) -> None:
self._ui.save_button.set_visible(False)
self._ui.edit_button.set_visible(True)
self._ui.remove_avatar_button.set_visible(False)
+ self._avatar_edit_button.set_visible(False)
self._ui.privacy_button.set_visible(False)
self._ui.nickname_entry.set_sensitive(False)
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/compare/03d66d825c76d4d82b6dc7e708bb34cda1cc8785...0fa45f7fa887de4970450a2c94644d38d751f9b9
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/compare/03d66d825c76d4d82b6dc7e708bb34cda1cc8785...0fa45f7fa887de4970450a2c94644d38d751f9b9
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
