diff --git a/rssguard.pro b/rssguard.pro index 59fbcdf55..02778956b 100755 --- a/rssguard.pro +++ b/rssguard.pro @@ -328,7 +328,8 @@ HEADERS += src/core/feeddownloader.h \ src/services/standard/rssparser.h \ src/miscellaneous/serviceoperator.h \ src/services/abstract/cacheforserviceroot.h \ - src/services/tt-rss/gui/formeditttrssaccount.h + src/services/tt-rss/gui/formeditttrssaccount.h \ + src/gui/guiutilities.h SOURCES += src/core/feeddownloader.cpp \ src/core/feedsmodel.cpp \ @@ -448,7 +449,8 @@ SOURCES += src/core/feeddownloader.cpp \ src/services/standard/rssparser.cpp \ src/miscellaneous/serviceoperator.cpp \ src/services/abstract/cacheforserviceroot.cpp \ - src/services/tt-rss/gui/formeditttrssaccount.cpp + src/services/tt-rss/gui/formeditttrssaccount.cpp \ + src/gui/guiutilities.cpp FORMS += src/gui/toolbareditor.ui \ src/network-web/downloaditem.ui \ diff --git a/src/gui/guiutilities.cpp b/src/gui/guiutilities.cpp new file mode 100755 index 000000000..55ccc4dae --- /dev/null +++ b/src/gui/guiutilities.cpp @@ -0,0 +1,37 @@ +// This file is part of RSS Guard. +// +// Copyright (C) 2011-2017 by Martin Rotter +// +// RSS Guard is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// RSS Guard is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with RSS Guard. If not, see . + +#include "gui/guiutilities.h" + +#include "definitions/definitions.h" + +#include + + +void GuiUtilities::setLabelAsNotice(QLabel *label, bool is_warning) { + label->setMargin(6); + + if (is_warning) { + label->setStyleSheet(QSL("font-weight: bold; font-style: italic; color: red")); + } + else { + label->setStyleSheet(QSL("font-style: italic;")); + } +} + +GuiUtilities::GuiUtilities() { +} diff --git a/src/gui/guiutilities.h b/src/gui/guiutilities.h new file mode 100755 index 000000000..999765931 --- /dev/null +++ b/src/gui/guiutilities.h @@ -0,0 +1,32 @@ +// This file is part of RSS Guard. +// +// Copyright (C) 2011-2017 by Martin Rotter +// +// RSS Guard is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// RSS Guard is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with RSS Guard. If not, see . + +#ifndef GUIUTILITIES_H +#define GUIUTILITIES_H + + +class QLabel; + +class GuiUtilities { + public: + static void setLabelAsNotice(QLabel *label, bool is_warning); + + private: + explicit GuiUtilities(); +}; + +#endif // GUIUTILITIES_H diff --git a/src/gui/settings/settingsbrowsermail.cpp b/src/gui/settings/settingsbrowsermail.cpp index 8edc300b2..fe3fd2f4c 100755 --- a/src/gui/settings/settingsbrowsermail.cpp +++ b/src/gui/settings/settingsbrowsermail.cpp @@ -20,6 +20,7 @@ #include "network-web/silentnetworkaccessmanager.h" #include "miscellaneous/application.h" #include "miscellaneous/textfactory.h" +#include "gui/guiutilities.h" #include #include @@ -29,6 +30,10 @@ SettingsBrowserMail::SettingsBrowserMail(Settings *settings, QWidget *parent) : SettingsPanel(settings, parent), m_ui(new Ui::SettingsBrowserMail) { m_ui->setupUi(this); + GuiUtilities::setLabelAsNotice(m_ui->label, false); + GuiUtilities::setLabelAsNotice(m_ui->m_lblExternalEmailInfo, false); + GuiUtilities::setLabelAsNotice(m_ui->m_lblProxyInfo, false); + #if defined(USE_WEBENGINE) m_ui->m_checkOpenLinksInExternal->setVisible(false); #else diff --git a/src/gui/settings/settingsbrowsermail.ui b/src/gui/settings/settingsbrowsermail.ui index 26fb77962..17eec220a 100755 --- a/src/gui/settings/settingsbrowsermail.ui +++ b/src/gui/settings/settingsbrowsermail.ui @@ -109,7 +109,7 @@ - + Note that "%1" (without quotation marks) is placeholder for URL of selected message. @@ -122,7 +122,7 @@ - + Always open links from simple internal text browser in external web browser diff --git a/src/gui/settings/settingsdatabase.cpp b/src/gui/settings/settingsdatabase.cpp index e3ebde6cb..d10a73162 100755 --- a/src/gui/settings/settingsdatabase.cpp +++ b/src/gui/settings/settingsdatabase.cpp @@ -21,12 +21,17 @@ #include "definitions/definitions.h" #include "miscellaneous/application.h" #include "miscellaneous/textfactory.h" +#include "gui/guiutilities.h" SettingsDatabase::SettingsDatabase(Settings *settings, QWidget *parent) : SettingsPanel(settings, parent), m_ui(new Ui::SettingsDatabase) { m_ui->setupUi(this); + GuiUtilities::setLabelAsNotice(m_ui->m_lblDataStorageWarning, true); + GuiUtilities::setLabelAsNotice(m_ui->m_lblMysqlInfo, false); + GuiUtilities::setLabelAsNotice(m_ui->m_lblSqliteInMemoryWarnings, true); + connect(m_ui->m_cmbDatabaseDriver, static_cast(&QComboBox::currentIndexChanged), this, &SettingsDatabase::dirtifySettings); connect(m_ui->m_checkSqliteUseInMemoryDatabase, &QCheckBox::toggled, this, &SettingsDatabase::dirtifySettings); connect(m_ui->m_txtMysqlDatabase->lineEdit(), &QLineEdit::textChanged, this, &SettingsDatabase::dirtifySettings); diff --git a/src/gui/settings/settingsdatabase.ui b/src/gui/settings/settingsdatabase.ui index a40b64879..33b7179b5 100755 --- a/src/gui/settings/settingsdatabase.ui +++ b/src/gui/settings/settingsdatabase.ui @@ -23,7 +23,35 @@ 0 - + + + + Note that turning this option ON will make saving of new messages FASTER, but it might rarely cause some issues with messages saving. + + + Use DB transactions when storing downloaded messages + + + + + + + QLabel { + margin-top: 12px; +} + + + WARNING: Note that switching to another data storage type will NOT copy existing your data from currently active data storage to newly selected one. + + + Qt::AlignCenter + + + true + + + + Database driver @@ -33,10 +61,10 @@ - + - + 1 @@ -110,16 +138,6 @@ Authors of this application are NOT responsible for lost data. 0 - - - - Hostname - - - m_txtMysqlHostname - - - @@ -156,15 +174,8 @@ Authors of this application are NOT responsible for lost data. - - - - Username - - - m_txtMysqlUsername - - + + @@ -182,6 +193,16 @@ Authors of this application are NOT responsible for lost data. + + + + &Show password + + + true + + + @@ -211,11 +232,6 @@ Authors of this application are NOT responsible for lost data. - - - true - - Note that speed of used MySQL server and latency of used connection medium HEAVILY influences the final performance of this application. Using slow database connections leads to bad performance when browsing feeds or messages. @@ -225,24 +241,18 @@ Authors of this application are NOT responsible for lost data. true - - 10 - - - + + - &Show password + Username - - true + + m_txtMysqlUsername - - - @@ -250,49 +260,31 @@ Authors of this application are NOT responsible for lost data. + + + + Hostname + + + m_txtMysqlHostname + + + - - - - Use DB transactions when storing downloaded messages - - - - - - - QLabel { - margin-top: 12px; -} - - - WARNING: Note that switching to another data storage type will NOT copy existing your data from currently active data storage to newly selected one. - - - Qt::AlignCenter - - - true - - - - - - - Note that turning this option ON will make saving of new messages FASTER, but it might rarely cause some issues with messages saving. - - - Qt::AlignHCenter|Qt::AlignTop - - - true - - - + m_lblDatabaseDriver + m_cmbDatabaseDriver + m_stackedDatabaseDriver + m_checkUseTransactions + m_lblDataStorageWarning + label_2 + label_11 + label_4 + label_5 + m_lblMysqlInfo diff --git a/src/gui/settings/settingsfeedsmessages.cpp b/src/gui/settings/settingsfeedsmessages.cpp index b7217e0a6..d1b601b00 100755 --- a/src/gui/settings/settingsfeedsmessages.cpp +++ b/src/gui/settings/settingsfeedsmessages.cpp @@ -25,6 +25,7 @@ #include "gui/feedsview.h" #include "gui/messagesview.h" #include "gui/timespinbox.h" +#include "gui/guiutilities.h" #include @@ -34,6 +35,8 @@ SettingsFeedsMessages::SettingsFeedsMessages(Settings *settings, QWidget *parent m_ui->setupUi(this); initializeMessageDateFormats(); + GuiUtilities::setLabelAsNotice(m_ui->label_9, false); + connect(m_ui->m_checkAutoUpdate, &QCheckBox::toggled, this, &SettingsFeedsMessages::dirtifySettings); connect(m_ui->m_checkKeppMessagesInTheMiddle, &QCheckBox::toggled, this, &SettingsFeedsMessages::dirtifySettings); connect(m_ui->m_checkMessagesDateTimeFormat, &QCheckBox::toggled, this, &SettingsFeedsMessages::dirtifySettings);