Commits June 2022

commits@gajim.org

1 participants
132 discussions

[Git][gajim/gajim][master] chore: Update pyrightconfig
by Daniel Brötzmann (＠wurstsalat) 28 Jun '22

28 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: e94c3bc8 by wurstsalat at 2022-06-28T23:44:55+02:00 chore: Update pyrightconfig - - - - - 1 changed file: - pyrightconfig.json Changes: ===================================== pyrightconfig.json ===================================== @@ -41,6 +41,7 @@ "gajim/common/sound.py", "gajim/common/storage/", "gajim/common/task_manager.py", + "gajim/gtk/conversation", "gajim/gtk/about.py", "gajim/gtk/account_page.py", "gajim/gtk/account_side_bar.py", @@ -65,9 +66,8 @@ "gajim/gtk/control_stack.py", "gajim/gtk/const.py", "gajim/gtk/contact_info.py", - "gajim/gtk/contacts_flowbox.py", "gajim/gtk/contact_settings.py", - "gajim/gtk/conversation", + "gajim/gtk/contacts_flowbox.py", "gajim/gtk/dialogs.py", "gajim/gtk/emoji_data_gtk.py", "gajim/gtk/exception.py", @@ -79,11 +79,13 @@ "gajim/gtk/groupchat_details.py", "gajim/gtk/groupchat_invitation.py", "gajim/gtk/groupchat_inviter.py", - "gajim/gtk/groupchat_nick.py", + "gajim/gtk/groupchat_join.py", "gajim/gtk/groupchat_nick_completion.py", + "gajim/gtk/groupchat_nick.py", "gajim/gtk/groupchat_outcasts.py", "gajim/gtk/groupchat_settings.py", "gajim/gtk/groupchat_state.py", + "gajim/gtk/gstreamer.py", "gajim/gtk/history_export.py", "gajim/gtk/history_sync.py", "gajim/gtk/main_stack.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e94c3bc8f617227ab598111cddc130df… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e94c3bc8f617227ab598111cddc130df… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] Controls: Remove obsolete code
by Daniel Brötzmann (＠wurstsalat) 28 Jun '22

28 Jun '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: b0ef2e17 by wurstsalat at 2022-06-28T23:27:53+02:00 Controls: Remove obsolete code - - - - - 3 changed files: - gajim/gtk/controls/base.py - gajim/gtk/controls/chat.py - gajim/gtk/controls/groupchat.py Changes: ===================================== gajim/gtk/controls/base.py ===================================== @@ -42,7 +42,6 @@ from gi.repository import Gio from nbxmpp import JID -from nbxmpp.const import Chatstate from nbxmpp.modules.security_labels import Displaymarking from gajim.common import app @@ -65,8 +64,6 @@ from gajim.gui.conversation.scrolled import ScrolledView from gajim.gui.conversation.jump_to_end_button import JumpToEndButton from gajim.gui.file_transfer_send import SendFileDialog -from gajim.gui.message_input import MessageInputTextView -from gajim.gui.security_label_selector import SecurityLabelSelector from gajim.gui.util import get_hardware_key_codes from gajim.gui.builder import get_builder from gajim.gui.util import set_urgency_hint @@ -333,14 +330,6 @@ def update_actions(self) -> None: Derived types MAY implement this """ - def draw_banner(self) -> None: - """ - Draw the fat line at the top of the window - that houses the icon, jid, etc - - Derived types MAY implement this. - """ - def update_toolbar(self) -> None: """ update state of buttons in toolbar ===================================== gajim/gtk/controls/chat.py ===================================== @@ -114,9 +114,6 @@ def focus(self) -> None: def delegate_action(self, action: str) -> int: return Gdk.EVENT_PROPAGATE - def _on_nickname_received(self, _event): - self.update_ui() - def _on_caps_update(self, _contact: types.BareContact, _signal_name: str @@ -152,9 +149,6 @@ def _on_message_received(self, event: events.MessageReceived) -> None: if event.properties.is_sent_carbon: kind = 'outgoing' - resource_contact = self.contact.get_resource(event.resource) - self.xml.phone_image.set_visible(resource_contact.is_phone) - self.add_message(event.msgtxt, kind, tim=event.properties.timestamp, @@ -265,13 +259,13 @@ def shutdown(self) -> None: app.check_finalize(self) def _on_drag_data_received(self, - _widget: Gtk.Widget, - _context: Gdk.DragContext, - _x_coord: int, - _y_coord: int, + widget: Gtk.Widget, + context: Gdk.DragContext, + x_coord: int, + y_coord: int, selection: Gtk.SelectionData, target_type: int, - _timestamp: int + timestamp: int ) -> None: if not selection.get_data(): return ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -133,10 +133,6 @@ def __init__(self, account: str, jid: JID) -> None: self.add_actions() GLib.idle_add(self.update_actions) - # muc attention flag (when we are mentioned in a muc) - # if True, the room has mentioned us - self.attention_flag: bool = False - # Holds CaptchaRequest widget self._captcha_request: Optional[DataFormWidget] = None @@ -691,11 +687,6 @@ def _set_control_inactive(self) -> None: def rejoin(self) -> None: self._client.get_module('MUC').join(self.room_jid) - # def send_pm(self, nick, message=None): - # ctrl = self._start_private_message(nick) - # if message is not None: - # ctrl.send_message(message) - def _on_user_joined(self, _contact: GroupchatContact, _signal_name: str, @@ -1050,17 +1041,16 @@ def _close_control(self) -> None: GLib.Variant('as', [self.account, str(self.room_jid)])) def set_control_active(self, state: bool) -> None: - self.attention_flag = False BaseControl.set_control_active(self, state) def _on_drag_data_received(self, - _widget: Gtk.Widget, - _context: Gdk.DragContext, - _x_coord: int, - _y_coord: int, + widget: Gtk.Widget, + context: Gdk.DragContext, + x_coord: int, + y_coord: int, selection: Gtk.SelectionData, target_type: int, - _timestamp: int + timestamp: int ) -> None: if not selection.get_data(): return @@ -1232,33 +1222,33 @@ def _on_captcha_changed(self, ) -> None: self.xml.captcha_set_button.set_sensitive(is_valid) - def _on_captcha_set_clicked(self, _button): + def _on_captcha_set_clicked(self, _button: Gtk.Button) -> None: form_node = self._captcha_request.get_submit_form() self._client.get_module('MUC').send_captcha(self.room_jid, form_node) self._remove_captcha_request() self._show_page('groupchat') - def _on_captcha_cancel_clicked(self, *args: Any) -> None: + def _on_captcha_cancel_clicked(self, _button: Gtk.Button) -> None: self._client.get_module('MUC').cancel_captcha(self.room_jid) self._remove_captcha_request() self._close_control() - def _on_captcha_try_again_clicked(self, *args: Any) -> None: + def _on_captcha_try_again_clicked(self, _button: Gtk.Button) -> None: self._client.get_module('MUC').join(self.room_jid) self._show_page('groupchat') - def _on_remove_bookmark_button_clicked(self, *args: Any) -> None: + def _on_remove_bookmark_button_clicked(self, _button: Gtk.Button) -> None: self._client.get_module('Bookmarks').remove(self.room_jid) self._close_control() - def _on_retry_join_clicked(self, *args: Any) -> None: + def _on_retry_join_clicked(self, _button: Gtk.Button) -> None: self._client.get_module('MUC').join(self.room_jid) self._show_page('groupchat') - def _on_page_cancel_clicked(self, *args: Any) -> None: + def _on_page_cancel_clicked(self, _button: Gtk.Button) -> None: self._show_page('groupchat') - def _on_page_close_clicked(self, *args: Any) -> None: + def _on_page_close_clicked(self, _button: Gtk.Button) -> None: self._close_control() def _on_groupchat_state_abort_clicked(self, _button: Gtk.Button) -> None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b0ef2e1756bc340e5ce6fe10ca929140… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b0ef2e1756bc340e5ce6fe10ca929140… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] Remove obsolete code
by Philipp Hörist (＠lovetox) 28 Jun '22

28 Jun '22

Philipp Hörist pushed to branch newcontrol at gajim / gajim Commits: d01f9ab6 by lovetox at 2022-06-28T23:18:21+02:00 Remove obsolete code - - - - - 2 changed files: - gajim/gtk/controls/base.py - gajim/gui_interface.py Changes: ===================================== gajim/gtk/controls/base.py ===================================== @@ -359,28 +359,6 @@ def _update_toolbar(self) -> None: Derived types MAY implement this """ - def set_session(self, session): - oldsession = None - if hasattr(self, 'session'): - oldsession = self.session - - if oldsession and session == oldsession: - return - - self.session = session - - if session: - session.control = self - - if session and oldsession: - oldsession.control = None - - def remove_session(self, session): - if session != self.session: - return - self.session.control = None - self.session = None - def _nec_ping(self, obj): raise NotImplementedError @@ -885,18 +863,3 @@ def has_focus(self) -> bool: if self == app.window.get_active_control(): return True return False - - -class ScrolledWindow(Gtk.ScrolledWindow): - def __init__(self, *args: Any, **kwargs: Any) -> None: - Gtk.ScrolledWindow.__init__(self, *args, **kwargs) - - self.set_overlay_scrolling(False) - self.set_max_content_height(100) - self.set_propagate_natural_height(True) - self.get_style_context().add_class('scrolled-no-border') - self.get_style_context().add_class('no-scroll-indicator') - self.get_style_context().add_class('scrollbar-style') - self.get_style_context().add_class('one-line-scrollbar') - self.set_shadow_type(Gtk.ShadowType.IN) - self.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC) ===================================== gajim/gui_interface.py ===================================== @@ -125,7 +125,6 @@ def _create_core_handlers_list(self) -> None: # pylint: disable=line-too-long self.handlers = { 'signed-in': [self.handle_event_signed_in], - 'presence-received': [self.handle_event_presence], 'message-sent': [self.handle_event_msgsent], 'message-not-sent': [self.handle_event_msgnotsent], } @@ -166,14 +165,6 @@ def handle_event_signed_in(event): if app.settings.get('ask_online_status'): app.window.show_account_page(account) - def handle_event_presence(self, event): - account = event.conn.name - jid = event.jid - - ctrl = app.window.get_control(account, jid) - if ctrl and ctrl.session and len(event.contact_list) > 1: - ctrl.remove_session(ctrl.session) - @staticmethod def handle_event_msgsent(event): if not event.play_sound: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d01f9ab69398556a487864f33bebb116… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d01f9ab69398556a487864f33bebb116… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] Move send_message() to chat stack
by Philipp Hörist (＠lovetox) 28 Jun '22

28 Jun '22

Philipp Hörist pushed to branch newcontrol at gajim / gajim Commits: b9e62055 by lovetox at 2022-06-28T23:15:58+02:00 Move send_message() to chat stack - - - - - 6 changed files: - gajim/gtk/chat_stack.py - gajim/gtk/control_stack.py - gajim/gtk/controls/base.py - gajim/gtk/controls/chat.py - gajim/gtk/controls/groupchat.py - gajim/gtk/message_actions_box.py Changes: ===================================== gajim/gtk/chat_stack.py ===================================== @@ -25,11 +25,12 @@ from gi.repository import Gtk from nbxmpp.protocol import JID -from gajim.common import app +from gajim.common import app, helpers from gajim.common.const import CallType from gajim.common.modules.contacts import BareContact from gajim.common.modules.contacts import GroupchatContact from gajim.common.modules.contacts import GroupchatParticipant +from gajim.common.structs import OutgoingMessage from gajim.common.types import ChatContactT from .chat_banner import ChatBanner @@ -170,7 +171,10 @@ def _on_action(self, account = contact.account jid = contact.jid - if action_name == 'block-contact': + if action_name == 'send-message': + self._on_send_message() + + elif action_name == 'block-contact': app.window.block_contact(account, jid) elif action_name == 'information': @@ -238,6 +242,62 @@ def _on_stateful_action(self, action.set_state(param) contact.settings.set('send_marker', param.get_boolean()) + def _on_send_message(self) -> None: + self._message_action_box.msg_textview.replace_emojis() + message = self._message_action_box.msg_textview.get_text() + + control = self._control_stack.get_current_control() + + action = app.window.lookup_action('set-encryption') + encryption = action.get_state().get_string() + + if encryption: + self.sendmessage = True + app.plugin_manager.extension_point( + 'send_message' + encryption, + control) + if not self.sendmessage: + return + + contact = self._current_contact + client = app.get_client(contact.account) + + message = helpers.remove_invalid_xml_chars(message) + if message in ('', None, '\n'): + return + + # if process_commands and self.process_as_command(message): + # return + + # TODO + # label = self.get_seclabel() + + correct_id: Optional[str] = None + if control.correcting and control.last_sent_msg: + correct_id = control.last_sent_msg + else: + correct_id = None + + chatstate = client.get_module('Chatstate').get_active_chatstate( + contact) + + type_ = 'chat' + if isinstance(contact, GroupchatContact): + type_ = 'groupchat' + + message_ = OutgoingMessage(account=contact.account, + contact=contact, + message=message, + type_=type_, + chatstate=chatstate, + # label=label, + control=control, + correct_id=correct_id) + + client.send_message(message_) + + self._message_action_box.msg_textview.clear() + def _get_pref_ft_method(self, contact: ChatContactT) -> Optional[str]: ft_pref = app.settings.get_account_setting(contact.account, 'filetransfer_preference') ===================================== gajim/gtk/control_stack.py ===================================== @@ -53,6 +53,9 @@ def get_control(self, account: str, jid: JID) -> Optional[ControlT]: except KeyError: return None + def get_current_control(self) -> ControlT: + return self._current_control + def get_controls(self, account: Optional[str] ) -> Generator[ControlT, None, None]: if account is None: ===================================== gajim/gtk/controls/base.py ===================================== @@ -589,60 +589,6 @@ def get_seclabel(self) -> Optional[str]: def get_our_nick(self) -> str: return app.nicks[self.account] - def _on_send_message(self, *args: Any) -> None: - self.msg_textview.replace_emojis() - message = self.msg_textview.get_text() - self.send_message(message) - - def send_message(self, - message: str, - type_: str = 'chat', - resource: Optional[str] = None, - process_commands: bool = True, - attention: bool = False - ) -> None: - """ - Send the given message to the active tab. Doesn't return None if error - """ - if not message or message == '\n': - return None - - if process_commands and self.process_as_command(message): - return - - label = self.get_seclabel() - - correct_id: Optional[str] = None - if self.correcting and self.last_sent_msg: - correct_id = self.last_sent_msg - else: - correct_id = None - - chatstate = self._client.get_module('Chatstate').get_active_chatstate( - self.contact) - - message_ = OutgoingMessage(account=self.account, - contact=self.contact, - message=message, - type_=type_, - chatstate=chatstate, - resource=resource, - user_nick=self.user_nick, - label=label, - control=self, - attention=attention, - correct_id=correct_id) - - self._client.send_message(message_) - - # Record the history of sent messages - # self.save_message(message, 'sent') - - # Be sure to send user nickname only once according to JEP-0172 - self.user_nick = None - - self.msg_textview.clear() - def _allow_add_message(self) -> bool: # Only add messages if the view is already populated return self.is_chat_loaded and self._scrolled_view.get_lower_complete() ===================================== gajim/gtk/controls/chat.py ===================================== @@ -103,6 +103,7 @@ def jid(self) -> JID: return self.contact.jid def focus(self) -> None: + # TODO does not work anymore if not hasattr(self, 'msg_textview'): # focus() is called sometimes with GLib.idle_add() # This means there is the possibility that shutdown() was called @@ -222,32 +223,6 @@ def update_ui(self) -> None: self.update_toolbar() self.update_actions() - def send_message(self, - message: str, - process_commands: bool = True, - attention: bool = False - ) -> None: - """ - Send a message to contact - """ - - if self.encryption: - self.sendmessage = True - app.plugin_manager.extension_point('send_message' + self.encryption, - self) - if not self.sendmessage: - return - - message = helpers.remove_invalid_xml_chars(message) - if message in ('', None, '\n'): - return - - BaseControl.send_message(self, - message, - type_='chat', - process_commands=process_commands, - attention=attention) - def add_message(self, text: str, kind: str, ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -574,7 +574,8 @@ def add_message(self, highlight = helpers.message_needs_highlight( text, self.contact.nickname, self._client.get_own_jid().bare) - self.msg_textview.process_outgoing_message(contact, highlight) + # TODO + # self.msg_textview.process_outgoing_message(contact, highlight) BaseControl.add_message(self, text, @@ -1023,55 +1024,6 @@ def _on_message_sent(self, event: events.MessageSent) -> None: self.msg_textview.get_style_context().remove_class( 'gajim-msg-correcting') - def send_message(self, - message: str, - process_commands: bool = True - ) -> None: - """ - Call this function to send our message - """ - if not message: - return - - if self.encryption: - self.sendmessage = True - app.plugin_manager.extension_point( - 'send_message' + self.encryption, self) - if not self.sendmessage: - return - - if process_commands and self.process_as_command(message): - return - - message = helpers.remove_invalid_xml_chars(message) - - if not message: - return - - label = self.get_seclabel() - if message != '' or message != '\n': - # self.save_message(message, 'sent') - - if self.correcting and self.last_sent_msg: - correct_id = self.last_sent_msg - else: - correct_id = None - chatstate = self._client.get_module('Chatstate')\ - .get_active_chatstate(self.contact) - - # Send the message - message_ = OutgoingMessage(account=self.account, - contact=self.contact, - message=message, - type_='groupchat', - label=label, - chatstate=chatstate, - correct_id=correct_id) - self._client.send_message(message_) - - self.msg_textview.get_buffer().set_text('') - self.msg_textview.grab_focus() - def _on_message_error(self, event: events.MessageError) -> None: self.conversation_view.show_error(event.message_id, event.error) @@ -1156,7 +1108,9 @@ def delegate_action(self, action: str) -> int: def focus(self) -> None: page_name = self._get_current_page() if page_name == 'groupchat': - self.msg_textview.grab_focus() + # TODO + # self.msg_textview.grab_focus() + pass elif page_name == 'password': self.xml.password_entry.grab_focus_without_selecting() elif page_name == 'nickname': ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -466,14 +466,14 @@ def _on_textview_key_press_event(self, textview.insert_newline() return True - if not app.account_is_available(self.account): + if not app.account_is_available(self._contact.account): # we are not connected ErrorDialog( _('No Connection Available'), _('Your message can not be sent until you are connected.')) return True - self._on_send_message() + app.window.activate_action('send-message', None) return True elif event.keyval == Gdk.KEY_z: # CTRL+z View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b9e620553475a5232112ca07d357905c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b9e620553475a5232112ca07d357905c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] 2 commits: ChatBanner: Improve styling
by Daniel Brötzmann (＠wurstsalat) 28 Jun '22

28 Jun '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: 52807f7d by wurstsalat at 2022-06-28T23:01:55+02:00 ChatBanner: Improve styling - - - - - 691adea6 by wurstsalat at 2022-06-28T23:02:42+02:00 PrivateChatControl: Remove obsolete method - - - - - 2 changed files: - gajim/data/gui/chat_banner.ui - gajim/gtk/controls/private.py Changes: ===================================== gajim/data/gui/chat_banner.ui ===================================== @@ -5,7 +5,7 @@ <object class="GtkBox" id="banner_box"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="spacing">6</property> + <property name="spacing">12</property> <child> <object class="GtkImage" id="avatar_image"> <property name="visible">True</property> @@ -35,7 +35,6 @@ <property name="can-focus">False</property> <property name="halign">start</property> <property name="hexpand">True</property> - <property name="label">Name</property> <property name="ellipsize">end</property> <property name="single-line-mode">True</property> <property name="xalign">0</property> ===================================== gajim/gtk/controls/private.py ===================================== @@ -66,7 +66,6 @@ def _connect_contact_signals(self) -> None: # 'room-destroyed': self._on_room_destroyed, 'room-joined': self._on_room_joined, # 'room-left': self._on_room_left - 'chatstate-update': self._on_chatstate_update, }) @property View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/4c0a56c94852b80a61d500111bd0552… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/4c0a56c94852b80a61d500111bd0552… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] 2 commits: GUI files: Remove bottom margin
by Daniel Brötzmann (＠wurstsalat) 28 Jun '22

28 Jun '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: f5b4801f by wurstsalat at 2022-06-28T22:26:25+02:00 GUI files: Remove bottom margin - - - - - 4c0a56c9 by wurstsalat at 2022-06-28T22:26:46+02:00 ChatBanner: Fix toggle roster button - - - - - 3 changed files: - gajim/data/gui/chat_control.ui - gajim/data/gui/groupchat_control.ui - gajim/gtk/chat_banner.py Changes: ===================================== gajim/data/gui/chat_control.ui ===================================== @@ -6,7 +6,6 @@ <property name="can-focus">True</property> <property name="margin-start">7</property> <property name="margin-end">7</property> - <property name="margin-bottom">7</property> <property name="spacing">1</property> <child> <object class="GtkOverlay" id="overlay"> ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -63,7 +63,6 @@ <property name="can-focus">True</property> <property name="margin-start">7</property> <property name="margin-end">7</property> - <property name="margin-bottom">7</property> <property name="spacing">3</property> <child> <object class="GtkBox" id="textview_box"> ===================================== gajim/gtk/chat_banner.py ===================================== @@ -66,6 +66,8 @@ def __init__(self) -> None: ('account-disabled', ged.GUI2, self._on_account_changed) ]) + hide_roster = app.settings.get('hide_groupchat_occupants_list') + self._set_toggle_roster_button_icon(hide_roster) app.settings.connect_signal( 'hide_groupchat_occupants_list', self._set_toggle_roster_button_icon) @@ -122,8 +124,6 @@ def switch_contact(self, self.set_no_show_all(False) self.show_all() - hide_roster = app.settings.get('hide_groupchat_occupants_list') - self._set_toggle_roster_button_icon(hide_roster) self._update_avatar() self._update_content() @@ -288,10 +288,8 @@ def _on_request_voice_clicked(self, _button: Gtk.Button) -> None: f'request-voice-{control.control_id}', None) def _on_toggle_roster_clicked(self, _button: Gtk.Button) -> None: - control = app.window.get_active_control() - if control is not None: - app.window.activate_action( - f'toggle-occupants-list-{control.control_id}', None) + state = app.settings.get('hide_groupchat_occupants_list') + app.settings.set('hide_groupchat_occupants_list', not state) def _set_toggle_roster_button_icon(self, show_roster: bool, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/5b38645eeba89d9988b1f479baa778e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/5b38645eeba89d9988b1f479baa778e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] Cleanup GUI files
by Philipp Hörist (＠lovetox) 28 Jun '22

28 Jun '22

Philipp Hörist pushed to branch newcontrol at gajim / gajim Commits: 5b38645e by lovetox at 2022-06-28T20:00:20+02:00 Cleanup GUI files - - - - - 7 changed files: - gajim/data/gui/chat_control.ui - gajim/data/gui/groupchat_control.ui - gajim/gtk/controls/base.py - gajim/gtk/controls/chat.py - gajim/gtk/controls/groupchat.py - gajim/gtk/main.py - gajim/gtk/message_actions_box.py Changes: ===================================== gajim/data/gui/chat_control.ui ===================================== @@ -2,82 +2,6 @@  <interface> <requires lib="gtk+" version="3.24"/> - <object class="GtkBox" id="drop_area"> - <property name="name">DropArea</property> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="opacity">0.90</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="orientation">vertical</property> - <property name="spacing">18</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="valign">end</property> - <property name="vexpand">True</property> - <property name="icon-name">mail-attachment-symbolic</property> - <property name="icon_size">6</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="valign">start</property> - <property name="vexpand">True</property> - <property name="label" translatable="yes">Drop files or contacts</property> - <property name="wrap">True</property> - <property name="max-width-chars">40</property> - <style> - <class name="bold16"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <object class="GtkMenu" id="formattings_menu"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <child> - <object class="GtkMenuItem" id="bold"> - <property name="name">bold</property> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Bold</property> - <signal name="activate" handler="_on_formatting_menuitem_activate" swapped="no"/> - </object> - </child> - <child> - <object class="GtkMenuItem" id="italic"> - <property name="name">italic</property> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Italic</property> - <signal name="activate" handler="_on_formatting_menuitem_activate" swapped="no"/> - </object> - </child> - <child> - <object class="GtkMenuItem" id="strike"> - <property name="name">strike</property> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Strike</property> - <signal name="activate" handler="_on_formatting_menuitem_activate" swapped="no"/> - </object> - </child> - </object> <object class="GtkBox" id="chat_control_hbox"> <property name="can-focus">True</property> <property name="margin-start">7</property> @@ -128,199 +52,7 @@ </packing> </child> <child> - <object class="GtkBox" id="hbox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <child> - <object class="GtkMenuButton" id="emoticons_button"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes">Show a list of emojis</property> - <property name="relief">none</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">face-smile-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">0</property> - </packing> - </child> - <child> - <object class="GtkMenuButton" id="formattings_button"> - <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="tooltip-text" translatable="yes">Format your message…</property> - <property name="relief">none</property> - <property name="popup">formattings_menu</property> - <property name="direction">up</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">format-text-bold-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">1</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child> - <object class="GtkMenuButton" id="settings_menu"> - <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="GtkImage"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">open-menu-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="pack-type">end</property> - <property name="position">4</property> - </packing> - </child> - <child> - <object class="GtkButton" id="authentication_button"> - <property name="can-focus">True</property> - <property name="focus-on-click">False</property> - <property name="receives-default">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="no-show-all">True</property> - <property name="relief">none</property> - <signal name="clicked" handler="_on_authentication_button_clicked" swapped="no"/> - <child> - <object class="GtkImage" id="lock_image"> - <property name="visible">True</property> - <property name="can-focus">False</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">False</property> - <property name="pack-type">end</property> - <property name="position">5</property> - </packing> - </child> - <child> - <object class="GtkMenuButton" id="encryption_menu"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes">Choose encryption</property> - <property name="relief">none</property> - <child> - <placeholder/> - </child> - <style> - <class name="chatcontrol-actionbar-button"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack-type">end</property> - <property name="position">6</property> - </packing> - </child> - <child> - <object class="GtkButton" id="sendfile_button"> - <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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="relief">none</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">mail-attachment-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">False</property> - <property name="pack-type">end</property> - <property name="position">7</property> - </packing> - </child> - <child> - <object class="GtkButton" id="send_message_button"> - <property name="can-focus">True</property> - <property name="focus-on-click">False</property> - <property name="receives-default">True</property> - <property name="no-show-all">True</property> - <property name="tooltip-text" translatable="yes">Send Message</property> - <property name="relief">none</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">document-send</property> - </object> - </child> - <style> - <class name="chatcontrol-actionbar-button"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack-type">end</property> - <property name="position">8</property> - </packing> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">4</property> - </packing> + <placeholder/> </child> </object> <packing> @@ -335,4 +67,49 @@ </packing> </child> </object> + <object class="GtkBox" id="drop_area"> + <property name="name">DropArea</property> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="opacity">0.90</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <property name="spacing">18</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="valign">end</property> + <property name="vexpand">True</property> + <property name="icon-name">mail-attachment-symbolic</property> + <property name="icon_size">6</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="valign">start</property> + <property name="vexpand">True</property> + <property name="label" translatable="yes">Drop files or contacts</property> + <property name="wrap">True</property> + <property name="max-width-chars">40</property> + <style> + <class name="bold16"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> </interface> ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -47,37 +47,6 @@ </packing> </child> </object> - <object class="GtkMenu" id="formattings_menu"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <child> - <object class="GtkMenuItem" id="bold"> - <property name="name">bold</property> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Bold</property> - <signal name="activate" handler="_on_formatting_menuitem_activate" swapped="no"/> - </object> - </child> - <child> - <object class="GtkMenuItem" id="italic"> - <property name="name">italic</property> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Italic</property> - <signal name="activate" handler="_on_formatting_menuitem_activate" swapped="no"/> - </object> - </child> - <child> - <object class="GtkMenuItem" id="strike"> - <property name="name">strike</property> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Strike</property> - <signal name="activate" handler="_on_formatting_menuitem_activate" swapped="no"/> - </object> - </child> - </object> <object class="GtkBox" id="groupchat_control_hbox"> <property name="can-focus">True</property> <child> @@ -138,219 +107,7 @@ </packing> </child> <child> - <object class="GtkBox" id="hbox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <child> - <object class="GtkButton" id="quick_invite_button"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes">Invite Contacts…</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">list-add-symbolic</property> - </object> - </child> - <style> - <class name="chatcontrol-actionbar-button"/> - <class name="flat"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack-type">end</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkMenuButton" id="settings_menu"> - <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="GtkImage"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">open-menu-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="pack-type">end</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="authentication_button"> - <property name="can-focus">True</property> - <property name="focus-on-click">False</property> - <property name="receives-default">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="no-show-all">True</property> - <property name="relief">none</property> - <signal name="clicked" handler="_on_authentication_button_clicked" swapped="no"/> - <child> - <object class="GtkImage" id="lock_image"> - <property name="visible">True</property> - <property name="can-focus">False</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">False</property> - <property name="pack-type">end</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkMenuButton" id="encryption_menu"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes">Choose encryption</property> - <property name="relief">none</property> - <child> - <placeholder/> - </child> - <style> - <class name="chatcontrol-actionbar-button"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack-type">end</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkButton" id="sendfile_button"> - <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="relief">none</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">mail-attachment-symbolic</property> - </object> - </child> - <style> - <class name="chatcontrol-actionbar-button"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack-type">end</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkMenuButton" id="emoticons_button"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes">Show a list of emojis</property> - <property name="relief">none</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">face-smile-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">5</property> - </packing> - </child> - <child> - <object class="GtkButton" id="send_message_button"> - <property name="can-focus">True</property> - <property name="focus-on-click">False</property> - <property name="receives-default">True</property> - <property name="no-show-all">True</property> - <property name="tooltip-text" translatable="yes">Send Message</property> - <property name="relief">none</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">document-send</property> - </object> - </child> - <style> - <class name="chatcontrol-actionbar-button"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack-type">end</property> - <property name="position">6</property> - </packing> - </child> - <child> - <object class="GtkMenuButton" id="formattings_button"> - <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="tooltip-text" translatable="yes">Format your message</property> - <property name="relief">none</property> - <property name="popup">formattings_menu</property> - <property name="direction">up</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">format-text-bold-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">7</property> - </packing> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">4</property> - </packing> + <placeholder/> </child> </object> <packing> ===================================== gajim/gtk/controls/base.py ===================================== @@ -192,31 +192,6 @@ def __init__(self, widget_name: str, account: str, jid: JID) -> None: self._scrolled_view.connect('request-history', self.fetch_n_lines_history, 20) - self._security_label_selector = SecurityLabelSelector( - account, self.contact) - self.xml.hbox.pack_start(self._security_label_selector, False, True, 0) - - self.msg_textview = MessageInputTextView() - - # Send message button - self.xml.send_message_button.set_action_name( - f'win.send-message-{self.control_id}') - self.xml.send_message_button.set_visible( - app.settings.get('show_send_message_button')) - app.settings.bind_signal( - 'show_send_message_button', - self.xml.send_message_button, - 'set_visible') - - self.msg_scrolledwindow = ScrolledWindow() - self.msg_scrolledwindow.set_margin_start(3) - self.msg_scrolledwindow.set_margin_end(3) - self.msg_scrolledwindow.get_style_context().add_class( - 'message-input-border') - self.msg_scrolledwindow.add(self.msg_textview) - - self.xml.hbox.pack_start(self.msg_scrolledwindow, True, True, 0) - # Keeps track of whether the ConversationView is populated self._chat_loaded: bool = False @@ -459,8 +434,6 @@ def shutdown(self) -> None: del self.conversation_view del self._scrolled_view - del self.msg_textview - del self.msg_scrolledwindow self.widget.destroy() del self.widget @@ -824,23 +797,11 @@ def set_control_active(self, state: bool) -> None: if not self._chat_loaded: self.fetch_n_lines_history(self._scrolled_view, True, 20) - if state: - self._security_label_selector.update() - - if self.msg_textview.has_text(): - self._client.get_module('Chatstate').set_chatstate( - self.contact, Chatstate.PAUSED) - else: - self._client.get_module('Chatstate').set_chatstate( - self.contact, Chatstate.ACTIVE) - else: - self._client.get_module('Chatstate').set_chatstate( - self.contact, Chatstate.INACTIVE) - def set_message_input_state(self, state: bool) -> None: - self.xml.formattings_button.set_sensitive(state) - self.msg_textview.set_sensitive(state) - self.msg_textview.set_editable(state) + return + # self.xml.formattings_button.set_sensitive(state) + # self.msg_textview.set_sensitive(state) + # self.msg_textview.set_editable(state) @property def is_chat_loaded(self) -> bool: ===================================== gajim/gtk/controls/chat.py ===================================== @@ -88,8 +88,6 @@ def __init__(self, account: str, jid: JID) -> None: self.update_toolbar() self.update_ui() - self.msg_textview.grab_focus() - # PluginSystem: adding GUI extension point for this ChatControl # instance object app.plugin_manager.gui_extension_point('chat_control', self) ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -143,8 +143,8 @@ def __init__(self, account: str, jid: JID) -> None: self._subject_text = '' # Groupchat invite - self.xml.quick_invite_button.set_action_name( - f'win.invite-{self.control_id}') + # self.xml.quick_invite_button.set_action_name( + # f'win.invite-{self.control_id}') self._invite_box = GroupChatInviter(self.room_jid) self.xml.invite_grid.attach(self._invite_box, 0, 0, 1, 1) ===================================== gajim/gtk/main.py ===================================== @@ -433,6 +433,8 @@ def _on_window_motion_notify(self, if control is None: return + return + # TODO if self.get_property('has-toplevel-focus'): client = app.get_client(control.account) client.get_module('Chatstate').set_mouse_activity( ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -37,6 +37,7 @@ from gajim.common.const import Direction from gajim.common.modules.contacts import GroupchatContact from gajim.common.types import ChatContactT +from gajim.gui.security_label_selector import SecurityLabelSelector from .builder import get_builder from .dialogs import DialogButton @@ -75,6 +76,10 @@ def __init__(self) -> None: self._ui.send_message_button, 'set_visible') + # self._security_label_selector = SecurityLabelSelector( + # account, self._contact) + # self._ui.box.pack_start(self._security_label_selector, False, True, 0) + self.msg_textview = MessageInputTextView() self.msg_textview.get_buffer().connect('changed', self._on_buffer_changed) @@ -162,6 +167,22 @@ def switch_contact(self, contact: ChatContactT) -> None: self._set_encryption_details(encryption) self._set_spell_checker_language(contact) + self._set_chatstate() + + def _set_chatstate(self) -> None: + return #TODO + if state: + self._security_label_selector.update() + + if self.msg_textview.has_text(): + self._client.get_module('Chatstate').set_chatstate( + self.contact, Chatstate.PAUSED) + else: + self._client.get_module('Chatstate').set_chatstate( + self.contact, Chatstate.ACTIVE) + else: + self._client.get_module('Chatstate').set_chatstate( + self.contact, Chatstate.INACTIVE) def _set_encryption_state(self, state: str) -> None: action = app.window.lookup_action('set-encryption') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5b38645eeba89d9988b1f479baa778e6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5b38645eeba89d9988b1f479baa778e6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] imprv: ChatBanner: Move separator
by Daniel Brötzmann (＠wurstsalat) 28 Jun '22

28 Jun '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: 13fa84ec by wurstsalat at 2022-06-28T18:30:40+02:00 imprv: ChatBanner: Move separator - - - - - 3 changed files: - gajim/data/gui/chat_control.ui - gajim/data/gui/groupchat_control.ui - gajim/gtk/chat_stack.py Changes: ===================================== gajim/data/gui/chat_control.ui ===================================== @@ -82,7 +82,6 @@ <property name="can-focus">True</property> <property name="margin-start">7</property> <property name="margin-end">7</property> - <property name="margin-top">5</property> <property name="margin-bottom">7</property> <property name="spacing">1</property> <child> @@ -98,18 +97,7 @@ <placeholder/> </child> <child> - <object class="GtkSeparator"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <style> - <class name="chatcontrol-separator-top"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> + <placeholder/> </child> <child> <object class="GtkOverlay" id="conv_view_overlay"> ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -94,7 +94,6 @@ <property name="can-focus">True</property> <property name="margin-start">7</property> <property name="margin-end">7</property> - <property name="margin-top">5</property> <property name="margin-bottom">7</property> <property name="spacing">3</property> <child> @@ -108,18 +107,7 @@ <placeholder/> </child> <child> - <object class="GtkSeparator"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <style> - <class name="chatcontrol-separator-top"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> + <placeholder/> </child> <child> <object class="GtkOverlay" id="conv_view_overlay"> ===================================== gajim/gtk/chat_stack.py ===================================== @@ -54,6 +54,7 @@ def __init__(self): box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) box.add(self._chat_banner) + box.add(Gtk.Separator()) box.add(self._control_stack) box.add(self._message_action_box) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/13fa84eca7abaa541b02885942b2aaad… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/13fa84eca7abaa541b02885942b2aaad… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Roster: Display show value in tooltip
by Daniel Brötzmann (＠wurstsalat) 28 Jun '22

28 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 35ad0441 by wurstsalat at 2022-06-28T16:03:36+02:00 imprv: Roster: Display show value in tooltip Fixes #11010 - - - - - 1 changed file: - gajim/gtk/tooltips.py Changes: ===================================== gajim/gtk/tooltips.py ===================================== @@ -206,6 +206,8 @@ def _add_resources(self, contact: types.BareContact) -> None: show_image.set_halign(Gtk.Align.START) show_image.set_valign(Gtk.Align.CENTER) + show_string = helpers.get_uf_show(resource.show.value) + assert resource.jid.resource is not None resource_string = GLib.markup_escape_text(resource.jid.resource) resource_label = Gtk.Label() @@ -213,7 +215,7 @@ def _add_resources(self, contact: types.BareContact) -> None: resource_label.set_xalign(0) resource_label.set_ellipsize(Pango.EllipsizeMode.END) resource_label.set_max_width_chars(30) - resource_label.set_text(resource_string) + resource_label.set_text(f'{show_string} ({resource_string})') base_box = Gtk.Box(spacing=6) base_box.add(show_image) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/35ad0441714e9bf09e228ed1113a6fdf… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/35ad0441714e9bf09e228ed1113a6fdf… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: ChatActionProcessor: Improve detection of emoji shortcode start
by Daniel Brötzmann (＠wurstsalat) 28 Jun '22

28 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 0c7c1a87 by wurstsalat at 2022-06-28T10:29:40+02:00 imprv: ChatActionProcessor: Improve detection of emoji shortcode start - - - - - 1 changed file: - gajim/gtk/chat_action_processor.py Changes: ===================================== gajim/gtk/chat_action_processor.py ===================================== @@ -210,7 +210,7 @@ def _check_for_emoji(self, start_iter: Gtk.TextIter) -> bool: start, _end = search colon_offset = start.get_offset() before_colon = self._buf.get_iter_at_offset(colon_offset - 1) - if before_colon.get_char() != ' ': + if before_colon.get_char() not in (' ', '\n'): # We want to show the menu only if text begins with a colon, # or if a colon follows on a space. This avoids showing the # menu within normal sentences containing colons. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0c7c1a87b7795303fc57af864e997c78… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0c7c1a87b7795303fc57af864e997c78… 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 June 2022