Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][newcontrol] Add captcha and password widgets
by Daniel Brötzmann (＠wurstsalat) 15 Jul '22

15 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: c671abf2 by wurstsalat at 2022-07-15T18:32:47+02:00 Add captcha and password widgets - - - - - 5 changed files: - gajim/common/const.py - gajim/common/modules/muc.py - gajim/common/structs.py - gajim/gtk/chat_function_page.py - gajim/gtk/chat_stack.py Changes: ===================================== gajim/common/const.py ===================================== @@ -246,6 +246,7 @@ class MUCJoinedState(Enum): CREATING = 'creating' CAPTCHA_REQUEST = 'captcha in progress' CAPTCHA_FAILED = 'captcha failed' + PASSWORD_REQUEST = 'password required' def __str__(self): return self.name @@ -274,6 +275,10 @@ def is_captcha_request(self): def is_captcha_failed(self): return self == MUCJoinedState.CAPTCHA_FAILED + @property + def is_password_request(self): + return self == MUCJoinedState.PASSWORD_REQUEST + class ClientState(IntEnum): DISCONNECTING = 0 ===================================== gajim/common/modules/muc.py ===================================== @@ -815,8 +815,11 @@ def _on_captcha_challenge(self, return self._log.info('Captcha challenge received from %s', properties.jid) + + assert properties.captcha is not None store_bob_data(properties.captcha.bob_data) muc_data.captcha_id = properties.id + muc_data.captcha_form = properties.captcha.form self._set_muc_state(properties.jid, MUCJoinedState.CAPTCHA_REQUEST) self._remove_rejoin_timeout(properties.jid) ===================================== gajim/common/structs.py ===================================== @@ -31,8 +31,10 @@ from nbxmpp.const import Chatstate from nbxmpp.const import PresenceShow from nbxmpp.const import Role +from nbxmpp.modules.dataforms import SimpleDataForm from nbxmpp.modules.security_labels import SecurityLabel from nbxmpp.protocol import JID +from nbxmpp.structs import MucSubject from nbxmpp.structs import PresenceProperties from gajim.common import types @@ -56,7 +58,7 @@ class MUCData: def __init__(self, room_jid: str, nick: str, - password: str, + password: Optional[str], config: Optional[dict[str, Any]] = None ) -> None: @@ -66,8 +68,9 @@ def __init__(self, self.password = password self.state = MUCJoinedState.NOT_JOINED # Message id of the captcha challenge - self.captcha_id = None - self.subject = None + self.captcha_id: Optional[str] = None + self.captcha_form: Optional[SimpleDataForm] = None + self.subject: Optional[MucSubject] = None @property def jid(self) -> JID: ===================================== gajim/gtk/chat_function_page.py ===================================== @@ -31,6 +31,7 @@ from gajim.common.modules.contacts import GroupchatContact from gajim.common.types import ChatContactT +from .dataform import DataFormWidget from .groupchat_inviter import GroupChatInviter @@ -138,10 +139,32 @@ def set_mode(self, 'destructive-action') self._widget = InputWidget(self._contact, mode, data) + elif mode == 'password-request': + self._confirm_button.set_label(_('Join')) + self._confirm_button.get_style_context().add_class( + 'suggested-action') + self._widget = InputWidget(self._contact, mode) + + elif mode == 'captcha-request': + self._confirm_button.set_label(_('Join')) + self._confirm_button.get_style_context().add_class( + 'suggested-action') + muc_data = self._client.get_module('MUC').get_muc_data( + self._contact.jid) + form = muc_data.captcha_form + options = {'no-scrolling': True, + 'entry-activates-default': True} + self._widget = DataFormWidget(form, options=options) + self._widget.set_valign(Gtk.Align.START) + self._widget.show_all() + self._widget.connect('is-valid', self._on_ready) + assert self._widget is not None self._content_box.add(self._widget) if isinstance(self._widget, InputWidget): self._widget.focus() + elif isinstance(self._widget, DataFormWidget): + self._widget.focus_first_entry() def _on_ready(self, _widget: Gtk.Widget, @@ -181,9 +204,32 @@ def _on_confirm_clicked(self, _button: Gtk.Button) -> None: self._contact.jid, {self._data: {'affiliation': 'outcast', 'reason': reason}}) + elif self._mode == 'password-request': + assert isinstance(self._widget, InputWidget) + password = self._widget.get_text() + assert self._client is not None + assert self._contact is not None + self._client.get_module('MUC').set_password( + self._contact.jid, password) + self._client.get_module('MUC').join(self._contact.jid) + + elif self._mode == 'captcha-request': + assert isinstance(self._widget, DataFormWidget) + form_node = self._widget.get_submit_form() + assert self._client is not None + assert self._contact is not None + self._client.get_module('MUC').send_captcha( + self._contact.jid, form_node) + self.emit('finish') def _on_cancel_clicked(self, _button: Gtk.Button) -> None: + if self._mode == 'captcha-request': + assert self._client is not None + assert self._contact is not None + self._client.get_module('MUC').cancel_captcha( + self._contact.jid) + self.emit('finish') def _invite(self, invited_jid: JID) -> None: @@ -236,12 +282,20 @@ def __init__(self, sub_label.set_text(_('Enter your new nickname')) assert isinstance(self._contact, GroupchatContact) self._entry.set_text(self._contact.nickname or '') + elif mode == 'kick': heading_label.set_text(_('Kick %s') % data) sub_label.set_text(_('Reason (optional)')) + elif mode == 'ban': heading_label.set_text(_('Ban %s') % data) sub_label.set_text(_('Reason (optional)')) + + elif mode == 'password-request': + heading_label.set_text(_('Password Required')) + sub_label.set_text(_('Enter a password to join this chat')) + self._entry.set_input_purpose(Gtk.InputPurpose.PASSWORD) + self.connect('destroy', self._on_destroy) self.show_all() ===================================== gajim/gtk/chat_stack.py ===================================== @@ -27,7 +27,8 @@ from nbxmpp.protocol import JID from nbxmpp.structs import PresenceProperties -from gajim.common import app, helpers +from gajim.common import app +from gajim.common import helpers from gajim.common.events import MucDiscoUpdate from gajim.common.i18n import _ from gajim.common.const import CallType @@ -112,6 +113,19 @@ def show_chat(self, account: str, jid: JID) -> None: else: self._update_chat_actions(self._current_contact) + if isinstance(self._current_contact, GroupchatContact): + muc_data = client.get_module('MUC').get_muc_data( + str(self._current_contact.jid)) + if muc_data is not None: + if muc_data.state.is_captcha_request: + self._chat_function_page.set_mode( + self._current_contact, 'captcha-request') + return + if muc_data.state.is_password_request: + self._chat_function_page.set_mode( + self._current_contact, 'password-request') + return + self.set_transition_type(Gtk.StackTransitionType.NONE) self.set_visible_child_name('controls') @@ -399,6 +413,7 @@ def _show_chat_function_page(self, self.set_visible_child_name('function') def _on_function_finished(self, _function_page: ChatFunctionPage) -> None: + # TODO: close control on password/captcha cancel self.set_visible_child_name('controls') self.set_transition_type(Gtk.StackTransitionType.NONE) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c671abf28db63c2bbf50ac07a6f54bc9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c671abf28db63c2bbf50ac07a6f54bc9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] GroupChatInviter: Set size request
by Daniel Brötzmann (＠wurstsalat) 14 Jul '22

14 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: 52561f5a by wurstsalat at 2022-07-14T10:40:33+02:00 GroupChatInviter: Set size request - - - - - 1 changed file: - gajim/gtk/chat_function_page.py Changes: ===================================== gajim/gtk/chat_function_page.py ===================================== @@ -113,6 +113,7 @@ def set_mode(self, self._confirm_button.get_style_context().add_class( 'suggested-action') self._widget = GroupChatInviter(str(contact.jid)) + self._widget.set_size_request(-1, 500) self._widget.connect('listbox-changed', self._on_ready) self._widget.load_contacts() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/52561f5ace353e93c6ab522a28ad0f5d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/52561f5ace353e93c6ab522a28ad0f5d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] Add empty page to controlstack
by Philipp Hörist (＠lovetox) 13 Jul '22

13 Jul '22

Philipp Hörist pushed to branch newcontrol at gajim / gajim Commits: 1a607394 by lovetox at 2022-07-13T23:27:49+02:00 Add empty page to controlstack - - - - - 1 changed file: - gajim/gtk/control_stack.py Changes: ===================================== gajim/gtk/control_stack.py ===================================== @@ -38,6 +38,8 @@ def __init__(self): self.set_vexpand(True) self.set_hexpand(True) + self.add_named(Gtk.Box(), 'empty') + self.show_all() self._controls: dict[tuple[str, JID], ControlT] = {} self._current_control: Optional[ControlT] = None @@ -122,6 +124,7 @@ def is_chat_loaded(self, account: str, jid: JID) -> bool: return control.is_chat_loaded def clear(self) -> None: + self.set_visible_child_name('empty') self._current_control = None def process_event(self, event: Any) -> None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1a607394f47ef40fc6dd67388f227353… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1a607394f47ef40fc6dd67388f227353… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: GroupchatInfo: Don’t set subject when loading from disco info
by Philipp Hörist (＠lovetox) 13 Jul '22

13 Jul '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: d4eb4a35 by lovetox at 2022-07-13T20:09:26+02:00 fix: GroupchatInfo: Don’t set subject when loading from disco info Disco provides only the subject text not the author and timestamp. It’s better to set this info separately when we receive the subject from the MUC. This has the drawback that we can’t show the subject when we only show the disco (StartChatDialog). But everything else would bring alot more complexity than it’s worth. Fixes #11040 - - - - - 2 changed files: - gajim/gtk/groupchat_info.py - test/gtk/groupchat_info.py Changes: ===================================== gajim/gtk/groupchat_info.py ===================================== @@ -191,9 +191,6 @@ def set_from_disco_info(self, info: DiscoInfo) -> None: if self._minimal: return - # Set subject - self.set_subject(info.muc_subject) - # Set user has_users = info.muc_users is not None self._ui.users.set_text(info.muc_users or '') ===================================== test/gtk/groupchat_info.py ===================================== @@ -6,6 +6,7 @@ from nbxmpp.protocol import Iq from nbxmpp.modules.discovery import parse_disco_info +from nbxmpp.structs import MucSubject from gajim.common.const import CSSPriority @@ -86,6 +87,10 @@ </query> </iq>''') + +subject = ('Lorem ipsum dolor sit amet, consetetur sadipscing elitr sed ' + 'diam nonumy eirmod tempor invidunt ut labore et dolore magna') + disco_info = parse_disco_info(stanza) class GroupchatInfo(Gtk.ApplicationWindow): @@ -107,10 +112,9 @@ def __init__(self): self.add(self._main_box) self._muc_info_box.set_from_disco_info(disco_info) - self._muc_info_box.set_subject( - 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr sed ' - 'diam nonumy eirmod tempor invidunt ut labore et dolore magna') - self._muc_info_box.set_author('userX', None) + self._muc_info_box.set_subject(MucSubject(text=subject, + author='someone', + timestamp=None)) self.show_all() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d4eb4a35c696599258c0984600875058… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d4eb4a35c696599258c0984600875058… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] Add ChatFunctionPage
by Daniel Brötzmann (＠wurstsalat) 13 Jul '22

13 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: 32cdc9d1 by wurstsalat at 2022-07-13T13:41:19+02:00 Add ChatFunctionPage - - - - - 5 changed files: - gajim/data/gui/groupchat_control.ui - + gajim/gtk/chat_function_page.py - gajim/gtk/chat_stack.py - gajim/gtk/controls/groupchat.py - pyrightconfig.json Changes: ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -112,114 +112,6 @@ <property name="name">groupchat</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"> - <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="row-spacing">12</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Enter Nickname</property> - <property name="xalign">0</property> - <style> - <class name="bold16"/> - </style> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="nickname_entry"> - <property name="width-request">200</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="activates-default">True</property> - <property name="caps-lock-warning">False</property> - <property name="show-emoji-icon">True</property> - <signal name="notify::text" handler="_on_nickname_text_changed" swapped="no"/> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> - </packing> - </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="homogeneous">True</property> - <child> - <object class="GtkButton"> - <property name="label" translatable="yes">_Cancel</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="halign">start</property> - <property name="valign">start</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="nickname_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="can-default">True</property> - <property name="receives-default">True</property> - <property name="halign">end</property> - <property name="valign">start</property> - <property name="use-underline">True</property> - <signal name="clicked" handler="_on_nickname_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">1</property> - </packing> - </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">2</property> - </packing> - </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">nickname</property> - <property name="position">1</property> - </packing> - </child> <child> <object class="GtkBox"> <property name="visible">True</property> @@ -325,7 +217,7 @@ </object> <packing> <property name="name">password</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <child> @@ -417,7 +309,7 @@ </object> <packing> <property name="name">captcha</property> - <property name="position">3</property> + <property name="position">2</property> </packing> </child> <child> @@ -556,7 +448,7 @@ </object> <packing> <property name="name">error</property> - <property name="position">4</property> + <property name="position">3</property> </packing> </child> <child> @@ -663,344 +555,14 @@ </object> <packing> <property name="name">captcha-error</property> - <property name="position">5</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"> - <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="row-spacing">6</property> - <child> - <object class="GtkLabel" id="kick_label"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="margin-bottom">6</property> - <property name="label" translatable="yes">Kick Participant</property> - <property name="ellipsize">end</property> - <property name="single-line-mode">True</property> - <property name="max-width-chars">22</property> - <property name="xalign">0</property> - <style> - <class name="bold16"/> - </style> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="homogeneous">True</property> - <child> - <object class="GtkButton"> - <property name="label" translatable="yes">_Cancel</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="halign">start</property> - <property name="valign">start</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="kick_participant_button"> - <property name="label" translatable="yes">_Kick</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="can-default">True</property> - <property name="receives-default">True</property> - <property name="halign">end</property> - <property name="valign">start</property> - <property name="use-underline">True</property> - <signal name="clicked" handler="_on_kick_participant_clicked" swapped="no"/> - <style> - <class name="destructive-action"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">3</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="kick_reason_entry"> - <property name="width-request">200</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="margin-bottom">6</property> - <property name="activates-default">True</property> - <property name="caps-lock-warning">False</property> - <property name="secondary-icon-tooltip-text" translatable="yes">Insert Emoji</property> - <property name="show-emoji-icon">True</property> - </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="halign">start</property> - <property name="label" translatable="yes">Reason (optional)</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">0</property> - </packing> - </child> - </object> - <packing> - <property name="name">kick</property> - <property name="position">6</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"> - <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="row-spacing">6</property> - <child> - <object class="GtkLabel" id="ban_label"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="margin-bottom">6</property> - <property name="label" translatable="yes">Ban Participant</property> - <property name="ellipsize">end</property> - <property name="single-line-mode">True</property> - <property name="max-width-chars">22</property> - <property name="xalign">0</property> - <style> - <class name="bold16"/> - </style> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="homogeneous">True</property> - <child> - <object class="GtkButton"> - <property name="label" translatable="yes">_Cancel</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="halign">start</property> - <property name="valign">start</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="ban_participant_button"> - <property name="label" translatable="yes">_Ban</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="can-default">True</property> - <property name="receives-default">True</property> - <property name="halign">end</property> - <property name="valign">start</property> - <property name="use-underline">True</property> - <signal name="clicked" handler="_on_ban_participant_clicked" swapped="no"/> - <style> - <class name="destructive-action"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">3</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="ban_reason_entry"> - <property name="width-request">200</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="margin-bottom">6</property> - <property name="activates-default">True</property> - <property name="caps-lock-warning">False</property> - <property name="secondary-icon-tooltip-text" translatable="yes">Insert Emoji</property> - <property name="show-emoji-icon">True</property> - </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="halign">start</property> - <property name="label" translatable="yes">Reason (optional)</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">0</property> - </packing> - </child> - </object> - <packing> - <property name="name">ban</property> - <property name="position">7</property> + <property name="position">4</property> </packing> </child> <child> <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="invite_grid"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">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="margin-top">6</property> - <property name="spacing">12</property> - <child> - <object class="GtkButton"> - <property name="label" translatable="yes">_Cancel</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</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="invite_button"> - <property name="label" translatable="yes">_Invite</property> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="use-underline">True</property> - <signal name="clicked" handler="_on_invite_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="left-attach">0</property> - <property name="top-attach">1</property> - </packing> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="name">invite</property> - <property name="position">9</property> - </packing> + <placeholder/> </child> </object> <packing> ===================================== gajim/gtk/chat_function_page.py ===================================== @@ -0,0 +1,270 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from __future__ import annotations + +from typing import Optional + +from gi.repository import Gdk +from gi.repository import GObject +from gi.repository import Gtk +from gi.repository import Pango + +from nbxmpp.protocol import InvalidJid +from nbxmpp.protocol import JID +from nbxmpp.protocol import validate_resourcepart + +from gajim.common import app +from gajim.common.client import Client +from gajim.common.i18n import _ +from gajim.common.modules.contacts import GroupchatContact +from gajim.common.types import ChatContactT + +from .groupchat_inviter import GroupChatInviter + + +class ChatFunctionPage(Gtk.Box): + + __gsignals__ = { + 'finish': (GObject.SignalFlags.RUN_LAST, None, ()), + 'message': (GObject.SignalFlags.RUN_LAST, None, (str,)), + } + + def __init__(self) -> None: + Gtk.Box.__init__(self, + orientation=Gtk.Orientation.VERTICAL, + spacing=18) + self.set_halign(Gtk.Align.CENTER) + self.set_valign(Gtk.Align.CENTER) + self.get_style_context().add_class('padding-18') + + self._client: Optional[Client] = None + self._contact: Optional[ChatContactT] = None + self._mode: Optional[str] = None + + self._widget: Optional[Gtk.Widget] = None + + self._heading = Gtk.Label() + self._heading.set_max_width_chars(30) + self._heading.set_ellipsize(Pango.EllipsizeMode.END) + self._heading.get_style_context().add_class('large-header') + self.add(self._heading) + + self._content_box = Gtk.Box() + self.add(self._content_box) + + cancel_button = Gtk.Button(label=_('Cancel')) + cancel_button.connect('clicked', self._on_cancel_clicked) + + self._confirm_button = Gtk.Button() + self._confirm_button.set_can_default(True) + self._confirm_button.connect('clicked', self._on_confirm_clicked) + + button_box = Gtk.Box() + button_box.pack_start(cancel_button, False, True, 0) + button_box.pack_end(self._confirm_button, False, True, 0) + + self.add(button_box) + self.connect('key-press-event', self._on_key_press) + + def _on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> None: + if event.keyval == Gdk.KEY_Escape: + self.emit('finish') + + def _clear(self) -> None: + for child in self._content_box.get_children(): + child.destroy() + + def set_mode(self, + contact: ChatContactT, + mode: str, + data: Optional[str] = None + ) -> None: + self._clear() + self._confirm_button.get_style_context().remove_class( + 'destructive-action') + self._confirm_button.get_style_context().remove_class( + 'suggested-action') + self._confirm_button.set_sensitive(False) + self._confirm_button.grab_default() + + self._contact = contact + self._heading.set_text(self._contact.name) + self._client = app.get_client(contact.account) + self._mode = mode + self._data = data + + if self._widget is not None: + self._widget.destroy() + + if mode == 'invite': + self._confirm_button.set_label(_('Invite')) + self._confirm_button.get_style_context().add_class( + 'suggested-action') + self._widget = GroupChatInviter(str(contact.jid)) + self._widget.connect('listbox-changed', self._on_ready) + self._widget.load_contacts() + + elif mode == 'change-nickname': + self._confirm_button.set_label(_('Change')) + self._confirm_button.get_style_context().add_class( + 'suggested-action') + self._widget = InputWidget(self._contact, mode) + self._widget.connect('changed', self._on_ready) + + elif mode == 'kick': + self._confirm_button.set_label(_('Kick')) + self._confirm_button.set_sensitive(True) + self._confirm_button.get_style_context().add_class( + 'destructive-action') + self._widget = InputWidget(self._contact, mode, data) + + elif mode == 'ban': + self._confirm_button.set_label(_('Ban')) + self._confirm_button.set_sensitive(True) + self._confirm_button.get_style_context().add_class( + 'destructive-action') + self._widget = InputWidget(self._contact, mode, data) + + assert self._widget is not None + self._content_box.add(self._widget) + if isinstance(self._widget, InputWidget): + self._widget.focus() + + def _on_ready(self, + _widget: Gtk.Widget, + state: bool + ) -> None: + self._confirm_button.set_sensitive(state) + + def _on_confirm_clicked(self, _button: Gtk.Button) -> None: + if self._mode == 'invite': + assert isinstance(self._widget, GroupChatInviter) + invitees = self._widget.get_invitees() + for jid in invitees: + self._invite(JID.from_string(jid)) + + elif self._mode == 'change-nickname': + assert isinstance(self._widget, InputWidget) + nickname = self._widget.get_text() + assert self._client is not None + assert self._contact is not None + self._client.get_module('MUC').change_nick( + self._contact.jid, nickname) + + elif self._mode == 'kick': + assert isinstance(self._widget, InputWidget) + reason = self._widget.get_text() + assert self._client is not None + assert self._contact is not None + self._client.get_module('MUC').set_role( + self._contact.jid, self._data, 'none', reason) + + elif self._mode == 'ban': + assert isinstance(self._widget, InputWidget) + reason = self._widget.get_text() + assert self._client is not None + assert self._contact is not None + self._client.get_module('MUC').set_affiliation( + self._contact.jid, + {self._data: {'affiliation': 'outcast', 'reason': reason}}) + + self.emit('finish') + + def _on_cancel_clicked(self, _button: Gtk.Button) -> None: + self.emit('finish') + + def _invite(self, invited_jid: JID) -> None: + assert self._contact is not None + client = app.get_client(self._contact.account) + client.get_module('MUC').invite( + self._contact.jid, invited_jid) + invited_contact = client.get_module('Contacts').get_contact( + invited_jid) + self.emit( + 'message', + _('%s has been invited to this group chat') % invited_contact.name) + + +class InputWidget(Gtk.Box): + + __gsignals__ = { + 'changed': (GObject.SignalFlags.RUN_LAST, None, (bool,)), + } + + def __init__(self, + contact: ChatContactT, + mode: str, + data: Optional[str] = None + ) -> None: + Gtk.Box.__init__(self, + orientation=Gtk.Orientation.VERTICAL, + spacing=12) + self._contact = contact + self._mode = mode + + heading_label = Gtk.Label() + heading_label.set_xalign(0) + heading_label.get_style_context().add_class('bold16') + self.add(heading_label) + + sub_label = Gtk.Label() + sub_label.set_xalign(0) + sub_label.get_style_context().add_class('dim-label') + self.add(sub_label) + + self._entry = Gtk.Entry() + self._entry.set_activates_default(True) + self._entry.set_size_request(300, -1) + self._entry.connect('changed', self._on_entry_changed) + self.add(self._entry) + + if mode == 'change-nickname': + heading_label.set_text(_('Change Nickname')) + sub_label.set_text(_('Enter your new nickname')) + assert isinstance(self._contact, GroupchatContact) + self._entry.set_text(self._contact.nickname or '') + elif mode == 'kick': + heading_label.set_text(_('Kick %s') % data) + sub_label.set_text(_('Reason (optional)')) + elif mode == 'ban': + heading_label.set_text(_('Ban %s') % data) + sub_label.set_text(_('Reason (optional)')) + self.connect('destroy', self._on_destroy) + self.show_all() + + def _on_destroy(self, _widget: InputWidget) -> None: + app.check_finalize(self) + + def _on_entry_changed(self, entry: Gtk.Entry) -> None: + text = entry.get_text() + + if self._mode == 'change-nickname': + assert isinstance(self._contact, GroupchatContact) + if not text or text == self._contact.nickname: + self.emit('changed', False) + return + try: + validate_resourcepart(text) + except InvalidJid: + self.emit('changed', False) + return + + self.emit('changed', bool(text)) + + def focus(self) -> None: + self._entry.grab_focus() + + def get_text(self) -> str: + return self._entry.get_text() ===================================== gajim/gtk/chat_stack.py ===================================== @@ -38,6 +38,7 @@ from gajim.common.types import ChatContactT from .chat_banner import ChatBanner +from .chat_function_page import ChatFunctionPage from .control_stack import ControlStack from .controls.groupchat import GroupchatControl from .message_actions_box import MessageActionsBox @@ -56,6 +57,11 @@ def __init__(self): self.add_named(ChatPlaceholderBox(), 'empty') + self._chat_function_page = ChatFunctionPage() + self._chat_function_page.connect('finish', self._on_function_finished) + self._chat_function_page.connect('message', self._on_function_message) + self.add_named(self._chat_function_page, 'function') + self._chat_banner = ChatBanner() self._control_stack = ControlStack() self._message_action_box = MessageActionsBox() @@ -70,6 +76,7 @@ def __init__(self): self._current_contact: Optional[ChatContactT] = None self.add_named(box, 'controls') + self._connect_actions() self.show_all() @@ -105,6 +112,7 @@ def show_chat(self, account: str, jid: JID) -> None: else: self._update_chat_actions(self._current_contact) + self.set_transition_type(Gtk.StackTransitionType.NONE) self.set_visible_child_name('controls') def _on_muc_state_changed(self, @@ -322,12 +330,10 @@ def _on_action(self, 'ContactInfo', account=account, contact=resource_contact) elif action_name == 'muc-invite': - assert isinstance(current_control, GroupchatControl) - current_control.show_inviter() + self._show_chat_function_page('invite') elif action_name == 'muc-change-nickname': - assert isinstance(current_control, GroupchatControl) - current_control.show_change_nick() + self._show_chat_function_page('change-nickname') elif action_name == 'muc-execute-command': assert isinstance(current_control, GroupchatControl) @@ -344,13 +350,13 @@ def _on_action(self, assert isinstance(current_control, GroupchatControl) assert param is not None kick_nick = param.get_string() - current_control.show_kick(kick_nick) + self._show_chat_function_page('kick', data=kick_nick) elif action_name == 'muc-ban': assert isinstance(current_control, GroupchatControl) assert param is not None ban_jid = param.get_string() - current_control.show_ban(ban_jid) + self._show_chat_function_page('ban', data=ban_jid) elif action_name == 'muc-change-role': assert param is not None @@ -382,6 +388,28 @@ def _on_stateful_action(self, action.set_state(param) contact.settings.set('send_marker', param.get_boolean()) + def _show_chat_function_page(self, + function: str, + data: Optional[str] = None + ) -> None: + assert self._current_contact is not None + self._chat_function_page.set_mode( + self._current_contact, function, data) + self.set_transition_type(Gtk.StackTransitionType.SLIDE_UP_DOWN) + self.set_visible_child_name('function') + + def _on_function_finished(self, _function_page: ChatFunctionPage) -> None: + self.set_visible_child_name('controls') + self.set_transition_type(Gtk.StackTransitionType.NONE) + + def _on_function_message(self, + _function_page: ChatFunctionPage, + message: str + ) -> None: + control = self._control_stack.get_current_control() + assert control is not None + control.add_info_message(message) + def _on_send_message(self) -> None: self._message_action_box.msg_textview.replace_emojis() message = self._message_action_box.msg_textview.get_text() ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -30,8 +30,6 @@ import logging from nbxmpp import JID -from nbxmpp.protocol import InvalidJid -from nbxmpp.protocol import validate_resourcepart from nbxmpp.const import StatusCode from nbxmpp.errors import StanzaError from nbxmpp.modules.security_labels import Displaymarking @@ -63,7 +61,6 @@ from gajim.gui.dialogs import DialogButton from gajim.gui.dialogs import ConfirmationDialog from gajim.gui.dataform import DataFormWidget -from gajim.gui.groupchat_inviter import GroupChatInviter from gajim.gui.groupchat_roster import GroupchatRoster from gajim.gui.groupchat_state import GroupchatState from gajim.gui.util import open_window @@ -89,12 +86,6 @@ def __init__(self, account: str, jid: JID) -> None: self.room_jid = str(self.contact.jid) - # Stores nickname we want to kick - self._kick_nick: Optional[str] = None - - # Stores nickname we want to ban - self._ban_jid: Optional[str] = None - # Last sent message text self.last_sent_txt: str = '' @@ -126,11 +117,6 @@ def __init__(self, account: str, jid: JID) -> None: self._subject_text = '' - # Groupchat invite - self._invite_box = GroupChatInviter(self.room_jid) - self.xml.invite_grid.attach(self._invite_box, 0, 0, 1, 1) - self._invite_box.connect('listbox-changed', self._on_invite_ready) - self._set_control_inactive() # Stack @@ -199,23 +185,8 @@ def _get_current_page(self) -> str: return self.xml.stack.get_visible_child_name() # Actions - def show_inviter(self) -> None: - self._invite_box.load_contacts() - self._show_page('invite') - - def _on_invite_ready(self, - _listbox: GroupChatInviter, - invitable: bool - ) -> None: - self.xml.invite_button.set_sensitive(invitable) - - def _on_invite_clicked(self, _button: Gtk.Button) -> None: - invitees = self._invite_box.get_invitees() - for jid in invitees: - self.invite(JID.from_string(jid)) - self._show_page('groupchat') - def invite(self, invited_jid: JID) -> None: + # TODO: Remove, used by command system self._client.get_module('MUC').invite( self.contact.jid, invited_jid) invited_contact = self._client.get_module('Contacts').get_contact( @@ -223,24 +194,6 @@ def invite(self, invited_jid: JID) -> None: self.add_info_message( _('%s has been invited to this group chat') % invited_contact.name) - def show_kick(self, kick_nick: str) -> None: - self._kick_nick = kick_nick - text = _('Kick %s') % kick_nick - self.xml.kick_label.set_text(text) - self.xml.kick_label.set_tooltip_text(text) - self.xml.kick_reason_entry.grab_focus() - self.xml.kick_participant_button.grab_default() - self._show_page('kick') - - def show_ban(self, ban_jid: str) -> None: - self._ban_jid = ban_jid - text = _('Ban %s') % ban_jid - self.xml.ban_label.set_text(text) - self.xml.ban_label.set_tooltip_text(text) - self.xml.ban_reason_entry.grab_focus() - self.xml.ban_participant_button.grab_default() - self._show_page('ban') - def _show_roster(self, show_roster: bool, *args: Any) -> None: transition = Gtk.RevealerTransitionType.SLIDE_RIGHT if show_roster: @@ -863,25 +816,8 @@ def focus(self) -> None: pass elif page_name == 'password': self.xml.password_entry.grab_focus_without_selecting() - elif page_name == 'nickname': - self.xml.nickname_entry.grab_focus_without_selecting() elif page_name == 'captcha': self._captcha_request.focus_first_entry() - elif page_name == 'invite': - self._invite_box.focus_search_entry() - - def _on_kick_participant_clicked(self, _button: Gtk.Button) -> None: - reason = self.xml.kick_reason_entry.get_text() - self._client.get_module('MUC').set_role( - self.room_jid, self._kick_nick, 'none', reason) - self._show_page('groupchat') - - def _on_ban_participant_clicked(self, _button: Gtk.Button) -> None: - reason = self.xml.ban_reason_entry.get_text() - self._client.get_module('MUC').set_affiliation( - self.room_jid, - {self._ban_jid: {'affiliation': 'outcast', 'reason': reason}}) - self._show_page('groupchat') def _on_page_change(self, stack: Gtk.Stack, _param: Any) -> None: page_name = stack.get_visible_child_name() @@ -898,31 +834,6 @@ def _on_page_change(self, stack: Gtk.Stack, _param: Any) -> None: elif page_name == 'error': self.xml.close_button.grab_default() - def show_change_nick(self) -> None: - if self._get_current_page() != 'groupchat': - return - self.xml.nickname_entry.set_text(self.contact.nickname) - self.xml.nickname_entry.grab_focus() - self.xml.nickname_change_button.grab_default() - self._show_page('nickname') - - def _on_nickname_text_changed(self, entry: Gtk.Entry, _param: Any) -> None: - text = entry.get_text() - if not text or text == self.contact.nickname: - self.xml.nickname_change_button.set_sensitive(False) - else: - try: - validate_resourcepart(text) - except InvalidJid: - self.xml.nickname_change_button.set_sensitive(False) - else: - self.xml.nickname_change_button.set_sensitive(True) - - def _on_nickname_change_clicked(self, _button: Gtk.Button) -> None: - new_nick = self.xml.nickname_entry.get_text() - self._client.get_module('MUC').change_nick(self.room_jid, new_nick) - 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) @@ -1000,9 +911,6 @@ def _on_retry_join_clicked(self, _button: Gtk.Button) -> None: self._client.get_module('MUC').join(self.room_jid) self._show_page('groupchat') - def _on_page_cancel_clicked(self, _button: Gtk.Button) -> None: - self._show_page('groupchat') - def _on_page_close_clicked(self, *args: Any) -> None: self._close_control() ===================================== pyrightconfig.json ===================================== @@ -59,6 +59,7 @@ "gajim/gtk/change_password.py", "gajim/gtk/chat_action_processor.py", "gajim/gtk/chat_filter.py", + "gajim/gtk/chat_function_page.py", "gajim/gtk/chat_list_stack.py", "gajim/gtk/chat_list.py", "gajim/gtk/chat_page.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/32cdc9d142b1c0a99dff7fa46030e8d7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/32cdc9d142b1c0a99dff7fa46030e8d7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] Fix GroupChatNickCompletion test
by Daniel Brötzmann (＠wurstsalat) 12 Jul '22

12 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: c4a77304 by wurstsalat at 2022-07-12T18:34:37+02:00 Fix GroupChatNickCompletion test - - - - - 1 changed file: - test/no_gui/test_nick_completion.py Changes: ===================================== test/no_gui/test_nick_completion.py ===================================== @@ -1,4 +1,5 @@ import unittest +from unittest.mock import MagicMock from gajim import gui gui.init('gtk') @@ -10,6 +11,8 @@ class Test(unittest.TestCase): def test_generate_suggestions(self): gen = GroupChatNickCompletion() + contact = MagicMock() + gen.switch_contact(contact) l = ['aaaa', 'fooo', 'xxxxz', 'xaaaz'] for n in l: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c4a773049fb7672ab484b956e35ccd2b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c4a773049fb7672ab484b956e35ccd2b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] Fix test, fix linter errors
by Daniel Brötzmann (＠wurstsalat) 12 Jul '22

12 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: 1cc7bd98 by wurstsalat at 2022-07-12T18:18:19+02:00 Fix test, fix linter errors - - - - - 3 changed files: - gajim/gtk/chat_stack.py - gajim/gtk/control_stack.py - test/no_gui/test_nick_completion.py Changes: ===================================== gajim/gtk/chat_stack.py ===================================== @@ -304,6 +304,7 @@ def _on_action(self, open_window('AddContact', account=account, jid=jid) elif action_name == 'clear-chat': + assert current_control is not None current_control.reset_view() elif action_name == 'show-contact-info': @@ -386,6 +387,7 @@ def _on_send_message(self) -> None: message = self._message_action_box.msg_textview.get_text() control = self._control_stack.get_current_control() + assert control is not None action = app.window.lookup_action('set-encryption') assert action is not None ===================================== gajim/gtk/control_stack.py ===================================== @@ -40,7 +40,7 @@ def __init__(self): self.show_all() self._controls: dict[tuple[str, JID], ControlT] = {} - self._current_control = None + self._current_control: Optional[ControlT] = None def get_control(self, account: str, jid: JID) -> Optional[ControlT]: try: @@ -48,7 +48,7 @@ def get_control(self, account: str, jid: JID) -> Optional[ControlT]: except KeyError: return None - def get_current_control(self) -> ControlT: + def get_current_control(self) -> Optional[ControlT]: return self._current_control def get_controls(self, account: Optional[str] ===================================== test/no_gui/test_nick_completion.py ===================================== @@ -1,5 +1,4 @@ import unittest -from unittest.mock import MagicMock from gajim import gui gui.init('gtk') @@ -10,8 +9,7 @@ class Test(unittest.TestCase): def test_generate_suggestions(self): - message_input = MagicMock() - gen = GroupChatNickCompletion(message_input) + gen = GroupChatNickCompletion() l = ['aaaa', 'fooo', 'xxxxz', 'xaaaz'] for n in l: @@ -45,7 +43,7 @@ def test_generate_suggestions(self): old_name = 'aaaa' new_name = 'bbbb' - for lst in (gen._attention_list, gen._sender_list): + for lst in (gen._highlight_list, gen._sender_list): for idx, contact in enumerate(lst): if contact == old_name: lst[idx] = new_name View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1cc7bd9839a877aa047d9ae2b61c4bc4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1cc7bd9839a877aa047d9ae2b61c4bc4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] ChatActionProcessor: Rename process_outgoing_message
by Daniel Brötzmann (＠wurstsalat) 12 Jul '22

12 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: febccf9f by wurstsalat at 2022-07-12T18:00:49+02:00 ChatActionProcessor: Rename process_outgoing_message - - - - - 3 changed files: - gajim/gtk/chat_action_processor.py - gajim/gtk/controls/groupchat.py - gajim/gtk/message_input.py Changes: ===================================== gajim/gtk/chat_action_processor.py ===================================== @@ -327,9 +327,6 @@ 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_name: str, - highlight: bool - ) -> None: + def process_message(self, contact_name: str, highlight: bool) -> None: if isinstance(self._contact, GroupchatContact): self._nick_completion.process_message(contact_name, highlight) ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -350,7 +350,7 @@ def add_message(self, text, self.contact.nickname, self._client.get_own_jid().bare) # TODO - # self.msg_textview.process_outgoing_message(contact, highlight) + # self.msg_textview.process_message(contact, highlight) BaseControl.add_message(self, text, ===================================== gajim/gtk/message_input.py ===================================== @@ -336,12 +336,8 @@ def undo(self, *args: Any) -> None: 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) + def process_message(self, contact_name: str, highlight: bool) -> None: + self._chat_action_processor.process_message(contact_name, highlight) def _on_populate_popup(self, _textview: MessageInputTextView, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/febccf9f8f813667a2062fc9b22eea4a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/febccf9f8f813667a2062fc9b22eea4a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] Settings: Move GroupChatSetting to correct type
by Daniel Brötzmann (＠wurstsalat) 12 Jul '22

12 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: c849307b by wurstsalat at 2022-07-12T17:47:10+02:00 Settings: Move GroupChatSetting to correct type - - - - - 1 changed file: - gajim/common/setting_values.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -383,13 +383,13 @@ class _ACCOUNT_DEFAULT: 'notify_on_all_messages', 'print_join_left', 'print_status', - 'send_chatstate', 'send_marker', ] StringGroupChatSettings = Literal[ 'encryption', 'speller_language', + 'send_chatstate', ] IntGroupChatSettings = Literal[ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c849307b3c944adb08c21b4001130e73… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c849307b3c944adb08c21b4001130e73… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] Add general start_file_transfer method to Interface
by Daniel Brötzmann (＠wurstsalat) 12 Jul '22

12 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: af97086e by wurstsalat at 2022-07-12T16:31:37+02:00 Add general start_file_transfer method to Interface - - - - - 4 changed files: - gajim/gtk/chat_stack.py - gajim/gtk/controls/base.py - gajim/gtk/message_actions_box.py - gajim/gui_interface.py Changes: ===================================== gajim/gtk/chat_stack.py ===================================== @@ -285,23 +285,14 @@ def _on_action(self, elif action_name.startswith('send-file'): name = action.get_name() if 'httpupload' in name: - app.interface.send_httpupload(current_control) + app.interface.start_file_transfer(contact, method='httpupload') return if 'jingle' in name: - app.interface.instances[ - 'file_transfers'].show_file_send_request(account, contact) + app.interface.start_file_transfer(contact, method='jingle') return - method = self._get_pref_ft_method(contact) - if method is None: - return - - if method == 'httpupload': - app.interface.send_httpupload(current_control) - else: - app.interface.instances[ - 'file_transfers'].show_file_send_request(account, contact) + app.interface.start_file_transfer(contact) elif action_name == 'invite-contacts': open_window('AdhocMUC', account=account, contact=contact) @@ -449,27 +440,6 @@ def _on_send_message(self) -> None: self._message_action_box.msg_textview.clear() - def _get_pref_ft_method(self, contact: ChatContactT) -> Optional[str]: - ft_pref = app.settings.get_account_setting(contact.account, - 'filetransfer_preference') - httpupload = app.window.get_action_enabled('send-file-httpupload') - jingle = app.window.get_action_enabled('send-file-jingle') - - if isinstance(contact, GroupchatContact): - if httpupload: - return 'httpupload' - return None - - if httpupload and jingle: - return ft_pref - - if httpupload: - return 'httpupload' - - if jingle: - return 'jingle' - return None - def clear(self) -> None: self.set_visible_child_name('empty') self._control_stack.clear() ===================================== gajim/gtk/controls/base.py ===================================== @@ -34,12 +34,10 @@ import sys import time import uuid -from functools import partial from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GLib -from gi.repository import Gio from nbxmpp import JID from nbxmpp.modules.security_labels import Displaymarking @@ -62,7 +60,6 @@ from gajim.gui.conversation.view import ConversationView from gajim.gui.conversation.scrolled import ScrolledView from gajim.gui.conversation.jump_to_end_button import JumpToEndButton -from gajim.gui.file_transfer_send import SendFileDialog from gajim.gui.util import get_hardware_key_codes from gajim.gui.builder import get_builder from gajim.gui.util import set_urgency_hint @@ -374,67 +371,6 @@ def shutdown(self) -> None: def _on_scroll_to_end(self, _view: ConversationView) -> None: scroll_to_end(self._scrolled_view) - def _get_pref_ft_method(self) -> Optional[str]: - ft_pref = app.settings.get_account_setting(self.account, - 'filetransfer_preference') - httpupload = app.window.lookup_action( - f'send-file-httpupload-{self.control_id}') - jingle = app.window.lookup_action( - f'send-file-jingle-{self.control_id}') - - if self.is_groupchat: - if httpupload.get_enabled(): - return 'httpupload' - return None - - if httpupload.get_enabled() and jingle.get_enabled(): - return ft_pref - - if httpupload.get_enabled(): - return 'httpupload' - - if jingle.get_enabled(): - return 'jingle' - return None - - def _start_filetransfer(self, path: str) -> None: - method = self._get_pref_ft_method() - if method is None: - return - - if method == 'httpupload': - app.interface.send_httpupload(self, path) - else: - send_callback = partial( - app.interface.instances['file_transfers'].send_file, - self.account, - self.contact) - SendFileDialog(self.contact, send_callback, app.window, [path]) - - def _on_send_file(self, - action: Gio.SimpleAction, - _param: Optional[GLib.Variant] - ) -> None: - name = action.get_name() - if 'httpupload' in name: - app.interface.send_httpupload(self) - return - - if 'jingle' in name: - app.interface.instances['file_transfers'].show_file_send_request( - self.account, self.contact) - return - - method = self._get_pref_ft_method() - if method is None: - return - - if method == 'httpupload': - app.interface.send_httpupload(self) - else: - app.interface.instances['file_transfers'].show_file_send_request( - self.account, self.contact) - def _on_autoscroll_changed(self, _widget: ScrolledView, autoscroll: bool @@ -494,7 +430,7 @@ def drag_data_file_transfer(self, selection: Gtk.SelectionData) -> None: 'not uploaded: %s') % path) continue - self._start_filetransfer(path) + app.interface.start_file_transfer(self.contact, path) def get_our_nick(self) -> str: return app.nicks[self.account] ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -578,23 +578,25 @@ def _on_paste_clipboard(self, clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) image = clipboard.wait_for_image() - if image is not None: - if not app.settings.get('confirm_paste_image'): - self._paste_event_confirmed(True, image) - return + if image is None: + return - PastePreviewDialog( - _('Paste Image'), - _('You are trying to paste an image'), - _('Are you sure you want to paste your ' - 'clipboard\'s image into the chat window?'), - _('_Do not ask me again'), - image, - [DialogButton.make('Cancel'), - DialogButton.make('Accept', - text=_('_Paste'), - callback=self._paste_event_confirmed, - args=[image])]).show() + if not app.settings.get('confirm_paste_image'): + self._paste_event_confirmed(True, image) + return + + PastePreviewDialog( + _('Paste Image'), + _('You are trying to paste an image'), + _('Are you sure you want to paste your ' + 'clipboard\'s image into the chat window?'), + _('_Do not ask me again'), + image, + [DialogButton.make('Cancel'), + DialogButton.make('Accept', + text=_('_Paste'), + callback=self._paste_event_confirmed, + args=[image])]).show() def _paste_event_confirmed(self, is_checked: bool, @@ -606,9 +608,10 @@ def _paste_event_confirmed(self, dir_ = tempfile.gettempdir() path = os.path.join(dir_, f'{uuid.uuid4()}.png') if image is None: - self.add_info_message(_('Error: Could not process image')) + log.error('Could not process pasted image') return image.savev(path, 'png', [], []) - self._start_filetransfer(path) + assert self._contact is not None + app.interface.start_file_transfer(self._contact, path) ===================================== gajim/gui_interface.py ===================================== @@ -67,16 +67,20 @@ from gajim.common.events import FileHashError from gajim.common.events import FileProgress from gajim.common.events import FileError +from gajim.common.modules.contacts import BareContact +from gajim.common.modules.contacts import GroupchatContact from gajim.common.structs import OutgoingMessage from gajim.common.i18n import _ from gajim.common.client import Client from gajim.common.const import FTState from gajim.common.file_props import FileProp +from gajim.common.types import ChatContactT from gajim.common.modules.httpupload import HTTPFileTransfer from gajim.gui.dialogs import ErrorDialog from gajim.gui.filechoosers import FileChooserDialog +from gajim.gui.file_transfer_send import SendFileDialog from gajim.gui.filetransfer import FileTransfersWindow from gajim.gui.menus import build_accounts_menu from gajim.gui.util import get_app_window @@ -368,6 +372,60 @@ def _on_cancel_upload(self, client = app.get_client(transfer.account) client.get_module('HTTPUpload').cancel_transfer(transfer) + def _get_pref_ft_method(self, contact: ChatContactT) -> Optional[str]: + ft_pref = app.settings.get_account_setting(contact.account, + 'filetransfer_preference') + httpupload = app.window.get_action_enabled('send-file-httpupload') + jingle = app.window.get_action_enabled('send-file-jingle') + + if isinstance(contact, GroupchatContact): + if httpupload: + return 'httpupload' + return None + + if httpupload and jingle: + return ft_pref + + if httpupload: + return 'httpupload' + + if jingle: + return 'jingle' + return None + + def start_file_transfer(self, + contact: ChatContactT, + path: Optional[str] = None, + method: Optional[str] = None + ) -> None: + if method is None: + method = self._get_pref_ft_method(contact) + if method is None: + return + + current_control = app.window.get_active_control() + if current_control is None: + return + + if path is None: + if method == 'httpupload': + self.send_httpupload(current_control) + return + if method == 'jingle': + self.instances['file_transfers'].show_file_send_request( + contact.account, contact) + return + + if method == 'httpupload': + self.send_httpupload(current_control, path) + else: + assert isinstance(contact, BareContact) + send_callback = partial( + self.instances['file_transfers'].send_file, + contact.account, + contact) + SendFileDialog(contact, send_callback, app.window, [path]) + @staticmethod def create_groupchat(account: str, room_jid: str, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/af97086ec67236e3e3015a37f65f5791… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/af97086ec67236e3e3015a37f65f5791… 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