Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Dialogs: Typing
by Daniel Brötzmann (＠wurstsalat) 29 Jan '22

29 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 85eb7436 by wurstsalat at 2022-01-30T00:46:17+01:00 Dialogs: Typing - - - - - 1 changed file: - gajim/gtk/dialogs.py Changes: ===================================== gajim/gtk/dialogs.py ===================================== @@ -15,9 +15,8 @@ from __future__ import annotations from typing import Any -from typing import Dict +from typing import cast from typing import NamedTuple -from typing import List from typing import Optional from gi.repository import Gtk @@ -80,7 +79,7 @@ def make(cls, type_: Optional[str] = None, **kwargs: Any) -> DialogButton: default_kwargs['text'] = _('_Remove') default_kwargs['action'] = ButtonAction.DESTRUCTIVE else: - raise ValueError('Unknown button type: %s ' % type_) + raise ValueError(f'Unknown button type: {type_} ') default_kwargs.update(kwargs) return cls(**default_kwargs) @@ -88,15 +87,16 @@ def make(cls, type_: Optional[str] = None, **kwargs: Any) -> DialogButton: class HigDialog(Gtk.MessageDialog): def __init__(self, - parent, - type_, - buttons, - pritext, - sectext, - on_response_ok=None, - on_response_cancel=None, - on_response_yes=None, - on_response_no=None): + parent: Gtk.Window, + type_: Gtk.MessageType, + buttons: Gtk.ButtonsType, + pritext: str, + sectext: str, + on_response_ok: Optional[Any] = None, + on_response_cancel: Optional[Any] = None, + on_response_yes: Optional[Any] = None, + on_response_no: Optional[Any] = None + ) -> None: self.call_cancel_on_destroy = True Gtk.MessageDialog.__init__(self, transient_for=parent, @@ -108,7 +108,7 @@ def __init__(self, self.format_secondary_markup(sectext) - self.possible_responses = { + self.possible_responses: dict[Gtk.ResponseType, Any] = { Gtk.ResponseType.OK: on_response_ok, Gtk.ResponseType.CANCEL: on_response_cancel, Gtk.ResponseType.YES: on_response_yes, @@ -118,7 +118,10 @@ def __init__(self, self.connect('response', self.on_response) self.connect('destroy', self.on_dialog_destroy) - def on_response(self, dialog, response_id): + def on_response(self, + dialog: Gtk.MessageDialog, + response_id: Gtk.ResponseType + ) -> None: if response_id not in self.possible_responses: return if not self.possible_responses[response_id]: @@ -132,7 +135,7 @@ def on_response(self, dialog, response_id): else: self.possible_responses[response_id](dialog) - def on_dialog_destroy(self, _widget): + def on_dialog_destroy(self, _widget: Gtk.Widget) -> Optional[bool]: if not self.call_cancel_on_destroy: return None cancel_handler = self.possible_responses[Gtk.ResponseType.CANCEL] @@ -144,13 +147,14 @@ def on_dialog_destroy(self, _widget): cancel_handler(None) return None - def popup(self): + def popup(self) -> None: """ Show dialog """ - vb = self.get_children()[0].get_children()[0] # Give focus to top vbox - # vb.set_flags(Gtk.CAN_FOCUS) - vb.grab_focus() + # Give focus to top vbox + box = cast(Gtk.Box, self.get_children()[0]) + inner_box = cast(Gtk.Box, box.get_children()[0]) + inner_box.grab_focus() self.show_all() @@ -166,6 +170,7 @@ def __init__(self, ) -> None: if transient_for is None: transient_for = app.app.get_active_window() + assert transient_for HigDialog.__init__(self, transient_for, Gtk.MessageType.WARNING, @@ -188,6 +193,7 @@ def __init__(self, ) -> None: if transient_for is None: transient_for = app.app.get_active_window() + assert transient_for HigDialog.__init__(self, transient_for, Gtk.MessageType.INFO, @@ -206,11 +212,13 @@ class ErrorDialog(HigDialog): def __init__(self, pritext: str, sectext: str = '', - on_response_ok=None, - on_response_cancel=None, - transient_for=None): + on_response_ok: Optional[Any] = None, + on_response_cancel: Optional[Any] = None, + transient_for: Optional[Gtk.Window] = None + ) -> None: if transient_for is None: transient_for = app.app.get_active_window() + assert transient_for HigDialog.__init__(self, transient_for, Gtk.MessageType.ERROR, @@ -227,7 +235,7 @@ def __init__(self, title: str, text: str, sec_text: str, - buttons: List[DialogButton], + buttons: list[DialogButton], modal: bool = True, transient_for: Optional[Gtk.Window] = None ) -> None: @@ -242,7 +250,7 @@ def __init__(self, self.get_style_context().add_class('confirmation-dialog') - self._buttons: Dict[Gtk.ResponseType, DialogButton] = {} + self._buttons: dict[Gtk.ResponseType, DialogButton] = {} for button in buttons: self._buttons[button.response] = button @@ -250,7 +258,8 @@ def __init__(self, if button.is_default: self.set_default_response(button.response) if button.action is not None: - widget = self.get_widget_for_response(button.response) + widget = cast( + Gtk.Button, self.get_widget_for_response(button.response)) widget.get_style_context().add_class(button.action.value) self.format_secondary_markup(sec_text) @@ -290,7 +299,7 @@ def __init__(self, text: str, sec_text: str, check_text: str, - buttons: List[DialogButton], + buttons: list[DialogButton], modal: bool = True, transient_for: Optional[Gtk.Window] = None ) -> None: @@ -335,7 +344,7 @@ def __init__(self, sec_text: str, check_text: str, image: GdkPixbuf.Pixbuf, - buttons: List[DialogButton], + buttons: list[DialogButton], modal: bool = True, transient_for: Optional[Gtk.Window] = None ) -> None: @@ -373,7 +382,7 @@ def __init__(self, title: str, text: str, sec_text: str, - buttons: List[DialogButton], + buttons: list[DialogButton], input_str: Optional[str] = None, modal: bool = True, transient_for: Optional[Gtk.Window] = None, @@ -410,12 +419,13 @@ def _on_response(self, class ShortcutsWindow: def __init__(self): transient = app.app.get_active_window() + assert transient builder = get_builder('shortcuts_window.ui') - self.window = builder.get_object('shortcuts_window') + self.window = cast(Gtk.Window, builder.get_object('shortcuts_window')) self.window.connect('destroy', self._on_window_destroy) self.window.set_transient_for(transient) self.window.show_all() self.window.present() - def _on_window_destroy(self, _widget): + def _on_window_destroy(self, _widget: Gtk.Widget) -> None: self.window = None View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/85eb7436837993677edeb8d818259967… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/85eb7436837993677edeb8d818259967… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Preview: Catch exceptions when resizing GIFs
by Philipp Hörist (＠lovetox) 29 Jan '22

29 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 91b4a346 by lovetox at 2022-01-29T11:35:47+01:00 Preview: Catch exceptions when resizing GIFs - - - - - 1 changed file: - gajim/common/preview_helpers.py Changes: ===================================== gajim/common/preview_helpers.py ===================================== @@ -201,19 +201,18 @@ def create_thumbnail_with_pil(data: bytes, size: int) -> Optional[bytes]: output_file.close() return data - if image.format == 'GIF' and image.n_frames > 1: - resize_gif(image, output_file, (size, size)) - else: - try: + try: + if image.format == 'GIF' and image.n_frames > 1: + resize_gif(image, output_file, (size, size)) + else: image.thumbnail((size, size)) - image.save( - output_file, - format=image.format, - exif=image.info.get('exif', b''), - optimize=True) - except OSError as error: - log.warning('saving pil thumbnail failed: %s', error) - return None + image.save(output_file, + format=image.format, + exif=image.info.get('exif', b''), + optimize=True) + except Exception as error: + log.warning('saving pil thumbnail failed: %s', error) + return None bytes_ = output_file.getvalue() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/91b4a34683877364f2a878c04c976bc8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/91b4a34683877364f2a878c04c976bc8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] GroupchatDetails: Update GroupchatInfo on disco update
by Daniel Brötzmann (＠wurstsalat) 28 Jan '22

28 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 65a137e8 by wurstsalat at 2022-01-29T00:57:02+01:00 GroupchatDetails: Update GroupchatInfo on disco update - - - - - 1 changed file: - gajim/gtk/groupchat_details.py Changes: ===================================== gajim/gtk/groupchat_details.py ===================================== @@ -91,6 +91,9 @@ def __init__(self, def _on_muc_disco_update(self, event: MucDiscoUpdate) -> None: self._ui.name_entry.set_text(self._contact.name) + disco_info = self._contact.get_disco() + assert disco_info is not None + self._groupchat_info.set_from_disco_info(disco_info) def _on_stack_child_changed(self, _widget: Gtk.Stack, @@ -129,14 +132,14 @@ def _add_groupchat_manage(self) -> None: self._ui.manage_box.add(self._groupchat_manage) def _add_groupchat_info(self) -> None: - # TODO: Update avatar on update - groupchat_info = GroupChatInfoScrolled(self._contact.account, width=600) - groupchat_info.set_halign(Gtk.Align.FILL) + self._groupchat_info = GroupChatInfoScrolled( + self._contact.account, width=600) + self._groupchat_info.set_halign(Gtk.Align.FILL) disco_info = self._contact.get_disco() assert disco_info is not None - groupchat_info.set_from_disco_info(disco_info) - groupchat_info.set_subject(self._contact.subject) - self._ui.info_box.add(groupchat_info) + self._groupchat_info.set_from_disco_info(disco_info) + self._groupchat_info.set_subject(self._contact.subject) + self._ui.info_box.add(self._groupchat_info) def _add_groupchat_settings(self) -> None: scrolled_window = Gtk.ScrolledWindow() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/65a137e89c2be5e9490b5336010f8bae… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/65a137e89c2be5e9490b5336010f8bae… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] PlainWidget: Allow Focus and remove selection when focus is lost
by Philipp Hörist (＠lovetox) 28 Jan '22

28 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 96274696 by lovetox at 2022-01-29T00:17:21+01:00 PlainWidget: Allow Focus and remove selection when focus is lost Without focus keybindings like CTRL + C do not work anymore Remove the selection on losing foucs so users know that they lost focus - - - - - 1 changed file: - gajim/gtk/conversation/plain_widget.py Changes: ===================================== gajim/gtk/conversation/plain_widget.py ===================================== @@ -12,6 +12,8 @@ # 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 import logging @@ -80,7 +82,6 @@ def __init__(self, account: str, selectable: bool) -> None: self.set_xalign(0) self.set_line_wrap_mode(Pango.WrapMode.WORD_CHAR) self.set_track_visited_links(False) - self.set_can_focus(False) self._account = account @@ -88,6 +89,7 @@ def __init__(self, account: str, selectable: bool) -> None: self.connect('populate-popup', self._on_populate_popup) self.connect('activate-link', self._on_activate_link) + self.connect('focus-out-event', self._on_focus_out) def _on_populate_popup(self, label: Gtk.Label, menu: Gtk.Menu) -> None: selected, start, end = label.get_selection_bounds() @@ -124,6 +126,11 @@ def _on_activate_link(self, _label: Gtk.Label, uri: str) -> int: open_uri(uri, self._account) return Gdk.EVENT_STOP + def _on_focus_out(self, + widget: MessageLabel, + event: Gdk.EventFocus) -> None: + self.select_region(0, 0) + class MessageTextview(Gtk.TextView): def __init__(self, account: str) -> None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9627469656960af5858031333fbd3093… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9627469656960af5858031333fbd3093… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ChatList: Make close chat button smaller
by Philipp Hörist (＠lovetox) 28 Jan '22

28 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 49a50738 by lovetox at 2022-01-28T23:55:36+01:00 ChatList: Make close chat button smaller - - - - - 1 changed file: - gajim/data/style/gajim.css Changes: ===================================== gajim/data/style/gajim.css ===================================== @@ -337,8 +337,9 @@ .chatlist-row:selected label:not(.unread-counter){ color: @theme_text_color; } .chatlist-row button { - min-width: 16px; - min-height: 20px; + min-width: 25px; + min-height: 25px; + padding: 0px } .chatlist-row:selected button { color: @theme_fg_color; View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/49a50738ccdb610f1d673c6dcda3a1fa… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/49a50738ccdb610f1d673c6dcda3a1fa… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ChatList: Reduce margin
by Philipp Hörist (＠lovetox) 28 Jan '22

28 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5d52bfff by lovetox at 2022-01-28T23:24:27+01:00 ChatList: Reduce margin - - - - - 1 changed file: - gajim/data/gui/chat_list_row.ui Changes: ===================================== gajim/data/gui/chat_list_row.ui ===================================== @@ -45,7 +45,7 @@ <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="margin-end">12</property> + <property name="margin-end">6</property> <property name="hexpand">True</property> <property name="orientation">vertical</property> <child> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5d52bfff09e37ac5da967b242802de8d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5d52bfff09e37ac5da967b242802de8d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: ChatList: Remove the overlay for chat close button
by Philipp Hörist (＠lovetox) 28 Jan '22

28 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: aa802429 by lovetox at 2022-01-28T23:20:46+01:00 ChatList: Remove the overlay for chat close button With the overlay the unread counter was often not visible anymore - - - - - 11b94d48 by lovetox at 2022-01-28T23:21:26+01:00 Update builder types - - - - - 3 changed files: - gajim/data/gui/chat_list_row.ui - gajim/data/style/gajim.css - gajim/gtk/builder.pyi Changes: ===================================== gajim/data/gui/chat_list_row.ui ===================================== @@ -6,129 +6,87 @@ <property name="visible">True</property> <property name="can-focus">False</property> <child> - <object class="GtkOverlay" id="overlay"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> <child> - <object class="GtkBox"> - <property name="visible">True</property> + <object class="GtkBox" id="account_identifier"> + <property name="width-request">6</property> <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="margin-end">6</property> + <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="account_identifier"> - <property name="width-request">6</property> - <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="margin-end">6</property> - <property name="orientation">vertical</property> - <child> - <placeholder/> - </child> - <style> - <class name="account-identifier-bar"/> - </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="avatar_image"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="margin-end">12</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> + <placeholder/> </child> + <style> + <class name="account-identifier-bar"/> + </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="avatar_image"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-end">12</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-end">12</property> + <property name="hexpand">True</property> + <property name="orientation">vertical</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="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="spacing">3</property> - <child> - <object class="GtkImage" id="group_chat_indicator"> - <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="icon-name">feather-users-symbolic</property> - <property name="icon_size">1</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <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="ellipsize">end</property> - <property name="single-line-mode">True</property> - <property name="xalign">0</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> + <property name="spacing">3</property> <child> - <object class="GtkImage" id="chatstate_image"> + <object class="GtkImage" id="group_chat_indicator"> <property name="can-focus">False</property> <property name="no-show-all">True</property> - <property name="valign">end</property> - <property name="icon-name">content-loading-symbolic</property> + <property name="icon-name">feather-users-symbolic</property> + <property name="icon_size">1</property> <style> - <class name="chatstate-icon"/> + <class name="dim-label"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkLabel" id="timestamp_label"> + <object class="GtkLabel" id="name_label"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="valign">end</property> - <style> - <class name="small-label"/> - <class name="dim-label"/> - </style> + <property name="halign">start</property> + <property name="ellipsize">end</property> + <property name="single-line-mode">True</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack-type">end</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> </object> @@ -139,73 +97,73 @@ </packing> </child> <child> - <object class="GtkBox"> + <object class="GtkImage" id="chatstate_image"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="valign">end</property> + <property name="icon-name">content-loading-symbolic</property> + <style> + <class name="chatstate-icon"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="timestamp_label"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="spacing">3</property> - <child> - <object class="GtkLabel" id="nick_label"> - <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="halign">start</property> - <property name="ellipsize">end</property> - <property name="single-line-mode">True</property> - <property name="xalign">0</property> - <style> - <class name="small-label"/> - <class name="dim-label"/> - </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="message_icon"> - <property name="can-focus">False</property> - <property name="no-show-all">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="message_label"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">start</property> - <property name="ellipsize">end</property> - <property name="single-line-mode">True</property> - <property name="xalign">0</property> - <style> - <class name="small-label"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="unread_label"> - <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <style> - <class name="unread-counter"/> - </style> - </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> + <property name="valign">end</property> + <style> + <class name="small-label"/> + <class name="dim-label"/> + </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> + </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">3</property> + <child> + <object class="GtkLabel" id="nick_label"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="halign">start</property> + <property name="ellipsize">end</property> + <property name="single-line-mode">True</property> + <property name="xalign">0</property> + <style> + <class name="small-label"/> + <class name="dim-label"/> + </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="message_icon"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> </object> <packing> <property name="expand">False</property> @@ -213,24 +171,59 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkLabel" id="message_label"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">start</property> + <property name="ellipsize">end</property> + <property name="single-line-mode">True</property> + <property name="xalign">0</property> + <style> + <class name="small-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="unread_label"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <style> + <class name="unread-counter"/> + </style> + </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="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> </object> <packing> - <property name="index">-1</property> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">2</property> </packing> </child> - <child type="overlay"> + <child> <object class="GtkRevealer" id="revealer"> <property name="can-focus">False</property> <property name="halign">end</property> - <property name="transition-type">crossfade</property> - <property name="transition-duration">50</property> + <property name="transition-type">slide-right</property> + <property name="transition-duration">100</property> <child> <object class="GtkButton" id="close_button"> <property name="visible">True</property> @@ -248,6 +241,11 @@ </object> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> </child> </object> </child> ===================================== gajim/data/style/gajim.css ===================================== @@ -319,7 +319,7 @@ .chatlist { } .chatlist-row { transition: none; - padding: 0px; + padding: 6px 0px 6px 6px; margin-left: 12px; margin-right: 12px; margin-bottom: 3px; @@ -337,7 +337,8 @@ .chatlist-row:selected label:not(.unread-counter){ color: @theme_text_color; } .chatlist-row button { - padding: 3px; + min-width: 16px; + min-height: 20px; } .chatlist-row:selected button { color: @theme_fg_color; @@ -346,9 +347,7 @@ .chatlist-row:selected button { .chatlist-row:selected image { color: @theme_fg_color; } -.chatlist-row overlay > box { - padding: 6px; -} + @keyframes composing { 0% { -gtk-icon-transform: translate(0px, 2px); ===================================== gajim/gtk/builder.pyi ===================================== @@ -225,7 +225,6 @@ class ChatControlBuilder(Builder): class ChatListRowBuilder(Builder): eventbox: Gtk.EventBox - overlay: Gtk.Overlay account_identifier: Gtk.Box avatar_image: Gtk.Image group_chat_indicator: Gtk.Image @@ -407,9 +406,6 @@ class GroupchatControlBuilder(Builder): bold: Gtk.MenuItem italic: Gtk.MenuItem strike: Gtk.MenuItem - manage_popover: Gtk.Popover - manage_advanced_button: Gtk.Button - manage_destroy_button: Gtk.Button groupchat_control_hbox: Gtk.Box overlay: Gtk.Overlay stack: Gtk.Stack @@ -461,13 +457,6 @@ class GroupchatControlBuilder(Builder): destroy_reason_entry: Gtk.Entry invite_grid: Gtk.Grid invite_button: Gtk.Button - avatar_button_image: Gtk.Image - avatar_select_button: Gtk.Button - muc_description_entry: Gtk.Entry - muc_name_entry: Gtk.Entry - manage_save_button: Gtk.Button - avatar_selector_grid: Gtk.Grid - avatar_update_button: Gtk.Button visitor_popover: Gtk.Popover @@ -533,6 +522,7 @@ class GroupchatInviterBuilder(Builder): class GroupchatManageBuilder(Builder): + subject_buffer: Gtk.TextBuffer stack: Gtk.Stack avatar_button_image: Gtk.Image avatar_select_button: Gtk.Button @@ -543,7 +533,6 @@ class GroupchatManageBuilder(Builder): subject_change_button: Gtk.Button avatar_selector_grid: Gtk.Grid avatar_update_button: Gtk.Button - subject_buffer: Gtk.TextBuffer class GroupchatNickChooserBuilder(Builder): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/288ab8073a5f9ee654d72f8c6339e46… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/288ab8073a5f9ee654d72f8c6339e46… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Notifications: Windows improvements
by Daniel Brötzmann (＠wurstsalat) 28 Jan '22

28 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: d7c25b18 by wurstsalat at 2022-01-28T18:36:56+01:00 Notifications: Windows improvements - - - - - 55087e41 by wurstsalat at 2022-01-28T18:58:00+01:00 ChatControl: Remove unnecessary AdditionalDataDict - - - - - 288ab807 by wurstsalat at 2022-01-28T18:59:03+01:00 BaseControl: Prevent mark as read when not active Fixes #10751 - - - - - 3 changed files: - gajim/gtk/controls/base.py - gajim/gtk/controls/chat.py - gajim/gtk/notification.py Changes: ===================================== gajim/gtk/controls/base.py ===================================== @@ -1007,7 +1007,8 @@ def _on_autoscroll_changed(self, return self._jump_to_end_button.toggle(False) - app.window.mark_as_read(self.account, self.contact.jid) + if app.window.is_chat_active(self.account, self.contact.jid): + app.window.mark_as_read(self.account, self.contact.jid) def _on_jump_to_end(self, _button: Gtk.Button) -> None: self.scroll_to_end(force=True) @@ -1212,6 +1213,9 @@ def add_message(self, if additional_data is None: additional_data = AdditionalDataDict() + chat_active = app.window.is_chat_active( + self.account, self.contact.jid) + if self._allow_add_message(): self.conversation_view.add_message( text, @@ -1246,9 +1250,6 @@ def add_message(self, if notify: self._notify(name, text, tim, additional_data) - chat_active = app.window.is_chat_active( - self.account, self.contact.jid) - if not chat_active: if self.is_groupchat: needs_highlight = message_needs_highlight( @@ -1262,7 +1263,8 @@ def add_message(self, if chat_active and self._scrolled_view.get_autoscroll(): # Send chat marker if we’re actively following the chat - app.window.mark_as_read(self.account, self.contact.jid) + pass + #app.window.mark_as_read(self.account, self.contact.jid) def _notify(self, name: str, ===================================== gajim/gtk/controls/chat.py ===================================== @@ -558,9 +558,6 @@ def add_message(self, notify: bool = True ) -> None: - if additional_data is None: - additional_data = AdditionalDataDict() - if kind == 'incoming': name = self.contact.name else: ===================================== gajim/gtk/notification.py ===================================== @@ -152,6 +152,7 @@ def __init__(self, event: events.Notification, timeout: int) -> None: self.set_accept_focus(False) self.set_skip_taskbar_hint(True) self.set_decorated(False) + self.set_keep_above(True) self._timeout_id: Optional[int] = None self._event = event @@ -221,6 +222,9 @@ def _on_button_press(self, sub_type=self._event.sub_type or '', account=self._event.account, jid=jid) + # present_with_time needs to be called at this instant in order to + # work on Windows + app.window.present_with_time(event.time) app.app.activate_action(f'app.{self._event.account}-open-event', params.to_variant()) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b53c508041e100e2d25c41a9de56d15… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b53c508041e100e2d25c41a9de56d15… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] GroupchatManage: Better error handling
by Daniel Brötzmann (＠wurstsalat) 27 Jan '22

27 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: b53c5080 by wurstsalat at 2022-01-28T00:55:37+01:00 GroupchatManage: Better error handling - - - - - 1 changed file: - gajim/gtk/groupchat_manage.py Changes: ===================================== gajim/gtk/groupchat_manage.py ===================================== @@ -26,10 +26,12 @@ from gajim.common import app from gajim.common.const import AvatarSize +from gajim.common.i18n import _ from gajim.common.modules.contacts import GroupchatContact from .avatar_selector import AvatarSelector from .builder import get_builder +from .dialogs import ErrorDialog from .filechoosers import AvatarChooserDialog log = logging.getLogger('gajim.gui.groupchat_manage') @@ -201,26 +203,21 @@ def _on_upload_avatar_result(self, task: Task) -> None: try: task.finish() except Exception as error: - print(error) - pass - # self.add_info_message(_('Avatar upload failed: %s') % error) - - else: - pass - # self.add_info_message(_('Avatar upload successful')) + ErrorDialog(_('Uploading Avatar Failed'), + _('Uploading avatar image failed: %s' % error)) def _on_avatar_update_clicked(self, _button: Gtk.Button) -> None: - success, data, _, _ = self._avatar_selector.get_avatar_bytes() + success, data, _w, _h = self._avatar_selector.get_avatar_bytes() if not success: - pass - # self.add_info_message(_('Loading avatar failed')) + ErrorDialog(_('Loading Avatar Failed'), + _('Loading avatar image failed')) return assert data sha = app.app.avatar_storage.save_avatar(data) if sha is None: - pass - # self.add_info_message(_('Loading avatar failed')) + ErrorDialog(_('Saving Avatar Failed'), + _('Saving avatar image failed')) return vcard = VCard() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b53c508041e100e2d25c41a9de56d151… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b53c508041e100e2d25c41a9de56d151… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Groupchat: Refactor Management page
by Daniel Brötzmann (＠wurstsalat) 27 Jan '22

27 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 3bb17656 by wurstsalat at 2022-01-28T00:44:33+01:00 Groupchat: Refactor Management page - - - - - 8 changed files: - gajim/data/gui/groupchat_control.ui - gajim/data/gui/groupchat_details.ui - + gajim/data/gui/groupchat_manage.ui - gajim/gtk/builder.pyi - gajim/gtk/controls/groupchat.py - gajim/gtk/groupchat_details.py - + gajim/gtk/groupchat_manage.py - gajim/gtk/menus.py Changes: ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -78,67 +78,6 @@ </object> </child> </object> - <object class="GtkPopover" id="manage_popover"> - <property name="can-focus">False</property> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkButton" id="manage_advanced_button"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <signal name="clicked" handler="_on_configure_room" swapped="no"/> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">Advanced Settings…</property> - </object> - </child> - <style> - <class name="flat"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="manage_destroy_button"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <signal name="clicked" handler="_on_destroy_room" swapped="no"/> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">Destroy…</property> - </object> - </child> - <style> - <class name="flat"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <style> - <class name="padding-6"/> - </style> - </object> - </child> - </object> <object class="GtkBox" id="groupchat_control_hbox"> <property name="can-focus">True</property> <child> @@ -746,9 +685,6 @@ <property name="position">1</property> </packing> </child> - <child> - <placeholder/> - </child> <child> <object class="GtkBox"> <property name="visible">True</property> @@ -854,7 +790,7 @@ </object> <packing> <property name="name">password</property> - <property name="position">3</property> + <property name="position">2</property> </packing> </child> <child> @@ -946,7 +882,7 @@ </object> <packing> <property name="name">captcha</property> - <property name="position">4</property> + <property name="position">3</property> </packing> </child> <child> @@ -1085,7 +1021,7 @@ </object> <packing> <property name="name">error</property> - <property name="position">5</property> + <property name="position">4</property> </packing> </child> <child> @@ -1192,7 +1128,7 @@ </object> <packing> <property name="name">captcha-error</property> - <property name="position">6</property> + <property name="position">5</property> </packing> </child> <child> @@ -1319,7 +1255,7 @@ </object> <packing> <property name="name">kick</property> - <property name="position">7</property> + <property name="position">6</property> </packing> </child> <child> @@ -1446,7 +1382,7 @@ </object> <packing> <property name="name">ban</property> - <property name="position">8</property> + <property name="position">7</property> </packing> </child> <child> @@ -1606,7 +1542,7 @@ </object> <packing> <property name="name">destroy</property> - <property name="position">9</property> + <property name="position">8</property> </packing> </child> <child> @@ -1685,331 +1621,14 @@ </object> <packing> <property name="name">invite</property> - <property name="position">10</property> + <property name="position">9</property> </packing> </child> <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">center</property> - <property name="valign">center</property> - <property name="orientation">vertical</property> - <property name="spacing">18</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="margin-bottom">12</property> - <property name="label" translatable="yes">Manage This Chat</property> - <style> - <class name="bold16"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkOverlay"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">center</property> - <child> - <object class="GtkImage" id="avatar_button_image"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="margin-end">6</property> - <property name="margin-bottom">6</property> - <property name="pixel-size">100</property> - <property name="icon_size">6</property> - </object> - <packing> - <property name="index">-1</property> - </packing> - </child> - <child type="overlay"> - <object class="GtkButton" id="avatar_select_button"> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="no-show-all">True</property> - <property name="halign">end</property> - <property name="valign">end</property> - <signal name="clicked" handler="_on_change_avatar" swapped="no"/> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">document-edit-symbolic</property> - </object> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> -  - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">center</property> - <property name="row-spacing">6</property> - <property name="column-spacing">12</property> - <child> - <object class="GtkEntry" id="muc_description_entry"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can-focus">True</property> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">1</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="muc_name_entry"> - <property name="width-request">250</property> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can-focus">True</property> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">Name</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">Description</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkMenuButton"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="focus-on-click">False</property> - <property name="receives-default">False</property> - <property name="halign">center</property> - <property name="margin-top">12</property> - <property name="direction">up</property> - <property name="popover">manage_popover</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">More…</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">4</property> - </packing> - </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="margin-top">18</property> - <child> - <object class="GtkButton"> - <property name="label" translatable="yes">_Close</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="use-underline">True</property> - <signal name="clicked" handler="_on_page_cancel_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="manage_save_button"> - <property name="label" translatable="yes">Save</property> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can-focus">True</property> - <property name="can-default">True</property> - <property name="receives-default">True</property> - <signal name="clicked" handler="_on_manage_save_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">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">5</property> - </packing> - </child> - <style> - <class name="padding-18"/> - </style> - </object> - <packing> - <property name="name">muc-manage</property> - <property name="position">11</property> - </packing> + <placeholder/> </child> <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="orientation">vertical</property> - <child> -  - <object class="GtkGrid" id="avatar_selector_grid"> - <property name="name">settings_grid</property> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">center</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="border-width">18</property> - <property name="row-spacing">6</property> - <property name="column-spacing">12</property> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">center</property> - <property name="margin-top">6</property> - <property name="spacing">12</property> - <child type="center"> - <object class="GtkButton" id="avatar_update_button"> - <property name="label" translatable="yes">Update</property> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can-focus">True</property> - <property name="can-default">True</property> - <property name="receives-default">True</property> - <signal name="clicked" handler="_on_avatar_update_clicked" swapped="no"/> - <style> - <class name="suggested-action"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkButton"> - <property name="label" translatable="yes">_Close</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="use-underline">True</property> - <signal name="clicked" handler="_on_page_cancel_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton"> - <property name="label" translatable="yes">Select File…</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <signal name="clicked" handler="_on_avatar_select_file_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Update Avatar</property> - <style> - <class name="bold16"/> - </style> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - </object> - <packing> - <property name="name">avatar-selector</property> - <property name="position">12</property> - </packing> + <placeholder/> </child> </object> <packing> ===================================== gajim/data/gui/groupchat_details.ui ===================================== @@ -2,9 +2,6 @@  <interface> <requires lib="gtk+" version="3.24"/> - <object class="GtkTextBuffer" id="subject_buffer"> - <signal name="changed" handler="_on_subject_text_changed" swapped="no"/> - </object>  <object class="GtkGrid" id="main_grid"> <property name="visible">True</property> @@ -132,65 +129,31 @@ </packing> </child> <child> - <object class="GtkBox" id="subject_box"> + <placeholder/> + </child> + <child> + <object class="GtkBox" id="manage_box"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="orientation">vertical</property> - <property name="spacing">18</property> <child> - <object class="GtkScrolledWindow"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="hscrollbar-policy">never</property> - <property name="shadow-type">in</property> - <child> - <object class="GtkTextView" id="subject_textview"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="wrap-mode">word-char</property> - <property name="left-margin">6</property> - <property name="right-margin">6</property> - <property name="top-margin">6</property> - <property name="bottom-margin">6</property> - <property name="buffer">subject_buffer</property> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> + <placeholder/> </child> <child> - <object class="GtkButton" id="subject_change_button"> - <property name="label" translatable="yes">Ch_ange</property> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="halign">end</property> - <property name="use-underline">True</property> - <signal name="clicked" handler="_on_subject_change_clicked" swapped="no"/> - <style> - <class name="suggested-action"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> + <placeholder/> + </child> + <child> + <placeholder/> </child> <style> <class name="padding-18"/> </style> </object> <packing> - <property name="name">subject</property> - <property name="title" translatable="yes">Subject</property> - <property name="icon-name">view-pin-symbolic</property> - <property name="position">2</property> + <property name="name">manage</property> + <property name="title" translatable="yes">Manage</property> + <property name="icon-name">preferences-other-symbolic</property> + <property name="position">3</property> </packing> </child> <child> @@ -209,7 +172,7 @@ <property name="name">affiliations</property> <property name="title" translatable="yes">Affiliations</property> <property name="icon-name">system-users-symbolic</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> <child> @@ -228,7 +191,7 @@ <property name="name">outcasts</property> <property name="title" translatable="yes">Outcasts</property> <property name="icon-name">system-users-symbolic</property> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> <style> ===================================== gajim/data/gui/groupchat_manage.ui ===================================== @@ -0,0 +1,344 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<interface> + <requires lib="gtk+" version="3.24"/> + <object class="GtkTextBuffer" id="subject_buffer"> + <signal name="changed" handler="_on_subject_text_changed" swapped="no"/> + </object> + <object class="GtkStack" id="stack"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="transition-type">crossfade</property> + <child> + <object class="GtkBox"> + <property name="width-request">400</property> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">center</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> + <child> + <object class="GtkOverlay"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">center</property> + <child> + <object class="GtkImage" id="avatar_button_image"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-end">6</property> + <property name="margin-bottom">6</property> + <property name="pixel-size">100</property> + <property name="icon-name">missing-image</property> + <property name="icon_size">6</property> + </object> + <packing> + <property name="index">-1</property> + </packing> + </child> + <child type="overlay"> + <object class="GtkButton" id="avatar_select_button"> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="no-show-all">True</property> + <property name="halign">end</property> + <property name="valign">end</property> + <signal name="clicked" handler="_on_change_avatar_clicked" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">document-edit-symbolic</property> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</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="halign">center</property> + <property name="row-spacing">6</property> + <property name="column-spacing">12</property> + <child> + <object class="GtkEntry" id="muc_description_entry"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can-focus">True</property> + <signal name="changed" handler="_on_name_desc_changed" swapped="no"/> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="muc_name_entry"> + <property name="width-request">300</property> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can-focus">True</property> + <signal name="changed" handler="_on_name_desc_changed" swapped="no"/> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Name</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Description</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="manage_save_button"> + <property name="label" translatable="yes">Save</property> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can-focus">True</property> + <property name="can-default">True</property> + <property name="receives-default">False</property> + <property name="halign">end</property> + <signal name="clicked" handler="_on_manage_save_clicked" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkSeparator"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-top">12</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Subject</property> + <style> + <class name="bold16"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow"> + <property name="height-request">100</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="hscrollbar-policy">never</property> + <property name="shadow-type">in</property> + <child> + <object class="GtkTextView" id="subject_textview"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="wrap-mode">word-char</property> + <property name="left-margin">6</property> + <property name="right-margin">6</property> + <property name="top-margin">6</property> + <property name="bottom-margin">6</property> + <property name="buffer">subject_buffer</property> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + <child> + <object class="GtkButton" id="subject_change_button"> + <property name="label" translatable="yes">Ch_ange Subject</property> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="halign">end</property> + <property name="use-underline">True</property> + <signal name="clicked" handler="_on_subject_change_clicked" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">6</property> + </packing> + </child> + </object> + <packing> + <property name="name">manage</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <child> +  + <object class="GtkGrid" id="avatar_selector_grid"> + <property name="name">settings_grid</property> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="border-width">18</property> + <property name="row-spacing">6</property> + <property name="column-spacing">12</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">center</property> + <property name="margin-top">6</property> + <property name="spacing">12</property> + <child type="center"> + <object class="GtkButton" id="avatar_update_button"> + <property name="label" translatable="yes">Update</property> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can-focus">True</property> + <property name="can-default">True</property> + <property name="receives-default">True</property> + <signal name="clicked" handler="_on_avatar_update_clicked" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_Close</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <signal name="clicked" handler="_on_avatar_cancel_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">Select File…</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <signal name="clicked" handler="_on_avatar_select_file_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Update Avatar</property> + <style> + <class name="bold16"/> + </style> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="name">avatar</property> + <property name="position">1</property> + </packing> + </child> + <style> + <class name="padding-18"/> + </style> + </object> +</interface> ===================================== gajim/gtk/builder.pyi ===================================== @@ -408,7 +408,6 @@ class GroupchatControlBuilder(Builder): italic: Gtk.MenuItem strike: Gtk.MenuItem manage_popover: Gtk.Popover - manage_change_subject_button: Gtk.Button manage_advanced_button: Gtk.Button manage_destroy_button: Gtk.Button groupchat_control_hbox: Gtk.Box @@ -439,8 +438,6 @@ class GroupchatControlBuilder(Builder): roster_revealer: Gtk.Revealer nickname_entry: Gtk.Entry nickname_change_button: Gtk.Button - subject_change_button: Gtk.Button - subject_textview: Gtk.TextView password_set_button: Gtk.Button password_entry: Gtk.Entry captcha_set_button: Gtk.Button @@ -498,11 +495,9 @@ class GroupchatDetailsBuilder(Builder): main_stack: Gtk.Stack info_box: Gtk.Box settings_box: Gtk.Box + manage_box: Gtk.Box affiliation_box: Gtk.Box outcasts_box: Gtk.Box - subject_box: Gtk.Box - subject_textview: Gtk.TextView - subject_change_button: Gtk.Button class GroupchatInfoScrolledBuilder(Builder): @@ -537,6 +532,20 @@ class GroupchatInviterBuilder(Builder): invitees_scrolled: Gtk.ScrolledWindow +class GroupchatManageBuilder(Builder): + stack: Gtk.Stack + avatar_button_image: Gtk.Image + avatar_select_button: Gtk.Button + muc_description_entry: Gtk.Entry + muc_name_entry: Gtk.Entry + manage_save_button: Gtk.Button + subject_textview: Gtk.TextView + subject_change_button: Gtk.Button + avatar_selector_grid: Gtk.Grid + avatar_update_button: Gtk.Button + subject_buffer: Gtk.TextBuffer + + class GroupchatNickChooserBuilder(Builder): button_content: Gtk.Box label: Gtk.Label @@ -1037,6 +1046,8 @@ def get_builder(file_name: Literal['groupchat_info_scrolled.ui'], widgets: list[ @overload def get_builder(file_name: Literal['groupchat_inviter.ui'], widgets: list[str] = ...) -> GroupchatInviterBuilder: ... @overload +def get_builder(file_name: Literal['groupchat_manage.ui'], widgets: list[str] = ...) -> GroupchatManageBuilder: ... +@overload def get_builder(file_name: Literal['groupchat_nick_chooser.ui'], widgets: list[str] = ...) -> GroupchatNickChooserBuilder: ... @overload def get_builder(file_name: Literal['groupchat_outcast.ui'], widgets: list[str] = ...) -> GroupchatOutcastBuilder: ... ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -30,14 +30,11 @@ import logging from nbxmpp import JID -from nbxmpp.namespaces import Namespace from nbxmpp.protocol import InvalidJid from nbxmpp.protocol import validate_resourcepart from nbxmpp.const import StatusCode -from nbxmpp.const import Affiliation from nbxmpp.errors import StanzaError from nbxmpp.modules.security_labels import Displaymarking -from nbxmpp.modules.vcard_temp import VCard from nbxmpp.structs import PresenceProperties from nbxmpp.structs import MessageProperties from nbxmpp.structs import MucSubject @@ -73,9 +70,7 @@ from gajim.gui.dialogs import DialogButton from gajim.gui.dialogs import ConfirmationCheckDialog from gajim.gui.dialogs import ConfirmationDialog -from gajim.gui.filechoosers import AvatarChooserDialog from gajim.gui.groupchat_config import GroupchatConfig -from gajim.gui.avatar_selector import AvatarSelector from gajim.gui.dataform import DataFormWidget from gajim.gui.groupchat_inviter import GroupChatInviter from gajim.gui.groupchat_roster import GroupchatRoster @@ -171,10 +166,6 @@ def __init__(self, account: str, jid: JID) -> None: self._subject_text = '' - # Holds the room’s config form, which is requested when managing - # the room - self._room_config_form = None - # Groupchat invite self.xml.quick_invite_button.set_action_name( f'win.invite-{self.control_id}') @@ -183,11 +174,6 @@ def __init__(self, account: str, jid: JID) -> None: self.xml.invite_grid.attach(self._invite_box, 0, 0, 1, 1) self._invite_box.connect('listbox-changed', self._on_invite_ready) - # Avatar selector - self._avatar_selector = AvatarSelector() - self._avatar_selector.set_size_request(400, 400) - self.xml.avatar_selector_grid.attach(self._avatar_selector, 0, 1, 1, 1) - self.control_menu = get_groupchat_menu(self.control_id, self.account, self.contact.jid) @@ -285,7 +271,6 @@ def disco_info(self): def add_actions(self) -> None: super().add_actions() actions = [ - ('groupchat-manage-', None, self._on_groupchat_manage), ('change-nickname-', None, self._on_change_nick), ('destroy-', None, self._on_destroy_room), ('configure-', None, self._on_configure_room), @@ -345,30 +330,6 @@ def update_actions(self, *args: Any) -> None: tooltip_text = _('No File Transfer available') self.xml.sendfile_button.set_tooltip_text(tooltip_text) - # Manage chat - self._get_action('groupchat-manage-').set_enabled( - joined and contact.affiliation in (Affiliation.ADMIN, - Affiliation.OWNER)) - - vcard_support = False - if self.disco_info is not None: - vcard_support = self.disco_info.supports(Namespace.VCARD) - - self.xml.muc_name_entry.set_text(self.disco_info.muc_name or '') - self.xml.muc_description_entry.set_text( - self.disco_info.muc_description or '') - - if (joined and vcard_support and - contact.affiliation.is_owner): - self.xml.avatar_select_button.show() - - self.xml.manage_advanced_button.set_sensitive( - joined and contact.affiliation in (Affiliation.ADMIN, - Affiliation.OWNER)) - - self.xml.manage_destroy_button.set_sensitive( - joined and contact.affiliation.is_owner) - self._get_action('contact-information-').set_enabled(joined) self._get_action('execute-command-').set_enabled(joined) @@ -380,7 +341,6 @@ def update_actions(self, *args: Any) -> None: def remove_actions(self) -> None: super().remove_actions() actions = [ - 'groupchat-manage-', 'change-nickname-', 'destroy-', 'configure-', @@ -426,38 +386,6 @@ def _on_details(self, contact=self.contact, subject=self._subject_text) - def _on_groupchat_manage(self, - _action: Gio.SimpleAction, - _param: Optional[GLib.Variant] - ) -> None: - surface = app.app.avatar_storage.get_muc_surface( - self.account, - self.contact.jid, - AvatarSize.GROUP_INFO, - self.scale_factor) - self.xml.avatar_button_image.set_from_surface(surface) - - self._show_page('muc-manage') - self.xml.manage_save_button.grab_default() - - contact = self.contact.get_self() - if contact.affiliation.is_owner: - con = app.connections[self.account] - con.get_module('MUC').request_config( - self.room_jid, callback=self._on_manage_form_received) - - def _on_manage_form_received(self, task: Task) -> None: - try: - result = task.finish() - except StanzaError as error: - log.info(error) - return - - self.xml.muc_name_entry.set_sensitive(True) - self.xml.muc_description_entry.set_sensitive(True) - self.xml.manage_save_button.set_sensitive(True) - self._room_config_form = result.form - def _on_invite(self, _action: Gio.SimpleAction, _param: Optional[GLib.Variant] @@ -515,8 +443,6 @@ def _on_destroy_confirm(self, _button: Gtk.Button) -> None: self._show_page('groupchat') def _on_configure_room(self, _button: Gtk.Button) -> None: - self.xml.manage_popover.popdown() - win = get_app_window('GroupchatConfig', self.account, self.room_jid) if win is not None: win.present() @@ -564,58 +490,6 @@ def _on_execute_command(self, jid += '/' + nick open_window('AdHocCommands', account=self.account, jid=jid) - def _on_change_avatar(self, _button: Gtk.Button) -> None: - def _on_accept(path: str) -> None: - self._avatar_selector.prepare_crop_area(path) - self.xml.avatar_update_button.set_sensitive( - self._avatar_selector.get_prepared()) - self._show_page('avatar-selector') - self.xml.avatar_update_button.grab_default() - - AvatarChooserDialog(_on_accept, - transient_for=app.window, - modal=True) - - def _on_avatar_select_file_clicked(self, _button: Gtk.Button) -> None: - def _on_accept(path: str) -> None: - self._avatar_selector.prepare_crop_area(path) - self.xml.avatar_update_button.set_sensitive( - self._avatar_selector.get_prepared()) - - AvatarChooserDialog(_on_accept, - transient_for=app.window, - modal=True) - - def _on_upload_avatar_result(self, task: Task) -> None: - try: - task.finish() - except Exception as error: - self.add_info_message(_('Avatar upload failed: %s') % error) - - else: - self.add_info_message(_('Avatar upload successful')) - - def _on_avatar_update_clicked(self, _button: Gtk.Button) -> None: - success, data, _, _ = self._avatar_selector.get_avatar_bytes() - if not success: - self.add_info_message(_('Loading avatar failed')) - return - - sha = app.app.avatar_storage.save_avatar(data) - if sha is None: - self.add_info_message(_('Loading avatar failed')) - return - - vcard = VCard() - vcard.set_avatar(data, 'image/png') - - client = app.get_client(self.account) - client.get_module('VCardTemp').set_vcard( - vcard, - jid=self.room_jid, - callback=self._on_upload_avatar_result) - self._show_page('groupchat') - def _on_contact_information(self, _action: Gio.SimpleAction, param: GLib.Variant @@ -1547,7 +1421,7 @@ def delegate_action(self, action: str) -> int: open_window('GroupchatDetails', contact=self.contact, subject=self._subject_text, - page='subject') + page='manage') return Gdk.EVENT_STOP if action == 'show-contact-info': @@ -1628,25 +1502,6 @@ def _on_nickname_change_clicked(self, _button: Gtk.Button) -> None: self._client.get_module('MUC').change_nick(self.room_jid, new_nick) self._show_page('groupchat') - def _on_manage_save_clicked(self, _button: Gtk.Button) -> None: - if self._room_config_form is not None: - name = self.xml.muc_name_entry.get_text() - desc = self.xml.muc_description_entry.get_text() - try: - name_field = self._room_config_form['muc#roomconfig_roomname'] - desc_field = self._room_config_form['muc#roomconfig_roomdesc'] - except KeyError: - pass - else: - name_field.value = name - desc_field.value = desc - - con = app.connections[self.account] - con.get_module('MUC').set_config( - self.room_jid, self._room_config_form) - - self._show_page('groupchat') - def _on_password_set_clicked(self, _button: Gtk.Button) -> None: password = self.xml.password_entry.get_text() self._client.get_module('MUC').set_password(self.room_jid, password) ===================================== gajim/gtk/groupchat_details.py ===================================== @@ -20,11 +20,10 @@ from gi.repository import GObject from gi.repository import Gtk -from nbxmpp.const import Affiliation -from nbxmpp.structs import MucSubject - from gajim.common import app +from gajim.common import ged from gajim.common.const import AvatarSize +from gajim.common.events import MucDiscoUpdate from gajim.common.i18n import _ from gajim.common.modules.contacts import GroupchatContact from gajim.gtk.groupchat_affiliation import GroupchatAffiliation @@ -32,6 +31,7 @@ from .builder import get_builder from .groupchat_info import GroupChatInfoScrolled +from .groupchat_manage import GroupchatManage from .groupchat_settings import GroupChatSettings from .sidebar_switcher import SideBarSwitcher @@ -55,8 +55,7 @@ def __init__(self, self._client = app.get_client(contact.account) self._subject_text = subject self._contact = contact - self._contact.connect( - 'room-subject', self._on_room_subject) + self._contact.connect('avatar-update', self._on_avatar_update) self._ui = get_builder('groupchat_details.ui') self._ui.connect_signals(self) @@ -68,26 +67,30 @@ def __init__(self, self._on_stack_child_changed) self.add(self._ui.main_grid) + self._groupchat_manage: Optional[GroupchatManage] = None + self._add_groupchat_info() self._add_groupchat_settings() + self._add_groupchat_manage() self._add_affiliations() self._add_outcasts() - self._prepare_subject() self._load_avatar() self._ui.name_entry.set_text(contact.name) if page is not None: self._switcher.set_row(page) + app.ged.register_event_handler( + 'muc-disco-update', ged.GUI1, self._on_muc_disco_update) + self.connect('key-press-event', self._on_key_press) self.connect('destroy', self._on_destroy) self.show_all() - @property - def disco_info(self): - return app.storage.cache.get_last_disco_info(self._contact.jid) + def _on_muc_disco_update(self, event: MucDiscoUpdate) -> None: + self._ui.name_entry.set_text(self._contact.name) def _on_stack_child_changed(self, _widget: Gtk.Stack, @@ -111,51 +114,22 @@ def _load_avatar(self) -> None: surface = self._contact.get_avatar(AvatarSize.VCARD_HEADER, scale) self._ui.header_image.set_from_surface(surface) - def _prepare_subject(self) -> None: - self._ui.subject_textview.get_buffer().set_text(self._subject_text) - - joined = self._contact.is_joined - change_allowed = self._is_subject_change_allowed() - self._ui.subject_textview.set_sensitive(joined and change_allowed) - - def _is_subject_change_allowed(self) -> bool: - contact = self._contact.get_self() - if contact is None: - return False - - if contact.affiliation in (Affiliation.OWNER, Affiliation.ADMIN): - return True - - if self.disco_info is None: - return False - return self.disco_info.muc_subjectmod or False - - def _on_subject_text_changed(self, buffer_: Gtk.TextBuffer) -> None: - text = buffer_.get_text(buffer_.get_start_iter(), - buffer_.get_end_iter(), - False) - self._ui.subject_change_button.set_sensitive( - text != self._subject_text) - - def _on_subject_change_clicked(self, _button: Gtk.Button) -> None: - buffer_ = self._ui.subject_textview.get_buffer() - subject = buffer_.get_text(buffer_.get_start_iter(), - buffer_.get_end_iter(), - False) - self._client.get_module('MUC').set_subject(self._contact.jid, subject) - - def _on_room_subject(self, - _contact: GroupchatContact, - _signal_name: str, - subject: Optional[MucSubject] - ) -> None: - if subject is None: - return - - self._subject_text = subject.text - self._ui.subject_textview.get_buffer().set_text(subject.text) + def _on_avatar_update(self, + _contact: GroupchatContact, + _signal_name: str + ) -> None: + self._load_avatar() + assert self._groupchat_manage + self._groupchat_manage.update_avatar() + + def _add_groupchat_manage(self) -> None: + self._groupchat_manage = GroupchatManage(self.account, + self._contact, + self._subject_text) + self._ui.manage_box.add(self._groupchat_manage) def _add_groupchat_info(self) -> None: + # TODO: Update avatar on update groupchat_info = GroupChatInfoScrolled(self._contact.account, width=600) groupchat_info.set_halign(Gtk.Align.FILL) disco_info = self._contact.get_disco() ===================================== gajim/gtk/groupchat_manage.py ===================================== @@ -0,0 +1,241 @@ +# +# 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 Optional + +import logging + +from gi.repository import Gtk + +from nbxmpp.const import Affiliation +from nbxmpp.task import Task +from nbxmpp.errors import StanzaError +from nbxmpp.structs import MucSubject +from nbxmpp.modules.vcard_temp import VCard +from nbxmpp.namespaces import Namespace + +from gajim.common import app +from gajim.common.const import AvatarSize +from gajim.common.modules.contacts import GroupchatContact + +from .avatar_selector import AvatarSelector +from .builder import get_builder +from .filechoosers import AvatarChooserDialog + +log = logging.getLogger('gajim.gui.groupchat_manage') + + +class GroupchatManage(Gtk.Box): + def __init__(self, + account: str, + contact: GroupchatContact, + subject: str + ) -> None: + Gtk.Box.__init__(self) + self._account = account + self._client = app.get_client(account) + self._contact = contact + self._contact.connect('room-subject', self._on_room_subject) + + self._subject_text = subject + + self._room_config_form = None + + self._ui = get_builder('groupchat_manage.ui') + self.add(self._ui.stack) + self._ui.connect_signals(self) + + self._avatar_selector = AvatarSelector() + self._avatar_selector.set_size_request(500, 500) + self._ui.avatar_selector_grid.attach(self._avatar_selector, 0, 1, 1, 1) + + self._prepare_subject() + self._prepare_manage() + + self.show_all() + + @property + def disco_info(self): + return app.storage.cache.get_last_disco_info(self._contact.jid) + + def _prepare_subject(self) -> None: + self._ui.subject_textview.get_buffer().set_text(self._subject_text) + + joined = self._contact.is_joined + change_allowed = self._is_subject_change_allowed() + self._ui.subject_textview.set_sensitive(joined and change_allowed) + + def _is_subject_change_allowed(self) -> bool: + contact = self._contact.get_self() + if contact is None: + return False + + if contact.affiliation in (Affiliation.OWNER, Affiliation.ADMIN): + return True + + if self.disco_info is None: + return False + return self.disco_info.muc_subjectmod or False + + def _on_subject_text_changed(self, buffer_: Gtk.TextBuffer) -> None: + text = buffer_.get_text(buffer_.get_start_iter(), + buffer_.get_end_iter(), + False) + self._ui.subject_change_button.set_sensitive( + text != self._subject_text) + + def _on_subject_change_clicked(self, _button: Gtk.Button) -> None: + buffer_ = self._ui.subject_textview.get_buffer() + subject = buffer_.get_text(buffer_.get_start_iter(), + buffer_.get_end_iter(), + False) + self._client.get_module('MUC').set_subject(self._contact.jid, subject) + + def _on_room_subject(self, + _contact: GroupchatContact, + _signal_name: str, + subject: Optional[MucSubject] + ) -> None: + if subject is None: + return + + self._subject_text = subject.text + self._ui.subject_textview.get_buffer().set_text(subject.text) + + def _prepare_manage(self) -> None: + joined = self._contact.is_joined + vcard_support = False + self_contact = self._contact.get_self() + assert self_contact + + if self.disco_info is not None: + vcard_support = self.disco_info.supports(Namespace.VCARD) + + self._ui.muc_name_entry.set_text(self.disco_info.muc_name or '') + self._ui.muc_description_entry.set_text( + self.disco_info.muc_description or '') + + if (joined and vcard_support and + self_contact.affiliation.is_owner): + self._ui.avatar_select_button.show() + + self.update_avatar() + + if self_contact.affiliation.is_owner: + self._client.get_module('MUC').request_config( + self._contact.jid, callback=self._on_manage_form_received) + + def _on_manage_form_received(self, task: Task) -> None: + try: + result = task.finish() + except StanzaError as error: + log.info(error) + return + + self._ui.muc_name_entry.set_sensitive(True) + self._ui.muc_description_entry.set_sensitive(True) + self._room_config_form = result.form + + def _on_name_desc_changed(self, _entry: Gtk.Entry) -> None: + if self.disco_info is not None: + disco_name = self.disco_info.muc_name or '' + disco_desc = self.disco_info.muc_description or '' + name = self._ui.muc_name_entry.get_text() + desc = self._ui.muc_description_entry.get_text() + + self._ui.manage_save_button.set_sensitive( + desc != disco_desc or name != disco_name) + + def _on_manage_save_clicked(self, _button: Gtk.Button) -> None: + if self._room_config_form is not None: + name = self._ui.muc_name_entry.get_text() + desc = self._ui.muc_description_entry.get_text() + try: + name_field = self._room_config_form['muc#roomconfig_roomname'] + desc_field = self._room_config_form['muc#roomconfig_roomdesc'] + except KeyError: + pass + else: + name_field.value = name + desc_field.value = desc + + self._client.get_module('MUC').set_config( + self._contact.jid, self._room_config_form) + + def _on_avatar_cancel_clicked(self, _button: Gtk.Button) -> None: + self._ui.stack.set_visible_child_name('manage') + + def _on_change_avatar_clicked(self, _button: Gtk.Button) -> None: + def _on_accept(path: str) -> None: + self._avatar_selector.prepare_crop_area(path) + self._ui.avatar_update_button.set_sensitive( + self._avatar_selector.get_prepared()) + self._ui.stack.set_visible_child_name('avatar') + self._ui.avatar_update_button.grab_default() + + AvatarChooserDialog(_on_accept, + transient_for=self.get_toplevel(), + modal=True) + + def _on_avatar_select_file_clicked(self, _button: Gtk.Button) -> None: + def _on_accept(path: str) -> None: + self._avatar_selector.prepare_crop_area(path) + self._ui.avatar_update_button.set_sensitive( + self._avatar_selector.get_prepared()) + + AvatarChooserDialog(_on_accept, + transient_for=self.get_toplevel(), + modal=True) + + def _on_upload_avatar_result(self, task: Task) -> None: + try: + task.finish() + except Exception as error: + print(error) + pass + # self.add_info_message(_('Avatar upload failed: %s') % error) + + else: + pass + # self.add_info_message(_('Avatar upload successful')) + + def _on_avatar_update_clicked(self, _button: Gtk.Button) -> None: + success, data, _, _ = self._avatar_selector.get_avatar_bytes() + if not success: + pass + # self.add_info_message(_('Loading avatar failed')) + return + + assert data + sha = app.app.avatar_storage.save_avatar(data) + if sha is None: + pass + # self.add_info_message(_('Loading avatar failed')) + return + + vcard = VCard() + vcard.set_avatar(data, 'image/png') + + self._client.get_module('VCardTemp').set_vcard( + vcard, + jid=self._contact.jid, + callback=self._on_upload_avatar_result) + self._ui.stack.set_visible_child_name('manage') + + def update_avatar(self): + surface = app.app.avatar_storage.get_muc_surface( + self._account, + self._contact.jid, + AvatarSize.GROUP_INFO, + self.get_scale_factor()) + self._ui.avatar_button_image.set_from_surface(surface) ===================================== gajim/gtk/menus.py ===================================== @@ -155,7 +155,6 @@ def get_groupchat_menu(control_id: str, account: str, jid: JID) -> Gio.Menu: menulist: MenuItemListT = [ (_('Details'), f'win.groupchat-details-{control_id}', None), - (_('Manage…'), f'win.groupchat-manage-{control_id}', None), (_('Change Nickname…'), f'win.change-nickname-{control_id}', None), (_('Request Voice'), f'win.request-voice-{control_id}', None), (_('Execute Command…'), f'win.execute-command-{control_id}', '""'), View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3bb17656b6238c1e17d9ead0ea6db591… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3bb17656b6238c1e17d9ead0ea6db591… 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