FreshRSS/rssguard
1
0
Fork 0
mirror of https://github.com/martinrotter/rssguard.git synced 2025-01-29 00:30:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

article toolbar label btns follow rest of app style

Browse Source
This commit is contained in:
Martin Rotter 2022-02-22 14:10:45 +01:00
parent 2d4d5f88a7
commit 970dfc0c44
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/librssguard/gui/messagepreviewer.cpp
View File

@ -107,10 +107,9 @@ void MessagePreviewer::hideToolbar() {
m_toolBar->setVisible(false); m_toolBar->setVisible(false);
} }
void MessagePreviewer::loadUrl(const QString &url) { void MessagePreviewer::loadUrl(const QString& url) {
#if defined(USE_WEBENGINE) #if defined(USE_WEBENGINE)
m_txtMessage->loadUrl(url); m_txtMessage->loadUrl(url);
#else #else
m_txtMessage->loadUrl(url); m_txtMessage->loadUrl(url);
#endif #endif
@ -255,7 +254,9 @@ void MessagePreviewer::updateLabels(bool only_clear) {
btn_label->setIcon(Label::generateIcon(label->color())); btn_label->setIcon(Label::generateIcon(label->color()));
btn_label->setAutoRaise(false); btn_label->setAutoRaise(false);
btn_label->setText(QSL(" ") + label->title()); btn_label->setText(QSL(" ") + label->title());
btn_label->setToolButtonStyle(Qt::ToolButtonStyle::ToolButtonTextBesideIcon); btn_label->setToolButtonStyle(Qt::ToolButtonStyle(qApp->settings()->value(GROUP(GUI),
SETTING(GUI::ToolbarStyle)).toInt()));
btn_label->setToolTip(label->title());
btn_label->setChecked(DatabaseQueries::isLabelAssignedToMessage(database, label, m_message)); btn_label->setChecked(DatabaseQueries::isLabelAssignedToMessage(database, label, m_message));
QAction* act_label = m_toolBar->addWidget(btn_label); QAction* act_label = m_toolBar->addWidget(btn_label);

6
src/librssguard/gui/settings/settingsnodejs.ui
View File

@ -41,7 +41,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>&amp;Browse...</string> <string>&amp;Browse</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -71,7 +71,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>&amp;Browse...</string> <string>&amp;Browse</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -101,7 +101,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>&amp;Browse...</string> <string>&amp;Browse</string>
</property> </property>
</widget> </widget>
</item> </item>

3
src/librssguard/services/tt-rss/gui/formttrssnote.ui
View File

@ -10,9 +10,6 @@
<height>340</height> <height>340</height>
</rect> </rect>
</property> </property>
<property name="windowTitle">
<string>Dialog</string>
</property>
<layout class="QFormLayout" name="formLayout"> <layout class="QFormLayout" name="formLayout">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">