Simplify the inserting and processing of messages.

Message widgets are now inserted into the listView through the `rowsInserted` callback of the messages model.

Messages are processed in the GetMessagesTask and GetApplicationMessagesTask when fetching multiple new messages. Single new incoming messages are processed in ProcessMessageTask.

gotify_tray/gui/widgets/MainWindow.py

@@ -11,6 +11,8 @@ from . import MessageWidget
 from gotify_tray.__version__ import __title__
 from gotify_tray.database import Settings
 from gotify_tray.gui.themes import get_theme_file
+from gotify_tray.gui.models import MessageItemDataRole
+from gotify_tray import gotify
 
 
 settings = Settings("gotify-tray")
@@ -104,17 +106,20 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
     def set_error(self):
         self.status_widget.set_error()
 
-    def insert_message_widget(
-        self, message_item: MessagesModelItem, image_path: str = ""
-    ):
-        message_widget = MessageWidget(
-            self.app, self.listView_messages, message_item, image_path=image_path
-        )
-        self.listView_messages.setIndexWidget(
-            self.messages_model.indexFromItem(message_item), message_widget
-        )
-        message_widget.deletion_requested.connect(self.delete_message.emit)
-        message_widget.image_popup.connect(self.image_popup.emit)
+    def display_message_widgets(self, parent: QtCore.QModelIndex, first: int, last: int):
+        for i in range(first, last+1):
+            if index := self.messages_model.index(i, 0, parent):
+                message_item = self.messages_model.itemFromIndex(index)
+
+                message: gotify.GotifyMessageModel = self.messages_model.data(index, MessageItemDataRole.MessageRole)
+
+                application_item = self.application_model.itemFromId(message.appid)
+                
+                message_widget = MessageWidget(self.app, self.listView_messages, message_item, icon=application_item.icon())
+                message_widget.deletion_requested.connect(self.delete_message.emit)
+                message_widget.image_popup.connect(self.image_popup.emit)
+                
+                self.listView_messages.setIndexWidget(self.messages_model.indexFromItem(message_item), message_widget)
 
     def currentApplicationIndex(self) -> QtCore.QModelIndex:
         return self.listView_applications.selectionModel().currentIndex()

gotify_tray/gui/widgets/MessageWidget.py

@@ -23,9 +23,9 @@ class MessageWidget(QtWidgets.QWidget, Ui_Form):
         app: QtWidgets.QApplication,
         parent: QtWidgets.QWidget,
         message_item: MessagesModelItem,
-        image_path: str = "",
+        icon: QtGui.QIcon = None,
     ):
-        super(MessageWidget, self).__init__()
+        super(MessageWidget, self).__init__(parent)
         self.app = app
         self.parent = parent
         self.setupUi(self)
@@ -59,15 +59,9 @@ class MessageWidget(QtWidgets.QWidget, Ui_Form):
             self.label_message.setText(convert_links(message.message))
 
         # Show the application icon
-        if image_path:
+        if icon:
             image_size = settings.value("MessageWidget/image/size", type=int)
-            self.label_image.setFixedSize(QtCore.QSize(image_size, image_size))
-            pixmap = QtGui.QPixmap(image_path).scaled(
-                image_size,
-                image_size,
-                aspectRatioMode=QtCore.Qt.AspectRatioMode.KeepAspectRatioByExpanding,
-                transformMode=QtCore.Qt.TransformationMode.SmoothTransformation,
-            )
+            pixmap = icon.pixmap(QtCore.QSize(image_size, image_size))
             self.label_image.setPixmap(pixmap)
         else:
             self.label_image.hide()

gotify_tray/gui/widgets/SettingsDialog.py

@@ -118,7 +118,7 @@ class SettingsDialog(QtWidgets.QDialog, Ui_Dialog):
                     }
                 )
             ),
-            get_icon("gotify-small"),
+            QtGui.QIcon(get_icon("gotify-small")),
         )
         self.layout_fonts_message.addWidget(self.message_widget)