Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] DOAP: Remove XEPs 0107 and 0108
by Daniel Brötzmann (＠wurstsalat) 10 Dec '21

10 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: c5977f5c by wurstsalat at 2021-12-10T09:55:25+01:00 DOAP: Remove XEPs 0107 and 0108 - - - - - 1 changed file: - data/gajim.doap Changes: ===================================== data/gajim.doap ===================================== @@ -240,20 +240,6 @@ <xmpp:version>1.1.1</xmpp:version> </xmpp:SupportedXep> </implements> - <implements> - <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0107.html"/> - <xmpp:status>complete</xmpp:status> - <xmpp:version>1.2</xmpp:version> - </xmpp:SupportedXep> - </implements> - <implements> - <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0108.html"/> - <xmpp:status>complete</xmpp:status> - <xmpp:version>1.3</xmpp:version> - </xmpp:SupportedXep> - </implements> <implements> <xmpp:SupportedXep> <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0115.html"/> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c5977f5c4d7d586889472c328b2e430c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c5977f5c4d7d586889472c328b2e430c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Windows installer: Improve UX
by Daniel Brötzmann (＠wurstsalat) 10 Dec '21

10 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 2a8aea22 by wurstsalat at 2021-12-10T09:49:59+01:00 Windows installer: Improve UX - - - - - 1 changed file: - win/misc/gajim.nsi Changes: ===================================== win/misc/gajim.nsi ===================================== @@ -249,9 +249,13 @@ SectionEnd ; Installer Function StartUpgrade - ; Disable 'Upgrade' button to avoid further clicks + ; Disable 'Upgrade', 'Cancel', and 'Back' buttons to avoid further clicks GetDlgItem $1 $HWNDPARENT 1 EnableWindow $1 0 + GetDlgItem $2 $HWNDPARENT 2 + EnableWindow $2 0 + GetDlgItem $3 $HWNDPARENT 3 + EnableWindow $3 0 ; Hint: Gajim setup should not be named gajim.exe ExecWait "TaskKill /IM gajim.exe /F" View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2a8aea2201dd2c7a3b583a7d47a3c094… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2a8aea2201dd2c7a3b583a7d47a3c094… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: BaseControl: Properly format info message
by Daniel Brötzmann (＠wurstsalat) 09 Dec '21

09 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: b5b55c09 by wurstsalat at 2021-12-09T21:43:33+01:00 BaseControl: Properly format info message - - - - - 63e54926 by wurstsalat at 2021-12-09T21:46:02+01:00 ReadMarkerRow: Improve UX - - - - - 2 changed files: - gajim/gtk/controls/base.py - gajim/gtk/conversation/rows/read_marker.py Changes: ===================================== gajim/gtk/controls/base.py ===================================== @@ -999,7 +999,9 @@ def drag_data_file_transfer(self, selection: Gtk.SelectionData) -> None: for uri in uri_splitted: path = get_file_path_from_dnd_dropped_uri(uri) if not os.path.isfile(path): # is it a file? - self.add_info_message(_("The following file could not be accessed and was not uploaded: ") + path) + self.add_info_message( + _('The following file could not be accessed and was ' + 'not uploaded: %s') % path) continue self._start_filetransfer(path) ===================================== gajim/gtk/conversation/rows/read_marker.py ===================================== @@ -24,6 +24,7 @@ class ReadMarkerRow(BaseRow): def __init__(self, account, contact): BaseRow.__init__(self, account, widget='label') + self.set_activatable(False) self.type = 'read_marker' self.timestamp = datetime.fromtimestamp(0) self._last_incoming_timestamp = datetime.fromtimestamp(0) @@ -34,6 +35,7 @@ def __init__(self, account, contact): self.label.set_text(text) self.label.set_halign(Gtk.Align.CENTER) self.label.set_hexpand(True) + self.label.set_sensitive(False) self.label.get_style_context().add_class( 'conversation-read-marker') self.grid.attach(self.label, 0, 0, 1, 1) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/aaa140aadbd9e0addc485cd58d175aa… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/aaa140aadbd9e0addc485cd58d175aa… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Shortcuts: Show correct shortcut for quoting messages
by Daniel Brötzmann (＠wurstsalat) 09 Dec '21

09 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: a4cc5e9e by wurstsalat at 2021-12-09T21:17:50+01:00 Shortcuts: Show correct shortcut for quoting messages - - - - - aaa140aa by wurstsalat at 2021-12-09T21:33:45+01:00 Shortcuts: Improve section name and move Contact Info - - - - - 1 changed file: - gajim/data/gui/shortcuts_window.ui Changes: ===================================== gajim/data/gui/shortcuts_window.ui ===================================== @@ -4,8 +4,8 @@ <child> <object class="GtkShortcutsSection"> <property name="visible">1</property> - <property name="section-name">roster</property> - <property name="title" translatable="yes">Contact List</property> + <property name="section-name">window</property> + <property name="title" translatable="yes">Gajim</property> <child> <object class="GtkShortcutsGroup"> <property name="visible">1</property> @@ -61,19 +61,6 @@ </child> </object> </child> - <child> - <object class="GtkShortcutsGroup"> - <property name="visible">1</property> - <property name="title" translatable="yes">Contacts</property> - <child> - <object class="GtkShortcutsShortcut"> - <property name="visible">1</property> - <property name="accelerator"><primary>i</property> - <property name="title" translatable="yes">Contact information</property> - </object> - </child> - </object> - </child> </object> </child> <child> @@ -130,14 +117,14 @@ <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator"><primary><alt>Up</property> + <property name="accelerator"><primary><shift>Up</property> <property name="title" translatable="yes">Quote previous message</property> </object> </child> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator"><primary><alt>Down</property> + <property name="accelerator"><primary><shift>Down</property> <property name="title" translatable="yes">Quote next message</property> </object> </child> @@ -252,6 +239,19 @@ </child> </object> </child> + <child> + <object class="GtkShortcutsGroup"> + <property name="visible">1</property> + <property name="title" translatable="yes">Contacts</property> + <child> + <object class="GtkShortcutsShortcut"> + <property name="visible">1</property> + <property name="accelerator"><primary>i</property> + <property name="title" translatable="yes">Contact information</property> + </object> + </child> + </object> + </child> </object> </child> </object> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/33d6a38ba973a0b90ab959ef71f0c61… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/33d6a38ba973a0b90ab959ef71f0c61… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Control: Move get_our_nick
by Daniel Brötzmann (＠wurstsalat) 09 Dec '21

09 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 33d6a38b by wurstsalat at 2021-12-09T20:56:06+01:00 Control: Move get_our_nick - - - - - 2 changed files: - gajim/gtk/controls/base.py - gajim/gtk/controls/chat.py Changes: ===================================== gajim/gtk/controls/base.py ===================================== @@ -1016,6 +1016,9 @@ def get_seclabel(self): label = labels[lname] return label + def get_our_nick(self) -> str: + return app.nicks[self.account] + def _on_send_message(self, *args): self.msg_textview.replace_emojis() message = self.msg_textview.get_text() ===================================== gajim/gtk/controls/chat.py ===================================== @@ -583,9 +583,6 @@ def send_message(self, process_commands=process_commands, attention=attention) - def get_our_nick(self) -> str: - return app.nicks[self.account] - def add_message(self, text: str, kind: str, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/33d6a38ba973a0b90ab959ef71f0c61f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/33d6a38ba973a0b90ab959ef71f0c61f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: MessageRow: Fix contact typing
by Daniel Brötzmann (＠wurstsalat) 09 Dec '21

09 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 0d68b968 by wurstsalat at 2021-12-09T20:47:12+01:00 MessageRow: Fix contact typing - - - - - 4d83f3f0 by wurstsalat at 2021-12-09T20:47:12+01:00 Bring back urgency hint - - - - - 3 changed files: - gajim/gtk/controls/base.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/main.py Changes: ===================================== gajim/gtk/controls/base.py ===================================== @@ -46,9 +46,10 @@ from nbxmpp.modules.security_labels import Displaymarking from gajim.common import app -from gajim.common import helpers from gajim.common import ged from gajim.common import i18n +from gajim.common.helpers import message_needs_highlight +from gajim.common.helpers import get_file_path_from_dnd_dropped_uri from gajim.common.i18n import _ from gajim.common.nec import EventHelper from gajim.common.nec import NetworkEvent @@ -68,6 +69,7 @@ from gajim.gui.message_input import MessageInputTextView from gajim.gui.util import get_hardware_key_codes from gajim.gui.util import get_builder +from gajim.gui.util import set_urgency_hint from gajim.gui.util import AccountBadge from gajim.gui.const import ControlType # pylint: disable=unused-import from gajim.gui.const import TARGET_TYPE_URI_LIST @@ -798,7 +800,7 @@ def _get_pref_ft_method(self) -> Optional[str]: jingle = app.window.lookup_action( f'send-file-jingle-{self.control_id}') - if self._type.is_groupchat: + if self.is_groupchat: if httpupload.get_enabled(): return 'httpupload' return None @@ -866,7 +868,7 @@ def _on_message_textview_key_press_event(self, textview, event): self.space_pressed = False # Ctrl [+ Shift] + Tab are not forwarded to notebook. We handle it here - if self._type.is_groupchat: + if self.is_groupchat: if event.keyval not in (Gdk.KEY_ISO_Left_Tab, Gdk.KEY_Tab): self.last_key_tabs = False @@ -920,7 +922,7 @@ def _on_message_textview_key_press_event(self, textview, event): self.COMMAND_PREFIX + self.command_hits[0] + ' ') self.last_key_tabs = True return True - if not self._type.is_groupchat: + if not self.is_groupchat: self.last_key_tabs = False if event.keyval == Gdk.KEY_Up: if event_state & Gdk.ModifierType.CONTROL_MASK: @@ -995,7 +997,7 @@ def drag_data_file_transfer(self, selection: Gtk.SelectionData) -> None: # we may have more than one file dropped uri_splitted = selection.get_uris() for uri in uri_splitted: - path = helpers.get_file_path_from_dnd_dropped_uri(uri) + path = get_file_path_from_dnd_dropped_uri(uri) if not os.path.isfile(path): # is it a file? self.add_info_message(_("The following file could not be accessed and was not uploaded: ") + path) continue @@ -1173,7 +1175,7 @@ def add_message(self, self._jump_to_end_button.add_unread_count() if message_id: - if self._type.is_groupchat: + if self.is_groupchat: self.last_msg_id = stanza_id or message_id else: self.last_msg_id = message_id @@ -1186,10 +1188,22 @@ def add_message(self, if notify: self._notify(name, text, tim, additional_data) - # Send chat marker if we’re actively following the chat chat_active = app.window.is_chat_active( self.account, self.contact.jid) + + if not chat_active: + if self.is_groupchat: + needs_highlight = message_needs_highlight( + text, + self.contact.nickname, + self._client.get_own_jid().bare) + if needs_highlight or self.contact.can_notify(): + set_urgency_hint(app.window, True) + else: + set_urgency_hint(app.window, True) + if chat_active and self._scrolled_view.get_autoscroll(): + # Send chat marker if we’re actively following the chat app.window.mark_as_read(self.account, self.contact.jid) def _notify(self, @@ -1222,7 +1236,7 @@ def _notify(self, if self.is_groupchat: msg_type = 'group-chat-message' title += f' ({self.contact.name})' - needs_highlight = helpers.message_needs_highlight( + needs_highlight = message_needs_highlight( text, self.contact.nickname, self._client.get_own_jid().bare) if needs_highlight: sound = 'muc_message_highlight' ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -12,6 +12,8 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from __future__ import annotations + from typing import Optional from typing import Union @@ -28,6 +30,7 @@ from nbxmpp.modules.security_labels import Displaymarking from gajim.common import app +from gajim.common import types from gajim.common.const import AvatarSize from gajim.common.const import TRUST_SYMBOL_DATA from gajim.common.helpers import AdditionalDataDict @@ -36,9 +39,6 @@ from gajim.common.helpers import message_needs_highlight from gajim.common.helpers import reduce_chars_newlines from gajim.common.helpers import to_user_string -from gajim.common.modules.contacts import BareContact -from gajim.common.modules.contacts import GroupchatContact -from gajim.common.modules.contacts import GroupchatParticipant from gajim.common.styling import process from gajim.common.styling import ParsingResult from gajim.common.i18n import _ @@ -56,14 +56,13 @@ MERGE_TIMEFRAME = timedelta(seconds=120) -# TODO: -ContactType = Union[BareContact, GroupchatContact, GroupchatParticipant] - class MessageRow(BaseRow): def __init__(self, account: str, - contact: ContactType, + contact: Union[types.BareContact, + types.GroupchatContact, + types.GroupchatParticipant], message_id: Optional[str], stanza_id: Optional[str], timestamp: float, ===================================== gajim/gtk/main.py ===================================== @@ -52,6 +52,7 @@ from .util import restore_main_window_position from .util import save_main_window_position from .util import open_window +from .util import set_urgency_hint log = logging.getLogger('gajim.gui.main') @@ -521,7 +522,7 @@ def get_chat_unread_count(self, def mark_as_read(self, account: str, jid: JID, send_marker: bool = True) -> None: - # TODO set window urgency hint, etc. + set_urgency_hint(self, False) control = self.get_control(account, jid) if control is not None: # Send displayed marker and @@ -536,6 +537,7 @@ def _on_window_active(self, window, _param): if not is_active: return + set_urgency_hint(self, False) control = self.get_active_control() if control is None: return View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ad86867ab7e6fe531e9e24d2823cdac… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ad86867ab7e6fe531e9e24d2823cdac… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix typo when accessing contact module
by Philipp Hörist (＠lovetox) 09 Dec '21

09 Dec '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: ad86867a by lovetox at 2021-12-09T20:43:54+01:00 Fix typo when accessing contact module - - - - - 2 changed files: - gajim/common/helpers.py - gajim/remote_control.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -827,7 +827,7 @@ def load_json(path, key=None, default=None): def ignore_contact(account, jid): client = app.get_client(account) - contact = client.get_module('Contact').get_contact(jid) + contact = client.get_module('Contacts').get_contact(jid) ignore_unknown = app.settings.get_account_setting( account, 'ignore_unknown_contacts') ===================================== gajim/remote_control.py ===================================== @@ -569,7 +569,7 @@ def open_chat(self, jid, account, message): for acct in accounts: if app.account_is_available(acct): # account is online client = app.get_client(acct) - contact = client.get_module('Contact').get_contact(jid) + contact = client.get_module('Contacts').get_contact(jid) control = app.window.get_control(acct, jid) if control is not None: connected_account = acct @@ -723,7 +723,7 @@ def remove_contact(self, jid, account): contact_exists = False for account_ in accounts: client = app.get_client(account_) - contact = client.get_module('Contact').get_contact(jid) + contact = client.get_module('Contacts').get_contact(jid) if contact.is_in_roster: client.get_module('Presence').unsubscribe(jid) client.get_module('Roster').delete_item(jid) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ad86867ab7e6fe531e9e24d2823cdac1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ad86867ab7e6fe531e9e24d2823cdac1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Remove XEPs 0107 (User Mood) and 0108 (User Activity)
by Daniel Brötzmann (＠wurstsalat) 09 Dec '21

09 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 983bb8bb by wurstsalat at 2021-12-09T19:56:46+01:00 Remove XEPs 0107 (User Mood) and 0108 (User Activity) - - - - - 608017b0 by wurstsalat at 2021-12-09T19:56:49+01:00 GroupchatControl: Improve toggle participants button - - - - - 30 changed files: - gajim/common/client.py - gajim/common/const.py - gajim/common/helpers.py - gajim/common/modules/__init__.py - − gajim/common/modules/user_activity.py - − gajim/common/modules/user_mood.py - gajim/common/setting_values.py - gajim/data/gui/chat_control.ui - gajim/data/gui/groupchat_control.ui - gajim/data/gui/roster_tooltip.ui - − gajim/data/icons/hicolor/16x16/status/activity-doing-chores-buying-groceries.png - − gajim/data/icons/hicolor/16x16/status/activity-doing-chores-cleaning.png - − gajim/data/icons/hicolor/16x16/status/activity-doing-chores-cooking.png - − gajim/data/icons/hicolor/16x16/status/activity-doing-chores-doing-maintenance.png - − gajim/data/icons/hicolor/16x16/status/activity-doing-chores-doing-the-dishes.png - − gajim/data/icons/hicolor/16x16/status/activity-doing-chores-doing-the-laundry.png - − gajim/data/icons/hicolor/16x16/status/activity-doing-chores-gardening.png - − gajim/data/icons/hicolor/16x16/status/activity-doing-chores-running-an-errand.png - − gajim/data/icons/hicolor/16x16/status/activity-doing-chores-walking-the-dog.png - − gajim/data/icons/hicolor/16x16/status/activity-doing-chores.png - − gajim/data/icons/hicolor/16x16/status/activity-drinking-having-a-beer.png - − gajim/data/icons/hicolor/16x16/status/activity-drinking-having-coffee.png - − gajim/data/icons/hicolor/16x16/status/activity-drinking-having-tea.png - − gajim/data/icons/hicolor/16x16/status/activity-drinking.png - − gajim/data/icons/hicolor/16x16/status/activity-eating-having-a-snack.png - − gajim/data/icons/hicolor/16x16/status/activity-eating-having-breakfast.png - − gajim/data/icons/hicolor/16x16/status/activity-eating-having-dinner.png - − gajim/data/icons/hicolor/16x16/status/activity-eating-having-lunch.png - − gajim/data/icons/hicolor/16x16/status/activity-eating.png - − gajim/data/icons/hicolor/16x16/status/activity-exercising-cycling.png The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/af19d4abacd19805a395b5a9ee1cb47… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/af19d4abacd19805a395b5a9ee1cb47… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Avatar: Fix contact annotations
by Philipp Hörist (＠lovetox) 09 Dec '21

09 Dec '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: af19d4ab by lovetox at 2021-12-09T18:27:58+01:00 Avatar: Fix contact annotations - - - - - 1 changed file: - gajim/gtk/avatar.py Changes: ===================================== gajim/gtk/avatar.py ===================================== @@ -12,7 +12,10 @@ # 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, Union +from __future__ import annotations + +from typing import Optional +from typing import Union import logging import hashlib @@ -50,9 +53,6 @@ AvatarCacheT = dict[JID, dict[tuple[int, int, Optional[str]], cairo.ImageSurface]] -ContactT = Union[types.BareContact, - types.GroupchatContact, - types.GroupchatParticipant] def generate_avatar(letters: str, color: tuple[float, float, float], @@ -360,7 +360,9 @@ def invalidate_cache(self, jid: JID) -> None: self._cache.pop(jid, None) def get_pixbuf(self, - contact: ContactT, + contact: Union[types.BareContact, + types.GroupchatContact, + types.GroupchatParticipant], size: int, scale: int, show: Optional[str] = None, @@ -373,7 +375,9 @@ def get_pixbuf(self, return Gdk.pixbuf_get_from_surface(surface, 0, 0, size, size) def get_surface(self, - contact: ContactT, + contact: Union[types.BareContact, + types.GroupchatContact, + types.GroupchatParticipant], size: int, scale: int, show: Optional[str] = None, @@ -554,7 +558,9 @@ def _load_surface_from_storage(self, return fit(surface, size) def _get_avatar_from_storage(self, - contact: ContactT, + contact: Union[types.BareContact, + types.GroupchatContact, + types.GroupchatParticipant], size: int, scale: int, style: str) -> Optional[cairo.ImageSurface]: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/af19d4abacd19805a395b5a9ee1cb47a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/af19d4abacd19805a395b5a9ee1cb47a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] BaseControl: Check for message text before adding status message
by Daniel Brötzmann (＠wurstsalat) 09 Dec '21

09 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 312efbe5 by wurstsalat at 2021-12-09T10:32:26+01:00 BaseControl: Check for message text before adding status message - - - - - 1 changed file: - gajim/gtk/controls/base.py Changes: ===================================== gajim/gtk/controls/base.py ===================================== @@ -1416,14 +1416,14 @@ def add_messages(self, messages): self.conversation_view.add_call_message(db_message=msg) continue + if not msg.message: + continue + if msg.kind in (KindConstant.STATUS, KindConstant.GCSTATUS): self.conversation_view.add_info_message(msg.message) continue - if not msg.message: - continue - message_text = msg.message contact_name = msg.contact_name View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/312efbe5d33852dfe0459c476b0bd97e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/312efbe5d33852dfe0459c476b0bd97e… 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