message widget: display date on the right hand side

gotify_tray/gui/designs/widget_message.py

@@ -12,7 +12,7 @@ from PyQt6 import QtCore, QtGui, QtWidgets
 class Ui_Form(object):
     def setupUi(self, Form):
         Form.setObjectName("Form")
-        Form.resize(454, 122)
+        Form.resize(454, 90)
         self.gridLayout = QtWidgets.QGridLayout(Form)
         self.gridLayout.setSizeConstraint(QtWidgets.QLayout.SizeConstraint.SetMinimumSize)
         self.gridLayout.setContentsMargins(0, 0, 0, 0)
@@ -25,6 +25,13 @@ class Ui_Form(object):
         self.gridLayout_frame.setSizeConstraint(QtWidgets.QLayout.SizeConstraint.SetMinimumSize)
         self.gridLayout_frame.setContentsMargins(-1, 0, -1, 0)
         self.gridLayout_frame.setObjectName("gridLayout_frame")
+        self.pb_delete = QtWidgets.QPushButton(self.frame)
+        self.pb_delete.setText("")
+        self.pb_delete.setFlat(True)
+        self.pb_delete.setObjectName("pb_delete")
+        self.gridLayout_frame.addWidget(self.pb_delete, 0, 4, 1, 1)
+        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+        self.gridLayout_frame.addItem(spacerItem, 0, 2, 1, 1)
         self.label_title = QtWidgets.QLabel(self.frame)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Minimum)
         sizePolicy.setHorizontalStretch(0)
@@ -39,6 +46,10 @@ class Ui_Form(object):
         self.label_title.setTextInteractionFlags(QtCore.Qt.TextInteractionFlag.LinksAccessibleByMouse|QtCore.Qt.TextInteractionFlag.TextSelectableByMouse)
         self.label_title.setObjectName("label_title")
         self.gridLayout_frame.addWidget(self.label_title, 0, 1, 1, 1)
+        self.label_image = QtWidgets.QLabel(self.frame)
+        self.label_image.setText("")
+        self.label_image.setObjectName("label_image")
+        self.gridLayout_frame.addWidget(self.label_image, 0, 0, 1, 1)
         self.label_message = QtWidgets.QLabel(self.frame)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.MinimumExpanding)
         sizePolicy.setHorizontalStretch(0)
@@ -52,25 +63,14 @@ class Ui_Form(object):
         self.label_message.setOpenExternalLinks(True)
         self.label_message.setTextInteractionFlags(QtCore.Qt.TextInteractionFlag.LinksAccessibleByMouse|QtCore.Qt.TextInteractionFlag.TextSelectableByMouse)
         self.label_message.setObjectName("label_message")
-        self.gridLayout_frame.addWidget(self.label_message, 3, 1, 1, 3)
+        self.gridLayout_frame.addWidget(self.label_message, 3, 1, 1, 4)
         self.label_date = QtWidgets.QLabel(self.frame)
         font = QtGui.QFont()
         font.setPointSize(11)
         self.label_date.setFont(font)
         self.label_date.setTextInteractionFlags(QtCore.Qt.TextInteractionFlag.LinksAccessibleByMouse|QtCore.Qt.TextInteractionFlag.TextSelectableByMouse)
         self.label_date.setObjectName("label_date")
-        self.gridLayout_frame.addWidget(self.label_date, 2, 1, 1, 1)
-        self.pb_delete = QtWidgets.QPushButton(self.frame)
-        self.pb_delete.setText("")
-        self.pb_delete.setFlat(True)
-        self.pb_delete.setObjectName("pb_delete")
-        self.gridLayout_frame.addWidget(self.pb_delete, 0, 3, 1, 1)
-        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
-        self.gridLayout_frame.addItem(spacerItem, 0, 2, 1, 1)
-        self.label_image = QtWidgets.QLabel(self.frame)
-        self.label_image.setText("")
-        self.label_image.setObjectName("label_image")
-        self.gridLayout_frame.addWidget(self.label_image, 0, 0, 1, 1)
+        self.gridLayout_frame.addWidget(self.label_date, 0, 3, 1, 1)
         self.gridLayout.addWidget(self.frame, 0, 0, 1, 1)
 
         self.retranslateUi(Form)

gotify_tray/gui/designs/widget_message.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>454</width>
-    <height>122</height>
+    <height>90</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -47,6 +47,29 @@
       <property name="bottomMargin">
        <number>0</number>
       </property>
+      <item row="0" column="4">
+       <widget class="QPushButton" name="pb_delete">
+        <property name="text">
+         <string/>
+        </property>
+        <property name="flat">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2">
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
       <item row="0" column="1">
        <widget class="QLabel" name="label_title">
         <property name="sizePolicy">
@@ -70,7 +93,14 @@
         </property>
        </widget>
       </item>
-      <item row="3" column="1" colspan="3">
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_image">
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1" colspan="4">
        <widget class="QLabel" name="label_message">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
@@ -97,7 +127,7 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="1">
+      <item row="0" column="3">
        <widget class="QLabel" name="label_date">
         <property name="font">
          <font>
@@ -112,36 +142,6 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="3">
-       <widget class="QPushButton" name="pb_delete">
-        <property name="text">
-         <string/>
-        </property>
-        <property name="flat">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2">
-       <spacer name="horizontalSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_image">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>

gotify_tray/gui/widgets/MessageWidget.py

@@ -61,8 +61,8 @@ class MessageWidget(QtWidgets.QWidget, Ui_Form):
             self.label_image.hide()
 
         # Set MessagesModelItem's size hint based on the size of this widget
-        self.gridLayout_frame.setContentsMargins(10, 5, 10, 5)
-        self.gridLayout.setContentsMargins(5, 15, 5, 15)
+        self.gridLayout_frame.setContentsMargins(5, 5, 5, 5)
+        self.gridLayout.setContentsMargins(5, 5, 5, 5)
         self.adjustSize()
         size_hint = self.message_item.sizeHint()
         self.message_item.setSizeHint(QtCore.QSize(size_hint.width(), self.height()))