FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

elide notifications title!

Browse Source
This commit is contained in:
Martin Rotter 2023-11-10 10:20:52 +01:00
parent 967ed28f8c
commit 24f72dee33
5 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/librssguard/gui/notifications/articlelistnotification.cpp
View File

@ -71,6 +71,7 @@ void ArticleListNotification::loadResults(const QHash<Feed*, QList<Message>>& ne
m_newMessages = new_messages; m_newMessages = new_messages;
m_ui.m_lblTitle->setText(tr("%n feeds fetched", nullptr, new_messages.size())); m_ui.m_lblTitle->setText(tr("%n feeds fetched", nullptr, new_messages.size()));
m_ui.m_lblTitle->setToolTip(m_ui.m_lblTitle->text());
m_ui.m_cmbFeeds->model()->sort(0, Qt::SortOrder::AscendingOrder); m_ui.m_cmbFeeds->model()->sort(0, Qt::SortOrder::AscendingOrder);
m_ui.m_cmbFeeds->clear(); m_ui.m_cmbFeeds->clear();

10
src/librssguard/gui/notifications/articlelistnotification.ui
View File

@ -51,16 +51,13 @@
<item row="0" column="0" colspan="2"> <item row="0" column="0" colspan="2">
<layout class="QHBoxLayout" name="m_titleLayout"> <layout class="QHBoxLayout" name="m_titleLayout">
<item> <item>
<widget class="QLabel" name="m_lblTitle"> <widget class="SqueezeLabel" name="m_lblTitle">
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
</property> </property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@ -136,6 +133,11 @@
<extends>QToolButton</extends> <extends>QToolButton</extends>
<header>plaintoolbutton.h</header> <header>plaintoolbutton.h</header>
</customwidget> </customwidget>
<customwidget>
<class>SqueezeLabel</class>
<extends>QLabel</extends>
<header>squeezelabel.h</header>
</customwidget>
</customwidgets> </customwidgets>
<tabstops> <tabstops>
<tabstop>m_btnClose</tabstop> <tabstop>m_btnClose</tabstop>

3
src/librssguard/gui/notifications/toastnotification.cpp
View File

@ -24,7 +24,9 @@ ToastNotification::ToastNotification(Notification::Event event,
void ToastNotification::loadNotification(Notification::Event event, const GuiMessage& msg, const GuiAction& action) { void ToastNotification::loadNotification(Notification::Event event, const GuiMessage& msg, const GuiAction& action) {
m_ui.m_lblTitle->setText(msg.m_title); m_ui.m_lblTitle->setText(msg.m_title);
m_ui.m_lblTitle->setToolTip(msg.m_title);
m_ui.m_lblBody->setText(msg.m_message); m_ui.m_lblBody->setText(msg.m_message);
m_ui.m_lblBody->setToolTip(msg.m_message);
m_ui.m_lblIcon->setPixmap(iconForType(msg.m_type) m_ui.m_lblIcon->setPixmap(iconForType(msg.m_type)
.pixmap({ .pixmap({
@ -41,6 +43,7 @@ void ToastNotification::loadNotification(Notification::Event event, const GuiMes
} }
else { else {
m_ui.m_mainLayout->removeItem(m_ui.m_actionLayout); m_ui.m_mainLayout->removeItem(m_ui.m_actionLayout);
m_ui.m_mainLayout->update();
m_ui.m_btnAction->deleteLater(); m_ui.m_btnAction->deleteLater();
} }
} }

10
src/librssguard/gui/notifications/toastnotification.ui
View File

@ -26,16 +26,13 @@
<item row="0" column="0" colspan="2"> <item row="0" column="0" colspan="2">
<layout class="QHBoxLayout" name="m_titleLayout"> <layout class="QHBoxLayout" name="m_titleLayout">
<item> <item>
<widget class="QLabel" name="m_lblTitle"> <widget class="SqueezeLabel" name="m_lblTitle">
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
</property> </property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@ -100,6 +97,11 @@
<extends>QToolButton</extends> <extends>QToolButton</extends>
<header>plaintoolbutton.h</header> <header>plaintoolbutton.h</header>
</customwidget> </customwidget>
<customwidget>
<class>SqueezeLabel</class>
<extends>QLabel</extends>
<header>squeezelabel.h</header>
</customwidget>
</customwidgets> </customwidgets>
<resources/> <resources/>
<connections/> <connections/>

2
src/librssguard/gui/reusable/squeezelabel.cpp
View File

@ -10,7 +10,7 @@ void SqueezeLabel::paintEvent(QPaintEvent* event) {
QFontMetrics fm = fontMetrics(); QFontMetrics fm = fontMetrics();
if (fm.horizontalAdvance(m_squeezedTextCache) > contentsRect().width()) { if (fm.horizontalAdvance(m_squeezedTextCache) > contentsRect().width()) {
setText(fm.elidedText(text(), Qt::ElideMiddle, width())); setText(fm.elidedText(text(), Qt::TextElideMode::ElideRight, width()));
} }
} }