gajim/common/events.py

@@ -190,6 +190,7 @@ class MessageAcknowledged(ApplicationEvent):
     account: str
     jid: JID
     pk: int
+    stanza_id: str | None
 
 
 @dataclass

gajim/common/modules/message.py

@@ -163,7 +163,8 @@ class Message(BaseModule):
                 app.ged.raise_event(
                     MessageAcknowledged(account=self._account,
                                         jid=remote_jid,
-                                        pk=pk))
+                                        pk=pk,
+                                        stanza_id=stanza_id))
                 return
 
         occupant = self._get_occupant_info(

gajim/common/winapi/system_style.py

@@ -11,9 +11,9 @@ from typing import Any
 import logging
 from collections.abc import Callable
 
-from winsdk.windows.ui import Color
-from winsdk.windows.ui.viewmanagement import UIColorType
-from winsdk.windows.ui.viewmanagement import UISettings
+from winrt.windows.ui import Color
+from winrt.windows.ui.viewmanagement import UIColorType
+from winrt.windows.ui.viewmanagement import UISettings
 
 from gajim.common import app
 from gajim.common.events import StyleChanged

gajim/gtk/control.py

@@ -169,9 +169,6 @@ class ChatControl(EventHelper):
     def remove_message(self, pk: int) -> None:
         self._scrolled_view.remove_message(pk)
 
-    def _acknowledge_message(self, pk: int) -> None:
-        self._scrolled_view.acknowledge_message(pk)
-
     def reset_view(self) -> None:
         self._scrolled_view.reset()
 
@@ -342,7 +339,7 @@ class ChatControl(EventHelper):
         if not self._is_event_processable(event):
             return
 
-        self._acknowledge_message(event.pk)
+        self._scrolled_view.acknowledge_message(event)
 
     def _on_message_received(self, event: events.MessageReceived) -> None:
         if not self._is_event_processable(event):

gajim/gtk/conversation/rows/message.py

@@ -196,7 +196,7 @@ class MessageRow(BaseRow):
 
         if (self._contact.is_groupchat and
                 self.direction == ChatDirection.OUTGOING):
-            self.show_group_chat_message_state(self.state)
+            self._message_icons.set_message_state_icon(self.state)
 
         if message.error is not None:
             if message.error.text is not None:
@@ -407,15 +407,16 @@ class MessageRow(BaseRow):
 
         return icon, color, tooltip
 
+    def set_acknowledged(self, stanza_id: str | None) -> None:
+        self.state = MessageState.ACKNOWLEDGED
+        self.stanza_id = stanza_id
+        self._message_icons.set_message_state_icon(self.state)
+
     def show_receipt(self, show: bool) -> None:
         self._message_icons.set_receipt_icon_visible(show)
 
-    def show_group_chat_message_state(self, state: MessageState) -> None:
-        self.state = state
-        self._message_icons.set_group_chat_message_state_icon(state)
-
     def show_error(self, tooltip: str) -> None:
-        self._message_icons.hide_group_chat_message_state_icon()
+        self._message_icons.hide_message_state_icon()
         self._message_icons.set_error_icon_visible(True)
         self._message_icons.set_error_tooltip(tooltip)
 

gajim/gtk/conversation/rows/widgets.py

@@ -119,9 +119,9 @@ class MessageIcons(Gtk.Box):
         self._correction_image.set_no_show_all(True)
         self._correction_image.get_style_context().add_class('dim-label')
 
-        self._group_chat_message_state_image = Gtk.Image()
-        self._group_chat_message_state_image.set_no_show_all(True)
-        self._group_chat_message_state_image.get_style_context().add_class(
+        self._message_state_image = Gtk.Image()
+        self._message_state_image.set_no_show_all(True)
+        self._message_state_image.get_style_context().add_class(
             'dim-label')
 
         self._marker_image = Gtk.Image.new_from_icon_name(
@@ -138,7 +138,7 @@ class MessageIcons(Gtk.Box):
         self.add(self._encryption_image)
         self.add(self._security_label)
         self.add(self._correction_image)
-        self.add(self._group_chat_message_state_image)
+        self.add(self._message_state_image)
         self.add(self._marker_image)
         self.add(self._error_image)
         self.show_all()
@@ -172,20 +172,20 @@ class MessageIcons(Gtk.Box):
             return
         self._marker_image.set_visible(visible)
 
-    def set_group_chat_message_state_icon(self, state: MessageState) -> None:
+    def set_message_state_icon(self, state: MessageState) -> None:
         if state == MessageState.PENDING:
             icon_name = 'feather-clock-symbolic'
             tooltip_text = _('Pending')
         else:
             icon_name = 'feather-check-symbolic'
             tooltip_text = _('Received')
-        self._group_chat_message_state_image.set_from_icon_name(
+        self._message_state_image.set_from_icon_name(
             icon_name, Gtk.IconSize.MENU)
-        self._group_chat_message_state_image.set_tooltip_text(tooltip_text)
-        self._group_chat_message_state_image.show()
+        self._message_state_image.set_tooltip_text(tooltip_text)
+        self._message_state_image.show()
 
-    def hide_group_chat_message_state_icon(self):
-        self._group_chat_message_state_image.hide()
+    def hide_message_state_icon(self):
+        self._message_state_image.hide()
 
     def set_correction_icon_visible(self, visible: bool) -> None:
         self._correction_image.set_visible(visible)

gajim/gtk/conversation/view.py

@@ -32,7 +32,6 @@ from gajim.common.modules.contacts import BareContact
 from gajim.common.modules.contacts import GroupchatContact
 from gajim.common.modules.httpupload import HTTPFileTransfer
 from gajim.common.storage.archive.const import ChatDirection
-from gajim.common.storage.archive.const import MessageState
 from gajim.common.storage.archive.models import Message
 from gajim.common.types import ChatContactT
 
@@ -671,12 +670,12 @@ class ConversationView(Gtk.ScrolledWindow):
             # unset merged state.
             decendant_row.set_merged(False)
 
-    def acknowledge_message(self, pk: int) -> None:
-        row = self.get_row_by_pk(pk)
+    def acknowledge_message(self, event: events.MessageAcknowledged) -> None:
+        row = self.get_row_by_pk(event.pk)
         if row is None:
             return
 
-        row.show_group_chat_message_state(MessageState.ACKNOWLEDGED)
+        row.set_acknowledged(event.stanza_id)
         self._check_for_merge(row)
 
     def scroll_to_message_and_highlight(self, pk: int) -> None:

win/_base.sh

@@ -80,7 +80,6 @@ function install_deps {
         "${MINGW_PACKAGE_PREFIX}"-python-setuptools \
         "${MINGW_PACKAGE_PREFIX}"-python-setuptools-scm \
         "${MINGW_PACKAGE_PREFIX}"-python-six \
-        "${MINGW_PACKAGE_PREFIX}"-python-winsdk \
         "${MINGW_PACKAGE_PREFIX}"-python-sqlalchemy \
         "${MINGW_PACKAGE_PREFIX}"-gtk3 \
         "${MINGW_PACKAGE_PREFIX}"-gtksourceview4 \
@@ -110,6 +109,8 @@ qrcode
 css_parser
 sentry-sdk
 emoji
+winrt-Windows.UI
+winrt-Windows.UI.ViewManagement
 "
     # Workaround for https://dev.gajim.org/gajim/gajim/-/issues/11490
     # Env variable described in https://www.msys2.org/docs/python/

win/dev_env.sh

@@ -24,7 +24,6 @@ function main {
         ${MINGW_PACKAGE_PREFIX}-python-setuptools \
         ${MINGW_PACKAGE_PREFIX}-python-setuptools-scm \
         ${MINGW_PACKAGE_PREFIX}-python-six \
-        ${MINGW_PACKAGE_PREFIX}-python-winsdk \
         ${MINGW_PACKAGE_PREFIX}-python-sqlalchemy \
         ${MINGW_PACKAGE_PREFIX}-gtk3 \
         ${MINGW_PACKAGE_PREFIX}-gtksourceview4 \
@@ -52,6 +51,8 @@ qrcode
 css_parser
 sentry-sdk
 emoji
+winrt-Windows.UI
+winrt-Windows.UI.ViewManagement
 "
 # Workaround for https://dev.gajim.org/gajim/gajim/-/issues/11490
 # Env variable described in https://www.msys2.org/docs/python/