Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][mainwindow] Contacts: Improve supports()
by Philipp Hörist (＠lovetox) 29 Aug '21

29 Aug '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 0f6f37be by lovetox at 2021-08-29T21:27:52+02:00 Contacts: Improve supports() - - - - - 1 changed file: - gajim/common/modules/contacts.py Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -134,10 +134,11 @@ def _on_signal(self, _contact, signal_name, *args, **kwargs): self.notify(signal_name, *args, **kwargs) def supports(self, requested_feature): - if not self.is_available: - return False + return self._supports(self._jid, requested_feature) - disco_info = app.storage.cache.get_last_disco_info(self._jid) + @staticmethod + def _supports(jid, requested_feature): + disco_info = app.storage.cache.get_last_disco_info(jid) if disco_info is None: return False @@ -167,6 +168,12 @@ def __init__(self, logger, jid, account): self._avatar_sha = app.storage.cache.get_contact(jid, 'avatar') + def supports(self, requested_feature): + for resource in self.iter_resources(): + if resource.supports(requested_feature): + return True + return False + def add_resource(self, resource): jid = self._jid.new_with(resource=resource) contact = ResourceContact(self._log, jid, self._account) @@ -185,13 +192,13 @@ def get_resource(self, resource): def get_resources(self): resources = [] for contact in self._resources.values(): - if contact.show != PresenceShowExt.OFFLINE: + if contact.is_available: resources.append(contact) return resources def iter_resources(self): for contact in self._resources.values(): - if contact.show != PresenceShowExt.OFFLINE: + if contact.is_available: yield contact @property @@ -306,6 +313,11 @@ def __init__(self, logger, jid, account): self._presence = UNKNOWN_PRESENCE + def supports(self, requested_feature): + if not self.is_available: + return False + return CommonContact.supports(self, requested_feature) + @property def is_available(self): return self._presence.available @@ -457,6 +469,11 @@ def __init__(self, logger, jid, account): self._presence = UNKNOWN_MUC_PRESENCE + def supports(self, requested_feature): + if not self.is_available: + return False + return CommonContact.supports(self, requested_feature) + @property def is_pm_contact(self): return True View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0f6f37be8964d5c6c4ed6a9f77958f1a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0f6f37be8964d5c6c4ed6a9f77958f1a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 4 commits: PrivateChatControl: Linting
by Daniel Brötzmann (＠wurstsalat) 29 Aug '21

29 Aug '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 9faa5606 by wurstsalat at 2021-08-29T17:37:23+02:00 PrivateChatControl: Linting - - - - - cdd51278 by wurstsalat at 2021-08-29T17:51:00+02:00 GroupChatControl: Remove focus_line_out, linting - - - - - 625d1a7e by wurstsalat at 2021-08-29T18:55:09+02:00 ChatControl: Remove roster reference, linting - - - - - c2043a6e by wurstsalat at 2021-08-29T19:04:22+02:00 BaseControl: Fix PM jingle file transfer warning, linting - - - - - 4 changed files: - gajim/gtk/controls/base.py - gajim/gtk/controls/chat.py - gajim/gtk/controls/groupchat.py - gajim/gtk/controls/private.py Changes: ===================================== gajim/gtk/controls/base.py ===================================== @@ -256,7 +256,6 @@ def __init__(self, widget_name, account, jid): # instance object (also subclasses, eg. ChatControl or GroupchatControl) app.plugin_manager.gui_extension_point('chat_control_base', self) - # pylint: disable=line-too-long self.register_events([ ('ping-sent', ged.GUI1, self._nec_ping), ('ping-reply', ged.GUI1, self._nec_ping), @@ -264,7 +263,6 @@ def __init__(self, widget_name, account, jid): ('sec-catalog-received', ged.GUI1, self._sec_labels_received), ('style-changed', ged.GUI1, self._style_changed), ]) - # pylint: enable=line-too-long # This is basically a very nasty hack to surpass the inability # to properly use the super, because of the old code. @@ -363,7 +361,7 @@ def safe_shutdown(self): return True def allow_shutdown(self, method, on_response_yes, on_response_no, - on_response_minimize): + on_response_minimize): """ Called to check is a control is allowed to shutdown. If a control is not in a suitable shutdown state this method @@ -427,10 +425,6 @@ def get_tab_label(self, chatstate): # Return a markup'd label and optional Gtk.Color in a tuple like: # return (label_str, None) - def get_tab_image(self): - # Return a suitable tab image for display. - return None - def prepare_context_menu(self, hide_buttonbar_items=False): """ Derived classes SHOULD implement this @@ -627,7 +621,8 @@ def set_encryption_menu_icon(self): Gtk.IconSize.MENU) def set_speller(self): - if not app.is_installed('GSPELL') or not app.settings.get('use_speller'): + if (not app.is_installed('GSPELL') or + not app.settings.get('use_speller')): return gspell_lang = self.get_speller_language() @@ -751,6 +746,7 @@ def _on_banner_eventbox_button_press_event(self, _widget, event): If right-clicked, show popup """ if event.button == 3: # right click + # TODO: self.parent_win.popup_menu(event) def _on_message_textview_paste_event(self, _texview): @@ -822,9 +818,10 @@ def _on_message_textview_key_press_event(self, textview, event): if event.keyval == Gdk.KEY_space: self.space_pressed = True - elif (self.space_pressed or self.msg_textview.undo_pressed) and \ - event.keyval not in (Gdk.KEY_Control_L, Gdk.KEY_Control_R) and \ - not (event.keyval == Gdk.KEY_z and event.get_state() & Gdk.ModifierType.CONTROL_MASK): + elif ((self.space_pressed or self.msg_textview.undo_pressed) and + event.keyval not in (Gdk.KEY_Control_L, Gdk.KEY_Control_R) and + not (event.keyval == Gdk.KEY_z and + event.get_state() & Gdk.ModifierType.CONTROL_MASK)): # If the space key has been pressed and now it hasn't, # we save the buffer into the undo list. But be careful we're not # pressing Control again (as in ctrl+z) @@ -841,8 +838,9 @@ def _on_message_textview_key_press_event(self, textview, event): self.last_key_tabs = False if event.get_state() & Gdk.ModifierType.SHIFT_MASK: - if event.get_state() & Gdk.ModifierType.CONTROL_MASK and \ - event.keyval == Gdk.KEY_ISO_Left_Tab: + if (event.get_state() & Gdk.ModifierType.CONTROL_MASK and + event.keyval == Gdk.KEY_ISO_Left_Tab): + # TODO: self.parent_win.move_to_next_unread_tab(False) return True @@ -852,6 +850,7 @@ def _on_message_textview_key_press_event(self, textview, event): if event.get_state() & Gdk.ModifierType.CONTROL_MASK: if event.keyval == Gdk.KEY_Tab: + # TODO self.parent_win.move_to_next_unread_tab(True) return True @@ -886,8 +885,8 @@ def _on_message_textview_key_press_event(self, textview, event): if self.command_hits: message_buffer.delete(start, end) - message_buffer.insert_at_cursor(self.COMMAND_PREFIX + \ - self.command_hits[0] + ' ') + message_buffer.insert_at_cursor( + self.COMMAND_PREFIX + self.command_hits[0] + ' ') self.last_key_tabs = True return True if not self._type.is_groupchat: @@ -930,7 +929,7 @@ def _on_message_textview_key_press_event(self, textview, event): self._on_send_message() return True - elif event.keyval == Gdk.KEY_z: # CTRL+z + elif event.keyval == Gdk.KEY_z: # CTRL+z if event_state & Gdk.ModifierType.CONTROL_MASK: self.msg_textview.undo() return True @@ -962,8 +961,8 @@ def _on_jump_to_end(self, _button): self.scroll_to_end(force=True) self._jump_to_end_button.reset_unread_count() - def _on_drag_data_received(self, widget, context, x, y, selection, - target_type, timestamp): + def _on_drag_data_received(self, widget, context, x_coord, y_coord, + selection, target_type, timestamp): """ Derived types SHOULD implement this """ @@ -1053,13 +1052,13 @@ def send_message(self, # Clear msg input message_buffer = self.msg_textview.get_buffer() - message_buffer.set_text('') # clear message buffer (and tv of course) + message_buffer.set_text('') # clear message buffer (and tv of course) def _on_window_motion_notify(self, *args): """ It gets called no matter if it is the active window or not """ - # TODO + # TODO: return if self.parent_win.get_active_jid() == self.contact.jid: # if window is the active one, set last interaction @@ -1069,7 +1068,7 @@ def _on_window_motion_notify(self, *args): def _on_message_tv_buffer_changed(self, textbuffer): has_text = self.msg_textview.has_text() app.window.lookup_action( - 'send-message-' + self.control_id).set_enabled(has_text) + f'send-message-{self.control_id}').set_enabled(has_text) if textbuffer.get_char_count() and self.encryption: app.plugin_manager.extension_point( @@ -1303,7 +1302,8 @@ def on_color_menuitem_activate(self, _widget): def on_font_menuitem_activate(self, _widget): font_dialog = Gtk.FontChooserDialog(None, app.window) start, finish = self.msg_textview.get_active_iters() - font_dialog.connect('response', self.msg_textview.font_set, start, finish) + font_dialog.connect( + 'response', self.msg_textview.font_set, start, finish) font_dialog.show_all() def on_formatting_menuitem_activate(self, widget): @@ -1344,45 +1344,34 @@ def _on_send_file(self, action, _param): else: self._on_send_file_jingle() - def _on_send_file_jingle(self, gc_contact=None): - """ - gc_contact can be set when we are in a groupchat control - """ - def _on_ok(_contact): + def _on_send_file_jingle(self): + def _on_send(): app.interface.instances['file_transfers'].show_file_send_request( - self.account, _contact) - - if self._type.is_privatechat: - gc_contact = self.gc_contact - - if not gc_contact: - _on_ok(self.contact) - return - - # gc or pm - gc_control = app.interface.msg_win_mgr.get_gc_control( - gc_contact.room_jid, self.account) - self_contact = app.contacts.get_gc_contact(self.account, - gc_control.room_jid, - gc_control.nick) - if (gc_control.is_anonymous and - gc_contact.affiliation.value not in ['admin', 'owner'] and - self_contact.affiliation.value in ['admin', 'owner']): - contact = app.contacts.get_contact(self.account, gc_contact.jid) - if not contact or contact.sub not in ('both', 'to'): + self.account, self.contact) + if self.is_privatechat: + gc_control = app.window.get_control( + self.account, self._room_contact.jid) + self_contact = self._room_contact.get_self() + + if (gc_control.is_anonymous and + self.contact.affiliation.value not + in ['admin', 'owner'] and + self_contact.affiliation.value in ['admin', 'owner']): + # Show a warning if we're trying to send a file to a PM contact + # which is not Admin/Owner, and thus cannot normally see our JID ConfirmationDialog( _('Privacy'), _('Warning'), _('If you send a file to <b>%s</b>, your real XMPP ' - 'address will be revealed.') % gc_contact.name, + 'address will be revealed.') % self.contact.name, [DialogButton.make('Cancel'), DialogButton.make( 'OK', - text=_('_Continue'), - callback=lambda: _on_ok(gc_contact))]).show() + text=_('_Send Anyway'), + callback=_on_send)]).show() return - _on_ok(gc_contact) + _on_send() def set_control_active(self, state): if state: @@ -1538,9 +1527,10 @@ def scroll_messages(self, direction, msg_buf, msg_type): start_iter = msg_buf.get_start_iter() end_iter = msg_buf.get_end_iter() self.orig_msg = msg_buf.get_text(start_iter, end_iter, False) - if pos == size and size > 0 and direction == 'up' and \ - msg_type == 'sent' and not self.correcting and (not \ - history[pos - 1].startswith('/') or history[pos - 1].startswith('/me')): + if (pos == size and size > 0 and direction == 'up' and + msg_type == 'sent' and not self.correcting and ( + not history[pos - 1].startswith('/') or + history[pos - 1].startswith('/me'))): self.correcting = True gtkgui_helpers.add_css_class( self.msg_textview, 'gajim-msg-correcting') ===================================== gajim/gtk/controls/chat.py ===================================== @@ -52,7 +52,8 @@ from gajim import gtkgui_helpers from gajim import gui_menu_builder -from gajim import dialogs + +from gajim.dialogs import TransformChatToMUC from gajim.gui.call_widget import CallWidget from gajim.gui.dialogs import DialogButton @@ -78,7 +79,7 @@ class ChatControl(BaseControl): A control for standard 1-1 chat """ _type = ControlType.CHAT - old_msg_kind = None # last kind of the printed message + old_msg_kind = None # last kind of the printed message # Set a command host to bound to. Every command given through a chat will be # processed with this command host. @@ -86,9 +87,9 @@ class ChatControl(BaseControl): def __init__(self, account, jid): BaseControl.__init__(self, - 'chat_control', - account, - jid) + 'chat_control', + account, + jid) self.last_recv_message_id = None self.last_recv_message_marks = None @@ -300,11 +301,6 @@ def delegate_action(self, action): return Gdk.EVENT_STOP if action == 'send-file': - if app.interface.msg_win_mgr.mode == \ - app.interface.msg_win_mgr.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER: - app.interface.roster.tree.grab_focus() - return Gdk.EVENT_PROPAGATE - self._get_action('send-file-').activate() return Gdk.EVENT_STOP @@ -324,7 +320,7 @@ def _on_invite_contacts(self, _action, _param): """ User wants to invite some friends to chat """ - dialogs.TransformChatToMUC(self.account, [self.contact.jid]) + TransformChatToMUC(self.account, [self.contact.jid]) def _on_send_chatstate(self, action, param): action.set_state(param) @@ -613,11 +609,11 @@ def send_message(self, return BaseControl.send_message(self, - message, - type_='chat', - xhtml=xhtml, - process_commands=process_commands, - attention=attention) + message, + type_='chat', + xhtml=xhtml, + process_commands=process_commands, + attention=attention) def get_our_nick(self): return app.nicks[self.account] @@ -642,15 +638,15 @@ def add_message(self, name = self.get_our_nick() BaseControl.add_message(self, - text, - kind, - name, - tim, - displaymarking=displaymarking, - msg_log_id=msg_log_id, - message_id=message_id, - correct_id=correct_id, - additional_data=additional_data) + text, + kind, + name, + tim, + displaymarking=displaymarking, + msg_log_id=msg_log_id, + message_id=message_id, + correct_id=correct_id, + additional_data=additional_data) def prepare_context_menu(self, hide_buttonbar_items=False): """ @@ -686,7 +682,7 @@ def shutdown(self): super(ChatControl, self).shutdown() app.check_finalize(self) - def allow_shutdown(self, method, on_yes, on_no, _on_minimize): + def allow_shutdown(self, _method, on_yes, on_no, _on_minimize): time_ = app.last_message_time[self.account][self.contact.jid] # 2 seconds if time.time() - time_ < 2: @@ -723,8 +719,8 @@ def _update_avatar(self): surface = self.contact.get_avatar(AvatarSize.CHAT, scale) self.xml.avatar_image.set_from_surface(surface) - def _on_drag_data_received(self, widget, context, x, y, selection, - target_type, timestamp): + def _on_drag_data_received(self, _widget, _context, _x_coord, _y_coord, + selection, target_type, _timestamp): if not selection.get_data(): return @@ -749,17 +745,15 @@ def _on_drag_data_received(self, widget, context, x, y, selection, dropped_transport = app.get_transport_name_from_jid(dropped_jid) c_transport = app.get_transport_name_from_jid(self.contact.jid) if dropped_transport or c_transport: - return # transport contacts cannot be invited + return # transport contacts cannot be invited - dialogs.TransformChatToMUC(self.account, - [self.contact.jid], - [dropped_jid]) + TransformChatToMUC(self.account, [self.contact.jid], [dropped_jid]) def _on_convert_to_gc_menuitem_activate(self, _widget): """ User wants to invite some friends to chat """ - dialogs.TransformChatToMUC(self.account, [self.contact.jid]) + TransformChatToMUC(self.account, [self.contact.jid]) def _on_client_state_changed(self, _client, _signal_name, state): self.msg_textview.set_sensitive(state.is_connected) ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -710,8 +710,6 @@ def add_message(self, self._nick_completion.record_message(contact, highlight) - # self.check_focus_out_line() - BaseControl.add_message(self, text, kind, @@ -723,18 +721,6 @@ def add_message(self, stanza_id=stanza_id, additional_data=additional_data) - def check_focus_out_line(self): - """ - Check and possibly add focus out line for room_jid if it needs it and - does not already have it as last event. If it goes to add this line - - remove previous line first - """ - - if app.window.is_chat_active(self.account, self.room_jid): - return - - # self.conv_textview.show_focus_out_line() - def _on_room_subject(self, _contact, _signal_name, properties): if self.subject == properties.subject: # Probably a rejoin, we already showed that subject @@ -881,7 +867,8 @@ def _on_room_config_failed(self, _contact, _signal_name, error): self.xml.error_label.set_text(to_user_string(error)) self._show_page('error') - def _on_user_nickname_changed(self, _contact, _signal_name, user_contact, properties): + def _on_user_nickname_changed(self, _contact, _signal_name, user_contact, + properties): nick = user_contact.name new_nick = properties.muc_user.nick if properties.is_muc_self_presence: @@ -922,7 +909,7 @@ def _on_user_affiliation_changed(self, reason = '' if reason is None else ': {reason}'.format(reason=reason) actor = properties.muc_user.actor - #Group Chat: You have been kicked by Alice + # Group Chat: You have been kicked by Alice actor = '' if actor is None else _(' by {actor}').format(actor=actor) if properties.is_muc_self_presence: @@ -953,7 +940,7 @@ def _on_user_role_changed(self, reason = '' if reason is None else ': {reason}'.format(reason=reason) actor = properties.muc_user.actor - #Group Chat: You have been kicked by Alice + # Group Chat: You have been kicked by Alice actor = '' if actor is None else _(' by {actor}').format(actor=actor) if properties.is_muc_self_presence: @@ -978,47 +965,47 @@ def _on_room_kicked(self, _contact, _signal_name, properties): reason = '' if reason is None else ': {reason}'.format(reason=reason) actor = properties.muc_user.actor - #Group Chat: You have been kicked by Alice + # Group Chat: You have been kicked by Alice actor = '' if actor is None else _(' by {actor}').format(actor=actor) - #Group Chat: We have been removed from the room by Alice: reason + # Group Chat: We have been removed from the room by Alice: reason message = _('You have been removed from the group chat{actor}{reason}') if StatusCode.REMOVED_ERROR in status_codes: # Handle 333 before 307, some MUCs add both - #Group Chat: Server kicked us because of an server error + # Group Chat: Server kicked us because of an server error message = _('You have left due ' 'to an error{reason}').format(reason=reason) self.add_info_message(message) elif StatusCode.REMOVED_KICKED in status_codes: - #Group Chat: We have been kicked by Alice: reason + # Group Chat: We have been kicked by Alice: reason message = _('You have been ' 'kicked{actor}{reason}').format(actor=actor, reason=reason) self.add_info_message(message) elif StatusCode.REMOVED_BANNED in status_codes: - #Group Chat: We have been banned by Alice: reason + # Group Chat: We have been banned by Alice: reason message = _('You have been ' 'banned{actor}{reason}').format(actor=actor, reason=reason) self.add_info_message(message) elif StatusCode.REMOVED_AFFILIATION_CHANGE in status_codes: - #Group Chat: We were removed because of an affiliation change + # Group Chat: We were removed because of an affiliation change reason = _(': Affiliation changed') message = message.format(actor=actor, reason=reason) self.add_info_message(message) elif StatusCode.REMOVED_NONMEMBER_IN_MEMBERS_ONLY in status_codes: - #Group Chat: Room configuration changed + # Group Chat: Room configuration changed reason = _(': Group chat configuration changed to members-only') message = message.format(actor=actor, reason=reason) self.add_info_message(message) elif StatusCode.REMOVED_SERVICE_SHUTDOWN in status_codes: - #Group Chat: Kicked because of server shutdown + # Group Chat: Kicked because of server shutdown reason = ': System shutdown' message = message.format(actor=actor, reason=reason) self.add_info_message(message) @@ -1031,10 +1018,10 @@ def _on_user_left(self, _contact, _signal_name, user_contact, properties): reason = '' if reason is None else ': {reason}'.format(reason=reason) actor = properties.muc_user.actor - #Group Chat: You have been kicked by Alice + # Group Chat: You have been kicked by Alice actor = '' if actor is None else _(' by {actor}').format(actor=actor) - #Group Chat: We have been removed from the room + # Group Chat: We have been removed from the room message = _('{nick} has been removed from the group chat{by}{reason}') if StatusCode.REMOVED_ERROR in status_codes: @@ -1043,7 +1030,7 @@ def _on_user_left(self, _contact, _signal_name, user_contact, properties): nick, properties.muc_user.reason, error=True) elif StatusCode.REMOVED_KICKED in status_codes: - #Group Chat: User was kicked by Alice: reason + # Group Chat: User was kicked by Alice: reason message = _('{nick} has been ' 'kicked{actor}{reason}').format(nick=nick, actor=actor, @@ -1051,7 +1038,7 @@ def _on_user_left(self, _contact, _signal_name, user_contact, properties): self.add_info_message(message) elif StatusCode.REMOVED_BANNED in status_codes: - #Group Chat: User was banned by Alice: reason + # Group Chat: User was banned by Alice: reason message = _('{nick} has been ' 'banned{actor}{reason}').format(nick=nick, actor=actor, @@ -1197,7 +1184,7 @@ def safe_shutdown(self): return False return True - def allow_shutdown(self, method, on_yes, on_no): + def allow_shutdown(self, _method, on_yes, on_no): # whether to ask for confirmation before closing muc if app.settings.get('confirm_close_muc') and self.contact.is_joined: def on_ok(is_checked): @@ -1237,8 +1224,8 @@ def set_control_active(self, state): self.attention_flag = False BaseControl.set_control_active(self, state) - def _on_drag_data_received(self, widget, context, x, y, selection, - target_type, timestamp): + def _on_drag_data_received(self, _widget, _context, _x_coord, _y_coord, + selection, target_type, _timestamp): if not selection.get_data(): return @@ -1269,7 +1256,7 @@ def _on_message_textview_key_press_event(self, widget, event): if res: return True - if event.keyval == Gdk.KEY_Tab: # TAB + if event.keyval == Gdk.KEY_Tab: # TAB message_buffer = widget.get_buffer() start_iter, end_iter = message_buffer.get_bounds() cursor_position = message_buffer.get_insert() @@ -1281,13 +1268,13 @@ def _on_message_textview_key_press_event(self, widget, event): # nick completion # check if tab is pressed with empty message if splitted_text: # if there are any words - begin = splitted_text[-1] # last word we typed + begin = splitted_text[-1] # last word we typed else: begin = '' gc_refer_to_nick_char = app.settings.get('gc_refer_to_nick_char') with_refer_to_nick_char = False - after_nick_len = 1 # the space that is printed after we type [Tab] + after_nick_len = 1 # the space that is printed after we type [Tab] # first part of this if : works fine even if refer_to_nick_char if (gc_refer_to_nick_char and @@ -1331,8 +1318,8 @@ def _on_message_textview_key_press_event(self, widget, event): not app.settings.get('shell_like_completion')): # have to accommodate for the added space from last # completion - start_iter.backward_chars(len(begin) + \ - len(gc_refer_to_nick_char)) + start_iter.backward_chars( + len(begin) + len(gc_refer_to_nick_char)) else: start_iter.backward_chars(len(begin)) @@ -1343,13 +1330,13 @@ def _on_message_textview_key_press_event(self, widget, event): # get a shell-like completion # if there's more than one nick for this completion, complete # only the part that all these nicks have in common - if app.settings.get('shell_like_completion') and \ - len(self.nick_hits) > 1: + if (app.settings.get('shell_like_completion') and + len(self.nick_hits) > 1): end = False completion = '' - add = "" # if nick is not complete, don't add anything + add = "" # if nick is not complete, don't add anything while not end and len(completion) < len(self.nick_hits[0]): - completion = self.nick_hits[0][:len(completion)+1] + completion = self.nick_hits[0][:len(completion) + 1] for nick in self.nick_hits: if completion.lower() not in nick.lower(): end = True @@ -1441,7 +1428,7 @@ def append_nick_in_msg_textview(self, _widget, nick): end_iter = message_buffer.get_iter_at_mark(cursor_position) text = message_buffer.get_text(start_iter, end_iter, False) start = '' - if text: # Cursor is not at first position + if text: # Cursor is not at first position if not text[-1] in (' ', '\n', '\t'): start = ' ' add = ' ' ===================================== gajim/gtk/controls/private.py ===================================== @@ -151,10 +151,10 @@ def send_message(self, message, xhtml=None, process_commands=True, if not self.contact.is_available: ErrorDialog( _('Sending private message failed'), - #in second %s code replaces with nickname - _('You are no longer in group chat "%(room)s" or ' - '"%(nick)s" has left.') % { - 'room': self.room_name, 'nick': self.contact.name}) + _('You are no longer joined "%(room)s" or ' + '"%(nick)s" has left the chat.') % { + 'room': self.room_name, + 'nick': self.contact.name}) return ChatControl.send_message(self, message, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/935a7ae229206cd45c67f486a3d12fb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/935a7ae229206cd45c67f486a3d12fb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] ManageSounds: Remove unused sound events
by Daniel Brötzmann (＠wurstsalat) 29 Aug '21

29 Aug '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 935a7ae2 by wurstsalat at 2021-08-29T17:14:31+02:00 ManageSounds: Remove unused sound events - - - - - 2 changed files: - gajim/common/setting_values.py - gajim/gtk/manage_sounds.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -344,14 +344,6 @@ class _ACCOUNT_DEFAULT: 'enabled': True, 'path': 'message1.wav' }, - 'next_message_received_focused': { - 'enabled': True, - 'path': 'message2.wav' - }, - 'next_message_received_unfocused': { - 'enabled': True, - 'path': 'message2.wav' - }, 'contact_connected': { 'enabled': False, 'path': 'connected.wav' ===================================== gajim/gtk/manage_sounds.py ===================================== @@ -83,9 +83,7 @@ def _fill_sound_treeview(self): # pylint: disable=line-too-long sounds_dict = { 'attention_received': _('Attention Message Received'), - 'first_message_received': _('First Message Received'), - 'next_message_received_focused': _('Next Message Received Focused'), - 'next_message_received_unfocused': _('Next Message Received Unfocused'), + 'first_message_received': _('Message Received'), 'contact_connected': _('Contact Connected'), 'contact_disconnected': _('Contact Disconnected'), 'message_sent': _('Message Sent'), View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/935a7ae229206cd45c67f486a3d12fb2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/935a7ae229206cd45c67f486a3d12fb2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] RosterItemExchange: FIrst fixes
by Daniel Brötzmann (＠wurstsalat) 29 Aug '21

29 Aug '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: deac35f7 by wurstsalat at 2021-08-29T16:32:14+02:00 RosterItemExchange: FIrst fixes - - - - - 4 changed files: - gajim/data/gui/roster_item_exchange_window.ui → gajim/data/gui/roster_item_exchange.ui - gajim/gtk/const.py - gajim/gtk/roster_item_exchange.py - gajim/gui_interface.py Changes: ===================================== gajim/data/gui/roster_item_exchange_window.ui → gajim/data/gui/roster_item_exchange.ui ===================================== ===================================== gajim/gtk/const.py ===================================== @@ -134,4 +134,5 @@ def __str__(self): 'GroupChatInvitation': 'gajim.gui.groupchat_invitation', 'ContactInfo': 'gajim.gui.contact_info', 'WorkspaceDialog': 'gajim.gui.workspace_dialog', + 'RosterItemExchange': 'gajim.gui.roster_item_exchange', } ===================================== gajim/gtk/roster_item_exchange.py ===================================== @@ -22,7 +22,7 @@ from .util import get_builder -class RosterItemExchangeWindow(Gtk.ApplicationWindow): +class RosterItemExchange(Gtk.ApplicationWindow): """ Used when someone sends a Roster Item Exchange suggestion (XEP-0144) """ @@ -33,33 +33,42 @@ def __init__(self, account, action, exchange_list, jid_from, self.set_position(Gtk.WindowPosition.CENTER) self.set_show_menubar(False) self.set_title(_('Contact List Exchange')) - self.set_name('RosterItemExchangeWindow') self.account = account - self.action = action - self.exchange_list = exchange_list - self.message_body = message_body - self.jid_from = jid_from + self._client = app.get_client(account) - self._ui = get_builder('roster_item_exchange_window.ui') + self._action = action + self._exchange_list = exchange_list + self._jid_from = jid_from + + self._ui = get_builder('roster_item_exchange.ui') self.add(self._ui.roster_item_exchange) # Set label depending on action + contact = self._client.get_module('Contacts').get_contact(jid_from) if action == 'add': - type_label = _('<b>%s</b> would like to add some ' - 'contacts to your contact list.') % self.jid_from + type_label = _('%(name)s (%(jid)s) would like to add some ' + 'contacts to your contact list.') % { + 'name': contact.name, + 'jid': self._jid_from} elif action == 'modify': - type_label = _('<b>%s</b> would like to modify some ' - 'contacts in your contact list.') % self.jid_from + type_label = _('%(name)s (%(jid)s) would like to modify some ' + 'contacts in your contact list.') % { + 'name': contact.name, + 'jid': self._jid_from} elif action == 'delete': - type_label = _('<b>%s</b> would like to delete some ' - 'contacts from your contact list.') % self.jid_from - self._ui.type_label.set_markup(type_label) + type_label = _('%(name)s (%(jid)s) would like to delete some ' + 'contacts from your contact list.') % { + 'name': contact.name, + 'jid': self._jid_from} + self._ui.type_label.set_text(type_label) + if message_body: buffer_ = self._ui.body_textview.get_buffer() - buffer_.set_text(self.message_body) + buffer_.set_text(message_body) else: self._ui.body_scrolledwindow.hide() + # Treeview model = Gtk.ListStore(bool, str, str, str, str) self._ui.items_list_treeview.set_model(model) @@ -67,11 +76,11 @@ def __init__(self, account, action, exchange_list, jid_from, renderer1 = Gtk.CellRendererToggle() renderer1.set_property('activatable', True) renderer1.connect('toggled', self._toggled) - if self.action == 'add': + if self._action == 'add': title = _('Add') - elif self.action == 'modify': + elif self._action == 'modify': title = _('Modify') - elif self.action == 'delete': + elif self._action == 'delete': title = _('Delete') self._ui.items_list_treeview.insert_column_with_attributes( -1, title, renderer1, active=0) @@ -104,25 +113,19 @@ def _toggled(self, cell, path): model[iter_][0] = not cell.get_active() def _add(self): - for jid in self.exchange_list: + for jid in self._exchange_list: + contact = self._client.get_module('Contacts').get_contact(jid) + name = self._exchange_list[jid][0] groups = '' - is_in_roster = True - contact = app.contacts.get_contact_with_highest_priority( - self.account, jid) - if not contact or _('Not in contact list') in contact.groups: - is_in_roster = False - name = self.exchange_list[jid][0] - num_list = len(self.exchange_list[jid][1]) + num_list = len(self._exchange_list[jid][1]) current = 0 - for group in self.exchange_list[jid][1]: + for group in self._exchange_list[jid][1]: current += 1 - if contact and group not in contact.groups: - is_in_roster = False if current == num_list: groups = groups + group else: groups = groups + group + ', ' - if not is_in_roster: + if not contact.is_in_roster: self.show_all() iter_ = self.model.append() self.model.set(iter_, 0, True, 1, jid, 2, name, 3, groups) @@ -130,30 +133,25 @@ def _add(self): self._ui.accept_button.set_label(_('Add')) def _modify(self): - for jid in self.exchange_list: - groups = '' - is_in_roster = True + for jid in self._exchange_list: is_right = True - contact = app.contacts.get_contact_with_highest_priority( - self.account, jid) - name = self.exchange_list[jid][0] - if not contact: - is_in_roster = False + contact = self._client.get_module('Contacts').get_contact(jid) + name = self._exchange_list[jid][0] + groups = '' + + if name != contact.name: is_right = False - else: - if name != contact.name: - is_right = False - num_list = len(self.exchange_list[jid][1]) + num_list = len(self._exchange_list[jid][1]) current = 0 - for group in self.exchange_list[jid][1]: + for group in self._exchange_list[jid][1]: current += 1 - if contact and group not in contact.groups: + if group not in contact.groups: is_right = False if current == num_list: groups = groups + group else: groups = groups + group + ', ' - if not is_right and is_in_roster: + if not is_right and contact.is_in_roster: self.show_all() iter_ = self.model.append() self.model.set(iter_, 0, True, 1, jid, 2, name, 3, groups) @@ -161,23 +159,19 @@ def _modify(self): self._ui.accept_button.set_label(_('Modify')) def _delete(self): - for jid in self.exchange_list: + for jid in self._exchange_list: + contact = self._client.get_module('Contacts').get_contact(jid) + name = self._exchange_list[jid][0] groups = '' - is_in_roster = True - contact = app.contacts.get_contact_with_highest_priority( - self.account, jid) - name = self.exchange_list[jid][0] - if not contact: - is_in_roster = False - num_list = len(self.exchange_list[jid][1]) + num_list = len(self._exchange_list[jid][1]) current = 0 - for group in self.exchange_list[jid][1]: + for group in self._exchange_list[jid][1]: current += 1 if current == num_list: groups = groups + group else: groups = groups + group + ', ' - if is_in_roster: + if contact.is_in_roster: self.show_all() iter_ = self.model.append() self.model.set(iter_, 0, True, 1, jid, 2, name, 3, groups) @@ -187,23 +181,27 @@ def _delete(self): def _on_accept_button_clicked(self, _widget): model = self._ui.items_list_treeview.get_model() iter_ = model.get_iter_first() - if self.action == 'add': + if self._action == 'add': count = 0 while iter_: if model[iter_][0]: count += 1 # It is selected - message = _('%s suggested me to add you to my ' - 'contact list.') % self.jid_from + contact = self._client.get_module('Contacts').get_contact( + self._jid_from) + message = _('%(name)s %(jid)s suggested me to add you to ' + 'my contact list.') % { + 'name': contact.name, + 'jid': self._jid_from} # Keep same groups and same nickname groups = model[iter_][3].split(', ') if groups == ['']: groups = [] jid = model[iter_][1] - if app.jid_is_transport(self.jid_from): - con = app.connections[self.account] - con.get_module('Presence').automatically_added.append( + if app.jid_is_transport(self._jid_from): + self._client.get_module('Presence').automatically_added.append( jid) + # TODO: app.interface.roster.req_sub( self, jid, message, self.account, groups=groups, nickname=model[iter_][2], auto_auth=True) @@ -211,7 +209,7 @@ def _on_accept_button_clicked(self, _widget): InformationDialog(i18n.ngettext('Added %d contact', 'Added %d contacts', count, count, count)) - elif self.action == 'modify': + elif self._action == 'modify': count = 0 while iter_: if model[iter_][0]: @@ -222,31 +220,29 @@ def _on_accept_button_clicked(self, _widget): groups = model[iter_][3].split(', ') if groups == ['']: groups = [] + # TODO: for contact in app.contacts.get_contact(self.account, jid): contact.name = model[iter_][2] - con = app.connections[self.account] - con.get_module('Roster').update_contact( + self._client.get_module('Roster').update_contact( jid, model[iter_][2], groups) - con.get_module('Roster').draw_contact(jid, self.account) + self._client.get_module('Roster').draw_contact( + jid, self.account) # Update opened chats - ctrl = app.interface.msg_win_mgr.get_control(jid, - self.account) + # TODO: + ctrl = app.window.get_control(self.account, jid) if ctrl: ctrl.update_ui() - win = app.interface.msg_win_mgr.get_window(jid, - self.account) - win.redraw_tab(ctrl) - win.show_title() + iter_ = model.iter_next(iter_) - elif self.action == 'delete': + elif self._action == 'delete': count = 0 while iter_: if model[iter_][0]: count += 1 # It is selected jid = model[iter_][1] - app.connections[self.account].get_module( - 'Presence').unsubscribe(jid) + self._client.get_module('Presence').unsubscribe(jid) + # TODO: app.interface.roster.remove_contact(jid, self.account) app.contacts.remove_jid(self.account, jid) iter_ = model.iter_next(iter_) ===================================== gajim/gui_interface.py ===================================== @@ -67,7 +67,6 @@ from gajim.common import helpers from gajim.common import passwords from gajim.common.helpers import ask_for_status_message -from gajim.common.helpers import get_muc_context from gajim.common.structs import OutgoingMessage from gajim.common.nec import NetworkEvent from gajim.common.nec import NetworkEventsController @@ -75,7 +74,6 @@ from gajim.common.client import Client from gajim.common.preview import PreviewManager from gajim.common.const import Display -from gajim.common.const import JingleState from gajim.common.file_props import FilesProp from gajim.common.connection_handlers_events import InformationEvent @@ -94,12 +92,12 @@ from gajim.gui.dialogs import PassphraseDialog from gajim.gui.filechoosers import FileChooserDialog from gajim.gui.filetransfer import FileTransfersWindow -from gajim.gui.roster_item_exchange import RosterItemExchangeWindow from gajim.gui.main import MainWindow from gajim.gui.util import get_show_in_systray from gajim.gui.util import get_app_window from gajim.gui.util import get_app_windows from gajim.gui.util import get_color_for_account +from gajim.gui.util import open_window log = logging.getLogger('gajim.interface') @@ -692,10 +690,11 @@ def handle_event_metacontacts(obj): @staticmethod def handle_event_roster_item_exchange(event): # data = (action in [add, delete, modify], exchange_list, jid_from) - RosterItemExchangeWindow(event.conn.name, - event.action, - event.exchange_items_list, - event.fjid) + open_window('RosterItemExchange', + account=event.conn.name, + action=event.action, + exchange_list=event.exchange_items_list, + jid_from=event.fjid) # Jingle File Transfer def handle_event_file_send_error(self, event): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/deac35f73293dd1ebb6a7494978511c8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/deac35f73293dd1ebb6a7494978511c8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: Connection Handlers Events: Cleanup and linting
by Daniel Brötzmann (＠wurstsalat) 29 Aug '21

29 Aug '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 7cf5bc39 by wurstsalat at 2021-08-29T14:22:05+02:00 Connection Handlers Events: Cleanup and linting - - - - - 55de1335 by wurstsalat at 2021-08-29T14:35:51+02:00 Notifications: Use new contacts API for avatar - - - - - 2 changed files: - gajim/common/connection_handlers_events.py - gajim/gtk/notification.py Changes: ===================================== gajim/common/connection_handlers_events.py ===================================== @@ -34,26 +34,37 @@ class PresenceReceivedEvent(nec.NetworkIncomingEvent): + name = 'presence-received' + class OurShowEvent(nec.NetworkIncomingEvent): + name = 'our-show' def init(self): self.reconnect = False + class MessageSentEvent(nec.NetworkIncomingEvent): + name = 'message-sent' + class ConnectionLostEvent(nec.NetworkIncomingEvent): + name = 'connection-lost' def generate(self): - app.nec.push_incoming_event(OurShowEvent(None, conn=self.conn, + app.nec.push_incoming_event(OurShowEvent( + None, + conn=self.conn, show='offline')) return True + class FileRequestReceivedEvent(nec.NetworkIncomingEvent): + name = 'file-request-received' def init(self): @@ -62,7 +73,8 @@ def init(self): def generate(self): self.id_ = self.stanza.getID() - self.fjid = self.conn.get_module('Bytestream')._ft_get_from(self.stanza) + self.fjid = self.conn.get_module('Bytestream')._ft_get_from( + self.stanza) self.jid = app.get_jid_without_resource(self.fjid) if not self.jingle_content: return @@ -84,7 +96,7 @@ def generate(self): self.FT_content.file_props = self.file_props self.FT_content.transport.set_file_props(self.file_props) self.file_props.streamhosts.extend( - self.FT_content.transport.remote_candidates) + self.FT_content.transport.remote_candidates) for host in self.file_props.streamhosts: host['initiator'] = self.FT_content.session.initiator host['target'] = self.FT_content.session.responder @@ -97,13 +109,13 @@ def generate(self): self.file_props.receiver = self.conn.get_own_jid() else: file_tag = desc.getTag('file') - h = file_tag.getTag('hash') - h = h.getData() if h else None - n = file_tag.getTag('name') - n = n.getData() if n else None + hash_ = file_tag.getTag('hash') + hash_ = hash_.getData() if hash_ else None + file_name = file_tag.getTag('name') + file_name = file_name.getData() if file_name else None pjid = app.get_jid_without_resource(self.fjid) file_info = self.conn.get_module('Jingle').get_file_info( - pjid, hash_=h, name=n, account=self.conn.name) + pjid, hash_=hash_, name=file_name, account=self.conn.name) self.file_props.file_name = file_info['file-name'] self.file_props.sender = self.conn.get_own_jid() self.file_props.receiver = self.fjid @@ -155,6 +167,7 @@ def init(self): class NotificationEventOld(nec.NetworkIncomingEvent): + name = 'notification' base_network_events = ['gc-message-received', 'presence-received'] @@ -171,7 +184,7 @@ def generate(self): # For output self.do_sound = False self.sound_file = '' - self.sound_event = '' # gajim sound played if not sound_file is set + self.sound_event = '' # gajim sound played if not sound_file is set self.show_popup = False self.do_popup = False @@ -190,93 +203,18 @@ def generate(self): self.show_in_notification_area = False self.show_in_roster = False - self.detect_type() - - if self.notif_type == 'msg': - self.handle_incoming_msg_event(self.base_event) - elif self.notif_type == 'gc-msg': - self.handle_incoming_gc_msg_event(self.base_event) - elif self.notif_type == 'pres': - self.handle_incoming_pres_event(self.base_event) + self.handle_incoming_pres_event(self.base_event) return True - def detect_type(self): - if self.base_event.name == 'decrypted-message-received': - self.notif_type = 'msg' - if self.base_event.name == 'gc-message-received': - self.notif_type = 'gc-msg' - if self.base_event.name == 'presence-received': - self.notif_type = 'pres' - def handle_incoming_msg_event(self, msg_obj): + # TODO: implement attention handling and remove this + # don't alert for carbon copied messages from ourselves if msg_obj.properties.is_sent_carbon: return - if not msg_obj.msgtxt: - return - self.jid = msg_obj.jid - if msg_obj.properties.is_muc_pm: - self.jid = msg_obj.fjid - - self.control = app.interface.msg_win_mgr.search_control( - msg_obj.jid, self.account, msg_obj.resource) - - if self.control is None: - event_type = msg_obj.properties.type.value - if msg_obj.properties.is_muc_pm: - event_type = 'pm' - if len(app.events.get_events( - self.account, msg_obj.jid, [event_type])) <= 1: - self.first_unread = True - else: - self.control_focused = self.control.has_focus() - - if msg_obj.properties.is_muc_pm: - nick = msg_obj.resource - else: - nick = app.get_name_from_jid(self.conn.name, self.jid) - - if self.first_unread: - self.sound_event = 'first_message_received' - elif self.control_focused: - self.sound_event = 'next_message_received_focused' - else: - self.sound_event = 'next_message_received_unfocused' - - if app.settings.get('notification_preview_message'): - self.popup_text = msg_obj.msgtxt - if self.popup_text and (self.popup_text.startswith('/me ') or \ - self.popup_text.startswith('/me\n')): - self.popup_text = '* ' + nick + self.popup_text[3:] - else: - # We don't want message preview, do_preview = False - self.popup_text = '' - - if msg_obj.properties.is_muc_pm: - self.popup_msg_type = 'pm' - self.popup_event_type = _('New Private Message') - else: # chat message - self.popup_msg_type = 'chat' - self.popup_event_type = _('New Message') - - num_unread = len(app.events.get_events(self.conn.name, self.jid, - ['printed_' + self.popup_msg_type, self.popup_msg_type])) - self.popup_title = i18n.ngettext( - 'New message from %(nickname)s', - '%(n_msgs)i unread messages from %(nickname)s', - num_unread) % {'nickname': nick, 'n_msgs': num_unread} - - if app.settings.get('show_notifications'): - if self.first_unread or not self.control_focused: - if app.settings.get('autopopupaway'): - # always show notification - self.do_popup = True - if app.connections[self.conn.name].status in ('online', 'chat'): - # we're online or chat - self.do_popup = True if msg_obj.properties.attention and not app.settings.get( - 'ignore_incoming_attention'): + 'ignore_incoming_attention'): self.popup_timeout = 0 self.do_popup = True else: @@ -285,88 +223,9 @@ def handle_incoming_msg_event(self, msg_obj): sound = app.settings.get_soundevent_settings('attention_received') if msg_obj.properties.attention and not app.settings.get( - 'ignore_incoming_attention') and sound['enabled']: + 'ignore_incoming_attention') and sound['enabled']: self.sound_event = 'attention_received' self.do_sound = True - elif self.first_unread and helpers.allow_sound_notification( - self.conn.name, 'first_message_received'): - self.do_sound = True - elif not self.first_unread and self.control_focused and \ - helpers.allow_sound_notification(self.conn.name, - 'next_message_received_focused'): - self.do_sound = True - elif not self.first_unread and not self.control_focused and \ - helpers.allow_sound_notification(self.conn.name, - 'next_message_received_unfocused'): - self.do_sound = True - - def handle_incoming_gc_msg_event(self, msg_obj): - if not msg_obj.gc_control: - # we got a message from a room we're not in? ignore it - return - self.jid = msg_obj.jid - sound = msg_obj.gc_control.highlighting_for_message( - msg_obj.msgtxt, msg_obj.properties.timestamp)[1] - - nick = msg_obj.properties.muc_nickname - - if nick == msg_obj.gc_control.nick: - # A message from ourself - return - - self.do_sound = True - if sound == 'received': - self.sound_event = 'muc_message_received' - elif sound == 'highlight': - self.sound_event = 'muc_message_highlight' - else: - self.do_sound = False - - self.control = app.interface.msg_win_mgr.search_control( - msg_obj.jid, self.account) - - if self.control is not None: - self.control_focused = self.control.has_focus() - - if app.settings.get('show_notifications'): - contact = app.contacts.get_groupchat_contact(self.account, - self.jid) - notify_for_muc = sound == 'highlight' or contact.can_notify() - - if not notify_for_muc: - self.do_popup = False - - elif self.control_focused: - self.do_popup = False - - elif app.settings.get('autopopupaway'): - # always show notification - self.do_popup = True - - elif app.connections[self.conn.name].status in ('online', 'chat'): - # we're online or chat - self.do_popup = True - - self.popup_msg_type = 'gc_msg' - self.popup_event_type = _('New Group Chat Message') - - if app.settings.get('notification_preview_message'): - self.popup_text = msg_obj.msgtxt - if self.popup_text and (self.popup_text.startswith('/me ') or - self.popup_text.startswith('/me\n')): - self.popup_text = '* ' + nick + self.popup_text[3:] - - type_events = ['printed_marked_gc_msg', 'printed_gc_msg'] - count = len(app.events.get_events(self.account, self.jid, type_events)) - - contact = app.contacts.get_contact(self.account, self.jid) - - self.popup_title = i18n.ngettext( - 'New message from %(nickname)s', - '%(n_msgs)i unread messages in %(groupchat_name)s', - count) % {'nickname': nick, - 'n_msgs': count, - 'groupchat_name': contact.get_shown_name()} def handle_incoming_pres_event(self, pres_obj): return @@ -402,21 +261,24 @@ def handle_incoming_pres_event(self, pres_obj): server = app.get_server_from_jid(self.jid) account_server = account + '/' + server block_transport = False - if account_server in app.block_signed_in_notifications and \ - app.block_signed_in_notifications[account_server]: + if (account_server in app.block_signed_in_notifications and + app.block_signed_in_notifications[account_server]): block_transport = True sound = app.settings.get_soundevent_settings('contact_connected') - if sound['enabled'] and not app.block_signed_in_notifications[account] and\ - not block_transport and helpers.allow_sound_notification(account, - 'contact_connected'): + if (sound['enabled'] and + not app.block_signed_in_notifications[account] and + not block_transport and helpers.allow_sound_notification( + account, 'contact_connected')): self.sound_event = event self.do_sound = True elif pres_obj.old_show > 1 and pres_obj.new_show < 2: event = 'contact_disconnected' - sound = app.settings.get_soundevent_settings('contact_disconnected') - if sound['enabled'] and helpers.allow_sound_notification(account, event): + sound = app.settings.get_soundevent_settings( + 'contact_disconnected') + if sound['enabled'] and helpers.allow_sound_notification( + account, event): self.sound_event = event self.do_sound = True # Status change (not connected/disconnected or error (<1)) @@ -444,6 +306,7 @@ def handle_incoming_pres_event(self, pres_obj): class InformationEvent(nec.NetworkIncomingEvent): + name = 'information' def init(self): ===================================== gajim/gtk/notification.py ===================================== @@ -231,9 +231,8 @@ def popup(self, event_type, jid, account, type_='', icon_name=None, @staticmethod def _get_avatar_for_notification(account, jid): scale = get_monitor_scale_factor() - contact = app.contacts.get_contact(account, jid) - if contact is None: - return None + client = app.get_client(account) + contact = client.get_module('Contacts').get_contact(jid) return app.interface.get_avatar(contact, 32, scale, pixbuf=True) def _on_popup_destroy(self, *args): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/11bd812f4e9b018f7f1d85829d5ada6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/11bd812f4e9b018f7f1d85829d5ada6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] App: Remove unused methods
by Daniel Brötzmann (＠wurstsalat) 28 Aug '21

28 Aug '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 11bd812f by wurstsalat at 2021-08-28T16:05:32+02:00 App: Remove unused methods - - - - - 1 changed file: - gajim/common/app.py Changes: ===================================== gajim/common/app.py ===================================== @@ -352,38 +352,9 @@ def get_room_and_nick_from_fjid(jid): l.append('') return l -def get_real_jid_from_fjid(account, fjid): - """ - Return real jid or returns None, if we don't know the real jid - """ - room_jid, nick = get_room_and_nick_from_fjid(fjid) - if not nick: # It's not a fake_jid, it is a real jid - return fjid # we return the real jid - real_jid = fjid - if interface.msg_win_mgr.get_gc_control(room_jid, account): - # It's a pm, so if we have real jid it's in contact.jid - gc_contact = contacts.get_gc_contact(account, room_jid, nick) - if not gc_contact: - return - # gc_contact.jid is None when it's not a real jid (we don't know real jid) - real_jid = gc_contact.jid - return real_jid - -def get_room_from_fjid(jid): - return get_room_and_nick_from_fjid(jid)[0] - -def get_contact_name_from_jid(account, jid): - c = contacts.get_first_contact_from_jid(account, jid) - return c.name - def get_jid_without_resource(jid): return jid.split('/')[0] -def construct_fjid(room_jid, nick): - # fake jid is the jid for a contact in a room - # gaim(a)conference.jabber.org/nick - return room_jid + '/' + nick - def get_resource_from_jid(jid): jids = jid.split('/', 1) if len(jids) > 1: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/11bd812f4e9b018f7f1d85829d5ada64… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/11bd812f4e9b018f7f1d85829d5ada64… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Refactor Jingle AV into separate widget
by Daniel Brötzmann (＠wurstsalat) 28 Aug '21

28 Aug '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 2a0fc69b by wurstsalat at 2021-08-28T13:59:25+02:00 Refactor Jingle AV into separate widget - - - - - 11 changed files: - gajim/common/events.py - gajim/common/jingle_session.py - + gajim/data/gui/call_widget.ui - gajim/data/gui/chat_control.ui - + gajim/gtk/call_widget.py - gajim/gtk/controls/base.py - gajim/gtk/controls/chat.py - gajim/gtk/conversation/rows/call.py - gajim/gtk/conversation/view.py - gajim/gtk/main.py - gajim/gui_interface.py Changes: ===================================== gajim/common/events.py ===================================== @@ -126,24 +126,6 @@ class FileHashErrorEvent(FileRequestEvent): type_ = 'file-hash-error' -class JingleIncomingEvent(Event): - - type_ = 'jingle-incoming' - - def __init__(self, - peerjid, - sid, - content_types, - time_=None, - show_in_systray=True): - Event.__init__(self, - time_, - show_in_systray=show_in_systray) - self.peerjid = peerjid - self.sid = sid - self.content_types = content_types - - class Events: def __init__(self): self._events = {} # list of events {acct: {jid1: [E1, E2]}, } ===================================== gajim/common/jingle_session.py ===================================== @@ -837,10 +837,12 @@ def __transport_accept(self, transport): self.state = JingleStates.ACTIVE def _raise_event(self, name, **kwargs): - jid, resource = app.get_room_and_nick_from_fjid(self.peerjid) + jid, resource = app.get_room_and_nick_from_fjid( + str(self.peerjid)) app.nec.push_incoming_event( NetworkEvent(name, conn=self.connection, + account=self.connection.name, fjid=self.peerjid, jid=jid, sid=self.sid, ===================================== gajim/data/gui/call_widget.ui ===================================== @@ -0,0 +1,633 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<interface> + <requires lib="gtk+" version="3.24"/> + <object class="GtkAdjustment" id="adjustment1"> + <property name="upper">110</property> + <property name="step-increment">1</property> + <property name="page-increment">10</property> + <property name="page-size">10</property> + </object> + <object class="GtkAdjustment" id="adjustment2"> + <property name="upper">110</property> + <property name="step-increment">1</property> + <property name="page-increment">10</property> + <property name="page-size">10</property> + </object> + <object class="GtkPopover" id="dtmf_popover"> + <property name="can-focus">False</property> + <child> +  + <object class="GtkGrid" id="grid1"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="border-width">6</property> + <child> + <object class="GtkButton" id="1_button"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="relief">none</property> + <child> + <object class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">center</property> + <property name="label" translatable="yes"><b>1</b></property> + <property name="use-markup">True</property> + <property name="xalign">0</property> + </object> + </child> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="2_button"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="relief">none</property> + <child> + <object class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes"><b>2</b> abc</property> + <property name="use-markup">True</property> + </object> + </child> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="3_button"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="relief">none</property> + <child> + <object class="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes"><b>3</b> def</property> + <property name="use-markup">True</property> + </object> + </child> + </object> + <packing> + <property name="left-attach">2</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="4_button"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="relief">none</property> + <child> + <object class="GtkLabel" id="label4"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes"><b>4</b> ghi</property> + <property name="use-markup">True</property> + </object> + </child> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="5_button"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="relief">none</property> + <child> + <object class="GtkLabel" id="label5"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes"><b>5</b> jkl</property> + <property name="use-markup">True</property> + </object> + </child> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="6_button"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="relief">none</property> + <child> + <object class="GtkLabel" id="label6"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes"><b>6</b> mno</property> + <property name="use-markup">True</property> + </object> + </child> + </object> + <packing> + <property name="left-attach">2</property> + <property name="top-attach">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="7_button"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="relief">none</property> + <child> + <object class="GtkLabel" id="label7"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes"><b>7</b> pqrs</property> + <property name="use-markup">True</property> + </object> + </child> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="8_button"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="relief">none</property> + <child> + <object class="GtkLabel" id="label8"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes"><b>8</b> tuv</property> + <property name="use-markup">True</property> + </object> + </child> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="9_button"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="relief">none</property> + <child> + <object class="GtkLabel" id="label9"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes"><b>9</b> wxyz</property> + <property name="use-markup">True</property> + </object> + </child> + </object> + <packing> + <property name="left-attach">2</property> + <property name="top-attach">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="*_button"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="relief">none</property> + <child> + <object class="GtkLabel" id="label10"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes"><b>*</b></property> + <property name="use-markup">True</property> + </object> + </child> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">3</property> + </packing> + </child> + <child> + <object class="GtkButton" id="0_button"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="relief">none</property> + <child> + <object class="GtkLabel" id="label11"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes"><b>0</b></property> + <property name="use-markup">True</property> + </object> + </child> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">3</property> + </packing> + </child> + <child> + <object class="GtkButton" id="#_button"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="relief">none</property> + <child> + <object class="GtkLabel" id="label12"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes"><b>#</b></property> + <property name="use-markup">True</property> + </object> + </child> + </object> + <packing> + <property name="left-attach">2</property> + <property name="top-attach">3</property> + </packing> + </child> + </object> + </child> + </object> + <object class="GtkBox" id="av_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkBox" id="video_box"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="margin-start">6</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkViewport" id="outgoing_viewport"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="shadow-type">none</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkViewport" id="incoming_viewport"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="shadow-type">none</property> + <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="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="valign">center</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkBox" id="av_start_box"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="halign">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="label" translatable="yes">Start Call…</property> + <style> + <class name="bold"/> + <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="GtkButton" id="av_start_mic_button"> + <property name="label" translatable="yes">With Microphone</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <signal name="clicked" handler="_on_call_with_mic" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="av_start_mic_cam_button"> + <property name="label" translatable="yes">Microphone & Camera</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <signal name="clicked" handler="_on_call_with_mic_and_cam" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</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="GtkImage" id="jingle_audio_state"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="pixel-size">100</property> + <property name="icon-name">audio-input-microphone-symbolic</property> + <style> + <class name="dim-label"/> + <class name="audio-mic-animation"/> + </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="jingle_connection_state"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="valign">end</property> + <property name="wrap">True</property> + <property name="max-width-chars">20</property> + <style> + <class name="bold"/> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkSpinner" id="jingle_connection_spinner"> + <property name="visible">True</property> + <property name="can-focus">False</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkButton" id="answer_video_button"> + <property name="label" translatable="yes">Start Video</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="no-show-all">True</property> + <property name="halign">center</property> + <signal name="clicked" handler="_on_answer_video_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</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="spacing">6</property> + <child> + <object class="GtkButton"> + <property name="width-request">70</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">End call</property> + <property name="halign">center</property> + <signal name="clicked" handler="_on_end_call_clicked" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">call-stop</property> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="audio_buttons_box"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can-focus">False</property> + <child> + <object class="GtkVolumeButton" id="mic_hscale"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="focus-on-click">False</property> + <property name="receives-default">True</property> + <property name="has-tooltip">True</property> + <property name="relief">none</property> + <property name="orientation">vertical</property> + <property name="size">menu</property> + <property name="adjustment">adjustment1</property> + <property name="icons">microphone-sensitivity-muted-symbolic +microphone-sensitivity-low-symbolic +microphone-sensitivity-medium-symbolic +microphone-sensitivity-high-symbolic</property> + <property name="use-symbolic">False</property> + <signal name="value-changed" handler="_on_mic_volume_changed" swapped="no"/> + <child internal-child="plus_button"> + <object class="GtkButton" id="volumebutton-plus_button2"> + <property name="can-focus">False</property> + <property name="receives-default">False</property> + </object> + </child> + <child internal-child="minus_button"> + <object class="GtkButton" id="volumebutton-minus_button2"> + <property name="can-focus">False</property> + <property name="receives-default">False</property> + </object> + </child> + <style> + <class name="chatcontrol-actionbar-button"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkVolumeButton" id="sound_hscale"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="focus-on-click">False</property> + <property name="receives-default">True</property> + <property name="has-tooltip">True</property> + <property name="relief">none</property> + <property name="orientation">vertical</property> + <property name="size">menu</property> + <property name="adjustment">adjustment2</property> + <property name="icons">audio-volume-muted-symbolic +audio-volume-low-symbolic +audio-volume-medium-symbolic +audio-volume-high-symbolic</property> + <property name="use-symbolic">False</property> + <signal name="value-changed" handler="_on_output_volume_changed" swapped="no"/> + <child internal-child="plus_button"> + <object class="GtkButton" id="volumebutton-plus_button1"> + <property name="can-focus">False</property> + <property name="receives-default">False</property> + </object> + </child> + <child internal-child="minus_button"> + <object class="GtkButton" id="volumebutton-minus_button1"> + <property name="can-focus">False</property> + <property name="receives-default">False</property> + </object> + </child> + <style> + <class name="chatcontrol-actionbar-button"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="dtmf_button"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="relief">none</property> + <property name="direction">up</property> + <property name="popover">dtmf_popover</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">input-dialpad-symbolic</property> + <property name="icon_size">1</property> + </object> + </child> + <style> + <class name="chatcontrol-actionbar-button"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="av_cam_button"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Turn Camera on</property> + <property name="relief">none</property> + <signal name="clicked" handler="_on_video" swapped="no"/> + <child> + <object class="GtkImage" id="av_cam_image"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">feather-camera-symbolic</property> + </object> + </child> + <style> + <class name="chatcontrol-actionbar-button"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </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> +</interface> ===================================== gajim/data/gui/chat_control.ui ===================================== @@ -1,19 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?>  <interface> - <requires lib="gtk+" version="3.22"/> - <object class="GtkAdjustment" id="adjustment1"> - <property name="upper">110</property> - <property name="step-increment">1</property> - <property name="page-increment">10</property> - <property name="page-size">10</property> - </object> - <object class="GtkAdjustment" id="adjustment2"> - <property name="upper">110</property> - <property name="step-increment">1</property> - <property name="page-increment">10</property> - <property name="page-size">10</property> - </object> + <requires lib="gtk+" version="3.24"/> <object class="GtkBox" id="drop_area"> <property name="name">DropArea</property> <property name="visible">True</property> @@ -59,259 +47,6 @@ </packing> </child> </object> - <object class="GtkPopover" id="dtmf_popover"> - <property name="can-focus">False</property> - <child> -  - <object class="GtkGrid" id="grid1"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="border-width">6</property> - <child> - <object class="GtkButton" id="1_button"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="relief">none</property> - <child> - <object class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">center</property> - <property name="label" translatable="yes"><b>1</b></property> - <property name="use-markup">True</property> - <property name="xalign">0</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="2_button"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="relief">none</property> - <child> - <object class="GtkLabel" id="label2"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes"><b>2</b> abc</property> - <property name="use-markup">True</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="3_button"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="relief">none</property> - <child> - <object class="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes"><b>3</b> def</property> - <property name="use-markup">True</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">2</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="4_button"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="relief">none</property> - <child> - <object class="GtkLabel" id="label4"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes"><b>4</b> ghi</property> - <property name="use-markup">True</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="5_button"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="relief">none</property> - <child> - <object class="GtkLabel" id="label5"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes"><b>5</b> jkl</property> - <property name="use-markup">True</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="6_button"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="relief">none</property> - <child> - <object class="GtkLabel" id="label6"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes"><b>6</b> mno</property> - <property name="use-markup">True</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">2</property> - <property name="top-attach">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="7_button"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="relief">none</property> - <child> - <object class="GtkLabel" id="label7"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes"><b>7</b> pqrs</property> - <property name="use-markup">True</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">2</property> - </packing> - </child> - <child> - <object class="GtkButton" id="8_button"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="relief">none</property> - <child> - <object class="GtkLabel" id="label8"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes"><b>8</b> tuv</property> - <property name="use-markup">True</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">2</property> - </packing> - </child> - <child> - <object class="GtkButton" id="9_button"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="relief">none</property> - <child> - <object class="GtkLabel" id="label9"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes"><b>9</b> wxyz</property> - <property name="use-markup">True</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">2</property> - <property name="top-attach">2</property> - </packing> - </child> - <child> - <object class="GtkButton" id="*_button"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="relief">none</property> - <child> - <object class="GtkLabel" id="label10"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes"><b>*</b></property> - <property name="use-markup">True</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">3</property> - </packing> - </child> - <child> - <object class="GtkButton" id="0_button"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="relief">none</property> - <child> - <object class="GtkLabel" id="label11"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes"><b>0</b></property> - <property name="use-markup">True</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">3</property> - </packing> - </child> - <child> - <object class="GtkButton" id="#_button"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="relief">none</property> - <child> - <object class="GtkLabel" id="label12"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes"><b>#</b></property> - <property name="use-markup">True</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">2</property> - <property name="top-attach">3</property> - </packing> - </child> - </object> - </child> - </object> <object class="GtkMenu" id="formattings_menu"> <property name="visible">True</property> <property name="can-focus">False</property> @@ -869,354 +604,7 @@ </packing> </child> <child> - <object class="GtkBox" id="av_box"> - <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkBox" id="video_box"> - <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="margin-start">6</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkViewport" id="outgoing_viewport"> - <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="shadow-type">none</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkViewport" id="incoming_viewport"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="shadow-type">none</property> - <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="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="valign">center</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkBox" id="av_start_box"> - <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="halign">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="label" translatable="yes">Start Call…</property> - <style> - <class name="bold"/> - <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="GtkButton" id="av_start_mic_button"> - <property name="label" translatable="yes">With Microphone</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <signal name="clicked" handler="_on_call_with_mic" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="av_start_mic_cam_button"> - <property name="label" translatable="yes">Microphone & Camera</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <signal name="clicked" handler="_on_call_with_mic_and_cam" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</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="GtkImage" id="jingle_audio_state"> - <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="pixel-size">100</property> - <property name="icon-name">audio-input-microphone-symbolic</property> - <style> - <class name="dim-label"/> - <class name="audio-mic-animation"/> - </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="jingle_connection_state"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="valign">end</property> - <property name="wrap">True</property> - <property name="max-width-chars">20</property> - <style> - <class name="bold"/> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkSpinner" id="jingle_connection_spinner"> - <property name="visible">True</property> - <property name="can-focus">False</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkButton"> - <property name="width-request">70</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes">End call</property> - <property name="halign">center</property> - <signal name="clicked" handler="_on_end_call_clicked" swapped="no"/> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">call-stop</property> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox" id="audio_buttons_box"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can-focus">False</property> - <child> - <object class="GtkVolumeButton" id="mic_hscale"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="focus-on-click">False</property> - <property name="receives-default">True</property> - <property name="has-tooltip">True</property> - <property name="relief">none</property> - <property name="orientation">vertical</property> - <property name="size">menu</property> - <property name="adjustment">adjustment2</property> - <property name="icons">microphone-sensitivity-muted-symbolic -microphone-sensitivity-low-symbolic -microphone-sensitivity-medium-symbolic -microphone-sensitivity-high-symbolic</property> - <property name="use-symbolic">False</property> - <child internal-child="plus_button"> - <object class="GtkButton" id="volumebutton-plus_button2"> - <property name="can-focus">False</property> - <property name="receives-default">False</property> - </object> - </child> - <child internal-child="minus_button"> - <object class="GtkButton" id="volumebutton-minus_button2"> - <property name="can-focus">False</property> - <property name="receives-default">False</property> - </object> - </child> - <style> - <class name="chatcontrol-actionbar-button"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkVolumeButton" id="sound_hscale"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="focus-on-click">False</property> - <property name="receives-default">True</property> - <property name="has-tooltip">True</property> - <property name="relief">none</property> - <property name="orientation">vertical</property> - <property name="size">menu</property> - <property name="adjustment">adjustment1</property> - <property name="icons">audio-volume-muted-symbolic -audio-volume-low-symbolic -audio-volume-medium-symbolic -audio-volume-high-symbolic</property> - <property name="use-symbolic">False</property> - <child internal-child="plus_button"> - <object class="GtkButton" id="volumebutton-plus_button1"> - <property name="can-focus">False</property> - <property name="receives-default">False</property> - </object> - </child> - <child internal-child="minus_button"> - <object class="GtkButton" id="volumebutton-minus_button1"> - <property name="can-focus">False</property> - <property name="receives-default">False</property> - </object> - </child> - <style> - <class name="chatcontrol-actionbar-button"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkMenuButton" id="dtmf_button"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="relief">none</property> - <property name="direction">up</property> - <property name="popover">dtmf_popover</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">input-dialpad-symbolic</property> - <property name="icon_size">1</property> - </object> - </child> - <style> - <class name="chatcontrol-actionbar-button"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">4</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack-type">end</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="av_cam_button"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes">Turn Camera on</property> - <property name="relief">none</property> - <signal name="clicked" handler="_on_video" swapped="no"/> - <child> - <object class="GtkImage" id="av_cam_image"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">feather-camera-symbolic</property> - </object> - </child> - <style> - <class name="chatcontrol-actionbar-button"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - </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="resize">True</property> - <property name="shrink">True</property> - </packing> + <placeholder/> </child> </object> <packing> ===================================== gajim/gtk/call_widget.py ===================================== @@ -0,0 +1,522 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from typing import Optional # pylint: disable=unused-import + +import logging + +from gi.repository import GObject +from gi.repository import Gtk + +from nbxmpp.namespaces import Namespace + +from gajim.common import app +from gajim.common.const import JingleState +from gajim.common.helpers import allow_showing_notification +from gajim.common.i18n import _ + +from .gstreamer import create_gtk_widget +from .util import get_builder + +log = logging.getLogger('gajim.gui.call_widget') + + +class CallWidget(Gtk.Box): + + __gsignals__ = { + 'incoming-call': ( + GObject.SignalFlags.RUN_LAST | GObject.SignalFlags.ACTION, + None, + (object, ) + ), + 'call-ended': ( + GObject.SignalFlags.RUN_LAST | GObject.SignalFlags.ACTION, + None, + () + ), + } + + def __init__(self, account, contact): + Gtk.Box.__init__(self) + self.set_no_show_all(True) + + self._account = account + self._client = app.get_client(account) + self._contact = contact + + # Helper for upgrading voice call to voice + video without + # having to show a new call row + self._incoming_video_event = None + + self._jingle = { + 'audio': JingleObject( + JingleState.NULL, + self._update_audio), + 'video': JingleObject( + JingleState.NULL, + self._update_video), + } + self._video_widget_other = None + self._video_widget_self = None + + self._detect_av() + + self._ui = get_builder('call_widget.ui') + self.add(self._ui.av_box) + self.connect('destroy', self._on_destroy) + + dtmf = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '*', '0', '#'] + for key in dtmf: + button = self._ui.get_object(key + '_button') + button.connect('pressed', self._on_num_button_pressed, key) + button.connect('released', self._on_num_button_released) + + self._ui.connect_signals(self) + + def _on_destroy(self, *args): + for jingle_type in ('audio', 'video'): + self._close_jingle_content(jingle_type, shutdown=True) + self._jingle.clear() + + def _detect_av(self): + if (self._contact.supports(Namespace.JINGLE_ICE_UDP) and + app.is_installed('FARSTREAM') and self._contact.jid.resource): + self._jingle['audio'].available = self._contact.supports( + Namespace.JINGLE_RTP_AUDIO) + self._jingle['video'].available = self._contact.supports( + Namespace.JINGLE_RTP_VIDEO) + else: + if (self._jingle['audio'].available or + self._jingle['video'].available): + self._stop_jingle() + self._jingle['audio'].available = False + self._jingle['video'].available = False + + def get_jingle_available(self, content_type): + return self._jingle[content_type].available + + def _on_call_with_mic(self, _button): + self._on_jingle_button_toggled(['audio']) + self._ui.av_start_box.hide() + + def _on_call_with_mic_and_cam(self, _button): + self._on_jingle_button_toggled(['audio', 'video']) + self._ui.av_start_box.hide() + + def _on_answer_video_clicked(self, button): + self.accept_call(self._incoming_video_event) + self._incoming_video_event = None + button.hide() + + def _on_end_call_clicked(self, _widget): + self._close_jingle_content('audio') + self._close_jingle_content('video') + self._ui.jingle_audio_state.set_no_show_all(True) + self._ui.jingle_audio_state.hide() + self.set_no_show_all(True) + self.hide() + self.emit('call-ended') + + def _on_video(self, *args): + self._on_jingle_button_toggled(['video']) + + def _on_jingle_button_toggled(self, jingle_types): + if all(item in jingle_types for item in ['audio', 'video']): + # Both 'audio' and 'video' in jingle_types + sid = self._client.get_module('Jingle').start_audio_video( + self._contact.jid) + self._set_jingle_state('audio', JingleState.CONNECTING, sid) + self._set_jingle_state('video', JingleState.CONNECTING, sid) + return + + if 'audio' in jingle_types: + if self._jingle['audio'].state != JingleState.NULL: + self._close_jingle_content('audio') + else: + sid = self._client.get_module('Jingle').start_audio( + self._contact.jid) + self._set_jingle_state('audio', JingleState.CONNECTING, sid) + + if 'video' in jingle_types: + if self._jingle['video'].state != JingleState.NULL: + self._close_jingle_content('video') + else: + sid = self._client.get_module('Jingle').start_video( + self._contact.jid) + self._set_jingle_state('video', JingleState.CONNECTING, sid) + + def _on_num_button_pressed(self, _widget, num): + self._get_audio_content().start_dtmf(num) + + def _on_num_button_released(self, _released): + self._get_audio_content().stop_dtmf() + + def _on_mic_volume_changed(self, _widget, value): + self._get_audio_content().set_mic_volume(value / 100) + app.settings.set('audio_input_volume', int(value)) + + def _on_output_volume_changed(self, _widget, value): + self._get_audio_content().set_out_volume(value / 100) + app.settings.set('audio_output_volume', int(value)) + + def process_event(self, event): + if event.name == 'jingle-request-received': + self._on_jingle_request(event) + if event.name == 'jingle-connected-received': + self._on_jingle_connected(event) + if event.name == 'jingle-disconnected-received': + self._on_jingle_disconnected(event) + if event.name == 'jingle-error': + self._on_jingle_error(event) + + def _on_jingle_request(self, event): + content_types = [] + for item in event.contents: + content_types.append(item.media) + if 'audio' in content_types: + self._set_jingle_state( + 'audio', + JingleState.CONNECTION_RECEIVED, + event.sid) + if 'video' in content_types: + self._set_jingle_state( + 'video', + JingleState.CONNECTION_RECEIVED, + event.sid) + + if self._jingle['audio'].state in ( + JingleState.CONNECTED, + JingleState.CONNECTING) and 'video' in content_types: + self._incoming_video_event = event + else: + # There is no voice call running running yet + self.emit('incoming-call', event) + + if allow_showing_notification(self._account): + heading = _('Incoming Call') + contact = self._client.get_module('Contacts').get_contact( + event.jid) + text = _('%s is calling') % contact.name + app.notification.popup( + heading, + event.jid, + self._account, + 'jingle-incoming', + icon_name='call-start-symbolic', + title=heading, + text=text) + + def _on_jingle_connected(self, event): + session = self._client.get_module('Jingle').get_jingle_session( + event.fjid, event.sid) + + if event.media == 'audio': + content = session.get_content('audio') + self._set_jingle_state( + 'audio', + JingleState.CONNECTED, + event.sid) + if event.media == 'video': + content = session.get_content('video') + self._set_jingle_state( + 'video', + JingleState.CONNECTED, + event.sid) + + if not session.accepted: + session.approve_session() + for content in event.media: + session.approve_content(content) + + def _on_jingle_disconnected(self, event): + if event.media is None: + self._stop_jingle(sid=event.sid, reason=event.reason) + if event.media == 'audio': + self._set_jingle_state( + 'audio', + JingleState.NULL, + sid=event.sid, + reason=event.reason) + if event.media == 'video': + self._set_jingle_state( + 'video', + JingleState.NULL, + sid=event.sid, + reason=event.reason) + + def _on_jingle_error(self, event): + if event.sid == self._jingle['audio'].sid: + self._set_jingle_state( + 'audio', + JingleState.ERROR, + reason=event.reason) + + def start_call(self): + audio_state = self._jingle['audio'].state + video_state = self._jingle['video'].state + if audio_state == JingleState.NULL and video_state == JingleState.NULL: + self.set_no_show_all(False) + self.show_all() + self._ui.jingle_audio_state.hide() + self._ui.av_start_box.show() + self._ui.av_start_mic_cam_button.set_sensitive( + self._jingle['video'].available) + self._ui.av_cam_button.set_sensitive(False) + + def accept_call(self, event): + session = self._client.get_module('Jingle').get_jingle_session( + event.fjid, event.sid) + if not session: + return + + audio = session.get_content('audio') + video = session.get_content('video') + + if audio and not audio.negotiated: + self._set_jingle_state( + 'audio', JingleState.CONNECTING, event.sid) + if video and not video.negotiated: + self._set_jingle_state( + 'video', JingleState.CONNECTING, event.sid) + + if not session.accepted: + session.approve_session() + + for item in event.contents: + session.approve_content(item.media) + + def reject_call(self, event): + session = self._client.get_module('Jingle').get_jingle_session( + event.fjid, event.sid) + if not session: + return + + if not session.accepted: + session.decline_session() + else: + for item in event.contents: + session.reject_content(item.media) + + def _update_audio(self): + audio_state = self._jingle['audio'].state + video_state = self._jingle['video'].state + if self._jingle['video'].available: + self._ui.av_cam_button.set_sensitive( + video_state not in ( + JingleState.CONNECTING, + JingleState.CONNECTED)) + + if audio_state == JingleState.NULL: + self._ui.audio_buttons_box.set_sensitive(False) + self._ui.jingle_audio_state.set_no_show_all(True) + self._ui.jingle_audio_state.hide() + self._ui.jingle_connection_state.set_text('') + self._ui.jingle_connection_spinner.stop() + self._ui.jingle_connection_spinner.hide() + + if video_state == JingleState.NULL: + self.set_no_show_all(True) + self.hide() + self.emit('call-ended') + else: + self._ui.jingle_connection_spinner.show() + self._ui.jingle_connection_spinner.start() + + if audio_state == JingleState.CONNECTING: + self.set_no_show_all(False) + self.show_all() + self._ui.jingle_connection_state.set_text(_('Calling…')) + self._ui.av_cam_button.set_sensitive(False) + + elif audio_state == JingleState.CONNECTION_RECEIVED: + self._ui.jingle_connection_state.set_text(_('Incoming Call')) + + elif audio_state == JingleState.CONNECTED: + self._ui.jingle_audio_state.set_no_show_all(False) + self._ui.jingle_audio_state.show() + self._ui.jingle_connection_state.set_text('') + self._ui.jingle_connection_spinner.stop() + self._ui.jingle_connection_spinner.hide() + if self._jingle['video'].available: + self._ui.av_cam_button.set_sensitive(True) + + input_vol = app.settings.get('audio_input_volume') + output_vol = app.settings.get('audio_output_volume') + self._ui.mic_hscale.set_value(max(min(input_vol, 100), 0)) + self._ui.sound_hscale.set_value(max(min(output_vol, 100), 0)) + self._ui.audio_buttons_box.set_sensitive(True) + + elif audio_state == JingleState.ERROR: + self._ui.jingle_audio_state.hide() + self._ui.jingle_connection_state.set_text( + _('Connection Error')) + self._ui.jingle_connection_spinner.stop() + self._ui.jingle_connection_spinner.hide() + + if not self._jingle['audio'].sid: + self._ui.audio_buttons_box.set_sensitive(False) + + def _update_video(self): + audio_state = self._jingle['audio'].state + video_state = self._jingle['video'].state + + if video_state == JingleState.NULL: + self._ui.video_box.set_no_show_all(True) + self._ui.video_box.hide() + self._ui.outgoing_viewport.set_no_show_all(True) + self._ui.outgoing_viewport.hide() + if self._video_widget_other: + self._video_widget_other.destroy() + if self._video_widget_self: + self._video_widget_self.destroy() + + if audio_state != JingleState.CONNECTED: + self._ui.jingle_connection_state.set_text('') + self._ui.jingle_connection_spinner.stop() + self._ui.jingle_connection_spinner.hide() + self._ui.av_cam_button.set_sensitive(True) + self._ui.av_cam_button.set_tooltip_text(_('Turn Camera on')) + self._ui.av_cam_image.set_from_icon_name( + 'feather-camera-symbolic', Gtk.IconSize.BUTTON) + if audio_state == JingleState.NULL: + self.set_no_show_all(True) + self.hide() + self.emit('call-ended') + else: + self._ui.jingle_connection_spinner.show() + self._ui.jingle_connection_spinner.start() + + if video_state == JingleState.CONNECTING: + self._ui.jingle_connection_state.set_text(_('Calling (Video)…')) + self.set_no_show_all(False) + self.show_all() + self._ui.av_cam_button.set_sensitive(False) + self._ui.av_cam_button.set_tooltip_text(_('Turn Camera off')) + self._ui.av_cam_image.set_from_icon_name( + 'feather-camera-off-symbolic', Gtk.IconSize.BUTTON) + + elif video_state == JingleState.CONNECTION_RECEIVED: + self._ui.jingle_connection_state.set_text( + _('Incoming Call (Video)')) + self._ui.answer_video_button.show() + self._ui.av_cam_button.set_sensitive(False) + self._ui.av_cam_button.set_tooltip_text(_('Turn Camera off')) + self._ui.av_cam_image.set_from_icon_name( + 'feather-camera-off-symbolic', Gtk.IconSize.BUTTON) + + elif video_state == JingleState.CONNECTED: + self._ui.video_box.set_no_show_all(False) + self._ui.video_box.show_all() + self._ui.answer_video_button.hide() + if app.settings.get('video_see_self'): + self._ui.outgoing_viewport.set_no_show_all(False) + self._ui.outgoing_viewport.show() + else: + self._ui.outgoing_viewport.set_no_show_all(True) + self._ui.outgoing_viewport.hide() + + sink_other, self._video_widget_other, _name = create_gtk_widget() + sink_self, self._video_widget_self, _name = create_gtk_widget() + self._ui.incoming_viewport.add(self._video_widget_other) + self._ui.outgoing_viewport.add(self._video_widget_self) + + session = self._client.get_module('Jingle').get_jingle_session( + self._contact.jid, self._jingle['video'].sid) + content = session.get_content('video') + content.do_setup(sink_self, sink_other) + + self._ui.jingle_connection_state.set_text('') + self._ui.jingle_connection_spinner.stop() + self._ui.jingle_connection_spinner.hide() + + self._ui.av_cam_button.set_sensitive(True) + self._ui.av_cam_button.set_tooltip_text(_('Turn Camera off')) + self._ui.av_cam_image.set_from_icon_name( + 'feather-camera-off-symbolic', Gtk.IconSize.BUTTON) + + elif video_state == JingleState.ERROR: + self._ui.jingle_connection_state.set_text( + _('Connection Error')) + self._ui.jingle_connection_spinner.stop() + self._ui.jingle_connection_spinner.hide() + + def _set_jingle_state(self, jingle_type: str, state: str, sid: str = None, + reason: str = None) -> None: + jingle = self._jingle[jingle_type] + if state in ( + JingleState.CONNECTING, + JingleState.CONNECTED, + JingleState.NULL, + JingleState.ERROR) and reason: + log.info('%s state: %s, reason: %s', jingle_type, state, reason) + + if state in (jingle.state, JingleState.ERROR): + return + + if (state == JingleState.NULL and jingle.sid not in (None, sid)): + return + + new_sid = None + if state == JingleState.NULL: + new_sid = None + if state in ( + JingleState.CONNECTION_RECEIVED, + JingleState.CONNECTING, + JingleState.CONNECTED): + new_sid = sid + + jingle.state = state + jingle.sid = new_sid + jingle.update() + + def _stop_jingle(self, sid=None, reason=None): + audio_sid = self._jingle['audio'].sid + video_sid = self._jingle['video'].sid + if audio_sid and sid in (audio_sid, None): + self._close_jingle_content('audio') + if video_sid and sid in (video_sid, None): + self._close_jingle_content('video') + + def _close_jingle_content(self, jingle_type: str, + shutdown: Optional[bool] = False) -> None: + jingle = self._jingle[jingle_type] + if not jingle.sid: + return + + session = self._client.get_module('Jingle').get_jingle_session( + self._contact.jid, jingle.sid) + if session: + content = session.get_content(jingle_type) + if content: + session.remove_content(content.creator, content.name) + + if not shutdown: + jingle.sid = None + jingle.state = JingleState.NULL + jingle.update() + + def _get_audio_content(self): + session = self._client.get_module('Jingle').get_jingle_session( + self._contact.jid, self._jingle['audio'].sid) + return session.get_content('audio') + + +class JingleObject: + __slots__ = ('sid', 'state', 'available', 'update') + + def __init__(self, state, update): + self.sid = None + self.state = state + self.available = False + self.update = update ===================================== gajim/gtk/controls/base.py ===================================== @@ -277,6 +277,23 @@ def _get_action(self, name): return app.window.lookup_action(name + self.control_id) def process_event(self, event): + if event.account != self.account: + return + + jid = self.contact.jid.bare + if event.jid != jid: + return + + jingle_av_events = [ + 'jingle-request-received', + 'jingle-connected-received', + 'jingle-disconnected-received', + 'jingle-error-received' + ] + if self.is_chat and event.name in jingle_av_events: + self._process_jingle_av_event(event) + return + method_name = event.name.replace('-', '_') method_name = f'_on_{method_name}' getattr(self, method_name)(event) ===================================== gajim/gtk/controls/chat.py ===================================== @@ -25,7 +25,6 @@ from typing import ClassVar # pylint: disable=unused-import from typing import Type # pylint: disable=unused-import -from typing import Optional # pylint: disable=unused-import import os import time @@ -50,13 +49,12 @@ from gajim.common.const import AvatarSize from gajim.common.const import KindConstant from gajim.common.const import PEPEventType -from gajim.common.const import JingleState from gajim import gtkgui_helpers from gajim import gui_menu_builder from gajim import dialogs -from gajim.gui.gstreamer import create_gtk_widget +from gajim.gui.call_widget import CallWidget from gajim.gui.dialogs import DialogButton from gajim.gui.dialogs import ConfirmationDialog from gajim.gui.util import get_cursor @@ -75,17 +73,6 @@ log = logging.getLogger('gajim.gui.controls.chat') -class JingleObject: - __slots__ = ('sid', 'state', 'available', 'update') - - def __init__(self, state, update): - self.sid = None - self.state = state - self.available = False - self.update = update - - -################################################################################ class ChatControl(BaseControl): """ A control for standard 1-1 chat @@ -119,6 +106,14 @@ def __init__(self, account, jid): self.xml.sendfile_button.set_action_name( 'win.send-file-%s' % self.control_id) + self._call_widget = CallWidget(self.account, self.contact) + self._call_widget.connect('incoming-call', self._add_incoming_call) + self._call_widget.connect('call-ended', self._on_call_ended) + self.xml.paned1.add2(self._call_widget) + + self.conversation_view.connect('accept-call', self._on_accept_call) + self.conversation_view.connect('reject-call', self._on_reject_call) + # Menu for the HeaderBar self.control_menu = gui_menu_builder.get_singlechat_menu( self.control_id, self.account, self.contact.jid, self._type) @@ -126,18 +121,6 @@ def __init__(self, account, jid): # Settings menu self.xml.settings_menu.set_menu_model(self.control_menu) - self.jingle = { - 'audio': JingleObject( - JingleState.NULL, - self.update_audio), - 'video': JingleObject( - JingleState.NULL, - self.update_video), - } - self._video_widget_other = None - self._video_widget_self = None - self.conversation_view.connect('call-answered', self._on_call_answered) - self.update_toolbar() self.update_all_pep_types() self._update_avatar() @@ -154,22 +137,6 @@ def __init__(self, account, jid): self.on_location_eventbox_leave_notify_event) self.handlers[id_] = widget - for key in ('1', '2', '3', '4', '5', '6', '7', '8', '9', '*', '0', '#'): - widget = self.xml.get_object(key + '_button') - id_ = widget.connect('pressed', self.on_num_button_pressed, key) - self.handlers[id_] = widget - id_ = widget.connect('released', self.on_num_button_released) - self.handlers[id_] = widget - - widget = self.xml.mic_hscale - id_ = widget.connect('value_changed', self.on_mic_hscale_value_changed) - self.handlers[id_] = widget - - widget = self.xml.sound_hscale - id_ = widget.connect('value_changed', - self.on_sound_hscale_value_changed) - self.handlers[id_] = widget - self.info_bar = Gtk.InfoBar() content_area = self.info_bar.get_content_area() self.info_bar_label = Gtk.Label() @@ -259,23 +226,11 @@ def update_actions(self): self._get_action('block-contact-').set_enabled( online and self._client.get_module('Blocking').supported) - # Jingle AV detection - if (self.contact.supports(Namespace.JINGLE_ICE_UDP) and - app.is_installed('FARSTREAM') and self.contact.jid.resource): - self.jingle['audio'].available = self.contact.supports( - Namespace.JINGLE_RTP_AUDIO) - self.jingle['video'].available = self.contact.supports( - Namespace.JINGLE_RTP_VIDEO) - else: - if (self.jingle['audio'].available or - self.jingle['video'].available): - self.stop_jingle() - self.jingle['audio'].available = False - self.jingle['video'].available = False - - self._get_action(f'start-call-').set_enabled( - online and (self.jingle['audio'].available or - self.jingle['video'].available)) + # Jingle AV + audio_available = self._call_widget.get_jingle_available('audio') + video_available = self._call_widget.get_jingle_available('video') + self._get_action('start-call-').set_enabled( + online and (audio_available or video_available)) # Send message has_text = self.msg_textview.has_text() @@ -556,318 +511,23 @@ def _nec_ping(self, event): elif event.name == 'ping-error': self.add_info_message(event.error) - # Jingle AV - def _on_start_call(self, *args): - audio_state = self.jingle['audio'].state - video_state = self.jingle['video'].state - if audio_state == JingleState.NULL and video_state == JingleState.NULL: - self.xml.av_box.set_no_show_all(False) - self.xml.av_box.show_all() - self.xml.jingle_audio_state.hide() - self.xml.av_start_box.show() - self.xml.av_start_mic_cam_button.set_sensitive( - self.jingle['video'].available) - self.xml.av_cam_button.set_sensitive(False) - - def _on_call_with_mic(self, _button): - self._on_jingle_button_toggled(['audio']) - self.xml.av_start_box.hide() - - def _on_call_with_mic_and_cam(self, _button): - self._on_jingle_button_toggled(['audio', 'video']) - self.xml.av_start_box.hide() - - def _on_video(self, *args): - self._on_jingle_button_toggled(['video']) - - def update_audio(self): - self.update_actions() - - audio_state = self.jingle['audio'].state - video_state = self.jingle['video'].state - if self.jingle['video'].available: - self.xml.av_cam_button.set_sensitive( - video_state not in ( - JingleState.CONNECTING, - JingleState.CONNECTED)) - - if audio_state == JingleState.NULL: - self.xml.audio_buttons_box.set_sensitive(False) - self.xml.jingle_audio_state.set_no_show_all(True) - self.xml.jingle_audio_state.hide() - self.xml.jingle_connection_state.set_text('') - self.xml.jingle_connection_spinner.stop() - self.xml.jingle_connection_spinner.hide() - - if video_state == JingleState.NULL: - self.xml.av_box.set_no_show_all(True) - self.xml.av_box.hide() - else: - self.xml.jingle_connection_spinner.show() - self.xml.jingle_connection_spinner.start() - - if audio_state == JingleState.CONNECTING: - self.xml.av_box.set_no_show_all(False) - self.xml.av_box.show_all() - self.xml.jingle_connection_state.set_text( - _('Calling…')) - self.xml.av_cam_button.set_sensitive(False) - - elif audio_state == JingleState.CONNECTION_RECEIVED: - self.xml.jingle_connection_state.set_text( - _('Incoming Call')) - - elif audio_state == JingleState.CONNECTED: - self.xml.jingle_audio_state.set_no_show_all(False) - self.xml.jingle_audio_state.show() - self.xml.jingle_connection_state.set_text('') - self.xml.jingle_connection_spinner.stop() - self.xml.jingle_connection_spinner.hide() - if self.jingle['video'].available: - self.xml.av_cam_button.set_sensitive(True) - - input_vol = app.settings.get('audio_input_volume') - output_vol = app.settings.get('audio_output_volume') - self.xml.mic_hscale.set_value(max(min(input_vol, 100), 0)) - self.xml.sound_hscale.set_value(max(min(output_vol, 100), 0)) - self.xml.audio_buttons_box.set_sensitive(True) - - elif audio_state == JingleState.ERROR: - self.xml.jingle_audio_state.hide() - self.xml.jingle_connection_state.set_text( - _('Connection Error')) - self.xml.jingle_connection_spinner.stop() - self.xml.jingle_connection_spinner.hide() - - if not self.jingle['audio'].sid: - self.xml.audio_buttons_box.set_sensitive(False) - - def update_video(self): - self.update_actions() - - audio_state = self.jingle['audio'].state - video_state = self.jingle['video'].state - - if video_state == JingleState.NULL: - self.xml.video_box.set_no_show_all(True) - self.xml.video_box.hide() - self.xml.outgoing_viewport.set_no_show_all(True) - self.xml.outgoing_viewport.hide() - if self._video_widget_other: - self._video_widget_other.destroy() - if self._video_widget_self: - self._video_widget_self.destroy() - - if audio_state != JingleState.CONNECTED: - self.xml.jingle_connection_state.set_text('') - self.xml.jingle_connection_spinner.stop() - self.xml.jingle_connection_spinner.hide() - self.xml.av_cam_button.set_sensitive(True) - self.xml.av_cam_button.set_tooltip_text(_('Turn Camera on')) - self.xml.av_cam_image.set_from_icon_name( - 'feather-camera-symbolic', Gtk.IconSize.BUTTON) - if audio_state == JingleState.NULL: - self.xml.av_box.set_no_show_all(True) - self.xml.av_box.hide() - else: - self.xml.jingle_connection_spinner.show() - self.xml.jingle_connection_spinner.start() - - if video_state == JingleState.CONNECTING: - self.xml.jingle_connection_state.set_text(_('Calling (Video)…')) - self.xml.av_box.set_no_show_all(False) - self.xml.av_box.show_all() - self.xml.av_cam_button.set_sensitive(False) - self.xml.av_cam_button.set_tooltip_text(_('Turn Camera off')) - self.xml.av_cam_image.set_from_icon_name( - 'feather-camera-off-symbolic', Gtk.IconSize.BUTTON) - - elif video_state == JingleState.CONNECTION_RECEIVED: - self.xml.jingle_connection_state.set_text( - _('Incoming Call (Video)')) - self.xml.av_cam_button.set_sensitive(False) - self.xml.av_cam_button.set_tooltip_text(_('Turn Camera off')) - self.xml.av_cam_image.set_from_icon_name( - 'feather-camera-off-symbolic', Gtk.IconSize.BUTTON) - - elif video_state == JingleState.CONNECTED: - self.xml.video_box.set_no_show_all(False) - self.xml.video_box.show_all() - if app.settings.get('video_see_self'): - self.xml.outgoing_viewport.set_no_show_all(False) - self.xml.outgoing_viewport.show() - else: - self.xml.outgoing_viewport.set_no_show_all(True) - self.xml.outgoing_viewport.hide() - - sink_other, self._video_widget_other, _name = create_gtk_widget() - sink_self, self._video_widget_self, _name = create_gtk_widget() - self.xml.incoming_viewport.add(self._video_widget_other) - self.xml.outgoing_viewport.add(self._video_widget_self) - - session = self._client.get_module('Jingle').get_jingle_session( - self.contact.jid, self.jingle['video'].sid) - content = session.get_content('video') - content.do_setup(sink_self, sink_other) - - self.xml.jingle_connection_state.set_text('') - self.xml.jingle_connection_spinner.stop() - self.xml.jingle_connection_spinner.hide() - - self.xml.av_cam_button.set_sensitive(True) - self.xml.av_cam_button.set_tooltip_text(_('Turn Camera off')) - self.xml.av_cam_image.set_from_icon_name( - 'feather-camera-off-symbolic', Gtk.IconSize.BUTTON) - - elif video_state == JingleState.ERROR: - self.xml.jingle_connection_state.set_text( - _('Connection Error')) - self.xml.jingle_connection_spinner.stop() - self.xml.jingle_connection_spinner.hide() - - def set_jingle_state(self, jingle_type: str, state: str, sid: str = None, - reason: str = None) -> None: - jingle = self.jingle[jingle_type] - if state in ( - JingleState.CONNECTING, - JingleState.CONNECTED, - JingleState.NULL, - JingleState.ERROR) and reason: - log.info('%s state: %s, reason: %s', jingle_type, state, reason) - - if state in (jingle.state, JingleState.ERROR): - return - - if (state == JingleState.NULL and jingle.sid not in (None, sid)): - return - - new_sid = None - if state == JingleState.NULL: - new_sid = None - if state in ( - JingleState.CONNECTION_RECEIVED, - JingleState.CONNECTING, - JingleState.CONNECTED): - new_sid = sid - - jingle.state = state - jingle.sid = new_sid - jingle.update() - - def stop_jingle(self, sid=None, reason=None): - audio_sid = self.jingle['audio'].sid - video_sid = self.jingle['video'].sid - if audio_sid and sid in (audio_sid, None): - self.close_jingle_content('audio') - if video_sid and sid in (video_sid, None): - self.close_jingle_content('video') - - def close_jingle_content(self, jingle_type: str, - shutdown: Optional[bool] = False) -> None: - jingle = self.jingle[jingle_type] - if not jingle.sid: - return - - session = self._client.get_module('Jingle').get_jingle_session( - self.contact.jid, jingle.sid) - if session: - content = session.get_content(jingle_type) - if content: - session.remove_content(content.creator, content.name) - - if not shutdown: - jingle.sid = None - jingle.state = JingleState.NULL - jingle.update() - - def _on_end_call_clicked(self, _widget): - self.close_jingle_content('audio') - self.close_jingle_content('video') - self.xml.jingle_audio_state.set_no_show_all(True) - self.xml.jingle_audio_state.hide() - self.xml.av_box.set_no_show_all(True) - self.xml.av_box.hide() - - def _on_jingle_button_toggled(self, jingle_types): - if all(item in jingle_types for item in ['audio', 'video']): - # Both 'audio' and 'video' in jingle_types - sid = self._client.get_module('Jingle').start_audio_video( - self.contact.jid) - self.set_jingle_state('audio', JingleState.CONNECTING, sid) - self.set_jingle_state('video', JingleState.CONNECTING, sid) - return - - if 'audio' in jingle_types: - if self.jingle['audio'].state != JingleState.NULL: - self.close_jingle_content('audio') - else: - sid = self._client.get_module('Jingle').start_audio( - self.contact.jid) - self.set_jingle_state('audio', JingleState.CONNECTING, sid) - - if 'video' in jingle_types: - if self.jingle['video'].state != JingleState.NULL: - self.close_jingle_content('video') - else: - sid = self._client.get_module('Jingle').start_video( - self.contact.jid) - self.set_jingle_state('video', JingleState.CONNECTING, sid) - - def _get_audio_content(self): - session = self._client.get_module('Jingle').get_jingle_session( - self.contact.jid, self.jingle['audio'].sid) - return session.get_content('audio') - - def on_num_button_pressed(self, _widget, num): - self._get_audio_content().start_dtmf(num) - - def on_num_button_released(self, _released): - self._get_audio_content().stop_dtmf() - - def on_mic_hscale_value_changed(self, _widget, value): - self._get_audio_content().set_mic_volume(value / 100) - app.settings.set('audio_input_volume', int(value)) - - def on_sound_hscale_value_changed(self, _widget, value): - self._get_audio_content().set_out_volume(value / 100) - app.settings.set('audio_output_volume', int(value)) - - def _on_call_answered(self, _view, action, event): - if action == 'accept': - session = self._client.get_module('Jingle').get_jingle_session( - event.fjid, event.sid) - if not session: - return - - audio = session.get_content('audio') - video = session.get_content('video') - - if audio and not audio.negotiated: - self.set_jingle_state( - 'audio', JingleState.CONNECTING, event.sid) - if video and not video.negotiated: - self.set_jingle_state( - 'video', JingleState.CONNECTING, event.sid) + # Jingle AV calls + def _on_start_call(self): + self._call_widget.start_call() - if not session.accepted: - session.approve_session() + def _process_jingle_av_event(self, event): + self._call_widget.process_event(event) - for item in event.contents: - session.approve_content(item.media) + def _on_accept_call(self, _view, event): + self._call_widget.accept_call(event) - if action == 'reject': - session = self._client.get_module('Jingle').get_jingle_session( - event.fjid, event.sid) - if not session: - return + def _on_reject_call(self, _view, event): + self._call_widget.reject_call(event) - if not session.accepted: - session.decline_session() - else: - for item in event.contents: - session.reject_content(item.media) + def _on_call_ended(self, _call_widget): + self.conversation_view.update_call_rows() - def add_incoming_call(self, event): + def _add_incoming_call(self, _call_widget, event): self.add_call_message(time.time(), '', event=event) def on_location_eventbox_button_release_event(self, _widget, _event): @@ -1023,10 +683,6 @@ def shutdown(self): self._client.get_module('Chatstate').set_chatstate( self.contact, Chatstate.GONE) - for jingle_type in ('audio', 'video'): - self.close_jingle_content(jingle_type, shutdown=True) - self.jingle.clear() - super(ChatControl, self).shutdown() app.check_finalize(self) ===================================== gajim/gtk/conversation/rows/call.py ===================================== @@ -45,9 +45,10 @@ def __init__(self, account, contact, timestamp, text, event=None): Gtk.IconSize.MENU) self.grid.attach(icon, 1, 0, 1, 1) - self._label = SimpleLabel() - self._label.set_text(text) - self.grid.attach(self._label, 2, 0, 1, 1) + label = SimpleLabel() + label.get_style_context().add_class('dim-label') + label.set_text(text) + self.grid.attach(label, 2, 0, 1, 1) else: self._prepare_incoming_call() @@ -59,21 +60,40 @@ def __init__(self, account, contact, timestamp, text, event=None): self.show_all() + def update(self): + if self._event is None: + return + + self._call_box.destroy() + + icon = Gtk.Image.new_from_icon_name('call-start-symbolic', + Gtk.IconSize.MENU) + self.grid.attach(icon, 1, 0, 1, 1) + + label = SimpleLabel() + label.get_style_context().add_class('dim-label') + text = _('%s called you') % self._contact.name + label.set_text(text) + self.grid.attach(label, 2, 0, 1, 1) + self.show_all() + self._event = None + def _on_accept(self, button): button.set_sensitive(False) self._reject_button.set_sensitive(False) - self.get_parent().on_call_answered('accept', self._event) + self.get_parent().accept_call(self._event) def _on_reject(self, button): button.set_sensitive(False) self._accept_button.set_sensitive(False) - self.get_parent().on_call_answered('reject', self._event) + self.get_parent().reject_call(self._event) def _prepare_incoming_call(self): - call_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=6) - call_box.set_size_request(350, -1) - call_box.get_style_context().add_class('conversation-call-box') - call_box.get_style_context().add_class('gajim-call-message') + self._call_box = Gtk.Box( + orientation=Gtk.Orientation.VERTICAL, spacing=6) + self._call_box.set_size_request(350, -1) + self._call_box.get_style_context().add_class('conversation-call-box') + self._call_box.get_style_context().add_class('gajim-call-message') scale = self.get_scale_factor() avatar = self._contact.get_avatar( @@ -81,7 +101,7 @@ def _prepare_incoming_call(self): scale, add_show=False) avatar_image = Gtk.Image.new_from_surface(avatar) - call_box.add(avatar_image) + self._call_box.add(avatar_image) content_types = [] for item in self._event.contents: @@ -95,7 +115,7 @@ def _prepare_incoming_call(self): label.get_style_context().add_class('bold') label.set_max_width_chars(40) label.set_line_wrap(True) - call_box.add(label) + self._call_box.add(label) self._accept_button = Gtk.Button.new_with_label(_('Accept Call')) self._accept_button.connect('clicked', self._on_accept) @@ -107,6 +127,6 @@ def _prepare_incoming_call(self): button_box.set_halign(Gtk.Align.CENTER) button_box.add(self._accept_button) button_box.add(self._reject_button) - call_box.add(button_box) + self._call_box.add(button_box) - self.grid.attach(call_box, 1, 0, 1, 1) + self.grid.attach(self._call_box, 1, 0, 1, 1) ===================================== gajim/gtk/conversation/view.py ===================================== @@ -48,10 +48,15 @@ class ConversationView(Gtk.ListBox): None, (str, ) ), - 'call-answered': ( + 'accept-call': ( GObject.SignalFlags.RUN_LAST | GObject.SignalFlags.ACTION, None, - (str, object) + (object, ) + ), + 'reject-call': ( + GObject.SignalFlags.RUN_LAST | GObject.SignalFlags.ACTION, + None, + (object, ) ), } @@ -376,6 +381,11 @@ def iter_rows(self): for row in self.get_children(): yield row + def update_call_rows(self): + for row in self.get_children(): + if row.type == 'call': + row.update() + def set_read_marker(self, id_): if id_ is None: self._read_marker_row.hide() @@ -423,8 +433,11 @@ def show_error(self, id_, error): def on_quote(self, text): self.emit('quote', text) - def on_call_answered(self, action, event): - self.emit('call-answered', action, event) + def accept_call(self, event): + self.emit('accept-call', event) + + def reject_call(self, event): + self.emit('reject-call', event) def _on_contact_setting_changed(self, *args): self.invalidate_filter() ===================================== gajim/gtk/main.py ===================================== @@ -74,6 +74,10 @@ def __init__(self): ('muc-self-presence', ged.GUI1, self._on_event), ('muc-voice-request', ged.GUI1, self._on_event), ('muc-disco-update', ged.GUI1, self._on_event), + ('jingle-request-received', ged.GUI1, self._on_event), + ('jingle-connected-received', ged.GUI1, self._on_event), + ('jingle-disconnected-received', ged.GUI1, self._on_event), + ('jingle-error-received', ged.GUI1, self._on_event), ('our-show', ged.GUI1, self._on_our_show), ('signed-in', ged.GUI1, self._on_signed_in), ('account-enabled', ged.GUI1, self._on_account_enabled), @@ -442,7 +446,7 @@ def _load_chats(self): def _on_event(self, event): if event.name == 'caps-update': - #TODO + # TODO return if event.name == 'update-roster-avatar': @@ -457,6 +461,13 @@ def _on_event(self, event): else: jid = event.properties.jid.new_as_bare() self.add_chat(event.account, jid, 'contact') + elif event.name == 'jingle-request-received': + content_types = [] + for item in event.contents: + content_types.append(item.media) + if 'audio' in content_types or 'video' in content_types: + # AV Call received, open chat control + self.add_chat(event.account, event.jid, 'contact') else: # No chat is open, dont handle any gui events return ===================================== gajim/gui_interface.py ===================================== @@ -223,10 +223,6 @@ def _create_core_handlers_list(self): 'file-send-error': [self.handle_event_file_send_error], 'file-request-error': [self.handle_event_file_request_error], 'file-request-received': [self.handle_event_file_request], - 'jingle-connected-received': [self.handle_event_jingle_connected], - 'jingle-disconnected-received': [self.handle_event_jingle_disconnected], - 'jingle-error-received': [self.handle_event_jingle_error], - 'jingle-request-received': [self.handle_event_jingle_incoming], 'jingle-ft-cancelled-received': [self.handle_event_jingleft_cancel], } # pylint: enable=line-too-long @@ -1021,124 +1017,6 @@ def _popup_ft_result(self, account, jid, file_props): title=event_type, text=txt) - # Jingle AV handling - @staticmethod - def handle_event_jingle_incoming(event): - # ('JINGLE_INCOMING', conn, fjid, sid, resource, jingle session, - # tuple-of-contents==(type, data...)) - # TODO: conditional blocking if peer is not in roster - - account = event.conn.name - - content_types = [] - for item in event.contents: - content_types.append(item.media) - - if 'audio' not in content_types and 'video' not in content_types: - return - - ctrl = app.window.get_control(account, event.jid) - if ctrl: - if 'audio' in content_types: - ctrl.set_jingle_state( - 'audio', - JingleState.CONNECTION_RECEIVED, - event.sid) - if 'video' in content_types: - ctrl.set_jingle_state( - 'video', - JingleState.CONNECTION_RECEIVED, - event.sid) - ctrl.add_incoming_call(event) - - if helpers.allow_popup_window(account): - def _prepare_control(): - ctrl = app.window.get_control(account, event.jid) - ctrl.add_incoming_call(event) - - if not ctrl: - app.window.add_chat( - account, event.jid, 'contact', select=True) - GLib.idle_add(_prepare_control) - return - - if helpers.allow_showing_notification(account): - heading = _('Incoming Call') - client = app.get_client(account) - contact = client.get_module('Contacts').get_contact(event.jid) - text = _('%s is calling') % contact.name - app.notification.popup( - heading, - event.jid, - account, - 'jingle-incoming', - icon_name='call-start-symbolic', - title=heading, - text=text) - - @staticmethod - def handle_event_jingle_connected(event): - # ('JINGLE_CONNECTED', account, (peerjid, sid, media)) - if event.media in ('audio', 'video'): - account = event.conn.name - ctrl = app.window.get_control(account, event.jid) - if ctrl: - client = app.get_client(account) - session = client.get_module('Jingle').get_jingle_session( - event.fjid, event.sid) - - if event.media == 'audio': - content = session.get_content('audio') - ctrl.set_jingle_state( - 'audio', - JingleState.CONNECTED, - event.sid) - if event.media == 'video': - content = session.get_content('video') - ctrl.set_jingle_state( - 'video', - JingleState.CONNECTED, - event.sid) - - # Now, accept the content/sessions. - # This should be done after the chat control is running - if not session.accepted: - session.approve_session() - for content in event.media: - session.approve_content(content) - - @staticmethod - def handle_event_jingle_disconnected(event): - # ('JINGLE_DISCONNECTED', account, (peerjid, sid, reason)) - account = event.conn.name - ctrl = app.window.get_control(account, event.jid) - if ctrl: - if event.media is None: - ctrl.stop_jingle(sid=event.sid, reason=event.reason) - if event.media == 'audio': - ctrl.set_jingle_state( - 'audio', - JingleState.NULL, - sid=event.sid, - reason=event.reason) - if event.media == 'video': - ctrl.set_jingle_state( - 'video', - JingleState.NULL, - sid=event.sid, - reason=event.reason) - - @staticmethod - def handle_event_jingle_error(event): - # ('JINGLE_ERROR', account, (peerjid, sid, reason)) - account = event.conn.name - ctrl = app.window.get_control(account, event.jid) - if ctrl and event.sid == ctrl.jingle['audio'].sid: - ctrl.set_jingle_state( - 'audio', - JingleState.ERROR, - reason=event.reason) - def send_httpupload(self, chat_control, path=None): if path is not None: self._send_httpupload(chat_control, path) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2a0fc69b4a73a5711e8f70e7b515a011… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2a0fc69b4a73a5711e8f70e7b515a011… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] ConversationView: Add Call row
by Daniel Brötzmann (＠wurstsalat) 27 Aug '21

27 Aug '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 4dce9b32 by wurstsalat at 2021-08-27T21:10:08+02:00 ConversationView: Add Call row - - - - - 9 changed files: - gajim/common/const.py - gajim/data/style/default-dark.css - gajim/data/style/default.css - gajim/data/style/gajim.css - gajim/gtk/controls/base.py - gajim/gtk/controls/chat.py - + gajim/gtk/conversation/rows/call.py - gajim/gtk/conversation/view.py - gajim/gui_interface.py Changes: ===================================== gajim/common/const.py ===================================== @@ -32,6 +32,7 @@ class AvatarSize(IntEnum): WORKSPACE_EDIT = 100 CHAT = 48 NOTIFICATION = 48 + CALL = 100 GROUP_INFO = 100 TOOLTIP = 100 ACCOUNT_PAGE = 150 ===================================== gajim/data/style/default-dark.css ===================================== @@ -15,6 +15,10 @@ .gajim-subject-message { color: rgb(205, 225, 255); background: rgb(40, 60, 80); } +.gajim-call-message { + color: rgb(205, 225, 255); + background: rgb(40, 60, 80); +} .gajim-url { color: rgb(60, 135, 220); } ===================================== gajim/data/style/default.css ===================================== @@ -15,6 +15,10 @@ .gajim-subject-message { color: rgb(40, 70, 100); background: rgb(225, 235, 250); } +.gajim-call-message { + color: rgb(40, 70, 100); + background: rgb(225, 235, 250); +} .gajim-url { color: rgb(30, 75, 135); } ===================================== gajim/data/style/gajim.css ===================================== @@ -82,7 +82,8 @@ .conversation-system-row { .conversation-date-row { padding: 12px; } -.conversation-subject-box { +.conversation-subject-box, +.conversation-call-box { border-radius: 6px; padding: 12px; } ===================================== gajim/gtk/controls/base.py ===================================== @@ -1098,6 +1098,9 @@ def add_info_message(self, text): def add_file_transfer(self, transfer): self.conversation_view.add_file_transfer(transfer) + def add_call_message(self, timestamp, text, event=None): + self.conversation_view.add_call_message(timestamp, text, event) + def add_message(self, text, kind, ===================================== gajim/gtk/controls/chat.py ===================================== @@ -136,6 +136,7 @@ def __init__(self, account, jid): } self._video_widget_other = None self._video_widget_self = None + self.conversation_view.connect('call-answered', self._on_call_answered) self.update_toolbar() self.update_all_pep_types() @@ -831,6 +832,44 @@ def on_sound_hscale_value_changed(self, _widget, value): self._get_audio_content().set_out_volume(value / 100) app.settings.set('audio_output_volume', int(value)) + def _on_call_answered(self, _view, action, event): + if action == 'accept': + session = self._client.get_module('Jingle').get_jingle_session( + event.fjid, event.sid) + if not session: + return + + audio = session.get_content('audio') + video = session.get_content('video') + + if audio and not audio.negotiated: + self.set_jingle_state( + 'audio', JingleState.CONNECTING, event.sid) + if video and not video.negotiated: + self.set_jingle_state( + 'video', JingleState.CONNECTING, event.sid) + + if not session.accepted: + session.approve_session() + + for item in event.contents: + session.approve_content(item.media) + + if action == 'reject': + session = self._client.get_module('Jingle').get_jingle_session( + event.fjid, event.sid) + if not session: + return + + if not session.accepted: + session.decline_session() + else: + for item in event.contents: + session.reject_content(item.media) + + def add_incoming_call(self, event): + self.add_call_message(time.time(), '', event=event) + def on_location_eventbox_button_release_event(self, _widget, _event): return # TODO @@ -1200,61 +1239,6 @@ def _got_file_error(self, file_props, type_, pri_txt, sec_txt): file_props, Gtk.MessageType.ERROR) - def _on_reject_call(self, _button, event): - app.events.remove_events( - self.account, event.jid, types='jingle-incoming') - - session = self._client.get_module('Jingle').get_jingle_session( - event.peerjid, event.sid) - if not session: - return - - if not session.accepted: - session.decline_session() - else: - for content in event.content_types: - session.reject_content(content) - - def _on_accept_call(self, _button, event): - app.events.remove_events( - self.account, event.jid, types='jingle-incoming') - - session = self._client.get_module('Jingle').get_jingle_session( - event.peerjid, event.sid) - if not session: - return - - audio = session.get_content('audio') - video = session.get_content('video') - - if audio and not audio.negotiated: - self.set_jingle_state('audio', JingleState.CONNECTING, event.sid) - if video and not video.negotiated: - self.set_jingle_state('video', JingleState.CONNECTING, event.sid) - - if not session.accepted: - session.approve_session() - - for content in event.content_types: - session.approve_content(content) - - def add_call_received_message(self, event): - markup = '<b>%s</b>' % (_('Incoming Call')) - if 'video' in event.content_types: - markup += _('\nVideo Call') - else: - markup += _('\nVoice Call') - - button_reject = Gtk.Button.new_with_mnemonic(_('_Reject')) - button_reject.connect('clicked', self._on_reject_call, event) - button_accept = Gtk.Button.new_with_mnemonic(_('_Accept')) - button_accept.connect('clicked', self._on_accept_call, event) - self._add_info_bar_message( - markup, - [button_reject, button_accept], - event, - Gtk.MessageType.QUESTION) - def on_event_added(self, event): if event.account != self.account: return ===================================== gajim/gtk/conversation/rows/call.py ===================================== @@ -0,0 +1,112 @@ +# 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/>. + +import time +from datetime import datetime + +from gi.repository import Gtk + +from gajim.common.const import AvatarSize +from gajim.common.i18n import _ + +from .widgets import SimpleLabel +from .base import BaseRow + + +class CallRow(BaseRow): + def __init__(self, account, contact, timestamp, text, event=None): + BaseRow.__init__(self, account) + + self.type = 'call' + timestamp = time.time() + self.timestamp = datetime.fromtimestamp(timestamp) + self.db_timestamp = timestamp + + self._contact = contact + self._event = event + + avatar_placeholder = Gtk.Box() + avatar_placeholder.set_size_request(AvatarSize.ROSTER, -1) + self.grid.attach(avatar_placeholder, 0, 0, 1, 1) + + if event is None: + icon = Gtk.Image.new_from_icon_name('call-start-symbolic', + Gtk.IconSize.MENU) + self.grid.attach(icon, 1, 0, 1, 1) + + self._label = SimpleLabel() + self._label.set_text(text) + self.grid.attach(self._label, 2, 0, 1, 1) + else: + self._prepare_incoming_call() + + timestamp_widget = self.create_timestamp_widget(self.timestamp) + timestamp_widget.set_hexpand(True) + timestamp_widget.set_halign(Gtk.Align.END) + timestamp_widget.set_valign(Gtk.Align.START) + self.grid.attach(timestamp_widget, 3, 0, 1, 1) + + self.show_all() + + def _on_accept(self, button): + button.set_sensitive(False) + self._reject_button.set_sensitive(False) + self.get_parent().on_call_answered('accept', self._event) + + def _on_reject(self, button): + button.set_sensitive(False) + self._accept_button.set_sensitive(False) + self.get_parent().on_call_answered('reject', self._event) + + def _prepare_incoming_call(self): + call_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=6) + call_box.set_size_request(350, -1) + call_box.get_style_context().add_class('conversation-call-box') + call_box.get_style_context().add_class('gajim-call-message') + + scale = self.get_scale_factor() + avatar = self._contact.get_avatar( + AvatarSize.CALL, + scale, + add_show=False) + avatar_image = Gtk.Image.new_from_surface(avatar) + call_box.add(avatar_image) + + content_types = [] + for item in self._event.contents: + content_types.append(item.media) + text = _('%s is calling') % self._contact.name + if 'video' in content_types: + text += _(' (Video Call)') + else: + text += _(' (Voice Call)') + label = Gtk.Label(label=text) + label.get_style_context().add_class('bold') + label.set_max_width_chars(40) + label.set_line_wrap(True) + call_box.add(label) + + self._accept_button = Gtk.Button.new_with_label(_('Accept Call')) + self._accept_button.connect('clicked', self._on_accept) + + self._reject_button = Gtk.Button.new_with_label(_('Reject')) + self._reject_button.connect('clicked', self._on_reject) + + button_box = Gtk.Box(spacing=12) + button_box.set_halign(Gtk.Align.CENTER) + button_box.add(self._accept_button) + button_box.add(self._reject_button) + call_box.add(button_box) + + self.grid.attach(call_box, 1, 0, 1, 1) ===================================== gajim/gtk/conversation/view.py ===================================== @@ -29,6 +29,7 @@ from .rows.scroll_hint import ScrollHintRow from .rows.message import MessageRow from .rows.info import InfoMessage +from .rows.call import CallRow from .rows.date import DateRow from .rows.file_transfer import FileTransferRow from .rows.muc_subject import MUCSubject @@ -47,6 +48,11 @@ class ConversationView(Gtk.ListBox): None, (str, ) ), + 'call-answered': ( + GObject.SignalFlags.RUN_LAST | GObject.SignalFlags.ACTION, + None, + (str, object) + ), } def __init__(self, account, contact): @@ -168,6 +174,14 @@ def add_file_transfer(self, transfer): transfer_row = FileTransferRow(self._account, transfer) self._insert_message(transfer_row) + def add_call_message(self, timestamp, text, event): + call_row = CallRow(self._account, + self._contact, + timestamp, + text, + event) + self._insert_message(call_row) + def add_message(self, text, kind, @@ -409,5 +423,8 @@ def show_error(self, id_, error): def on_quote(self, text): self.emit('quote', text) + def on_call_answered(self, action, event): + self.emit('call-answered', action, event) + def _on_contact_setting_changed(self, *args): self.invalidate_filter() ===================================== gajim/gui_interface.py ===================================== @@ -1022,32 +1022,22 @@ def _popup_ft_result(self, account, jid, file_props): text=txt) # Jingle AV handling - def handle_event_jingle_incoming(self, event): - # ('JINGLE_INCOMING', account, peer jid, sid, tuple-of-contents==(type, - # data...)) + @staticmethod + def handle_event_jingle_incoming(event): + # ('JINGLE_INCOMING', conn, fjid, sid, resource, jingle session, + # tuple-of-contents==(type, data...)) # TODO: conditional blocking if peer is not in roster account = event.conn.name + content_types = [] for item in event.contents: content_types.append(item.media) - # check type of jingle session - if 'audio' in content_types or 'video' in content_types: - # a voip session... - # we now handle only voip, so the only thing we will do here is - # not to return from function - pass - else: - # unknown session type... it should be declined in common/jingle.py - return - notification_event = events.JingleIncomingEvent( - event.fjid, - event.sid, - content_types) + if 'audio' not in content_types and 'video' not in content_types: + return - ctrl = (app.window.get_control(account, event.fjid) or - app.window.get_control(account, event.jid)) + ctrl = app.window.get_control(account, event.jid) if ctrl: if 'audio' in content_types: ctrl.set_jingle_state( @@ -1059,25 +1049,24 @@ def handle_event_jingle_incoming(self, event): 'video', JingleState.CONNECTION_RECEIVED, event.sid) - ctrl.add_call_received_message(notification_event) + ctrl.add_incoming_call(event) if helpers.allow_popup_window(account): def _prepare_control(): ctrl = app.window.get_control(account, event.jid) - ctrl.add_call_received_message(notification_event) + ctrl.add_incoming_call(event) if not ctrl: app.window.add_chat( account, event.jid, 'contact', select=True) - GLib.idle_add(_prepare_control) - return - - self.add_event(account, event.fjid, notification_event) + GLib.idle_add(_prepare_control) + return if helpers.allow_showing_notification(account): heading = _('Incoming Call') - contact = app.get_name_from_jid(account, event.jid) - text = _('%s is calling') % contact + client = app.get_client(account) + contact = client.get_module('Contacts').get_contact(event.jid) + text = _('%s is calling') % contact.name app.notification.popup( heading, event.jid, @@ -1092,11 +1081,10 @@ def handle_event_jingle_connected(event): # ('JINGLE_CONNECTED', account, (peerjid, sid, media)) if event.media in ('audio', 'video'): account = event.conn.name - ctrl = (app.window.get_control(account, event.fjid) or - app.window.get_control(account, event.jid)) + ctrl = app.window.get_control(account, event.jid) if ctrl: - con = app.connections[account] - session = con.get_module('Jingle').get_jingle_session( + client = app.get_client(account) + session = client.get_module('Jingle').get_jingle_session( event.fjid, event.sid) if event.media == 'audio': @@ -1123,8 +1111,7 @@ def handle_event_jingle_connected(event): def handle_event_jingle_disconnected(event): # ('JINGLE_DISCONNECTED', account, (peerjid, sid, reason)) account = event.conn.name - ctrl = (app.window.get_control(account, event.fjid) or - app.window.get_control(account, event.jid)) + ctrl = app.window.get_control(account, event.jid) if ctrl: if event.media is None: ctrl.stop_jingle(sid=event.sid, reason=event.reason) @@ -1145,8 +1132,7 @@ def handle_event_jingle_disconnected(event): def handle_event_jingle_error(event): # ('JINGLE_ERROR', account, (peerjid, sid, reason)) account = event.conn.name - ctrl = (app.window.get_control(account, event.fjid) or - app.window.get_control(account, event.jid)) + ctrl = app.window.get_control(account, event.jid) if ctrl and event.sid == ctrl.jingle['audio'].sid: ctrl.set_jingle_state( 'audio', View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4dce9b3244d5fe56c0bd448aebf0d32d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4dce9b3244d5fe56c0bd448aebf0d32d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 3 commits: Settings: Remove mergeaccounts
by Daniel Brötzmann (＠wurstsalat) 25 Aug '21

25 Aug '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 55f91128 by wurstsalat at 2021-08-25T21:22:56+02:00 Settings: Remove mergeaccounts - - - - - 1ed364e0 by wurstsalat at 2021-08-25T21:33:29+02:00 Preferences: Remove window layout settings - - - - - 4f529d61 by wurstsalat at 2021-08-25T21:40:47+02:00 Preferences: Remove obsolete roster specific settings - - - - - 4 changed files: - gajim/app_actions.py - gajim/application.py - gajim/common/setting_values.py - gajim/gtk/preferences.py Changes: ===================================== gajim/app_actions.py ===================================== @@ -117,18 +117,6 @@ def on_single_message(_action, param): open_window('SingleMessageWindow', account=account) -def on_merge_accounts(action, param): - action.set_state(param) - value = param.get_boolean() - app.settings.set('mergeaccounts', value) - # Do not merge accounts if only one active - if len(app.connections) >= 2: - app.interface.roster.regroup = value - else: - app.interface.roster.regroup = False - app.interface.roster.setup_and_draw_roster() - - def on_add_account(action, _param): open_window('AccountWizard') ===================================== gajim/application.py ===================================== @@ -389,13 +389,6 @@ def add_actions(self): from gajim import app_actions # General Stateful Actions - - act = Gio.SimpleAction.new_stateful( - 'merge', None, - GLib.Variant.new_boolean(app.settings.get('mergeaccounts'))) - act.connect('change-state', app_actions.on_merge_accounts) - self.add_action(act) - actions = [ ('quit', app_actions.on_quit), ('add-account', app_actions.on_add_account), ===================================== gajim/common/setting_values.py ===================================== @@ -36,7 +36,6 @@ class _ACCOUNT_DEFAULT: 'use_transports_iconsets': True, 'collapsed_rows': '', 'roster_theme': 'default', - 'mergeaccounts': False, 'sort_by_show_in_roster': True, 'sort_by_show_in_muc': False, 'use_speller': False, @@ -82,7 +81,6 @@ class _ACCOUNT_DEFAULT: 'last_save_dir': '', 'last_send_dir': '', 'last_sounds_dir': '', - 'tabs_position': 'left', 'tabs_always_visible': False, 'tabs_border': False, 'tabs_close_button': True, @@ -105,7 +103,6 @@ class _ACCOUNT_DEFAULT: 'roster_window_skip_taskbar': False, 'use_urgency_hint': True, 'notification_timeout': 5, - 'one_message_window': 'always', 'show_roster_on_startup': 'always', 'escape_key_closes': False, 'hide_groupchat_banner': False, @@ -140,7 +137,6 @@ class _ACCOUNT_DEFAULT: 'gc_sync_threshold_public_default': 1, 'gc_sync_threshold_private_default': 0, 'show_subject_on_join': True, - 'show_chatstate_in_roster': True, 'show_chatstate_in_tabs': True, 'show_chatstate_in_banner': True, 'muclumbus_api_jid': 'api(a)search.jabber.network', ===================================== gajim/gtk/preferences.py ===================================== @@ -164,13 +164,6 @@ def __init__(self, settings): class WindowBehaviour(PreferenceBox): def __init__(self, *args): - win_layout_items = { - 'never': _('Detached contact list with detached chats'), - 'always': _('Detached contact list with single chat'), - 'always_with_roster': _('Single window for everything'), - 'peracct': _('Detached contact list with chats grouped by account'), - 'pertype': _('Detached contact list with chats grouped by type'), - } roster_on_startup_items = { 'always': _('Always'), @@ -178,21 +171,7 @@ def __init__(self, *args): 'last_state': _('Restore last state'), } - tab_position_items = { - 'top': _('Top'), - 'bottom': _('Bottom'), - 'left': _('Left'), - 'Right': _('Right'), - } - settings = [ - Setting(SettingKind.POPOVER, - _('Window Layout'), - SettingType.CONFIG, - 'one_message_window', - props={'entries': win_layout_items}, - callback=self._on_win_layout_changed), - Setting(SettingKind.POPOVER, _('Contact List on Startup'), SettingType.CONFIG, @@ -205,33 +184,17 @@ def __init__(self, *args): SettingType.CONFIG, 'quit_on_roster_x_button', desc=_('Quit when closing contact list')), - - Setting(SettingKind.POPOVER, - _('Tab Position'), - SettingType.CONFIG, - 'tabs_position', - props={'entries': tab_position_items}, - desc=_('Placement of chat window tabs'), - callback=self._on_win_layout_changed), ] PreferenceBox.__init__(self, settings) - @staticmethod - def _on_win_layout_changed(*args): - app.interface.msg_win_mgr.reconfig() - class ContactList(PreferenceBox): def __init__(self, *args): - settings = [ - Setting(SettingKind.SWITCH, - _('Merge Accounts'), - SettingType.CONFIG, - 'mergeaccounts', - callback=self._on_merge_accounts), + # TODO: Evaluate settings (and connect them) + settings = [ Setting(SettingKind.SWITCH, _('Enable Metacontacts'), SettingType.CONFIG, @@ -278,10 +241,6 @@ def __init__(self, *args): PreferenceBox.__init__(self, settings) - @staticmethod - def _on_merge_accounts(*args): - app.app.activate_action('merge') - @staticmethod def _on_show_avatar_in_roster_changed(*args): app.interface.roster.setup_and_draw_roster() @@ -351,13 +310,6 @@ def __init__(self, *args): 'show_chatstate_in_banner', desc=_('Show the contact’s chat state (e.g. typing) in ' 'the chats tab’s banner')), - - Setting(SettingKind.SWITCH, - _('Display Chat State In Contact List'), - SettingType.CONFIG, - 'show_chatstate_in_roster', - desc=_('Show the contact’s chat state (e.g. typing) in ' - 'the contact list')), ] PreferenceBox.__init__(self, settings) @@ -414,7 +366,7 @@ def __init__(self, *args): SettingType.CONFIG, 'gc_print_join_left_default', desc=_('Default for new group chats'), - props={'button-text':_('Reset'), + props={'button-text': _('Reset'), 'button-tooltip': _('Reset all group chats to the ' 'current default value'), 'button-style': 'destructive-action', @@ -425,7 +377,7 @@ def __init__(self, *args): SettingType.CONFIG, 'gc_print_status_default', desc=_('Default for new group chats'), - props={'button-text':_('Reset'), + props={'button-text': _('Reset'), 'button-tooltip': _('Reset all group chats to the ' 'current default value'), 'button-style': 'destructive-action', @@ -574,7 +526,7 @@ def __init__(self, account, parent): desc=_('Show notifications even if you are Away, ' 'Busy, etc.'), bind='show_notifications'), - ] + ] SettingsDialog.__init__(self, parent, _('Notifications'), Gtk.DialogFlags.MODAL, settings, account) @@ -682,7 +634,7 @@ def __init__(self, account, parent): SettingType.CONFIG, 'autoaway_message', bind='autoaway'), - ] + ] SettingsDialog.__init__(self, parent, _('Auto Away Settings'), Gtk.DialogFlags.MODAL, settings, account) @@ -710,7 +662,7 @@ def __init__(self, account, parent): SettingType.CONFIG, 'autoxa_message', bind='autoxa'), - ] + ] SettingsDialog.__init__(self, parent, _('Auto Extended Away Settings'), Gtk.DialogFlags.MODAL, settings, account) @@ -766,8 +718,6 @@ def _on_theme_changed(value, *args): app.css_config.change_theme(value) app.nec.push_incoming_event(NetworkEvent('theme-update')) app.nec.push_incoming_event(NetworkEvent('style-changed')) - app.interface.roster.repaint_themed_widgets() - app.interface.roster.change_roster_style(None) @staticmethod def _on_dark_theme(value, *args): @@ -810,6 +760,8 @@ def _toggle_emoticons(): class StatusIcon(PreferenceBox): def __init__(self, *args): + # TODO: Remove this section completely? + iconset_items = [] for _index, iconset_name in enumerate(get_available_iconsets()): iconset_items.append(iconset_name) @@ -868,7 +820,7 @@ def __init__(self, account, parent): SettingType.CONFIG, 'stun_server', bind='use_stun_server') - ] + ] SettingsDialog.__init__(self, parent, _('STUN Server Settings'), Gtk.DialogFlags.MODAL, settings, account) @@ -986,7 +938,7 @@ def __init__(self, *args): self.set_sensitive(deps_installed) @staticmethod - def _on_video_input_changed(value, *args): + def _on_video_input_changed(_value, *args): preview = get_app_window('Preferences').get_video_preview() if preview is None or not preview.is_active: # changed signal gets triggered when we fill the combobox View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/43f27148be3926d4ca5bcfeb817d6d9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/43f27148be3926d4ca5bcfeb817d6d9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 4 commits: Events: Cleanup chat message events
by Daniel Brötzmann (＠wurstsalat) 25 Aug '21

25 Aug '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: b75e03b3 by wurstsalat at 2021-08-25T18:42:08+02:00 Events: Cleanup chat message events - - - - - 83623983 by wurstsalat at 2021-08-25T20:26:08+02:00 App: Remove obsolete get_groupchat_control - - - - - ec083022 by wurstsalat at 2021-08-25T20:42:54+02:00 Fix Read Markers - - - - - 43f27148 by wurstsalat at 2021-08-25T21:01:50+02:00 Settings: Fix Control handling - - - - - 15 changed files: - gajim/command_system/implementation/standard.py - gajim/common/app.py - gajim/common/events.py - gajim/common/helpers.py - gajim/gtk/accounts.py - gajim/gtk/controls/base.py - gajim/gtk/controls/chat.py - gajim/gtk/conversation/rows/read_marker.py - gajim/gtk/conversation/view.py - gajim/gtk/main.py - gajim/gtk/notification.py - gajim/gtk/preferences.py - gajim/gtk/util.py - gajim/gui_interface.py - gajim/remote_control.py Changes: ===================================== gajim/command_system/implementation/standard.py ===================================== @@ -316,8 +316,8 @@ def topic(self, new_topic): @command(raw=True, empty=True) @doc(_("Invite a user to a group chat for a reason")) - def invite(self, jid, reason): - control = app.get_groupchat_control(self.account, self.room_jid) + def invite(self, jid, _reason): + control = app.window.get_control(self.account, self.room_jid) if control is not None: control.invite(jid) ===================================== gajim/common/app.py ===================================== @@ -676,15 +676,6 @@ def get_stored_bob_data(algo_hash: str) -> Optional[bytes]: return data return None -def get_groupchat_control(account, jid): - control = app.interface.msg_win_mgr.get_gc_control(jid, account) - if control is not None: - return control - try: - return app.interface.minimized_controls[account][jid] - except Exception: - return None - def register_task(self, task): _tasks[id(self)].append(task) ===================================== gajim/common/events.py ===================================== @@ -24,7 +24,7 @@ class Event: - def __init__(self, time_=None, show_in_roster=False, show_in_systray=True): + def __init__(self, time_=None, show_in_systray=True): """ type_ in chat, normal, file-request, file-error, file-completed, file-request-error, file-send-error, file-stopped, gc_msg, pm, @@ -32,9 +32,6 @@ def __init__(self, time_=None, show_in_roster=False, show_in_systray=True): jingle-incoming parameters is (per type_): - chat, normal, pm: [message, subject, kind, time, encrypted, - resource, msg_log_id] - where kind in error, incoming file-*: file_props printed_chat: [message, subject, control, msg_log_id] printed_*: None @@ -45,60 +42,15 @@ def __init__(self, time_=None, show_in_roster=False, show_in_systray=True): self.time_ = time_ else: self.time_ = time.time() - self.show_in_roster = show_in_roster self.show_in_systray = show_in_systray # Set when adding the event self.jid = None self.account = None -class ChatEvent(Event): +class ChatMsgEvent(Event): - type_ = 'chat' - - def __init__(self, - message, - subject, - kind, - time_, - resource, - msg_log_id, - correct_id=None, - message_id=None, - session=None, - displaymarking=None, - sent_forwarded=False, - show_in_roster=False, - show_in_systray=True, - additional_data=None): - Event.__init__(self, - time_, - show_in_roster=show_in_roster, - show_in_systray=show_in_systray) - self.message = message - self.subject = subject - self.kind = kind - self.time = time_ - self.resource = resource - self.msg_log_id = msg_log_id - self.message_id = message_id - self.correct_id = correct_id - self.session = session - self.displaymarking = displaymarking - self.sent_forwarded = sent_forwarded - if additional_data is None: - from gajim.common.helpers import AdditionalDataDict - self.additional_data = AdditionalDataDict() - - -class PmEvent(ChatEvent): - - type_ = 'pm' - - -class PrintedChatEvent(Event): - - type_ = 'printed_chat' + type_ = 'chat-message' def __init__(self, message, @@ -108,11 +60,9 @@ def __init__(self, time_=None, message_id=None, stanza_id=None, - show_in_roster=False, show_in_systray=True): Event.__init__(self, time_, - show_in_roster=show_in_roster, show_in_systray=show_in_systray) self.message = message self.subject = subject @@ -122,19 +72,14 @@ def __init__(self, self.stanza_id = stanza_id -class PrintedGcMsgEvent(PrintedChatEvent): - - type_ = 'printed_gc_msg' +class GroupChatMsgEvent(ChatMsgEvent): + type_ = 'group-chat-message' -class PrintedMarkedGcMsgEvent(PrintedChatEvent): - type_ = 'printed_marked_gc_msg' +class PrivateChatMsgEvent(ChatMsgEvent): - -class PrintedPmEvent(PrintedChatEvent): - - type_ = 'printed_pm' + type_ = 'private-chat-message' class FileRequestEvent(Event): @@ -144,11 +89,9 @@ class FileRequestEvent(Event): def __init__(self, file_props, time_=None, - show_in_roster=False, show_in_systray=True): Event.__init__(self, time_, - show_in_roster=show_in_roster, show_in_systray=show_in_systray) self.file_props = file_props @@ -192,11 +135,9 @@ def __init__(self, sid, content_types, time_=None, - show_in_roster=False, show_in_systray=True): Event.__init__(self, time_, - show_in_roster=show_in_roster, show_in_systray=show_in_systray) self.peerjid = peerjid self.sid = sid @@ -412,9 +353,8 @@ def _get_nb_events(self, account=None, jid=None, attribute=None, for event in self._events[acct][j]: if types and event.type_ not in types: continue - if (not attribute or - attribute == 'systray' and event.show_in_systray or - attribute == 'roster' and event.show_in_roster): + if (not attribute or attribute == 'systray' and + event.show_in_systray): nb += 1 return nb @@ -428,8 +368,7 @@ def _get_some_events(self, attribute): for jid in self._events[account]: events[account][jid] = [] for event in self._events[account][jid]: - if (attribute == 'systray' and event.show_in_systray or - attribute == 'roster' and event.show_in_roster): + if attribute == 'systray' and event.show_in_systray: events[account][jid].append(event) if not events[account][jid]: del events[account][jid] @@ -460,7 +399,7 @@ def _get_first_event_with_attribute(events): def get_nb_systray_events(self, types=None): """ - Return the number of events displayed in roster + Return the number of events displayed in systray """ if types is None: types = [] @@ -476,21 +415,3 @@ def get_systray_events(self): def get_first_systray_event(self): events = self.get_systray_events() return self._get_first_event_with_attribute(events) - - def get_nb_roster_events(self, account=None, jid=None, types=None): - """ - Return the number of events displayed in roster - """ - if types is None: - types = [] - return self._get_nb_events(attribute='roster', - account=account, - jid=jid, - types=types) - - def get_roster_events(self): - """ - Return all events that must be displayed in roster: - {account1: {jid1: [ev1, ev2], },. } - """ - return self._get_some_events('roster') ===================================== gajim/common/helpers.py ===================================== @@ -602,11 +602,6 @@ def get_icon_name_to_show(contact, account=None): """ Get the icon name to show in online, away, requested, etc """ - if account and app.events.get_nb_roster_events(account, contact.jid): - return 'event' - if account and app.events.get_nb_roster_events(account, - contact.get_full_jid()): - return 'event' if account and account in app.interface.minimized_controls and \ contact.jid in app.interface.minimized_controls[account] and app.interface.\ minimized_controls[account][contact.jid].get_nb_unread_pm() > 0: ===================================== gajim/gtk/accounts.py ===================================== @@ -799,7 +799,7 @@ def _reset_send_read_marker(self, button): app.settings.set_contact_settings('send_marker', None) app.settings.set_group_chat_settings( 'send_marker', None, context='private') - for ctrl in app.interface.msg_win_mgr.get_controls(acct=self._account): + for ctrl in app.window.get_controls(account=self._account): ctrl.update_actions() ===================================== gajim/gtk/controls/base.py ===================================== @@ -37,10 +37,12 @@ from gi.repository import Gio from gajim.common import app -from gajim.common import events from gajim.common import helpers from gajim.common import ged from gajim.common import i18n +from gajim.common.events import ChatMsgEvent +from gajim.common.events import GroupChatMsgEvent +from gajim.common.events import PrivateChatMsgEvent from gajim.common.i18n import _ from gajim.common.nec import EventHelper from gajim.common.helpers import AdditionalDataDict @@ -920,6 +922,24 @@ def _on_message_textview_key_press_event(self, textview, event): def _on_autoscroll_changed(self, _widget, autoscroll): self._jump_to_end_button.toggle(not autoscroll) + if not autoscroll: + return + + # Check for unread messages and sendXEP-0333 Send <displayed> marker + type_ = ['chat-message', 'private-chat-message'] + jid = self.contact.jid + if self.is_groupchat: + type_ = ['group-chat-message'] + jid = self.contact.jid.bare + if not app.events.remove_events(self.account, + jid, + types=type_): + # There were events to remove + self._client.get_module('ChatMarkers').send_displayed_marker( + self.contact, + self.last_msg_id, + self._type) + self.last_msg_id = None def _on_jump_to_end(self, _button): self.scroll_to_end(force=True) @@ -1205,18 +1225,13 @@ def _add_message_event(self, text, msg_log_id, message_id, stanza_id): return if self.is_groupchat: - needs_highlight = helpers.message_needs_highlight( - text, self.contact.nickname, self._client.get_own_jid().bare) - if needs_highlight: - event_type = events.PrintedMarkedGcMsgEvent - else: - event_type = events.PrintedGcMsgEvent + event_type = GroupChatMsgEvent event = 'gc_message_received' else: if self.is_chat: - event_type = events.PrintedChatEvent + event_type = ChatMsgEvent else: - event_type = events.PrintedPmEvent + event_type = PrivateChatMsgEvent event = 'message_received' show_in_systray = get_show_in_systray( event_type.type_, self.account, self.contact.jid) @@ -1355,9 +1370,11 @@ def set_control_active(self, state): jid = self.contact.jid if self.conversation_view.autoscroll: # we are at the end - type_ = [f'printed_{self._type}'] - if self._type.is_groupchat: - type_ = ['printed_gc_msg', 'printed_marked_gc_msg'] + type_ = ['chat-message'] + if self.is_groupchat: + type_ = ['group-chat-message'] + if self.is_privatechat: + type_ = ['private-chat-message'] if not app.events.remove_events(self.account, self.contact.jid, types=type_): ===================================== gajim/gtk/controls/chat.py ===================================== @@ -508,7 +508,8 @@ def _on_message_received(self, event): correct_id=event.correct_id, additional_data=event.additional_data) - self.conversation_view.set_read_marker(event.properties.id) + if kind == 'outgoing': + self.conversation_view.set_read_marker(event.properties.id) def _on_message_error(self, event): self.conversation_view.show_error(event.message_id, event.error) ===================================== gajim/gtk/conversation/rows/read_marker.py ===================================== @@ -39,4 +39,5 @@ def __init__(self, account, contact): def set_timestamp(self, timestamp): self.timestamp = timestamp self.changed() + self.set_no_show_all(False) self.show_all() ===================================== gajim/gtk/conversation/view.py ===================================== @@ -213,6 +213,8 @@ def _insert_message(self, message): self.add(message) self._add_date_row(message.timestamp) self._check_for_merge(message) + if message.kind == 'incoming': + self.set_read_marker(None) GLib.idle_add(message.queue_resize) def _add_date_row(self, timestamp): ===================================== gajim/gtk/main.py ===================================== @@ -508,7 +508,7 @@ def on_continue(message): # check if we have unread messages # unread = app.events.get_nb_events() - # for event in app.events.get_all_events(['printed_gc_msg']): + # for event in app.events.get_all_events(['group-chat-message']): # contact = app.contacts.get_groupchat_contact(event.jid) # if contact is None or not contact.can_notify(): # unread -= 1 ===================================== gajim/gtk/notification.py ===================================== @@ -130,9 +130,10 @@ def _on_notification(self, event): def _on_event_removed(self, event_list): for event in event_list: - if event.type_ in ('normal', 'printed_chat', 'chat', - 'printed_pm', 'pm', 'printed_marked_gc_msg', - 'printed_gc_msg', 'jingle-incoming'): + if event.type_ in ('chat-message', + 'group-chat-message', + 'private-chat-message', + 'jingle-incoming'): self._withdraw('new-message', event.account, event.jid) def _nec_our_status(self, event): ===================================== gajim/gtk/preferences.py ===================================== @@ -29,12 +29,9 @@ from gajim.common.multimedia_helpers import AudioOutputManager from gajim.common.multimedia_helpers import VideoInputManager -from gajim.gui.controls.base import BaseControl - from .const import Setting from .const import SettingKind from .const import SettingType -from .const import ControlType from .emoji_chooser import emoji_chooser from .settings import SettingsBox from .settings import SettingsDialog @@ -143,23 +140,6 @@ def update_theme_list(self): def update_proxy_list(self): self._prefs['miscellaneous'].update_proxy_list() - @staticmethod - def get_all_controls(): - for ctrl in app.interface.msg_win_mgr.get_controls(): - yield ctrl - for account in app.connections: - for ctrl in app.interface.minimized_controls[account].values(): - yield ctrl - - @staticmethod - def get_all_muc_controls(): - for ctrl in app.interface.msg_win_mgr.get_controls( - ControlType.GROUPCHAT): - yield ctrl - for account in app.connections: - for ctrl in app.interface.minimized_controls[account].values(): - yield ctrl - @staticmethod def _check_emoji_theme(): # Ensure selected emoji theme is valid @@ -309,9 +289,10 @@ def _on_show_avatar_in_roster_changed(*args): @staticmethod def _on_show_status_in_roster(*args): app.interface.roster.setup_and_draw_roster() - controls = get_app_window('Preferences').get_all_muc_controls() - for ctrl in controls: - ctrl.roster.draw_contacts() + + for ctrl in app.window.get_controls(): + if ctrl.is_groupchat: + ctrl.roster.draw_contacts() @staticmethod def _on_sort_by_show_in_roster(*args): @@ -395,9 +376,8 @@ def _on_use_speller(value, *args): if gspell_lang is None: gspell_lang = Gspell.language_get_default() app.settings.set('speller_language', gspell_lang.get_code()) - for ctrl in get_app_window('Preferences').get_all_controls(): - if isinstance(ctrl, BaseControl): - ctrl.set_speller() + for ctrl in app.window.get_controls(): + ctrl.set_speller() class GroupChats(PreferenceBox): @@ -457,8 +437,9 @@ def __init__(self, *args): @staticmethod def _on_sort_by_show_in_muc(*args): - for ctrl in get_app_window('Preferences').get_all_muc_controls(): - ctrl.roster.invalidate_sort() + for ctrl in app.window.get_controls(): + if ctrl.is_groupchat: + ctrl.roster.invalidate_sort() @staticmethod def _reset_join_left(button): @@ -822,8 +803,7 @@ def _on_emoticons_theme(self, *args): @staticmethod def _toggle_emoticons(): - controls = get_app_window('Preferences').get_all_controls() - for ctrl in controls: + for ctrl in app.window.get_controls(): ctrl.toggle_emoticons() ===================================== gajim/gtk/util.py ===================================== @@ -509,23 +509,11 @@ def get_metacontact_surface(icon_name, expanded, scale): return state_surface -def get_show_in_roster(event, session=None): - """ - Return True if this event must be shown in roster, else False - """ - if event == 'gc_message_received': - return True - if event == 'message_received': - if session and session.control: - return False - return True - - def get_show_in_systray(type_, account, jid): """ Return True if this event must be shown in systray, else False """ - if type_ == 'printed_gc_msg': + if type_ == 'group-chat-message': client = app.get_client(account) contact = client.get_module('Contacts').get_group_chat_contact(jid) return contact.can_notify() ===================================== gajim/gui_interface.py ===================================== @@ -262,9 +262,7 @@ def add_event(self, account, jid, event): 'file-completed': 'ft_finished' } event_type = event_types.get(event.type_) - # show_in_roster = get_show_in_roster(event_type, jid) show_in_systray = get_show_in_systray(event_type, account, jid) - # event.show_in_roster = show_in_roster event.show_in_systray = show_in_systray app.events.add_event(account, jid, event) @@ -289,15 +287,10 @@ def handle_event(self, account, jid, type_): if type_ in ('connection-lost', 'connection-failed'): app.window.show_account_page(account) app.events.remove_events(account, jid, types=type_) - elif type_ in ( - 'gc_msg', - 'printed_gc_msg', - 'printed_marked_gc_msg', - 'pm', - 'printed_pm'): + elif type_ in ('group-chat-message', 'private-chat-message'): app.window.select_chat(account, jid.bare) app.events.remove_events(account, jid, types=type_) - elif type_ in ('printed_chat', 'chat', ''): + elif type_ in ('chat-message', ''): # '' is for log in/out notifications app.window.select_chat(account, jid.bare) app.last_message_time[account][jid] = 0 # long time ago @@ -614,22 +607,18 @@ def handle_event_msgnotsent(event): @staticmethod def handle_event_read_state_sync(event): if event.type.is_groupchat: - control = app.get_groupchat_control( - event.account, event.jid.bare) - if control is None: - log.warning('Groupchat control not found') - return - jid = event.jid.bare - types = ['printed_gc_msg', 'printed_marked_gc_msg'] + types = ['group-chat-message'] else: - types = ['chat', 'pm', 'printed_chat', 'printed_pm'] jid = event.jid + types = ['chat-message', 'private-chat-message'] - control = app.window.get_control(event.account, jid) + control = app.window.get_control(event.account, jid) + if control is None: + log.warning('No ChatControl found') + return - # Compare with control.last_msg_id. events_ = app.events.get_events(event.account, jid, types) if not events_: log.warning('No Events') @@ -643,10 +632,7 @@ def handle_event_read_state_sync(event): if id_ != event.marker_id: return - if not app.events.remove_events(event.account, jid, types=types): - # There were events to remove - if control is not None: - control.redraw_after_event_removed(event.jid) + app.events.remove_events(event.account, jid, types=types) def handle_event_roster_info(self, obj): #('ROSTER_INFO', account, (jid, name, sub, ask, groups)) ===================================== gajim/remote_control.py ===================================== @@ -822,7 +822,7 @@ def _contacts_as_dbus_structure(self, contacts): def get_unread_msgs_number(self): unread = app.events.get_nb_events() - for event in app.events.get_all_events(['printed_gc_msg']): + for event in app.events.get_all_events(['group-chat-message']): contact = app.contacts.get_groupchat_contact(event.account, event.jid) if contact is None or not contact.can_notify(): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/db1beffd0e5632c790ea935d9329564… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/db1beffd0e5632c790ea935d9329564… 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