From 625ceb279c2bfeedeeac432f8f4bb38d358aa4f8 Mon Sep 17 00:00:00 2001 From: "dries.k" Date: Wed, 6 Apr 2022 19:47:30 +0200 Subject: [PATCH] message widget: display date on the right hand side --- gotify_tray/database/default_settings.py | 2 +- gotify_tray/gui/designs/widget_message.py | 28 +++++----- gotify_tray/gui/designs/widget_message.ui | 66 +++++++++++------------ gotify_tray/gui/widgets/MessageWidget.py | 4 +- 4 files changed, 50 insertions(+), 50 deletions(-) diff --git a/gotify_tray/database/default_settings.py b/gotify_tray/database/default_settings.py index 68731ef..4376c1b 100644 --- a/gotify_tray/database/default_settings.py +++ b/gotify_tray/database/default_settings.py @@ -16,7 +16,7 @@ DEFAULT_SETTINGS = { "tray/notifications/icon/show": True, "watchdog/interval/s": 60, "MessageWidget/image/size": 33, - "MessageWidget/font/title": "Noto Sans,17,-1,5,75,0,0,0,0,0,Bold", + "MessageWidget/font/title": "Noto Sans,12,-1,5,75,0,0,0,0,0,Bold", "MessageWidget/font/date": "Noto Sans,11,-1,5,50,1,0,0,0,0,Italic", "MessageWidget/font/message": "Noto Sans,11,-1,5,50,0,0,0,0,0,Regular", "ApplicationItem/font": "Noto Sans,10,-1,5,50,0,0,0,0,0,Regular", diff --git a/gotify_tray/gui/designs/widget_message.py b/gotify_tray/gui/designs/widget_message.py index 2001a89..4211280 100644 --- a/gotify_tray/gui/designs/widget_message.py +++ b/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) diff --git a/gotify_tray/gui/designs/widget_message.ui b/gotify_tray/gui/designs/widget_message.ui index a2ba26d..7891597 100644 --- a/gotify_tray/gui/designs/widget_message.ui +++ b/gotify_tray/gui/designs/widget_message.ui @@ -7,7 +7,7 @@ 0 0 454 - 122 + 90 @@ -47,6 +47,29 @@ 0 + + + + + + + true + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + @@ -70,7 +93,14 @@ - + + + + + + + + @@ -97,7 +127,7 @@ - + @@ -112,36 +142,6 @@ - - - - - - - true - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - diff --git a/gotify_tray/gui/widgets/MessageWidget.py b/gotify_tray/gui/widgets/MessageWidget.py index 48f7b24..07c8b36 100644 --- a/gotify_tray/gui/widgets/MessageWidget.py +++ b/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()))