diff --git a/src/librssguard/services/abstract/gui/authenticationdetails.ui b/src/librssguard/services/abstract/gui/authenticationdetails.ui
index 7486efb19..ee6e38413 100644
--- a/src/librssguard/services/abstract/gui/authenticationdetails.ui
+++ b/src/librssguard/services/abstract/gui/authenticationdetails.ui
@@ -6,8 +6,8 @@
0
0
- 400
- 300
+ 350
+ 196
diff --git a/src/librssguard/services/abstract/gui/formaccountdetails.ui b/src/librssguard/services/abstract/gui/formaccountdetails.ui
index 2f77fb9ae..c0cdfa1e6 100644
--- a/src/librssguard/services/abstract/gui/formaccountdetails.ui
+++ b/src/librssguard/services/abstract/gui/formaccountdetails.ui
@@ -6,8 +6,8 @@
0
0
- 500
- 558
+ 477
+ 336
diff --git a/src/librssguard/services/abstract/gui/formfeeddetails.ui b/src/librssguard/services/abstract/gui/formfeeddetails.ui
index f1b669854..8a0fb01fb 100644
--- a/src/librssguard/services/abstract/gui/formfeeddetails.ui
+++ b/src/librssguard/services/abstract/gui/formfeeddetails.ui
@@ -7,7 +7,7 @@
0
0
500
- 600
+ 563
diff --git a/src/librssguard/services/feedly/gui/feedlyaccountdetails.cpp b/src/librssguard/services/feedly/gui/feedlyaccountdetails.cpp
index b0263be58..106c48a4d 100644
--- a/src/librssguard/services/feedly/gui/feedlyaccountdetails.cpp
+++ b/src/librssguard/services/feedly/gui/feedlyaccountdetails.cpp
@@ -32,21 +32,21 @@ FeedlyAccountDetails::FeedlyAccountDetails(QWidget* parent) : QWidget(parent), m
tr("Here, results of connection test are shown."));
#if defined(FEEDLY_OFFICIAL_SUPPORT)
- m_ui.m_lblInfo->setText(tr("Your %1 build has official Feedly support. You do not have to use \"developer acess "
- "token\". You can therefore leave corresponding field empty.").arg(APP_NAME));
+ m_ui.m_lblInfo->setHelpText(tr("Your %1 build has official Feedly support. You do not have to use \"developer acess "
+ "token\". You can therefore leave corresponding field empty.").arg(QSL(APP_NAME)),
+ false);
#else
- m_ui.m_lblInfo->setText(tr("Your %1 does not offer official Feedly support, thus you must "
- "authorize via special authorization code called \"developer access token\". "
- "These tokens are usually valid only for 1 month and allow only 250 API calls "
- "each day.").arg(APP_NAME));
+ m_ui.m_lblInfo->setHelpText(tr("Your %1 does not offer official Feedly support, thus you must "
+ "authorize via special authorization code called \"developer access token\". "
+ "These tokens are usually valid only for 1 month and allow only 250 API calls "
+ "each day.").arg(QSL(APP_NAME)),
+ true);
#endif
- m_ui.m_lblLimitMessagesInfo->setText(tr("Beware of downloading too many articles, because "
- "Feedly permanently caches ALL articles of the feed, so you might "
- "end up with thousands of articles which you will never read anyway."));
-
- GuiUtilities::setLabelAsNotice(*m_ui.m_lblInfo, true);
- GuiUtilities::setLabelAsNotice(*m_ui.m_lblLimitMessagesInfo, true);
+ m_ui.m_lblLimitMessagesInfo->setHelpText(tr("Beware of downloading too many articles, because "
+ "Feedly permanently caches ALL articles of the feed, so you might "
+ "end up with thousands of articles which you will never read anyway."),
+ true);
connect(m_ui.m_btnGetToken, &QPushButton::clicked, this, &FeedlyAccountDetails::getDeveloperAccessToken);
connect(m_ui.m_txtUsername->lineEdit(), &BaseLineEdit::textChanged, this, &FeedlyAccountDetails::onUsernameChanged);
diff --git a/src/librssguard/services/feedly/gui/feedlyaccountdetails.ui b/src/librssguard/services/feedly/gui/feedlyaccountdetails.ui
index 225ff4dd3..75ef6746f 100644
--- a/src/librssguard/services/feedly/gui/feedlyaccountdetails.ui
+++ b/src/librssguard/services/feedly/gui/feedlyaccountdetails.ui
@@ -43,14 +43,7 @@
-
-
-
- Qt::AlignCenter
-
-
- true
-
-
+
-
@@ -115,35 +108,34 @@
-
-
-
- Qt::AlignCenter
-
-
- true
-
-
+
-
- LabelWithStatus
- QWidget
-
- 1
-
LineEditWithStatus
QWidget
1
+
+ LabelWithStatus
+ QWidget
+
+ 1
+
MessageCountSpinBox
QSpinBox
+
+ HelpSpoiler
+ QWidget
+
+ 1
+
diff --git a/src/librssguard/services/gmail/gui/gmailaccountdetails.cpp b/src/librssguard/services/gmail/gui/gmailaccountdetails.cpp
index 06da93b43..fcfabef91 100644
--- a/src/librssguard/services/gmail/gui/gmailaccountdetails.cpp
+++ b/src/librssguard/services/gmail/gui/gmailaccountdetails.cpp
@@ -14,16 +14,16 @@ GmailAccountDetails::GmailAccountDetails(QWidget* parent)
: QWidget(parent), m_oauth(nullptr), m_lastProxy({}) {
m_ui.setupUi(this);
- GuiUtilities::setLabelAsNotice(*m_ui.m_lblInfo, true);
-
#if defined(GMAIL_OFFICIAL_SUPPORT)
- m_ui.m_lblInfo->setText(tr("There are some preconfigured OAuth tokens so you do not have to fill in your "
- "client ID/secret, but it is strongly recommended to obtain your "
- "own as it preconfigured tokens have limited global usage quota. If you wish "
- "to use preconfigured tokens, simply leave those fields empty and make sure "
- "to leave default value of redirect URL."));
+ m_ui.m_lblInfo->setHelpText(tr("There are some preconfigured OAuth tokens so you do not have to fill in your "
+ "client ID/secret, but it is strongly recommended to obtain your "
+ "own as it preconfigured tokens have limited global usage quota. If you wish "
+ "to use preconfigured tokens, simply leave those fields empty and make sure "
+ "to leave default value of redirect URL."),
+ false);
#else
- m_ui.m_lblInfo->setText(tr("You have to fill in your client ID/secret and also fill in correct redirect URL."));
+ m_ui.m_lblInfo->setHelpText(tr("You have to fill in your client ID/secret and also fill in correct redirect URL."),
+ true);
#endif
m_ui.m_lblTestResult->setStatus(WidgetWithStatus::StatusType::Information,
diff --git a/src/librssguard/services/gmail/gui/gmailaccountdetails.ui b/src/librssguard/services/gmail/gui/gmailaccountdetails.ui
index 477427e2b..4ba3de692 100644
--- a/src/librssguard/services/gmail/gui/gmailaccountdetails.ui
+++ b/src/librssguard/services/gmail/gui/gmailaccountdetails.ui
@@ -97,20 +97,7 @@
-
-
-
-
- 0
- 1
-
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
-
-
- true
-
-
+
@@ -180,23 +167,29 @@
-
- LabelWithStatus
- QWidget
-
- 1
-
LineEditWithStatus
QWidget
1
+
+ LabelWithStatus
+ QWidget
+
+ 1
+
MessageCountSpinBox
QSpinBox
+
+ HelpSpoiler
+ QWidget
+
+ 1
+
m_btnRegisterApi
diff --git a/src/librssguard/services/owncloud/gui/owncloudaccountdetails.cpp b/src/librssguard/services/owncloud/gui/owncloudaccountdetails.cpp
index 5078944dd..12ca0a282 100644
--- a/src/librssguard/services/owncloud/gui/owncloudaccountdetails.cpp
+++ b/src/librssguard/services/owncloud/gui/owncloudaccountdetails.cpp
@@ -12,8 +12,9 @@ OwnCloudAccountDetails::OwnCloudAccountDetails(QWidget* parent) : QWidget(parent
m_ui.setupUi(this);
m_ui.m_lblTestResult->label()->setWordWrap(true);
- m_ui.m_lblServerSideUpdateInformation->setText(tr("Leaving this option on causes that updates "
- "of feeds will be probably much slower and may time-out often."));
+ m_ui.m_lblServerSideUpdateInformation->setHelpText(tr("Leaving this option on causes that updates "
+ "of feeds will be probably much slower and may time-out often."),
+ true);
m_ui.m_txtPassword->lineEdit()->setPlaceholderText(tr("Password for your Nextcloud account"));
m_ui.m_txtPassword->lineEdit()->setPasswordMode(true);
m_ui.m_txtUsername->lineEdit()->setPlaceholderText(tr("Username for your Nextcloud account"));
@@ -31,8 +32,6 @@ OwnCloudAccountDetails::OwnCloudAccountDetails(QWidget* parent) : QWidget(parent
}
});
- GuiUtilities::setLabelAsNotice(*m_ui.m_lblServerSideUpdateInformation, true);
-
connect(m_ui.m_txtPassword->lineEdit(), &BaseLineEdit::textChanged, this, &OwnCloudAccountDetails::onPasswordChanged);
connect(m_ui.m_txtUsername->lineEdit(), &BaseLineEdit::textChanged, this, &OwnCloudAccountDetails::onUsernameChanged);
connect(m_ui.m_txtUrl->lineEdit(), &BaseLineEdit::textChanged, this, &OwnCloudAccountDetails::onUrlChanged);
diff --git a/src/librssguard/services/owncloud/gui/owncloudaccountdetails.ui b/src/librssguard/services/owncloud/gui/owncloudaccountdetails.ui
index 782e554f6..0e05dfb00 100644
--- a/src/librssguard/services/owncloud/gui/owncloudaccountdetails.ui
+++ b/src/librssguard/services/owncloud/gui/owncloudaccountdetails.ui
@@ -73,14 +73,7 @@
-
-
-
-
-
-
- true
-
-
+
-
@@ -173,23 +166,29 @@
-
- LabelWithStatus
- QWidget
-
- 1
-
LineEditWithStatus
QWidget
1
+
+ LabelWithStatus
+ QWidget
+
+ 1
+
MessageCountSpinBox
QSpinBox
+
+ HelpSpoiler
+ QWidget
+
+ 1
+
m_checkDownloadOnlyUnreadMessages
diff --git a/src/librssguard/services/tt-rss/gui/ttrssaccountdetails.cpp b/src/librssguard/services/tt-rss/gui/ttrssaccountdetails.cpp
index eca03e686..816a8aaa4 100644
--- a/src/librssguard/services/tt-rss/gui/ttrssaccountdetails.cpp
+++ b/src/librssguard/services/tt-rss/gui/ttrssaccountdetails.cpp
@@ -11,8 +11,9 @@ TtRssAccountDetails::TtRssAccountDetails(QWidget* parent) : QWidget(parent) {
m_ui.setupUi(this);
m_ui.m_lblTestResult->label()->setWordWrap(true);
- m_ui.m_lblServerSideUpdateInformation->setText(tr("Leaving this option on causes that updates "
- "of feeds will be probably much slower and may time-out often."));
+ m_ui.m_lblServerSideUpdateInformation->setHelpText(tr("Leaving this option on causes that updates "
+ "of feeds will be probably much slower and may time-out often."),
+ true);
m_ui.m_txtHttpUsername->lineEdit()->setPlaceholderText(tr("HTTP authentication username"));
m_ui.m_txtHttpPassword->lineEdit()->setPlaceholderText(tr("HTTP authentication password"));
m_ui.m_txtPassword->lineEdit()->setPlaceholderText(tr("Password for your TT-RSS account"));
@@ -22,8 +23,6 @@ TtRssAccountDetails::TtRssAccountDetails(QWidget* parent) : QWidget(parent) {
tr("No test done yet."),
tr("Here, results of connection test are shown."));
- GuiUtilities::setLabelAsNotice(*m_ui.m_lblServerSideUpdateInformation, true);
-
setTabOrder(m_ui.m_txtUrl->lineEdit(), m_ui.m_checkDownloadOnlyUnreadMessages);
setTabOrder(m_ui.m_checkDownloadOnlyUnreadMessages, m_ui.m_spinLimitMessages);
setTabOrder(m_ui.m_spinLimitMessages, m_ui.m_checkServerSideUpdate);
diff --git a/src/librssguard/services/tt-rss/gui/ttrssaccountdetails.ui b/src/librssguard/services/tt-rss/gui/ttrssaccountdetails.ui
index b095fe272..fd9a73a75 100644
--- a/src/librssguard/services/tt-rss/gui/ttrssaccountdetails.ui
+++ b/src/librssguard/services/tt-rss/gui/ttrssaccountdetails.ui
@@ -7,7 +7,7 @@
0
0
432
- 480
+ 396
@@ -93,14 +93,7 @@
-
-
-
-
-
-
- true
-
-
+
-
@@ -220,23 +213,29 @@
-
- LabelWithStatus
- QWidget
-
- 1
-
LineEditWithStatus
QWidget
1
+
+ LabelWithStatus
+ QWidget
+
+ 1
+
MessageCountSpinBox
QSpinBox
+
+ HelpSpoiler
+ QWidget
+
+ 1
+